From b728c3beb1b7e4e5604fdc2999e5a55a22c88a4e Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Mon, 23 Oct 2017 20:33:14 +0200 Subject: [PATCH] Modify change handlers Signed-off-by: Mario Danic --- .../com/nextcloud/talk/activities/MainActivity.java | 10 +++++----- .../controllers/AccountVerificationController.java | 5 ++++- .../talk/controllers/CallsListController.java | 6 +++--- .../nextcloud/talk/controllers/ContactsController.java | 6 +++--- .../talk/controllers/ServerSelectionController.java | 5 ++++- .../talk/controllers/WebViewLoginController.java | 4 +++- .../com/nextcloud/talk/utils/CachingGlideModule.java | 2 +- 7 files changed, 23 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/activities/MainActivity.java b/app/src/main/java/com/nextcloud/talk/activities/MainActivity.java index ea618c97b..cf2f6b946 100644 --- a/app/src/main/java/com/nextcloud/talk/activities/MainActivity.java +++ b/app/src/main/java/com/nextcloud/talk/activities/MainActivity.java @@ -28,7 +28,7 @@ import android.view.ViewGroup; import com.bluelinelabs.conductor.Conductor; import com.bluelinelabs.conductor.Router; import com.bluelinelabs.conductor.RouterTransaction; -import com.bluelinelabs.conductor.changehandler.FadeChangeHandler; +import com.bluelinelabs.conductor.changehandler.HorizontalChangeHandler; import com.nextcloud.talk.R; import com.nextcloud.talk.application.NextcloudTalkApplication; import com.nextcloud.talk.controllers.BottomNavigationController; @@ -75,12 +75,12 @@ public final class MainActivity extends AppCompatActivity implements ActionBarPr if (!router.hasRootController() && userUtils.anyUserExists()) { router.setRoot(RouterTransaction.with(new BottomNavigationController(R.menu.menu_navigation)) - .pushChangeHandler(new FadeChangeHandler()) - .popChangeHandler(new FadeChangeHandler())); + .pushChangeHandler(new HorizontalChangeHandler()) + .popChangeHandler(new HorizontalChangeHandler())); } else if (!router.hasRootController()) { router.setRoot(RouterTransaction.with(new ServerSelectionController()) - .pushChangeHandler(new FadeChangeHandler()) - .popChangeHandler(new FadeChangeHandler())); + .pushChangeHandler(new HorizontalChangeHandler()) + .popChangeHandler(new HorizontalChangeHandler())); } } diff --git a/app/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.java b/app/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.java index ae20ea29c..85c01ba74 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.java @@ -32,6 +32,7 @@ import android.view.ViewGroup; import android.widget.TextView; import com.bluelinelabs.conductor.RouterTransaction; +import com.bluelinelabs.conductor.changehandler.HorizontalChangeHandler; import com.nextcloud.talk.R; import com.nextcloud.talk.api.NcApi; import com.nextcloud.talk.api.helpers.api.ApiHelper; @@ -136,7 +137,9 @@ public class AccountVerificationController extends BaseController { getResources().getString( R.string.nc_display_name_stored)); getRouter().setRoot(RouterTransaction.with(new - BottomNavigationController(R.menu.menu_navigation))); + BottomNavigationController(R.menu.menu_navigation)) + .pushChangeHandler(new HorizontalChangeHandler()) + .popChangeHandler(new HorizontalChangeHandler())); }, throwable -> { progressText.setText(progressText.getText().toString() + diff --git a/app/src/main/java/com/nextcloud/talk/controllers/CallsListController.java b/app/src/main/java/com/nextcloud/talk/controllers/CallsListController.java index 0494404a7..fde06c5cd 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/CallsListController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/CallsListController.java @@ -43,7 +43,7 @@ import android.view.ViewTreeObserver; import android.view.inputmethod.EditorInfo; import com.bluelinelabs.conductor.RouterTransaction; -import com.bluelinelabs.conductor.changehandler.FadeChangeHandler; +import com.bluelinelabs.conductor.changehandler.HorizontalChangeHandler; import com.bluelinelabs.logansquare.LoganSquare; import com.nextcloud.talk.R; import com.nextcloud.talk.adapters.items.RoomItem; @@ -144,8 +144,8 @@ public class CallsListController extends BaseController implements SearchView.On // Fallback to login if we have no users if (getParentController() != null && getParentController().getRouter() != null) { getParentController().getRouter().setRoot((RouterTransaction.with(new ServerSelectionController()) - .pushChangeHandler(new FadeChangeHandler()) - .popChangeHandler(new FadeChangeHandler()))); + .pushChangeHandler(new HorizontalChangeHandler()) + .popChangeHandler(new HorizontalChangeHandler()))); } } } diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java b/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java index 61c161647..601344e25 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java @@ -43,7 +43,7 @@ import android.view.ViewTreeObserver; import android.view.inputmethod.EditorInfo; import com.bluelinelabs.conductor.RouterTransaction; -import com.bluelinelabs.conductor.changehandler.FadeChangeHandler; +import com.bluelinelabs.conductor.changehandler.HorizontalChangeHandler; import com.bluelinelabs.logansquare.LoganSquare; import com.nextcloud.talk.R; import com.nextcloud.talk.adapters.items.UserItem; @@ -149,8 +149,8 @@ public class ContactsController extends BaseController implements SearchView.OnQ // Fallback to login if we have no users if (getParentController().getRouter() != null) { getParentController().getRouter().setRoot((RouterTransaction.with(new ServerSelectionController()) - .pushChangeHandler(new FadeChangeHandler()) - .popChangeHandler(new FadeChangeHandler()))); + .pushChangeHandler(new HorizontalChangeHandler()) + .popChangeHandler(new HorizontalChangeHandler()))); } } } diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ServerSelectionController.java b/app/src/main/java/com/nextcloud/talk/controllers/ServerSelectionController.java index e7c21adf8..9d2be27f2 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ServerSelectionController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/ServerSelectionController.java @@ -28,6 +28,7 @@ import android.view.ViewGroup; import android.view.inputmethod.EditorInfo; import com.bluelinelabs.conductor.RouterTransaction; +import com.bluelinelabs.conductor.changehandler.HorizontalChangeHandler; import com.nextcloud.talk.R; import com.nextcloud.talk.api.NcApi; import com.nextcloud.talk.api.helpers.api.ApiHelper; @@ -105,7 +106,9 @@ public class ServerSelectionController extends BaseController { getResources().getString(R.string.nc_server_product_name))) { getRouter().pushController(RouterTransaction.with( - new WebViewLoginController(finalServerUrl))); + new WebViewLoginController(finalServerUrl)) + .pushChangeHandler(new HorizontalChangeHandler()) + .popChangeHandler(new HorizontalChangeHandler())); } else if (!status.isInstalled()) { textFieldBoxes.setError(String.format( getResources().getString(R.string.nc_server_not_installed), productName), diff --git a/app/src/main/java/com/nextcloud/talk/controllers/WebViewLoginController.java b/app/src/main/java/com/nextcloud/talk/controllers/WebViewLoginController.java index d8a0fcaeb..1c7c640b6 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/WebViewLoginController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/WebViewLoginController.java @@ -33,6 +33,7 @@ import android.webkit.WebView; import android.webkit.WebViewClient; import com.bluelinelabs.conductor.RouterTransaction; +import com.bluelinelabs.conductor.changehandler.HorizontalChangeHandler; import com.nextcloud.talk.R; import com.nextcloud.talk.api.helpers.api.ApiHelper; import com.nextcloud.talk.application.NextcloudTalkApplication; @@ -166,7 +167,8 @@ public class WebViewLoginController extends BaseController { bundleBuilder.putString(BundleKeys.KEY_TOKEN, userEntity.getToken()); bundleBuilder.putString(BundleKeys.KEY_BASE_URL, userEntity.getBaseUrl()); getRouter().pushController(RouterTransaction.with(new AccountVerificationController - (bundleBuilder.build()))); + (bundleBuilder.build())).pushChangeHandler(new HorizontalChangeHandler()) + .popChangeHandler(new HorizontalChangeHandler())); }, throwable -> dispose(), this::dispose); } diff --git a/app/src/main/java/com/nextcloud/talk/utils/CachingGlideModule.java b/app/src/main/java/com/nextcloud/talk/utils/CachingGlideModule.java index 85f3fa0fb..2db9b1a8d 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/CachingGlideModule.java +++ b/app/src/main/java/com/nextcloud/talk/utils/CachingGlideModule.java @@ -43,7 +43,7 @@ public class CachingGlideModule extends AppGlideModule { // 128 MB private static final int OK_HTTP_CLIENT_CACHE = 128 * 1024 * 1024; // 256 MB - private static final int IMAGE_CACHE_SIZE = 256 * 1024 * 1024; + private static final int IMAGE_CACHE_SIZE = 256 * 1024 * 1024; @Override public void registerComponents(Context context, Glide glide, Registry registry) {