Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Change theme improvements

This commit is contained in:
tom79 2019-11-11 10:46:55 +01:00
parent d8a4be7bac
commit 5879bf08df
5 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/app/fedilab/android/activities/MainApplication.java
View File

@ -105,6 +105,10 @@ public class MainApplication extends MultiDexApplication {
if( pref_color_background != -1){
Cyanea.getInstance().edit().background(pref_color_background).apply();
}
Log.v(Helper.TAG,"primary: " + primary);
Log.v(Helper.TAG,"accent: " + accent);
Log.v(Helper.TAG,"pref_color_background: " + pref_color_background);
Cyanea.getInstance().edit().shouldTintNavBar(pref_color_navigation_bar).apply();
ApplicationJob.cancelAllJob(BackupStatusesSyncJob.BACKUP_SYNC);

6
app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
View File

@ -2023,6 +2023,12 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
if( holder.status_boosted_by_info != null && reblogColor != -1){
holder.status_boosted_by_info.setBackgroundColor(reblogColor);
}
int theme_text_color = prefs.getInt("theme_text_color", -1);
if( holder.status_content != null && theme_text_color != -1){
holder.status_content.setTextColor(theme_text_color);
holder.status_content_translated.setTextColor(theme_text_color);
holder.status_spoiler.setTextColor(theme_text_color);
}
int statusColor = prefs.getInt("theme_statuses_color", -1);
if( holder.main_card_container != null && statusColor != -1) {
holder.main_card_container.setCardBackgroundColor(statusColor);

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

@ -1158,7 +1158,7 @@
<string name="set_disable_animated_emoji">Disable custom animated emojis</string>
<string name="owner_charts">Charts</string>
<string name="display_charts">Display charts</string>
<string name="collecting_data_wait">The application collects your local data, please wait...</string>
<string name="collecting_data_wait">The application collects your local data, please wait…</string>
<string name="set_backup">Backup</string>
<string name="set_auto_backup">Auto backup statuses</string>
<string name="set_auto_backup_indication">This option is per account. It will launch a service that will automatically store your statuses locally in the database. That allows to get statistics and charts</string>
@ -1268,5 +1268,7 @@
<string name="translation">Translation</string>
<string name="image_preview">Image preview</string>
<string name="change_theme">Change the theme</string>
<string name="text_color_title">Text color</string>
<string name="text_color">Change the text color in pots</string>
</resources>

9
app/src/main/res/values/styles.xml
View File

@ -16,7 +16,6 @@
<item name="textHeader">@color/black</item>
<item name="customFeature">@color/mastodonC4</item>
<item name="cardviewHeaderBoostColor">@color/mastodonC2</item>
<item name="colorPrimary">@color/white</item>
<item name="textColor">@color/black</item>
<item name="android:textColor">@color/black</item>
</style>
@ -28,7 +27,6 @@
<item name="iconColorMenu">@color/black</item>
<item name="textHeader">@color/black</item>
<item name="customFeature">@color/mastodonC4</item>
<item name="colorPrimary">@color/white</item>
<item name="cardviewHeaderBoostColor">@color/mastodonC2</item>
<item name="textColor">@color/black</item>
<item name="android:textColor">@color/black</item>
@ -40,7 +38,6 @@
<item name="iconColorMenu">@color/dark_icon_theme</item>
<item name="textHeader">@color/dark_text_toot_header</item>
<item name="customFeature">@color/custom_features_button_black</item>
<item name="colorPrimary">@color/black</item>
<item name="cardviewHeaderBoostColor">@color/mastodonC1_</item>
<item name="textColor">@color/dark_text</item>
<item name="android:textColor">@color/dark_text</item>
@ -52,7 +49,6 @@
<item name="iconColorMenu">@color/dark_icon_theme</item>
<item name="textHeader">@color/dark_text_toot_header</item>
<item name="customFeature">@color/custom_features_button_black</item>
<item name="colorPrimary">@color/black</item>
<item name="cardviewHeaderBoostColor">@color/mastodonC1_</item>
<item name="textColor">@color/dark_text</item>
<item name="android:textColor">@color/dark_text</item>
@ -66,7 +62,6 @@
<item name="iconColorMenu">@color/dark_icon_theme</item>
<item name="textHeader">@color/dark_text_toot_header</item>
<item name="customFeature">@color/mastodonC4</item>
<item name="colorPrimary">@color/mastodonC1</item>
<item name="cardviewHeaderBoostColor">@color/mastodonC1___</item>
<item name="textColor">@color/dark_text</item>
<item name="android:textColor">@color/dark_text</item>
@ -78,7 +73,6 @@
<item name="iconColorMenu">@color/dark_icon_theme</item>
<item name="textHeader">@color/dark_text_toot_header</item>
<item name="customFeature">@color/mastodonC4</item>
<item name="colorPrimary">@color/mastodonC1</item>
<item name="cardviewHeaderBoostColor">@color/mastodonC1___</item>
<item name="textColor">@color/dark_text</item>
<item name="android:textColor">@color/dark_text</item>
@ -108,7 +102,6 @@
<style name="TransparentLight" parent="Theme.Cyanea.Light">black_icon_theme
<item name="iconColor">@color/black</item>
<item name="colorPrimary">@color/white</item>
<item name="android:windowIsTranslucent">true</item>
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowContentOverlay">@null</item>
@ -118,7 +111,6 @@
<style name="TransparentDark" parent="Theme.Cyanea.Dark">
<item name="iconColor">@color/dark_icon_theme</item>
<item name="colorPrimary">@color/mastodonC1</item>
<item name="android:windowIsTranslucent">true</item>
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowContentOverlay">@null</item>
@ -127,7 +119,6 @@
<style name="TransparentBlack" parent="Theme.Cyanea.Dark">
<item name="iconColor">@color/black_icon_theme</item>
<item name="colorPrimary">@color/black</item>
<item name="android:windowIsTranslucent">true</item>
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowContentOverlay">@null</item>

13
app/src/main/res/xml/fragment_settings_color.xml
View File

@ -34,9 +34,9 @@
<com.jaredrummler.android.colorpicker.ColorPreferenceCompat
app:iconSpaceReserved="false"
android:defaultValue="-1"
android:key="theme_background_color"
android:title="@string/background_color_title"
android:summary="@string/background_color"/>
android:key="theme_text_color"
android:title="@string/text_color_title"
android:summary="@string/text_color"/>
<com.jaredrummler.android.colorpicker.ColorPreferenceCompat
@ -67,14 +67,11 @@
<com.jaredrummler.android.colorpicker.ColorPreferenceCompat
app:iconSpaceReserved="false"
android:defaultValue="@color/cyanea_background_light"
android:defaultValue="-1"
android:key="pref_color_background"
android:summary="@string/pref_background_color_summary"
android:title="@string/pref_background_color_title"
app:cpv_colorPresets="@array/cyanea_background_color_presets"
app:cpv_dialogTitle="@string/pref_background_color_title"
app:cpv_showColorShades="false"
tools:ignore="PrivateResource"/>
/>
<Preference android:title="@string/reset_color"
app:iconSpaceReserved="false"