From ce8bd1368510fc73348ffa8e9745731bd7a6a97a Mon Sep 17 00:00:00 2001 From: Gabriel Calero Date: Fri, 27 Apr 2018 18:58:09 -0300 Subject: [PATCH] Cleanup android code --- android/app/src/main/cpp/native.cpp | 4 -- .../hifiinterface/InterfaceActivity.java | 5 --- .../hifiinterface/MainActivity.java | 40 ++++++------------- interface/src/AndroidHelper.cpp | 4 -- interface/src/AndroidHelper.h | 2 - 5 files changed, 13 insertions(+), 42 deletions(-) diff --git a/android/app/src/main/cpp/native.cpp b/android/app/src/main/cpp/native.cpp index 79611dd695..cdecc12df6 100644 --- a/android/app/src/main/cpp/native.cpp +++ b/android/app/src/main/cpp/native.cpp @@ -182,10 +182,6 @@ JNIEXPORT void Java_io_highfidelity_hifiinterface_InterfaceActivity_nativeOnResu JNIEXPORT void Java_io_highfidelity_hifiinterface_InterfaceActivity_nativeOnExitVr(JNIEnv* env, jobject obj) { } -JNIEXPORT void Java_io_highfidelity_hifiinterface_InterfaceActivity_nativeGoBackFromAndroidActivity(JNIEnv *env, jobject instance) { - AndroidHelper::instance().goBackFromAndroidActivity(); -} - // HifiUtils JNIEXPORT jstring JNICALL Java_io_highfidelity_hifiinterface_HifiUtils_getCurrentAddress(JNIEnv *env, jobject instance) { QSharedPointer addressManager = DependencyManager::get(); diff --git a/android/app/src/main/java/io/highfidelity/hifiinterface/InterfaceActivity.java b/android/app/src/main/java/io/highfidelity/hifiinterface/InterfaceActivity.java index a48093eaf5..7b32f72148 100644 --- a/android/app/src/main/java/io/highfidelity/hifiinterface/InterfaceActivity.java +++ b/android/app/src/main/java/io/highfidelity/hifiinterface/InterfaceActivity.java @@ -41,11 +41,8 @@ public class InterfaceActivity extends QtActivity { //private native void nativeOnResume(); private native void nativeOnDestroy(); private native void nativeGotoUrl(String url); - private native void nativeGoBackFromAndroidActivity(); private native void nativeEnterBackground(); private native void nativeEnterForeground(); - //private native void saveRealScreenSize(int width, int height); - //private native void setAppVersion(String version); private native long nativeOnExitVr(); private AssetManager assetManager; @@ -92,7 +89,6 @@ public class InterfaceActivity extends QtActivity { Point size = new Point(); getWindowManager().getDefaultDisplay().getRealSize(size); -// saveRealScreenSize(size.x, size.y); try { PackageInfo pInfo = this.getPackageManager().getPackageInfo(getPackageName(), 0); @@ -201,7 +197,6 @@ public class InterfaceActivity extends QtActivity { if (intent.hasExtra(DOMAIN_URL)) { nativeGotoUrl(intent.getStringExtra(DOMAIN_URL)); } - nativeGoBackFromAndroidActivity(); } public void openAndroidActivity(String activityName) { diff --git a/android/app/src/main/java/io/highfidelity/hifiinterface/MainActivity.java b/android/app/src/main/java/io/highfidelity/hifiinterface/MainActivity.java index 2298308541..ff5aff1f1c 100644 --- a/android/app/src/main/java/io/highfidelity/hifiinterface/MainActivity.java +++ b/android/app/src/main/java/io/highfidelity/hifiinterface/MainActivity.java @@ -82,54 +82,40 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On private void loadHomeFragment() { Fragment fragment = HomeFragment.newInstance(); - FragmentManager fragmentManager = getFragmentManager(); - FragmentTransaction ft = fragmentManager.beginTransaction(); - ft.replace(R.id.content_frame, fragment); - ft.commit(); - - setTitle(getString(R.string.home)); - mDrawerLayout.closeDrawer(mNavigationView); + loadFragment(fragment, getString(R.string.home), false); } private void loadLoginFragment() { Fragment fragment = LoginFragment.newInstance(); - FragmentManager fragmentManager = getFragmentManager(); - FragmentTransaction ft = fragmentManager.beginTransaction(); - ft.replace(R.id.content_frame, fragment).addToBackStack(null); - ft.commit(); - - // update selected item title, then close the drawer - setTitle(getString(R.string.login)); - mDrawerLayout.closeDrawer(mNavigationView); + loadFragment(fragment, getString(R.string.login), true); } private void loadGotoFragment() { Fragment fragment = GotoFragment.newInstance(); - FragmentManager fragmentManager = getFragmentManager(); - FragmentTransaction ft = fragmentManager.beginTransaction(); - ft.replace(R.id.content_frame, fragment).addToBackStack(null); - ft.commit(); - - // update selected item title, then close the drawer - setTitle(getString(R.string.go_to)); - mDrawerLayout.closeDrawer(mNavigationView); + loadFragment(fragment, getString(R.string.go_to), true); } private void loadPrivacyPolicyFragment() { Fragment fragment = PolicyFragment.newInstance(); + loadFragment(fragment, getString(R.string.privacyPolicy), true); + } + + private void loadFragment(Fragment fragment, String title, boolean addToBackStack) { FragmentManager fragmentManager = getFragmentManager(); FragmentTransaction ft = fragmentManager.beginTransaction(); - ft.replace(R.id.content_frame, fragment).addToBackStack(null); + ft.replace(R.id.content_frame, fragment); + if (addToBackStack) { + ft.addToBackStack(null); + } ft.commit(); - - // update selected item title, then close the drawer - setTitle(getString(R.string.privacyPolicy)); + setTitle(title); mDrawerLayout.closeDrawer(mNavigationView); } + private void updateLoginMenu() { TextView loginOption = findViewById(R.id.login); TextView logoutOption = findViewById(R.id.logout); diff --git a/interface/src/AndroidHelper.cpp b/interface/src/AndroidHelper.cpp index 6dea89b1d0..cd1b4cb3a9 100644 --- a/interface/src/AndroidHelper.cpp +++ b/interface/src/AndroidHelper.cpp @@ -40,10 +40,6 @@ void AndroidHelper::notifyLoadComplete() { emit qtAppLoadComplete(); } -void AndroidHelper::goBackFromAndroidActivity() { - emit backFromAndroidActivity(); -} - void AndroidHelper::notifyLoginComplete(bool success) { emit loginComplete(success); } diff --git a/interface/src/AndroidHelper.h b/interface/src/AndroidHelper.h index 52d9c9ab12..e1d00a080b 100644 --- a/interface/src/AndroidHelper.h +++ b/interface/src/AndroidHelper.h @@ -25,7 +25,6 @@ public: } void requestActivity(const QString &activityName); void notifyLoadComplete(); - void goBackFromAndroidActivity(); void notifyLoginComplete(bool success); void performHapticFeedback(const QString& feedbackConstant); @@ -36,7 +35,6 @@ public: void operator=(AndroidHelper const&) = delete; signals: void androidActivityRequested(const QString &activityName); - void backFromAndroidActivity(); void qtAppLoadComplete(); void loginComplete(bool success); void hapticFeedbackRequested(const QString &feedbackConstant);