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

Update icon colors

This commit is contained in:
tom79 2019-11-06 17:24:38 +01:00
parent c956d44a3b
commit bf64192680
5 changed files with 141 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -87,7 +87,7 @@ dependencies {
implementation 'com.r0adkll:slidableactivity:2.1.0'
implementation 'com.github.stom79:country-picker-android:1.2.0'
implementation 'com.github.stom79:mytransl:1.5'
implementation 'com.github.stom79:SparkButton:1.0.12'
implementation 'com.github.stom79:SparkButton:1.0.13'
implementation "com.koushikdutta.async:androidasync:2.+"
implementation 'com.vanniktech:emoji-one:0.6.0'
implementation 'com.oguzdev:CircularFloatingActionMenu:1.0.2'

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

@ -1029,16 +1029,16 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
}
if( social == UpdateAccountInfoAsyncTask.SOCIAL.PIXELFED && type == RetrieveFeedsAsyncTask.Type.CONTEXT && !(context instanceof ShowConversationActivity)) {
int customBGColor;
if (theme == Helper.THEME_DARK) {
holder.main_container.setBackgroundColor(ContextCompat.getColor(context, R.color.notif_dark_1));
holder.main_container.setAlpha(.5f);
customBGColor = ContextCompat.getColor(context, R.color.notif_dark_1);
} else if (theme == Helper.THEME_BLACK) {
holder.main_container.setBackgroundColor(ContextCompat.getColor(context, R.color.notif_black_1));
holder.main_container.setAlpha(.5f);
customBGColor = ContextCompat.getColor(context, R.color.notif_black_1);
} else {
holder.main_container.setBackgroundColor(ContextCompat.getColor(context, R.color.notif_light_1));
holder.main_container.setAlpha(.5f);
customBGColor = ContextCompat.getColor(context, R.color.notif_light_1);
}
holder.main_container.setBackgroundColor(customBGColor);
holder.main_container.setAlpha(.5f);
}
//Display a preview for accounts that have replied *if enabled and only for home timeline*
if (social == UpdateAccountInfoAsyncTask.SOCIAL.MASTODON || social == UpdateAccountInfoAsyncTask.SOCIAL.PLEROMA) {
@ -1353,105 +1353,88 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
Helper.changeDrawableColor(context, R.drawable.video_preview, R.color.white);
if (theme == Helper.THEME_BLACK) {
Helper.changeDrawableColor(context, holder.cached_status, R.color.action_dark);
Helper.changeDrawableColor(context, holder.status_remove, R.color.action_dark);
Helper.changeDrawableColor(context, holder.status_reply, R.color.action_black);
Helper.changeDrawableColor(context, holder.status_more, R.color.action_black);
Helper.changeDrawableColor(context, holder.status_privacy, R.color.action_black);
Helper.changeDrawableColor(context, R.drawable.ic_repeat, R.color.action_black);
Helper.changeDrawableColor(context, R.drawable.ic_conversation, R.color.action_black);
Helper.changeDrawableColor(context, R.drawable.ic_plus_one, R.color.action_black);
Helper.changeDrawableColor(context, R.drawable.ic_pin_drop, R.color.action_black);
holder.status_reply_count.setTextColor(ContextCompat.getColor(context, R.color.action_black));
holder.status_favorite_count.setTextColor(ContextCompat.getColor(context, R.color.action_black));
holder.status_reblog_count.setTextColor(ContextCompat.getColor(context, R.color.action_black));
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
int iconColor = prefs.getInt("theme_icons_color", -1);
int iconColorCompat = prefs.getInt("theme_icons_color", -1);
if( iconColor == -1) {
if (theme == Helper.THEME_BLACK) {
iconColor = R.color.action_black;
iconColorCompat = ContextCompat.getColor(context, iconColor);
holder.status_cardview.setBackgroundResource(R.drawable.card_border_black);
Helper.changeDrawableColor(context, R.drawable.ic_photo, R.color.dark_text);
Helper.changeDrawableColor(context, R.drawable.ic_remove_red_eye, R.color.dark_text);
holder.status_cardview_title.setTextColor(ContextCompat.getColor(context, R.color.black_text_toot_header));
holder.status_cardview_content.setTextColor(ContextCompat.getColor(context, R.color.dark_icon));
holder.status_cardview_url.setTextColor(ContextCompat.getColor(context, R.color.black_text_toot_header));
Helper.changeDrawableColor(context, R.drawable.ic_bookmark, R.color.black);
Helper.changeDrawableColor(context, R.drawable.ic_bookmark_border, R.color.black);
Helper.changeDrawableColor(context, R.drawable.ic_translate, R.color.black);
} else if (theme == Helper.THEME_DARK) {
iconColor = R.color.action_dark;
iconColorCompat = ContextCompat.getColor(context, iconColor);
Helper.changeDrawableColor(context, R.drawable.ic_photo, R.color.mastodonC4);
Helper.changeDrawableColor(context, R.drawable.ic_remove_red_eye, R.color.mastodonC4);
Helper.changeDrawableColor(context, R.drawable.ic_fetch_more, R.color.mastodonC4);
holder.status_cardview_title.setTextColor(ContextCompat.getColor(context, R.color.dark_text_toot_header));
holder.status_cardview_content.setTextColor(ContextCompat.getColor(context, R.color.dark_icon));
holder.status_cardview_url.setTextColor(ContextCompat.getColor(context, R.color.dark_text_toot_header));
holder.status_cardview.setBackgroundResource(R.drawable.card_border_dark);
Helper.changeDrawableColor(context, R.drawable.ic_photo, R.color.dark_text);
Helper.changeDrawableColor(context, R.drawable.ic_remove_red_eye, R.color.dark_text);
Helper.changeDrawableColor(context, R.drawable.ic_repeat_head_toot, R.color.black_text_toot_header);
Helper.changeDrawableColor(context, R.drawable.ic_fetch_more, R.color.dark_icon);
holder.status_cardview_title.setTextColor(ContextCompat.getColor(context, R.color.black_text_toot_header));
holder.status_cardview_content.setTextColor(ContextCompat.getColor(context, R.color.dark_icon));
holder.status_cardview_url.setTextColor(ContextCompat.getColor(context, R.color.black_text_toot_header));
Helper.changeDrawableColor(context, R.drawable.ic_bookmark, R.color.black);
Helper.changeDrawableColor(context, R.drawable.ic_bookmark_border, R.color.black);
Helper.changeDrawableColor(context, R.drawable.ic_translate, R.color.black);
holder.status_cardview.setBackgroundResource(R.drawable.card_border_black);
} else if (theme == Helper.THEME_DARK) {
Helper.changeDrawableColor(context, holder.cached_status, R.color.action_dark);
Helper.changeDrawableColor(context, holder.status_remove, R.color.action_dark);
Helper.changeDrawableColor(context, holder.status_reply, R.color.action_dark);
Helper.changeDrawableColor(context, holder.status_more, R.color.action_dark);
Helper.changeDrawableColor(context, R.drawable.ic_repeat, R.color.action_dark);
Helper.changeDrawableColor(context, holder.status_privacy, R.color.action_dark);
Helper.changeDrawableColor(context, R.drawable.ic_plus_one, R.color.action_dark);
Helper.changeDrawableColor(context, R.drawable.ic_pin_drop, R.color.action_dark);
Helper.changeDrawableColor(context, R.drawable.ic_conversation, R.color.action_dark);
holder.status_reply_count.setTextColor(ContextCompat.getColor(context, R.color.action_dark));
holder.status_favorite_count.setTextColor(ContextCompat.getColor(context, R.color.action_dark));
holder.status_reblog_count.setTextColor(ContextCompat.getColor(context, R.color.action_dark));
Helper.changeDrawableColor(context, R.drawable.ic_audio_wave, R.color.action_dark);
Helper.changeDrawableColor(context, R.drawable.ic_repeat_head_toot, R.color.dark_text_toot_header);
Helper.changeDrawableColor(context, R.drawable.ic_photo, R.color.mastodonC4);
Helper.changeDrawableColor(context, R.drawable.ic_remove_red_eye, R.color.mastodonC4);
Helper.changeDrawableColor(context, R.drawable.ic_fetch_more, R.color.mastodonC4);
holder.status_cardview_title.setTextColor(ContextCompat.getColor(context, R.color.dark_text_toot_header));
holder.status_cardview_content.setTextColor(ContextCompat.getColor(context, R.color.dark_icon));
holder.status_cardview_url.setTextColor(ContextCompat.getColor(context, R.color.dark_text_toot_header));
holder.status_cardview.setBackgroundResource(R.drawable.card_border_dark);
Helper.changeDrawableColor(context, R.drawable.ic_bookmark, R.color.mastodonC1);
Helper.changeDrawableColor(context, R.drawable.ic_bookmark_border, R.color.mastodonC1);
Helper.changeDrawableColor(context, R.drawable.ic_translate, R.color.mastodonC1);
} else {
Helper.changeDrawableColor(context, holder.cached_status, R.color.action_light);
Helper.changeDrawableColor(context, holder.status_remove, R.color.action_light);
Helper.changeDrawableColor(context, R.drawable.ic_fetch_more, R.color.action_light);
Helper.changeDrawableColor(context, holder.status_reply, R.color.action_light);
Helper.changeDrawableColor(context, R.drawable.ic_conversation, R.color.action_light);
Helper.changeDrawableColor(context, R.drawable.ic_more_horiz, R.color.action_light);
Helper.changeDrawableColor(context, holder.status_more, R.color.action_light);
Helper.changeDrawableColor(context, holder.status_privacy, R.color.action_light);
Helper.changeDrawableColor(context, R.drawable.ic_repeat, R.color.action_light);
Helper.changeDrawableColor(context, R.drawable.ic_plus_one, R.color.action_light);
Helper.changeDrawableColor(context, R.drawable.ic_pin_drop, R.color.action_light);
holder.status_reply_count.setTextColor(ContextCompat.getColor(context, R.color.action_light));
holder.status_favorite_count.setTextColor(ContextCompat.getColor(context, R.color.action_light));
holder.status_reblog_count.setTextColor(ContextCompat.getColor(context, R.color.action_light));
holder.status_cardview.setBackgroundResource(R.drawable.card_border_light);
Helper.changeDrawableColor(context, R.drawable.ic_photo, R.color.mastodonC4);
Helper.changeDrawableColor(context, R.drawable.ic_remove_red_eye, R.color.mastodonC4);
Helper.changeDrawableColor(context, R.drawable.ic_repeat_head_toot, R.color.action_light_header);
holder.status_cardview_title.setTextColor(ContextCompat.getColor(context, R.color.light_black));
holder.status_cardview_content.setTextColor(ContextCompat.getColor(context, R.color.light_black));
holder.status_cardview_url.setTextColor(ContextCompat.getColor(context, R.color.light_black));
Helper.changeDrawableColor(context, R.drawable.ic_bookmark, R.color.white);
Helper.changeDrawableColor(context, R.drawable.ic_bookmark_border, R.color.white);
Helper.changeDrawableColor(context, R.drawable.ic_translate, R.color.white);
Helper.changeDrawableColor(context, R.drawable.ic_bookmark, R.color.mastodonC1);
Helper.changeDrawableColor(context, R.drawable.ic_bookmark_border, R.color.mastodonC1);
Helper.changeDrawableColor(context, R.drawable.ic_translate, R.color.mastodonC1);
} else {
iconColor = R.color.action_light;
iconColorCompat = ContextCompat.getColor(context, iconColor);
holder.status_cardview.setBackgroundResource(R.drawable.card_border_light);
Helper.changeDrawableColor(context, R.drawable.ic_photo, R.color.mastodonC4);
Helper.changeDrawableColor(context, R.drawable.ic_remove_red_eye, R.color.mastodonC4);
holder.status_cardview_title.setTextColor(ContextCompat.getColor(context, R.color.light_black));
holder.status_cardview_content.setTextColor(ContextCompat.getColor(context, R.color.light_black));
holder.status_cardview_url.setTextColor(ContextCompat.getColor(context, R.color.light_black));
Helper.changeDrawableColor(context, R.drawable.ic_bookmark, R.color.white);
Helper.changeDrawableColor(context, R.drawable.ic_bookmark_border, R.color.white);
Helper.changeDrawableColor(context, R.drawable.ic_translate, R.color.white);
}
}
Helper.changeDrawableColor(context, R.drawable.ic_audio_wave, iconColor);
Helper.changeDrawableColor(context, holder.status_remove, iconColor);
Helper.changeDrawableColor(context, R.drawable.ic_fetch_more, iconColor);
Helper.changeDrawableColor(context, holder.status_reply, iconColor);
Helper.changeDrawableColor(context, R.drawable.ic_conversation, iconColor);
Helper.changeDrawableColor(context, R.drawable.ic_more_horiz, iconColor);
Helper.changeDrawableColor(context, holder.status_more, iconColor);
Helper.changeDrawableColor(context, holder.status_privacy, iconColor);
Helper.changeDrawableColor(context, R.drawable.ic_repeat, iconColor);
Helper.changeDrawableColor(context, R.drawable.ic_plus_one, iconColor);
Helper.changeDrawableColor(context, R.drawable.ic_pin_drop, iconColor);
holder.status_reply_count.setTextColor(iconColorCompat);
holder.status_favorite_count.setTextColor(iconColorCompat);
holder.status_reblog_count.setTextColor(iconColorCompat);
if (theme == Helper.THEME_DARK) {
holder.status_account_displayname.setTextColor(ContextCompat.getColor(context, R.color.dark_text_toot_header));
holder.status_toot_date.setTextColor(ContextCompat.getColor(context, R.color.dark_text_toot_header));
Helper.changeDrawableColor(context, R.drawable.ic_repeat_head_toot,R.color.dark_text_toot_header);
Helper.changeDrawableColor(context, holder.cached_status,R.color.dark_text_toot_header);
} else if (theme == Helper.THEME_BLACK) {
holder.status_account_displayname.setTextColor(ContextCompat.getColor(context, R.color.black_text_toot_header));
holder.status_toot_date.setTextColor(ContextCompat.getColor(context, R.color.black_text_toot_header));
Helper.changeDrawableColor(context, R.drawable.ic_repeat_head_toot,R.color.black_text_toot_header);
Helper.changeDrawableColor(context, holder.cached_status,R.color.black_text_toot_header);
} else if (theme == Helper.THEME_LIGHT) {
holder.status_account_displayname.setTextColor(ContextCompat.getColor(context, R.color.action_light_header));
holder.status_toot_date.setTextColor(ContextCompat.getColor(context, R.color.light_black));
Helper.changeDrawableColor(context, R.drawable.ic_repeat_head_toot,R.color.light_black);
Helper.changeDrawableColor(context, holder.cached_status,R.color.light_black);
}
@ -1484,31 +1467,21 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
}
});
int customColor;
if (theme == Helper.THEME_BLACK) {
holder.fedilab_features.setBackgroundColor(ContextCompat.getColor(context, R.color.custom_features_button_black));
holder.custom_feature_bookmark.setBackgroundColor(ContextCompat.getColor(context, R.color.custom_features_button_black));
holder.custom_feature_translate.setBackgroundColor(ContextCompat.getColor(context, R.color.custom_features_button_black));
holder.custom_feature_timed_mute.setBackgroundColor(ContextCompat.getColor(context, R.color.custom_features_button_black));
holder.custom_feature_schedule.setBackgroundColor(ContextCompat.getColor(context, R.color.custom_features_button_black));
holder.custom_feature_mention.setBackgroundColor(ContextCompat.getColor(context, R.color.custom_features_button_black));
holder.custom_feature_cache.setBackgroundColor(ContextCompat.getColor(context, R.color.custom_features_button_black));
customColor = ContextCompat.getColor(context, R.color.custom_features_button_black);
} else if (theme == Helper.THEME_DARK) {
holder.fedilab_features.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4_));
holder.custom_feature_bookmark.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4_));
holder.custom_feature_translate.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4_));
holder.custom_feature_timed_mute.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4_));
holder.custom_feature_schedule.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4_));
holder.custom_feature_mention.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4_));
holder.custom_feature_cache.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4_));
customColor = ContextCompat.getColor(context, R.color.mastodonC4_);
} else {
holder.fedilab_features.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4));
holder.custom_feature_bookmark.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4));
holder.custom_feature_translate.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4));
holder.custom_feature_timed_mute.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4));
holder.custom_feature_schedule.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4));
holder.custom_feature_mention.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4));
holder.custom_feature_cache.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4));
customColor = ContextCompat.getColor(context, R.color.mastodonC4);
}
holder.fedilab_features.setBackgroundColor(customColor);
holder.custom_feature_bookmark.setBackgroundColor(customColor);
holder.custom_feature_translate.setBackgroundColor(customColor);
holder.custom_feature_timed_mute.setBackgroundColor(customColor);
holder.custom_feature_schedule.setBackgroundColor(customColor);
holder.custom_feature_mention.setBackgroundColor(customColor);
holder.custom_feature_cache.setBackgroundColor(customColor);
if (status.isCustomFeaturesDisplayed()) {
holder.fedilab_features_panel.setVisibility(View.VISIBLE);
@ -1592,15 +1565,21 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
holder.spark_button_reblog.setDisableCircle(true);
holder.spark_button_fav.setActiveImageTint(R.color.marked_icon);
holder.spark_button_reblog.setActiveImageTint(R.color.boost_icon);
if (theme == Helper.THEME_DARK) {
holder.spark_button_fav.setInActiveImageTint(R.color.action_dark);
holder.spark_button_reblog.setInActiveImageTint(R.color.action_dark);
} else if (theme == Helper.THEME_BLACK) {
holder.spark_button_fav.setInActiveImageTint(R.color.action_black);
holder.spark_button_reblog.setInActiveImageTint(R.color.action_black);
} else {
holder.spark_button_fav.setInActiveImageTint(R.color.action_light);
holder.spark_button_reblog.setInActiveImageTint(R.color.action_light);
if( iconColorCompat == -1) {
if (theme == Helper.THEME_DARK) {
holder.spark_button_fav.setInActiveImageTint(R.color.action_dark);
holder.spark_button_reblog.setInActiveImageTint(R.color.action_dark);
} else if (theme == Helper.THEME_BLACK) {
holder.spark_button_fav.setInActiveImageTint(R.color.action_black);
holder.spark_button_reblog.setInActiveImageTint(R.color.action_black);
} else {
holder.spark_button_fav.setInActiveImageTint(R.color.action_light);
holder.spark_button_reblog.setInActiveImageTint(R.color.action_light);
}
}else{
holder.spark_button_fav.setInActiveImageTintColor(iconColorCompat);
holder.spark_button_reblog.setInActiveImageTintColor(iconColorCompat);
}
holder.spark_button_fav.setColors(R.color.marked_icon, R.color.marked_icon);
holder.spark_button_fav.setImageSize((int) (20 * iconSizePercent / 100 * scale + 0.5f));
@ -2112,7 +2091,6 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
holder.status_boosted_by_info.setVisibility(View.GONE);
}
}
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
int reblogColor = prefs.getInt("theme_boost_header_color", -1);
if( holder.status_boosted_by_info != null && reblogColor != -1 ){
holder.status_boosted_by_info.setBackgroundColor(reblogColor);
@ -2478,12 +2456,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
Helper.changeDrawableColor(context, R.drawable.ic_pin_drop_p, R.color.marked_icon);
imgPin = ContextCompat.getDrawable(context, R.drawable.ic_pin_drop_p);
} else {
if (theme == Helper.THEME_DARK)
Helper.changeDrawableColor(context, R.drawable.ic_pin_drop, R.color.action_dark);
else if (theme == Helper.THEME_BLACK)
Helper.changeDrawableColor(context, R.drawable.ic_pin_drop, R.color.action_black);
else
Helper.changeDrawableColor(context, R.drawable.ic_pin_drop, R.color.action_light);
Helper.changeDrawableColor(context, R.drawable.ic_pin_drop, iconColor);
imgPin = ContextCompat.getDrawable(context, R.drawable.ic_pin_drop);
}
assert imgPin != null;

