From 8777722df42b3601a7d8a14281aaa7a7ce1b9ec4 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Thu, 7 Jun 2018 23:55:37 -0400 Subject: [PATCH] Don't animate for initial view setup in settings screens --- .../main/java/common/util/extensions/ViewExtensions.kt | 9 +++++++++ .../feature/conversationinfo/ConversationInfoActivity.kt | 3 +++ .../notificationprefs/NotificationPrefsActivity.kt | 3 +++ .../src/main/java/feature/settings/SettingsActivity.kt | 4 ++++ .../src/main/res/layout/conversation_info_activity.xml | 2 +- .../src/main/res/layout/notification_prefs_activity.xml | 1 - presentation/src/main/res/layout/settings_activity.xml | 1 - 7 files changed, 20 insertions(+), 3 deletions(-) diff --git a/presentation/src/main/java/common/util/extensions/ViewExtensions.kt b/presentation/src/main/java/common/util/extensions/ViewExtensions.kt index ed1b67e0..8f51b614 100644 --- a/presentation/src/main/java/common/util/extensions/ViewExtensions.kt +++ b/presentation/src/main/java/common/util/extensions/ViewExtensions.kt @@ -18,6 +18,7 @@ */ package common.util.extensions +import android.animation.LayoutTransition import android.content.Context import android.content.res.ColorStateList import android.graphics.PorterDuff @@ -25,11 +26,19 @@ import android.os.Build import android.support.v7.widget.RecyclerView import android.view.MotionEvent import android.view.View +import android.view.ViewGroup import android.view.inputmethod.InputMethodManager import android.widget.EditText import android.widget.ImageView import android.widget.ProgressBar +var ViewGroup.animateLayoutChanges: Boolean + get() = layoutTransition != null + set(value) { + layoutTransition = if (value) LayoutTransition() else null + } + + fun EditText.showKeyboard() { requestFocus() val imm = context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager diff --git a/presentation/src/main/java/feature/conversationinfo/ConversationInfoActivity.kt b/presentation/src/main/java/feature/conversationinfo/ConversationInfoActivity.kt index be4709e3..47cd03c2 100644 --- a/presentation/src/main/java/feature/conversationinfo/ConversationInfoActivity.kt +++ b/presentation/src/main/java/feature/conversationinfo/ConversationInfoActivity.kt @@ -28,6 +28,7 @@ import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.kotlin.autoDisposable import common.Navigator import common.base.QkThemedActivity +import common.util.extensions.animateLayoutChanges import common.util.extensions.scrapViews import common.util.extensions.setVisible import dagger.android.AndroidInjection @@ -60,6 +61,8 @@ class ConversationInfoActivity : QkThemedActivity(), ConversationInfoView { viewModel.bindView(this) setTitle(R.string.info_title) + items.postDelayed({ items.animateLayoutChanges = true }, 100) + mediaAdapter.thumbnailClicks .autoDisposable(scope()) .subscribe { view -> navigator.showImageAnimated(this, view) } diff --git a/presentation/src/main/java/feature/notificationprefs/NotificationPrefsActivity.kt b/presentation/src/main/java/feature/notificationprefs/NotificationPrefsActivity.kt index b03ba4cb..ebf78c33 100644 --- a/presentation/src/main/java/feature/notificationprefs/NotificationPrefsActivity.kt +++ b/presentation/src/main/java/feature/notificationprefs/NotificationPrefsActivity.kt @@ -30,6 +30,7 @@ import com.jakewharton.rxbinding2.view.clicks import com.moez.QKSMS.R import common.QkDialog import common.base.QkThemedActivity +import common.util.extensions.animateLayoutChanges import common.util.extensions.setVisible import common.widget.PreferenceView import dagger.android.AndroidInjection @@ -58,6 +59,8 @@ class NotificationPrefsActivity : QkThemedActivity(), NotificationPrefsView { showBackButton(true) viewModel.bindView(this) + preferences.postDelayed({ preferences.animateLayoutChanges = true }, 100) + val hasOreo = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O notificationsO.setVisible(hasOreo) diff --git a/presentation/src/main/java/feature/settings/SettingsActivity.kt b/presentation/src/main/java/feature/settings/SettingsActivity.kt index ee64e6b5..499a9341 100644 --- a/presentation/src/main/java/feature/settings/SettingsActivity.kt +++ b/presentation/src/main/java/feature/settings/SettingsActivity.kt @@ -18,6 +18,7 @@ */ package feature.settings +import android.animation.LayoutTransition import android.app.ProgressDialog import android.app.TimePickerDialog import android.arch.lifecycle.ViewModelProvider @@ -33,6 +34,7 @@ import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.kotlin.autoDisposable import common.QkDialog import common.base.QkThemedActivity +import common.util.extensions.animateLayoutChanges import common.util.extensions.setBackgroundTint import common.util.extensions.setVisible import common.widget.PreferenceView @@ -81,6 +83,8 @@ class SettingsActivity : QkThemedActivity(), SettingsView { showBackButton(true) viewModel.bindView(this) + preferences.postDelayed({ preferences.animateLayoutChanges = true }, 100) + nightModeDialog.adapter.setData(R.array.night_modes) textSizeDialog.adapter.setData(R.array.text_sizes) sendDelayDialog.adapter.setData(R.array.delayed_sending_labels) diff --git a/presentation/src/main/res/layout/conversation_info_activity.xml b/presentation/src/main/res/layout/conversation_info_activity.xml index bf61ca0f..c1c74b30 100644 --- a/presentation/src/main/res/layout/conversation_info_activity.xml +++ b/presentation/src/main/res/layout/conversation_info_activity.xml @@ -40,9 +40,9 @@ app:layout_constraintTop_toBottomOf="@id/toolbar"> diff --git a/presentation/src/main/res/layout/settings_activity.xml b/presentation/src/main/res/layout/settings_activity.xml index e279b8ba..588de851 100644 --- a/presentation/src/main/res/layout/settings_activity.xml +++ b/presentation/src/main/res/layout/settings_activity.xml @@ -50,7 +50,6 @@ android:id="@+id/preferences" android:layout_width="match_parent" android:layout_height="wrap_content" - android:animateLayoutChanges="true" android:orientation="vertical" android:paddingBottom="8dp" android:paddingTop="8dp">