From 34041b0358d3752649c4557162c1b90e07bbd934 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Sun, 2 May 2021 23:08:21 +0200 Subject: [PATCH] Code changes due to conductor update to 3.0.1 Signed-off-by: Andy Scherzinger --- app/build.gradle | 2 +- .../ConversationsListController.java | 31 ++++--- .../controllers/base/ButterKnifeController.kt | 2 +- .../animations/SharedElementTransition.java | 84 ------------------- app/src/main/res/layout/bottom_sheet.xml | 1 + 5 files changed, 17 insertions(+), 103 deletions(-) delete mode 100644 app/src/main/java/com/nextcloud/talk/utils/animations/SharedElementTransition.java diff --git a/app/build.gradle b/app/build.gradle index e4c8de166..de9ff6cbe 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -181,6 +181,7 @@ dependencies { implementation 'org.michaelevans.colorart:library:0.0.3' implementation "androidx.work:work-runtime:${workVersion}" implementation "androidx.work:work-rxjava2:${workVersion}" + implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' androidTestImplementation "androidx.work:work-testing:${workVersion}" implementation 'com.google.android:flexbox:2.0.1' implementation ('com.gitlab.bitfireAT:dav4jvm:f2078bc846', { @@ -200,7 +201,6 @@ dependencies { implementation "io.reactivex.rxjava2:rxjava:2.2.21" implementation 'com.bluelinelabs:conductor:3.0.1' - implementation 'com.bluelinelabs:conductor-support:2.1.5' implementation "com.squareup.okhttp3:okhttp:${okhttpVersion}" implementation "com.squareup.okhttp3:okhttp-urlconnection:${okhttpVersion}" diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java b/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java index 8fc10a198..85eeaa374 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java @@ -44,22 +44,8 @@ import android.view.inputmethod.EditorInfo; import android.widget.LinearLayout; import android.widget.RelativeLayout; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.appcompat.widget.SearchView; -import androidx.core.content.res.ResourcesCompat; -import androidx.core.graphics.drawable.RoundedBitmapDrawable; -import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory; -import androidx.core.view.MenuItemCompat; -import androidx.recyclerview.widget.RecyclerView; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.work.Data; -import androidx.work.OneTimeWorkRequest; -import androidx.work.WorkManager; - import com.bluelinelabs.conductor.RouterTransaction; import com.bluelinelabs.conductor.changehandler.HorizontalChangeHandler; -import com.bluelinelabs.conductor.changehandler.TransitionChangeHandlerCompat; import com.bluelinelabs.conductor.changehandler.VerticalChangeHandler; import com.bluelinelabs.conductor.internal.NoOpControllerChangeHandler; import com.facebook.common.executors.UiThreadImmediateExecutorService; @@ -97,7 +83,6 @@ import com.nextcloud.talk.utils.ApiUtils; import com.nextcloud.talk.utils.ConductorRemapping; import com.nextcloud.talk.utils.DisplayUtils; import com.nextcloud.talk.utils.KeyboardUtils; -import com.nextcloud.talk.utils.animations.SharedElementTransition; import com.nextcloud.talk.utils.bundle.BundleKeys; import com.nextcloud.talk.utils.database.user.UserUtils; import com.nextcloud.talk.utils.preferences.AppPreferences; @@ -116,6 +101,18 @@ import java.util.List; import javax.inject.Inject; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.widget.SearchView; +import androidx.core.content.res.ResourcesCompat; +import androidx.core.graphics.drawable.RoundedBitmapDrawable; +import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory; +import androidx.core.view.MenuItemCompat; +import androidx.recyclerview.widget.RecyclerView; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; +import androidx.work.Data; +import androidx.work.OneTimeWorkRequest; +import androidx.work.WorkManager; import autodagger.AutoInjector; import butterknife.BindView; import eu.davidea.fastscroller.FastScroller; @@ -571,8 +568,8 @@ public class ConversationsListController extends BaseController implements Searc ArrayList names = new ArrayList<>(); names.add("userAvatar.transitionTag"); getRouter().pushController((RouterTransaction.with(new SettingsController()) - .pushChangeHandler(new TransitionChangeHandlerCompat(new SharedElementTransition(names), new VerticalChangeHandler())) - .popChangeHandler(new TransitionChangeHandlerCompat(new SharedElementTransition(names), new VerticalChangeHandler())))); + .pushChangeHandler(new HorizontalChangeHandler()) + .popChangeHandler(new HorizontalChangeHandler()))); }); } } diff --git a/app/src/main/java/com/nextcloud/talk/controllers/base/ButterKnifeController.kt b/app/src/main/java/com/nextcloud/talk/controllers/base/ButterKnifeController.kt index 8f813a4b4..1acae2aa3 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/base/ButterKnifeController.kt +++ b/app/src/main/java/com/nextcloud/talk/controllers/base/ButterKnifeController.kt @@ -39,7 +39,7 @@ abstract class ButterKnifeController : Controller { protected abstract fun inflateView(inflater: LayoutInflater, container: ViewGroup): View - override fun onCreateView(inflater: LayoutInflater, container: ViewGroup): View { + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup, savedViewState: Bundle?): View { val view = inflateView(inflater, container) unbinder = ButterKnife.bind(this, view) onViewBound(view) diff --git a/app/src/main/java/com/nextcloud/talk/utils/animations/SharedElementTransition.java b/app/src/main/java/com/nextcloud/talk/utils/animations/SharedElementTransition.java deleted file mode 100644 index 351adaafa..000000000 --- a/app/src/main/java/com/nextcloud/talk/utils/animations/SharedElementTransition.java +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Nextcloud Talk application - * - * @author Mario Danic - * Copyright (C) 2017-2018 Mario Danic - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.nextcloud.talk.utils.animations; - -import android.os.Bundle; -import android.transition.*; -import android.view.View; -import android.view.ViewGroup; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import com.bluelinelabs.conductor.changehandler.SharedElementTransitionChangeHandler; - -import java.util.ArrayList; -import java.util.List; - -public class SharedElementTransition extends SharedElementTransitionChangeHandler { - private static final String KEY_WAIT_FOR_TRANSITION_NAMES = "SharedElementTransition.names"; - - private final ArrayList names; - - public SharedElementTransition() { - names = new ArrayList<>(); - } - - public SharedElementTransition(ArrayList names) { - this.names = names; - } - - @Override - public void saveToBundle(@NonNull Bundle bundle) { - bundle.putStringArrayList(KEY_WAIT_FOR_TRANSITION_NAMES, names); - } - - @Override - public void restoreFromBundle(@NonNull Bundle bundle) { - List savedNames = bundle.getStringArrayList(KEY_WAIT_FOR_TRANSITION_NAMES); - if (savedNames != null) { - names.addAll(savedNames); - } - } - - @Nullable - public Transition getExitTransition(@NonNull ViewGroup container, @Nullable View from, @Nullable View to, boolean isPush) { - return new Fade(Fade.OUT); - } - - @Override - @Nullable - public Transition getSharedElementTransition(@NonNull ViewGroup container, @Nullable View from, @Nullable View to, boolean isPush) { - return new TransitionSet().addTransition(new ChangeBounds()).addTransition(new ChangeClipBounds()).addTransition(new ChangeTransform()); - } - - @Override - @Nullable - public Transition getEnterTransition(@NonNull ViewGroup container, @Nullable View from, @Nullable View to, boolean isPush) { - return new Fade(Fade.IN); - } - - @Override - public void configureSharedElements(@NonNull ViewGroup container, @Nullable View from, @Nullable View to, boolean isPush) { - for (String name : names) { - addSharedElement(name); - //waitOnSharedElementNamed(name); - } - } -} diff --git a/app/src/main/res/layout/bottom_sheet.xml b/app/src/main/res/layout/bottom_sheet.xml index 0f278eedd..7c038f873 100644 --- a/app/src/main/res/layout/bottom_sheet.xml +++ b/app/src/main/res/layout/bottom_sheet.xml @@ -20,6 +20,7 @@