Pixelfed
/
PixelDroid-App-Android
mirror of https://gitlab.shinice.net/pixeldroid/PixelDroid
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix edit dark mode bug (#192) 

* fixed visual dark mode bug

* fix another color bug
This commit is contained in:
Andrew Dobis 2020-05-21 13:31:51 +02:00 committed by GitHub
parent fb65ff6e83
commit 998792d61b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/res/layout/activity_photo_edit.xml
View File

@ -19,7 +19,7 @@
android:id="@+id/toolbar" android:id="@+id/toolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize" android:layout_height="?attr/actionBarSize"
android:background="@color/colorPrimaryTab" android:background="@color/colorPrimaryActionBar"
app:popupTheme="@style/AppTheme.PopupOverlay"/> app:popupTheme="@style/AppTheme.PopupOverlay"/>
</androidx.coordinatorlayout.widget.CoordinatorLayout> </androidx.coordinatorlayout.widget.CoordinatorLayout>

1
app/src/main/res/values-night/colors.xml
View File

@ -2,6 +2,7 @@
<resources> <resources>
<color name="colorPrimary">#FFFFFF</color> <color name="colorPrimary">#FFFFFF</color>
<color name="colorPrimaryTab">#6200EE</color> <color name="colorPrimaryTab">#6200EE</color>
<color name="colorPrimaryActionBar">#6200EE</color>
<color name="colorPrimaryDark">#3700B3</color> <color name="colorPrimaryDark">#3700B3</color>
<color name="colorAccent">#03DAC5</color> <color name="colorAccent">#03DAC5</color>
<color name="colorButtonBg">#6200EE</color> <color name="colorButtonBg">#6200EE</color>

6
app/src/main/res/values/arrays.xml
View File

@ -6,8 +6,8 @@
</string-array> </string-array>
<string-array name="theme_entries"> <string-array name="theme_entries">
<item>Default (Follows system)</item> <item>@string/default_theme</item>
<item>Light</item> <item>@string/light_theme</item>
<item>Dark</item> <item>@string/dark_theme</item>
</string-array> </string-array>
</resources> </resources>

1
app/src/main/res/values/colors.xml
View File

@ -2,6 +2,7 @@
<resources> <resources>
<color name="colorPrimary">#6200EE</color> <color name="colorPrimary">#6200EE</color>
<color name="colorPrimaryTab">#FFFFFF</color> <color name="colorPrimaryTab">#FFFFFF</color>
<color name="colorPrimaryActionBar">#6200EE</color>
<color name="colorPrimaryDark">#3700B3</color> <color name="colorPrimaryDark">#3700B3</color>
<color name="colorAccent">#03DAC5</color> <color name="colorAccent">#03DAC5</color>
<color name="icActive">#FFFFFFFF</color> <color name="icActive">#FFFFFFFF</color>

6
app/src/main/res/values/strings.xml
View File

@ -10,9 +10,13 @@
<string name="token_error">"Error getting token"</string> <string name="token_error">"Error getting token"</string>
<string name="instance_error">"Could not get instance information"</string> <string name="instance_error">"Could not get instance information"</string>
<string name="title_activity_settings2">Settings</string> <string name="title_activity_settings2">Settings</string>
<!-- Theme Preferences --> <!-- Theme Preferences -->
<string name="theme_title">Application Theme</string> <string name="theme_title">Application Theme</string>
<string name="theme_header">Theme</string> <string name="theme_header">Theme</string>
<string name="default_theme">Default (Follows system)</string>
<string name="light_theme">Light</string>
<string name="dark_theme">Dark</string>
<string name="followed_notification">%1$s followed you</string> <string name="followed_notification">%1$s followed you</string>
<string name="mention_notification">%1$s mentioned you</string> <string name="mention_notification">%1$s mentioned you</string>
@ -48,4 +52,6 @@
<string name="add_account_description">Add another Pixelfed Account</string> <string name="add_account_description">Add another Pixelfed Account</string>
<string name="cw_nsfw_hidden_media_n_click_to_show">CW / NSFW / Hidden Media \n (click to show)</string> <string name="cw_nsfw_hidden_media_n_click_to_show">CW / NSFW / Hidden Media \n (click to show)</string>
</resources> </resources>

2
app/src/main/res/xml/root_preferences.xml
View File

@ -2,7 +2,7 @@
<PreferenceCategory app:title="@string/theme_header"> <PreferenceCategory app:title="@string/theme_header">
<ListPreference <ListPreference
app:defaultValue="Default" app:defaultValue="@string/default_theme"
app:entries="@array/theme_entries" app:entries="@array/theme_entries"
app:entryValues="@array/theme_values" app:entryValues="@array/theme_values"
app:key="theme" app:key="theme"