TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-08-25 13:57:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Theme hierarchy refactoring.

Browse Source 
Force dark theme for media send activity.
This commit is contained in:
Anton Chekulaev
2020-08-25 19:43:00 +10:00
parent b04028f629
commit 810afe8e7e
12 changed files with 102 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout/activity_settings.xml
View File

@@ -6,7 +6,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="org.thoughtcrime.securesms.loki.activities.SettingsActivity"
tools:theme="@style/Session.DarkTheme.NoActionBar"
tools:theme="@style/Theme.Session.DayNight.NoActionBar"
tools:menu="@menu/settings_general">
<ScrollView

5
res/layout/mediasend_fragment.xml
View File

@@ -6,6 +6,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/core_black"
android:theme="@style/Theme.Session.ForceDark"
tools:context="org.thoughtcrime.securesms.mediasend.MediaSendActivity">
<org.thoughtcrime.securesms.components.ControllableViewPager
@@ -121,9 +122,9 @@
<org.thoughtcrime.securesms.components.SendButton
android:id="@+id/mediasend_send_button"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="fitCenter"
android:scaleType="fitXY"
android:contentDescription="@string/conversation_activity__send"
android:src="?conversation_transport_sms_indicator"
android:background="@drawable/circle_touch_highlight_background" />

2
res/layout/scribble_select_sticker_activity.xml
View File

@@ -9,7 +9,7 @@
android:id="@+id/camera_sticker_tabs"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:tabBackground="@color/core_grey_90"
app:tabBackground="?android:colorPrimary"
app:tabMode="fixed"/>
<androidx.viewpager.widget.ViewPager

6
res/values-notnight/themes.xml
View File

@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="Session.DarkTheme" parent="Session.BaseDarkTheme">
<!-- TODO: AC These values should not be hardcoded here or use any "notnight" color resources.
The light theme should be defined in the main "themes.xml" file. -->
<style name="Theme.Session.DayNight">
<item name="android:navigationBarColor">@color/gray65</item>
<item name="android:statusBarColor">@color/accent</item>
<item name="android:textColorHint">@color/gray50</item>
@@ -13,7 +15,7 @@
<item name="message_sent_background_color">?colorAccent</item>
</style>
<style name="TextSecure.DarkNoActionBar" parent="@style/TextSecure.BaseDarkNoActionBar">
<style name="Theme.TextSecure.DayNight">
<item name="android:navigationBarColor">@color/gray78</item>

2
res/values-v23/themes.xml
View File

@@ -5,7 +5,7 @@
<item name="android:statusBarColor">@color/core_grey_02</item>
</style>
<style name="TextSecure.DarkRegistrationTheme" parent="TextSecure.DarkNoActionBar">
<style name="TextSecure.DarkRegistrationTheme" parent="Theme.TextSecure.DayNight.NoActionBar">
<item name="android:windowLightStatusBar">false</item>
<item name="android:statusBarColor">@color/core_black</item>
</style>

3
res/values/styles.xml
View File

@@ -357,7 +357,8 @@
<item name="android:background">@null</item>
<item name="android:maxLines">4</item>
<item name="android:maxLength">65536</item>
<item name="android:textColor">?conversation_item_sent_text_primary_color</item>
<item name="android:textColor">?android:textColorPrimary</item>
<item name="android:textColorHint">?android:textColorTertiary</item>
<item name="android:capitalize">sentences</item>
<item name="android:autoText">true</item>
<item name="android:gravity">center_vertical</item>

121
res/values/themes.xml
View File

