Skip to content

Commit bf9dd96

Browse files
SES-4569 : 'Follow Setting' button doesn't follow theming (#1531)
* Use textColorPrimary for light theme for Follow Setting button/text * Added to accentText to themes * Added accentText for the test theme --------- Co-authored-by: ThomasSession <[email protected]>
1 parent 5858a97 commit bf9dd96

File tree

4 files changed

+9
-1
lines changed

4 files changed

+9
-1
lines changed

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/ControlMessageView.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import org.session.libsession.utilities.StringSubstitutionConstants.APP_NAME_KEY
2525
import org.session.libsession.utilities.StringSubstitutionConstants.NAME_KEY
2626
import org.session.libsession.utilities.TextSecurePreferences
2727
import org.session.libsession.utilities.TextSecurePreferences.Companion.CALL_NOTIFICATIONS_ENABLED
28+
import org.session.libsession.utilities.ThemeUtil
2829
import org.session.libsession.utilities.getColorFromAttr
2930
import org.session.libsession.utilities.isGroup
3031
import org.session.libsession.utilities.isGroupOrCommunity
@@ -83,6 +84,7 @@ class ControlMessageView : LinearLayout {
8384
binding.iconImageView.isGone = true
8485
binding.expirationTimerView.isGone = true
8586
binding.followSetting.isGone = true
87+
8688
var messageBody: CharSequence = message.getDisplayBody(context)
8789

8890
binding.root.contentDescription = null

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
android:background="@null"
8888
android:contentDescription="@string/AccessibilityId_disappearingMessagesFollowSetting"
8989
android:text="@string/disappearingMessagesFollowSetting"
90-
android:textColor="?android:colorAccent"
90+
android:textColor="?attr/accentText"
9191
android:textSize="@dimen/very_small_font_size" />
9292

9393
</LinearLayout>

app/src/main/res/values/attrs.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,4 +170,5 @@
170170
<attr name="sendOnly" format="boolean" />
171171
</declare-styleable>
172172

173+
<attr name="accentText" format="reference|color"/>
173174
</resources>

app/src/main/res/values/themes.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,7 @@
208208
<item name="android:textColor">?android:textColorPrimary</item>
209209
<item name="android:textColorHint">@color/gray27</item>
210210
<item name="textColorAlert">@color/classic_dark_6</item>
211+
<item name="accentText">?colorAccent</item>
211212
<item name="android:windowBackground">?colorPrimary</item>
212213
<item name="bottomSheetDialogTheme">@style/Classic.Dark.BottomSheet</item>
213214
<item name="actionMenuTextColor">?android:textColorPrimary</item>
@@ -287,6 +288,7 @@
287288
<item name="android:textColor">?android:textColorPrimary</item>
288289
<item name="android:textColorHint">@color/gray27</item>
289290
<item name="textColorAlert">@color/classic_light_0</item>
291+
<item name="accentText">?android:textColorPrimary</item>
290292
<item name="android:windowBackground">?colorPrimary</item>
291293
<item name="colorCellBackground">@color/classic_light_6</item>
292294
<item name="colorDividerBackground">@color/classic_light_3</item>
@@ -372,6 +374,7 @@
372374
<item name="android:textColor">?android:textColorPrimary</item>
373375
<item name="android:textColorHint">@color/ocean_dark_5</item>
374376
<item name="textColorAlert">@color/ocean_dark_7</item>
377+
<item name="accentText">?colorAccent</item>
375378
<item name="android:windowBackground">?colorPrimary</item>
376379
<item name="colorCellBackground">@color/ocean_dark_3</item>
377380
<item name="colorDividerBackground">@color/ocean_dark_4</item>
@@ -450,6 +453,7 @@
450453
<item name="android:textColor">?android:textColorPrimary</item>
451454
<item name="android:textColorHint">@color/ocean_light_6</item>
452455
<item name="textColorAlert">@color/ocean_light_0</item>
456+
<item name="accentText">?android:textColorPrimary</item>
453457
<item name="android:windowBackground">?colorPrimary</item>
454458
<item name="colorCellBackground">@color/ocean_light_5</item>
455459
<item name="colorDividerBackground">@color/ocean_light_3</item>
@@ -555,6 +559,7 @@
555559
<item name="danger">@color/danger_dark</item>
556560
<item name="disabled">@color/classic_light_1</item>
557561
<item name="textColorAlert">@color/classic_dark_6</item>
562+
<item name="accentText">?colorAccent</item>
558563

559564
<!-- Home screen -->
560565
<item name="searchBackgroundColor">#1B1B1B</item>

0 commit comments

Comments
 (0)