Merge pull request #1185 from nextcloud/dependabot/gradle/com.bluelinelabs-conductor-3.0.1

Bump conductor from 2.1.5 to 3.0.1

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', {
@@ -199,8 +200,7 @@ dependencies {
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
     implementation "io.reactivex.rxjava2:rxjava:2.2.21"
 
-    implementation 'com.bluelinelabs:conductor:2.1.5'
-    implementation 'com.bluelinelabs:conductor-support:2.1.5'
+    implementation 'com.bluelinelabs:conductor:3.0.1'
 
     implementation "com.squareup.okhttp3:okhttp:${okhttpVersion}"
     implementation "com.squareup.okhttp3:okhttp-urlconnection:${okhttpVersion}"

app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java

@@ -128,6 +128,7 @@ public class ContactsController extends BaseController implements SearchView.OnQ
     @BindView(R.id.loading_content)
     LinearLayout loadingContent;
 
+
     @BindView(R.id.recycler_view)
     RecyclerView recyclerView;
 
@@ -152,9 +153,6 @@ public class ContactsController extends BaseController implements SearchView.OnQ
     @BindView(R.id.generic_rv_layout)
     CoordinatorLayout genericRvLayout;
 
-    @Inject
-    NcApi ncApi;
-
     @Inject
     UserUtils userUtils;
 
@@ -164,6 +162,9 @@ public class ContactsController extends BaseController implements SearchView.OnQ
     @Inject
     AppPreferences appPreferences;
 
+    @Inject
+    NcApi ncApi;
+
     private String credentials;
     private UserEntity currentUser;
     private Disposable contactsQueryDisposable;
@@ -996,11 +997,19 @@ public class ContactsController extends BaseController implements SearchView.OnQ
 
     private void toggleNewCallHeaderVisibility(boolean showInitialLayout) {
         if (showInitialLayout) {
-            initialRelativeLayout.setVisibility(View.VISIBLE);
-            secondaryRelativeLayout.setVisibility(View.GONE);
+            if (initialRelativeLayout != null) {
+                initialRelativeLayout.setVisibility(View.VISIBLE);
+            }
+            if (secondaryRelativeLayout != null) {
+                secondaryRelativeLayout.setVisibility(View.GONE);
+            }
         } else {
-            initialRelativeLayout.setVisibility(View.GONE);
-            secondaryRelativeLayout.setVisibility(View.VISIBLE);
+            if (initialRelativeLayout != null) {
+                initialRelativeLayout.setVisibility(View.GONE);
+            }
+            if (secondaryRelativeLayout != null) {
+                secondaryRelativeLayout.setVisibility(View.VISIBLE);
+            }
         }
     }
 }

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<String> 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())));
                 });
             }
         }

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)

app/src/main/java/com/nextcloud/talk/utils/animations/SharedElementTransition.java

@@ -1,84 +0,0 @@
-/*
- * Nextcloud Talk application
- *
- * @author Mario Danic
- * Copyright (C) 2017-2018 Mario Danic <mario@lovelyhq.com>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-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<String> names;
-
-    public SharedElementTransition() {
-        names = new ArrayList<>();
-    }
-
-    public SharedElementTransition(ArrayList<String> 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<String> 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);
-        }
-    }
-}

app/src/main/res/layout/bottom_sheet.xml

@@ -20,6 +20,7 @@
 
 <com.bluelinelabs.conductor.ChangeHandlerFrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/bottom_sheet"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@color/bg_bottom_sheet"

scripts/analysis/findbugs-results.txt

@@ -1 +1 @@
-478
+476