Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-23 11:15:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

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
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)