@@ -3,7 +3,7 @@
<resources>
<!-- Session -->
<style name="Session.BaseDarkTheme" parent="@style/Theme.AppCompat.DayNight.DarkActionBar">
<style name="Theme.Session" parent="@style/Theme.AppCompat.DayNight.DarkActionBar">
<item name="colorPrimary">@color/action_bar_background</item>
<item name="colorPrimaryDark">@color/action_bar_background</item>
<item name="colorAccent">@color/accent</item>
@@ -64,33 +64,37 @@
<item name="conversation_keyboard_toggle">@drawable/ic_baseline_keyboard_24</item>
</style>
<style name="Session.DarkTheme" parent="Session.BaseDarkTheme">
<!-- This should be the default theme for the application. -->
<style name="Theme.Session.DayNight">
<!-- leave empty to allow overriding -->
</style>
<style name="Session.DarkTheme.NoActionBar" parent="@style/Session.DarkTheme">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
<style name="Theme.Session.DayNight.NoActionBar">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>
<style name="Session.DarkTheme.SubtitleActionBar" parent="@style/Session.DarkTheme">
<item name="actionBarStyle">@style/Session.DarkSubtitleActionBar</item>
</style>
<!-- <style name="Session.DarkTheme.SubtitleActionBar" parent="@style/Theme.Session.DayNight">-->
<!-- <item name="actionBarStyle">@style/Session.DarkSubtitleActionBar</item>-->
<!-- </style>-->
<!-- TODO Refactor this -->
<style name="Theme.Session.ForceDark" parent="Session.BaseDarkTheme">
<!-- TODO Refactor this use color resources -->
<style name="Theme.Session.ForceDark" parent="Theme.Session.DayNight">
<!-- TODO Use a color resource -->
<item name="colorPrimary">@color/action_bar_background</item>
<item name="colorPrimary">#171717</item>
<item name="android:textColorPrimary">#FFFFFF</item>
<item name="android:textColorSecondary">#DFFFFFFF</item>
<item name="android:textColorTertiary">#90FFFFFF</item>
<item name="colorControlNormal">?android:textColorPrimary</item>
<item name="android:colorBackground">#121212</item>
<item name="android:windowBackground">?android:colorBackground</item>
<item name="android:navigationBarColor">?android:colorBackground</item>
<item name="android:statusBarColor">?android:colorBackground</item>
</style>
<style name="Theme.Session.ForceDark.NoActionBar">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>
<!-- Session -->
<style name="TextSecure.LightNoActionBar" parent="@style/TextSecure.LightTheme">
@@ -117,36 +121,6 @@
<item name="media_overview_document_secondary">#99FFFFFF</item>
</style>
<style name="TextSecure.DarkNoActionBar" parent="@style/TextSecure.BaseDarkNoActionBar">
<!-- <item name="android:navigationBarColor">@color/compose_view_background</item>-->
<item name="android:colorControlActivated">@color/signal_primary_dark</item>
</style>
<style name="TextSecure.BaseDarkNoActionBar" parent="@style/TextSecure.BaseDarkTheme">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
<item name="windowActionModeOverlay">true</item>
<item name="theme_type">dark</item>
<item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
<item name="colorPrimary">@color/action_bar_background</item>
<item name="colorPrimaryDark">@color/action_bar_background</item>
<!-- <item name="colorAccent">@color/signal_primary_dark</item>-->
<item name="android:navigationBarColor">@color/compose_view_background</item>
<item name="recipient_preference_blocked">#d00000</item>
<item name="contact_selection_label_text">#66eeeeee</item>
<item name="contact_selection_push_user">#ffeeeeee</item>
<item name="contact_selection_lay_user">#afeeeeee</item>
<item name="contact_selection_header_text">#66eeeeee</item>
<item name="media_overview_toolbar_background">@color/transparent</item>
<item name="media_overview_toolbar_foreground">@color/white</item>
<item name="media_overview_header_foreground">@color/text</item>
<item name="media_overview_document_primary">@color/core_grey_05</item>
<item name="media_overview_document_secondary">#99FFFFFF</item>
</style>
<style name="TextSecure.HighlightTheme" parent="@style/TextSecure.LightTheme">
<item name="actionBarStyle">@style/TextSecure.FlatLightActionBar</item>
<item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
@@ -394,11 +368,26 @@
<item name="android:statusBarColor">@color/action_bar_background</item>
</style>
<style name="TextSecure.DarkTheme" parent="@style/TextSecure.BaseDarkTheme">
<!-- leave empty to allow overriding -->
</style>
<!-- Original Signal dark theme -->
<style name="Theme.TextSecure" parent="@style/Theme.Session.DayNight">
<style name="TextSecure.BaseDarkTheme" parent="@style/Session.DarkTheme">
<item name="windowActionModeOverlay">true</item>
<item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
<item name="colorPrimary">@color/action_bar_background</item>
<item name="colorPrimaryDark">@color/action_bar_background</item>
<item name="recipient_preference_blocked">#d00000</item>
<item name="contact_selection_label_text">#66eeeeee</item>
<item name="contact_selection_push_user">#ffeeeeee</item>
<item name="contact_selection_lay_user">#afeeeeee</item>
<item name="contact_selection_header_text">#66eeeeee</item>
<item name="media_overview_toolbar_background">@color/transparent</item>
<item name="media_overview_toolbar_foreground">@color/white</item>
<item name="media_overview_header_foreground">@color/text</item>
<item name="media_overview_document_primary">@color/core_grey_05</item>
<item name="media_overview_document_secondary">#99FFFFFF</item>
<item name="theme_type">dark</item>
<item name="actionBarTheme">@style/Session.DarkActionBar</item>
@@ -568,6 +557,44 @@
<item name="shared_contact_details_titlebar">@color/grey_900</item>
<item name="shared_contact_item_button_color">@color/core_grey_85</item>
</style>
<style name="Theme.TextSecure.DayNight">
<!-- leave empty to allow overriding -->
</style>
<!-- <style name="Theme.TextSecure.DarkNoActionBar" parent="@style/Theme.TextSecure.BaseDarkNoActionBar">-->
<!--&lt;!&ndash; <item name="android:navigationBarColor">@color/compose_view_background</item>&ndash;&gt;-->
<!-- <item name="android:colorControlActivated">@color/signal_primary_dark</item>-->
<!-- </style>-->
<style name="Theme.TextSecure.DayNight.NoActionBar">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
<item name="windowActionModeOverlay">true</item>
<!-- TODO Should be moved elsewhere -->
<item name="android:colorControlActivated">@color/signal_primary_dark</item>
<!-- <item name="theme_type">dark</item>-->
<!-- <item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>-->
<!-- <item name="colorPrimary">@color/action_bar_background</item>-->
<!-- <item name="colorPrimaryDark">@color/action_bar_background</item>-->
<!--&lt;!&ndash; <item name="colorAccent">@color/signal_primary_dark</item>&ndash;&gt;-->
<!-- <item name="android:navigationBarColor">@color/compose_view_background</item>-->
<!-- <item name="recipient_preference_blocked">#d00000</item>-->
<!-- <item name="contact_selection_label_text">#66eeeeee</item>-->
<!-- <item name="contact_selection_push_user">#ffeeeeee</item>-->
<!-- <item name="contact_selection_lay_user">#afeeeeee</item>-->
<!-- <item name="contact_selection_header_text">#66eeeeee</item>-->
<!-- <item name="media_overview_toolbar_background">@color/transparent</item>-->
<!-- <item name="media_overview_toolbar_foreground">@color/white</item>-->
<!-- <item name="media_overview_header_foreground">@color/text</item>-->
<!-- <item name="media_overview_document_primary">@color/core_grey_05</item>-->
<!-- <item name="media_overview_document_secondary">#99FFFFFF</item>-->
</style>
<style name="RationaleDialog" parent="Theme.AppCompat.DayNight.Dialog.Alert">
<!-- <item name="android:windowBackground">@drawable/permission_rationale_dialog_corners</item>-->
@@ -583,7 +610,7 @@
<style name="TextSecure.LightRegistrationTheme" parent="TextSecure.LightNoActionBar">
</style>
<style name="TextSecure.DarkRegistrationTheme" parent="TextSecure.DarkNoActionBar">
<style name="TextSecure.DarkRegistrationTheme" parent="Theme.TextSecure.DayNight.NoActionBar">
</style>
</resources>