Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:background="@android:color/white"
android:id="@+id/activity_authentication_root"
android:background="@color/background"
android:clipChildren="false"
android:clipToPadding="false"
android:layout_gravity="center_horizontal"
Expand Down
2 changes: 1 addition & 1 deletion Simperium/src/main/res/layout/activity_authentication.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/activity_authentication_root"
android:background="@color/background_primary"
android:background="@color/background"
android:clipToPadding="false"
android:layout_gravity="center_horizontal"
android:layout_height="match_parent"
Expand Down
4 changes: 2 additions & 2 deletions Simperium/src/main/res/layout/activity_credentials.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:background="@color/background_primary"
android:background="@color/background"
android:elevation="0dp"
android:layout_height="?attr/actionBarSize"
android:layout_width="match_parent"
Expand All @@ -22,7 +22,7 @@
</androidx.appcompat.widget.Toolbar>

<RelativeLayout
android:background="@color/background_primary"
android:background="@color/background"
android:clipToPadding="false"
android:layout_centerHorizontal="true"
android:layout_height="match_parent"
Expand Down
2 changes: 1 addition & 1 deletion Simperium/src/main/res/layout/sheet_login.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:background="@color/background_primary"
android:background="@color/background"
android:clipToPadding="false"
android:layout_height="wrap_content"
android:layout_width="@dimen/width_layout"
Expand Down
6 changes: 3 additions & 3 deletions Simperium/src/main/res/values-night-v27/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
<resources>

<style name="BottomSheetDialogTheme" parent="BaseBottomSheetDialog">
<item name="android:navigationBarColor">@color/background_primary</item>
<item name="android:navigationBarColor">@color/background</item>
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:windowLightNavigationBar">false</item>
</style>

<style name="Simperium" parent="Theme.MaterialComponents.DayNight.NoActionBar">
<item name="android:navigationBarColor">@color/background_primary</item>
<item name="android:statusBarColor">@color/background_primary</item>
<item name="android:navigationBarColor">@color/background</item>
<item name="android:statusBarColor">@color/background</item>
<item name="android:windowLightNavigationBar">false</item>
<item name="android:windowLightStatusBar">false</item>
<item name="colorAccent">@color/background_button_primary</item>
Expand Down
9 changes: 3 additions & 6 deletions Simperium/src/main/res/values-night/colors.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

<resources>

<!-- APPLICATION - Dark Mode Colors -->
<!-- APPLICATION -->
<color name="background">@color/gray_1</color>
<color name="background_button_disabled">@color/gray_40</color>
<color name="background_button_primary">@color/primary</color>
<color name="background_button_secondary">@color/gray_40</color>
Expand All @@ -17,8 +18,4 @@
<color name="text_subtitle">@color/gray_b</color>
<color name="text_title">@android:color/white</color>

<!-- Background colors for dark mode -->
<color name="background_primary">@color/gray_1</color>
<color name="background_secondary">@color/gray_3</color>

</resources>
</resources>
4 changes: 2 additions & 2 deletions Simperium/src/main/res/values-night/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<resources>

<style name="BaseBottomSheetDialog" parent="Theme.MaterialComponents.DayNight.BottomSheetDialog">
<item name="android:colorBackground">@color/background_primary</item>
<item name="android:colorBackground">@color/background</item>
<item name="android:windowIsFloating">false</item>
<item name="bottomSheetStyle">@style/Widget.Design.BottomSheet.Modal</item>
</style>
Expand All @@ -13,7 +13,7 @@
</style>

<style name="Simperium" parent="Theme.MaterialComponents.DayNight.NoActionBar">
<item name="android:statusBarColor">@color/background_primary</item>
<item name="android:statusBarColor">@color/background</item>
<item name="android:windowLightStatusBar">false</item>
<item name="colorAccent">@color/background_button_primary</item>
<item name="colorPrimary">@color/background_button_primary</item>
Expand Down
6 changes: 3 additions & 3 deletions Simperium/src/main/res/values-v27/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
<resources>

<style name="BottomSheetDialogTheme" parent="BaseBottomSheetDialog">
<item name="android:navigationBarColor">@color/background_primary</item>
<item name="android:navigationBarColor">@color/background</item>
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:windowLightNavigationBar">true</item>
</style>

<style name="Simperium" parent="Theme.MaterialComponents.DayNight.NoActionBar">
<item name="android:navigationBarColor">@color/background_primary</item>
<item name="android:statusBarColor">@color/background_primary</item>
<item name="android:navigationBarColor">@color/background</item>
<item name="android:statusBarColor">@color/background</item>
<item name="android:windowLightNavigationBar">true</item>
<item name="android:windowLightStatusBar">true</item>
<item name="colorAccent">@color/background_button_primary</item>
Expand Down
5 changes: 1 addition & 4 deletions Simperium/src/main/res/values/colors.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<resources>

<!-- APPLICATION -->
<color name="background">@android:color/white</color>
<color name="background_button_disabled">@color/gray_b</color>
<color name="background_button_primary">@color/primary</color>
<color name="background_button_secondary">@color/gray_3</color>
Expand All @@ -17,10 +18,6 @@
<color name="text_subtitle">@color/gray_1</color>
<color name="text_title">@color/gray_1</color>

<!-- Background colors for light mode -->
<color name="background_primary">@android:color/white</color>
<color name="background_secondary">@color/gray_b</color>

<!-- STANDARD -->
<color name="gray_1">#111111</color>
<color name="gray_3">#333333</color>
Expand Down
4 changes: 2 additions & 2 deletions Simperium/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<resources>

<style name="BaseBottomSheetDialog" parent="Theme.MaterialComponents.DayNight.BottomSheetDialog">
<item name="android:colorBackground">@color/background_primary</item>
<item name="android:colorBackground">@color/background</item>
<item name="android:windowIsFloating">false</item>
<item name="bottomSheetStyle">@style/Widget.Design.BottomSheet.Modal</item>
</style>
Expand All @@ -13,7 +13,7 @@
</style>

<style name="Simperium" parent="Theme.MaterialComponents.DayNight.NoActionBar">
<item name="android:statusBarColor">@color/background_primary</item>
<item name="android:statusBarColor">@color/background</item>
<item name="android:windowLightStatusBar">true</item>
<item name="colorAccent">@color/background_button_primary</item>
<item name="colorPrimary">@color/background_button_primary</item>
Expand Down