33
app/src/main/java/app/fedilab/android/helper/Helper.java
View File

@ -2659,10 +2659,15 @@ public class Helper {
*/
public static Drawable changeDrawableColor(Context context, int drawable, int hexaColor) {
Drawable mDrawable = ContextCompat.getDrawable(context, drawable);
int color = Color.parseColor(context.getString(hexaColor));
int color;
try {
color = Color.parseColor(context.getString(hexaColor));
}catch (Resources.NotFoundException e){
color = hexaColor;
}
assert mDrawable != null;
mDrawable.setColorFilter(color, PorterDuff.Mode.SRC_ATOP);
DrawableCompat.setTint(mDrawable, ContextCompat.getColor(context, hexaColor));
DrawableCompat.setTint(mDrawable, color);
return mDrawable;
}
@ -2675,7 +2680,13 @@ public class Helper {
public static void changeDrawableColor(Context context, ImageView imageView, int hexaColor) {
if (imageView == null)
return;
imageView.setColorFilter(context.getResources().getColor(hexaColor));
int color;
try {
color = context.getResources().getColor(hexaColor);
}catch (Resources.NotFoundException e){
color = hexaColor;
}
imageView.setColorFilter(color);
}
/**
@ -2687,7 +2698,13 @@ public class Helper {
public static void changeDrawableColor(Context context, ImageButton imageButton, int hexaColor) {
if (imageButton == null)
return;
imageButton.setColorFilter(context.getResources().getColor(hexaColor));
int color;
try {
color = context.getResources().getColor(hexaColor);
}catch (Resources.NotFoundException e){
color = hexaColor;
}
imageButton.setColorFilter(color);
}
/**
@ -2699,7 +2716,13 @@ public class Helper {
public static void changeButtonTextColor(Context context, Button button, int hexaColor) {
if (button == null)
return;
button.setTextColor(context.getResources().getColor(hexaColor));
int color;
try {
color = context.getResources().getColor(hexaColor);
}catch (Resources.NotFoundException e){
color = hexaColor;
}
button.setTextColor(color);
}
/**

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

@ -1257,4 +1257,6 @@
<string name="reset_color">Reset colors</string>
<string name="clik_reset">Click here to reset all your custom colors</string>
<string name="reset">Reset</string>
<string name="icons_color_title">Icons</string>
<string name="icons_color">Color of bottom icons in timelines</string>
</resources>

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

@ -23,6 +23,14 @@
android:summary="@string/background_status"/>
<com.jaredrummler.android.colorpicker.ColorPreferenceCompat
app:iconSpaceReserved="false"
android:defaultValue="?colorAccent"
android:key="theme_icons_color"
android:title="@string/icons_color_title"
android:summary="@string/icons_color"/>
<Preference android:title="@string/reset_color"
app:iconSpaceReserved="false"
android:id="@+id/resetButton"