Skip to content

SES-4569 : 'Follow Setting' button doesn't follow theming #1531

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Sep 24, 2025
Merged

SES-4569 : 'Follow Setting' button doesn't follow theming #1531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a9f4e5a
Use textColorPrimary for light theme for Follow Setting button/text
jbsession Sep 22, 2025
f7cb920
Merge branch 'dev' into improvements/ses-4569
ThomasSession Sep 23, 2025
7ae2278
Added to accentText to themes
jbsession Sep 23, 2025
844e334
Merge branch 'improvements/ses-4569' of github.com:jbsession/session-…
jbsession Sep 23, 2025
be0b217
Added accentText for the test theme
jbsession Sep 23, 2025
4389563
Merge branch 'dev' into improvements/ses-4569
jbsession Sep 23, 2025
b6e2c13
Merge branch 'dev' into improvements/ses-4569
jbsession Sep 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/ControlMessageView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import org.session.libsession.utilities.StringSubstitutionConstants.APP_NAME_KEY
import org.session.libsession.utilities.StringSubstitutionConstants.NAME_KEY
import org.session.libsession.utilities.TextSecurePreferences
import org.session.libsession.utilities.TextSecurePreferences.Companion.CALL_NOTIFICATIONS_ENABLED
import org.session.libsession.utilities.ThemeUtil
import org.session.libsession.utilities.getColorFromAttr
import org.session.libsession.utilities.isGroup
import org.session.libsession.utilities.isGroupOrCommunity
Expand Down Expand Up @@ -83,6 +84,7 @@ class ControlMessageView : LinearLayout {
binding.iconImageView.isGone = true
binding.expirationTimerView.isGone = true
binding.followSetting.isGone = true

var messageBody: CharSequence = message.getDisplayBody(context)

binding.root.contentDescription = null
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/view_control_message.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
android:background="@null"
android:contentDescription="@string/AccessibilityId_disappearingMessagesFollowSetting"
android:text="@string/disappearingMessagesFollowSetting"
android:textColor="?android:colorAccent"
android:textColor="?attr/accentText"
android:textSize="@dimen/very_small_font_size" />

</LinearLayout>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/attrs.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,4 +170,5 @@
<attr name="sendOnly" format="boolean" />
</declare-styleable>

<attr name="accentText" format="reference|color"/>
</resources>
5 changes: 5 additions & 0 deletions app/src/main/res/values/themes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@
<item name="android:textColor">?android:textColorPrimary</item>
<item name="android:textColorHint">@color/gray27</item>
<item name="textColorAlert">@color/classic_dark_6</item>
<item name="accentText">?colorAccent</item>
<item name="android:windowBackground">?colorPrimary</item>
<item name="bottomSheetDialogTheme">@style/Classic.Dark.BottomSheet</item>
<item name="actionMenuTextColor">?android:textColorPrimary</item>
Expand Down Expand Up @@ -287,6 +288,7 @@
<item name="android:textColor">?android:textColorPrimary</item>
<item name="android:textColorHint">@color/gray27</item>
<item name="textColorAlert">@color/classic_light_0</item>
<item name="accentText">?android:textColorPrimary</item>
<item name="android:windowBackground">?colorPrimary</item>
<item name="colorCellBackground">@color/classic_light_6</item>
<item name="colorDividerBackground">@color/classic_light_3</item>
Expand Down Expand Up @@ -372,6 +374,7 @@
<item name="android:textColor">?android:textColorPrimary</item>
<item name="android:textColorHint">@color/ocean_dark_5</item>
<item name="textColorAlert">@color/ocean_dark_7</item>
<item name="accentText">?colorAccent</item>
<item name="android:windowBackground">?colorPrimary</item>
<item name="colorCellBackground">@color/ocean_dark_3</item>
<item name="colorDividerBackground">@color/ocean_dark_4</item>
Expand Down Expand Up @@ -450,6 +453,7 @@
<item name="android:textColor">?android:textColorPrimary</item>
<item name="android:textColorHint">@color/ocean_light_6</item>
<item name="textColorAlert">@color/ocean_light_0</item>
<item name="accentText">?android:textColorPrimary</item>
<item name="android:windowBackground">?colorPrimary</item>
<item name="colorCellBackground">@color/ocean_light_5</item>
<item name="colorDividerBackground">@color/ocean_light_3</item>
Expand Down Expand Up @@ -555,6 +559,7 @@
<item name="danger">@color/danger_dark</item>
<item name="disabled">@color/classic_light_1</item>
<item name="textColorAlert">@color/classic_dark_6</item>
<item name="accentText">?colorAccent</item>

<!-- Home screen -->
<item name="searchBackgroundColor">#1B1B1B</item>
Expand Down