Fix edit dark mode bug (#192)
* fixed visual dark mode bug * fix another color bug
This commit is contained in:
parent
fb65ff6e83
commit
998792d61b
|
@ -19,7 +19,7 @@
|
|||
android:id="@+id/toolbar"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="?attr/actionBarSize"
|
||||
android:background="@color/colorPrimaryTab"
|
||||
android:background="@color/colorPrimaryActionBar"
|
||||
app:popupTheme="@style/AppTheme.PopupOverlay"/>
|
||||
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
|
@ -2,6 +2,7 @@
|
|||
<resources>
|
||||
<color name="colorPrimary">#FFFFFF</color>
|
||||
<color name="colorPrimaryTab">#6200EE</color>
|
||||
<color name="colorPrimaryActionBar">#6200EE</color>
|
||||
<color name="colorPrimaryDark">#3700B3</color>
|
||||
<color name="colorAccent">#03DAC5</color>
|
||||
<color name="colorButtonBg">#6200EE</color>
|
||||
|
|
|
@ -6,8 +6,8 @@
|
|||
</string-array>
|
||||
|
||||
<string-array name="theme_entries">
|
||||
<item>Default (Follows system)</item>
|
||||
<item>Light</item>
|
||||
<item>Dark</item>
|
||||
<item>@string/default_theme</item>
|
||||
<item>@string/light_theme</item>
|
||||
<item>@string/dark_theme</item>
|
||||
</string-array>
|
||||
</resources>
|
|
@ -2,6 +2,7 @@
|
|||
<resources>
|
||||
<color name="colorPrimary">#6200EE</color>
|
||||
<color name="colorPrimaryTab">#FFFFFF</color>
|
||||
<color name="colorPrimaryActionBar">#6200EE</color>
|
||||
<color name="colorPrimaryDark">#3700B3</color>
|
||||
<color name="colorAccent">#03DAC5</color>
|
||||
<color name="icActive">#FFFFFFFF</color>
|
||||
|
|
|
@ -10,9 +10,13 @@
|
|||
<string name="token_error">"Error getting token"</string>
|
||||
<string name="instance_error">"Could not get instance information"</string>
|
||||
<string name="title_activity_settings2">Settings</string>
|
||||
|
||||
<!-- Theme Preferences -->
|
||||
<string name="theme_title">Application 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="mention_notification">%1$s mentioned you</string>
|
||||
|
@ -48,4 +52,6 @@
|
|||
<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>
|
||||
|
||||
|
||||
|
||||
</resources>
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
<PreferenceCategory app:title="@string/theme_header">
|
||||
<ListPreference
|
||||
app:defaultValue="Default"
|
||||
app:defaultValue="@string/default_theme"
|
||||
app:entries="@array/theme_entries"
|
||||
app:entryValues="@array/theme_values"
|
||||
app:key="theme"
|
||||
|
|
Loading…
Reference in New Issue