empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Update legacy text and fix small animation bug.

Browse source
This commit is contained in:
Alex Hart 2021-06-25 10:57:58 -03:00
parent 93bb49dc16
commit f7212b9916
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsFragment.kt
View file

@ -50,11 +50,6 @@ abstract class DSLSettingsFragment(
bindAdapter(adapter)
}
override fun onResume() {
super.onResume()
scrollAnimationHelper.setImmediateState(recyclerView)
}
protected open fun getOnScrollAnimationHelper(toolbarShadow: View): OnScrollAnimationHelper {
return ToolbarShadowAnimationHelper(toolbarShadow)
}
@ -84,6 +79,11 @@ abstract class DSLSettingsFragment(
return
}
if (lastAnimationState == AnimationState.NONE) {
setImmediateState(recyclerView)
return
}
when (newAnimationState) {
AnimationState.NONE -> throw AssertionError()
AnimationState.HIDE -> hide(duration)

3
app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/preferences/LegacyGroupPreference.kt
View file

@ -1,6 +1,7 @@
package org.thoughtcrime.securesms.components.settings.conversation.preferences
import android.view.View
import androidx.core.content.ContextCompat
import org.thoughtcrime.securesms.R
import org.thoughtcrime.securesms.components.settings.PreferenceModel
import org.thoughtcrime.securesms.util.FeatureFlags
@ -32,6 +33,8 @@ object LegacyGroupPreference {
override fun bind(model: Model) {
itemView.visibility = View.VISIBLE
groupInfoText.setLinkColor(ContextCompat.getColor(context, R.color.signal_text_primary))
when (model.state) {
State.LEARN_MORE -> {
groupInfoText.setText(R.string.ManageGroupActivity_legacy_group_learn_more)

9
app/src/main/res/layout/conversation_settings_legacy_group_preference.xml
View file

@ -6,10 +6,7 @@
android:layout_marginStart="@dimen/dsl_settings_gutter"
android:layout_marginTop="12dp"
android:layout_marginEnd="@dimen/dsl_settings_gutter"
android:background="@drawable/round_background"
android:paddingStart="12dp"
android:paddingTop="10dp"
android:paddingEnd="12dp"
android:paddingBottom="10dp"
android:textAppearance="@style/TextAppearance.Signal.Subtitle"
android:text="@string/ManageGroupActivity_legacy_group_upgrade"
android:textAlignment="center"
android:textAppearance="@style/Signal.Text.Body"
android:textColor="@color/signal_text_secondary" />