Skip to content

Commit f5dbeb1

Browse files
mzorzmzorz
committed
applied changes from provided by @theck13 in #252 manually and verified they work
1 parent 2707fc5 commit f5dbeb1

File tree

10 files changed

+19
-24
lines changed

10 files changed

+19
-24
lines changed

‎Simperium/src/main/res/layout-land/activity_authentication.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
<RelativeLayout
44
xmlns:android="http://schemas.android.com/apk/res/android"
55
xmlns:tools="http://schemas.android.com/tools"
6-
android:background="@android:color/white"
6+
android:id="@+id/activity_authentication_root"
7+
android:background="@color/background"
78
android:clipChildren="false"
89
android:clipToPadding="false"
910
android:layout_gravity="center_horizontal"

‎Simperium/src/main/res/layout/activity_authentication.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
xmlns:android="http://schemas.android.com/apk/res/android"
55
xmlns:tools="http://schemas.android.com/tools"
66
android:id="@+id/activity_authentication_root"
7-
android:background="@color/background_primary"
7+
android:background="@color/background"
88
android:clipToPadding="false"
99
android:layout_gravity="center_horizontal"
1010
android:layout_height="match_parent"

‎Simperium/src/main/res/layout/activity_credentials.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<androidx.appcompat.widget.Toolbar
1212
android:id="@+id/toolbar"
13-
android:background="@color/background_primary"
13+
android:background="@color/background"
1414
android:elevation="0dp"
1515
android:layout_height="?attr/actionBarSize"
1616
android:layout_width="match_parent"
@@ -22,7 +22,7 @@
2222
</androidx.appcompat.widget.Toolbar>
2323

2424
<RelativeLayout
25-
android:background="@color/background_primary"
25+
android:background="@color/background"
2626
android:clipToPadding="false"
2727
android:layout_centerHorizontal="true"
2828
android:layout_height="match_parent"

‎Simperium/src/main/res/layout/sheet_login.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<RelativeLayout
44
xmlns:android="http://schemas.android.com/apk/res/android"
55
xmlns:tools="http://schemas.android.com/tools"
6-
android:background="@color/background_primary"
6+
android:background="@color/background"
77
android:clipToPadding="false"
88
android:layout_height="wrap_content"
99
android:layout_width="@dimen/width_layout"

‎Simperium/src/main/res/values-night-v27/styles.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
<resources>
44

55
<style name="BottomSheetDialogTheme" parent="BaseBottomSheetDialog">
6-
<item name="android:navigationBarColor">@color/background_primary</item>
6+
<item name="android:navigationBarColor">@color/background</item>
77
<item name="android:statusBarColor">@android:color/transparent</item>
88
<item name="android:windowLightNavigationBar">false</item>
99
</style>
1010

1111
<style name="Simperium" parent="Theme.MaterialComponents.DayNight.NoActionBar">
12-
<item name="android:navigationBarColor">@color/background_primary</item>
13-
<item name="android:statusBarColor">@color/background_primary</item>
12+
<item name="android:navigationBarColor">@color/background</item>
13+
<item name="android:statusBarColor">@color/background</item>
1414
<item name="android:windowLightNavigationBar">false</item>
1515
<item name="android:windowLightStatusBar">false</item>
1616
<item name="colorAccent">@color/background_button_primary</item>

‎Simperium/src/main/res/values-night/colors.xml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
<resources>
44

5-
<!-- APPLICATION - Dark Mode Colors -->
5+
<!-- APPLICATION -->
6+
<color name="background">@color/gray_1</color>
67
<color name="background_button_disabled">@color/gray_40</color>
78
<color name="background_button_primary">@color/primary</color>
89
<color name="background_button_secondary">@color/gray_40</color>
@@ -17,8 +18,4 @@
1718
<color name="text_subtitle">@color/gray_b</color>
1819
<color name="text_title">@android:color/white</color>
1920

20-
<!-- Background colors for dark mode -->
21-
<color name="background_primary">@color/gray_1</color>
22-
<color name="background_secondary">@color/gray_3</color>
23-
2421
</resources>

‎Simperium/src/main/res/values-night/styles.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<resources>
44

55
<style name="BaseBottomSheetDialog" parent="Theme.MaterialComponents.DayNight.BottomSheetDialog">
6-
<item name="android:colorBackground">@color/background_primary</item>
6+
<item name="android:colorBackground">@color/background</item>
77
<item name="android:windowIsFloating">false</item>
88
<item name="bottomSheetStyle">@style/Widget.Design.BottomSheet.Modal</item>
99
</style>
@@ -13,7 +13,7 @@
1313
</style>
1414

1515
<style name="Simperium" parent="Theme.MaterialComponents.DayNight.NoActionBar">
16-
<item name="android:statusBarColor">@color/background_primary</item>
16+
<item name="android:statusBarColor">@color/background</item>
1717
<item name="android:windowLightStatusBar">false</item>
1818
<item name="colorAccent">@color/background_button_primary</item>
1919
<item name="colorPrimary">@color/background_button_primary</item>

‎Simperium/src/main/res/values-v27/styles.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
<resources>
44

55
<style name="BottomSheetDialogTheme" parent="BaseBottomSheetDialog">
6-
<item name="android:navigationBarColor">@color/background_primary</item>
6+
<item name="android:navigationBarColor">@color/background</item>
77
<item name="android:statusBarColor">@android:color/transparent</item>
88
<item name="android:windowLightNavigationBar">true</item>
99
</style>
1010

1111
<style name="Simperium" parent="Theme.MaterialComponents.DayNight.NoActionBar">
12-
<item name="android:navigationBarColor">@color/background_primary</item>
13-
<item name="android:statusBarColor">@color/background_primary</item>
12+
<item name="android:navigationBarColor">@color/background</item>
13+
<item name="android:statusBarColor">@color/background</item>
1414
<item name="android:windowLightNavigationBar">true</item>
1515
<item name="android:windowLightStatusBar">true</item>
1616
<item name="colorAccent">@color/background_button_primary</item>

‎Simperium/src/main/res/values/colors.xml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<resources>
44

55
<!-- APPLICATION -->
6+
<color name="background">@android:color/white</color>
67
<color name="background_button_disabled">@color/gray_b</color>
78
<color name="background_button_primary">@color/primary</color>
89
<color name="background_button_secondary">@color/gray_3</color>
@@ -17,10 +18,6 @@
1718
<color name="text_subtitle">@color/gray_1</color>
1819
<color name="text_title">@color/gray_1</color>
1920

20-
<!-- Background colors for light mode -->
21-
<color name="background_primary">@android:color/white</color>
22-
<color name="background_secondary">@color/gray_b</color>
23-
2421
<!-- STANDARD -->
2522
<color name="gray_1">#111111</color>
2623
<color name="gray_3">#333333</color>

‎Simperium/src/main/res/values/styles.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<resources>
44

55
<style name="BaseBottomSheetDialog" parent="Theme.MaterialComponents.DayNight.BottomSheetDialog">
6-
<item name="android:colorBackground">@color/background_primary</item>
6+
<item name="android:colorBackground">@color/background</item>
77
<item name="android:windowIsFloating">false</item>
88
<item name="bottomSheetStyle">@style/Widget.Design.BottomSheet.Modal</item>
99
</style>
@@ -13,7 +13,7 @@
1313
</style>
1414

1515
<style name="Simperium" parent="Theme.MaterialComponents.DayNight.NoActionBar">
16-
<item name="android:statusBarColor">@color/background_primary</item>
16+
<item name="android:statusBarColor">@color/background</item>
1717
<item name="android:windowLightStatusBar">true</item>
1818
<item name="colorAccent">@color/background_button_primary</item>
1919
<item name="colorPrimary">@color/background_button_primary</item>

0 commit comments

Comments
 (0)