From e4816bcdeccd1d514582d6a2f2b9cac29ef8a619 Mon Sep 17 00:00:00 2001 From: tom79 Date: Fri, 8 Nov 2019 18:39:55 +0100 Subject: [PATCH] Some improvements --- .../android/activities/BaseMainActivity.java | 1 - .../android/activities/TootActivity.java | 43 +------ .../drawers/NotificationsListAdapter.java | 110 ++---------------- .../android/drawers/PixelfedListAdapter.java | 24 ---- .../fragments/ContentSettingsFragment.java | 6 +- .../DisplayNotificationsFragment.java | 26 +---- .../app/fedilab/android/helper/Helper.java | 18 --- .../main/res/layout/drawer_notification.xml | 12 +- app/src/main/res/layout/drawer_status.xml | 31 +++-- .../main/res/layout/drawer_status_compact.xml | 30 +++-- .../main/res/layout/drawer_status_console.xml | 24 +++- .../main/res/layout/drawer_status_focused.xml | 37 +++--- app/src/main/res/values/colors.xml | 5 + app/src/main/res/values/styles.xml | 17 ++- 14 files changed, 126 insertions(+), 258 deletions(-) diff --git a/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java b/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java index 3c9a57fe0..221630a38 100644 --- a/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java @@ -146,7 +146,6 @@ import app.fedilab.android.interfaces.OnSyncTimelineInterface; import app.fedilab.android.interfaces.OnUpdateAccountInfoInterface; import static app.fedilab.android.asynctasks.ManageFiltersAsyncTask.action.GET_ALL_FILTER; -import static app.fedilab.android.helper.Helper.changeDrawableColor; public abstract class BaseMainActivity extends BaseActivity diff --git a/app/src/main/java/app/fedilab/android/activities/TootActivity.java b/app/src/main/java/app/fedilab/android/activities/TootActivity.java index 89ad95795..826d97ebd 100644 --- a/app/src/main/java/app/fedilab/android/activities/TootActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/TootActivity.java @@ -385,7 +385,6 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate, pp_progress = actionBar.getCustomView().findViewById(R.id.pp_progress); } - changeColor(); //By default the toot is not restored so the id -1 is defined @@ -2379,8 +2378,7 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate, itemPoll.setVisible(false); } SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE); - int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK); - changeColor(); + String instanceVersion = sharedpreferences.getString(Helper.INSTANCE_VERSION + userId + instance, null); Version currentVersion = new Version(instanceVersion); Version minVersion = new Version("2.0"); @@ -3972,45 +3970,6 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate, } } - private void changeColor() { - final SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE); - int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK); - if (theme == Helper.THEME_DARK || theme == Helper.THEME_BLACK) { - changeDrawableColor(TootActivity.this, R.drawable.ic_public_toot, R.color.dark_text); - changeDrawableColor(TootActivity.this, R.drawable.ic_lock_open_toot, R.color.dark_text); - changeDrawableColor(TootActivity.this, R.drawable.ic_lock_outline_toot, R.color.dark_text); - changeDrawableColor(TootActivity.this, R.drawable.ic_mail_outline_toot, R.color.dark_text); - changeDrawableColor(TootActivity.this, R.drawable.ic_insert_photo, R.color.dark_text); - changeDrawableColor(TootActivity.this, R.drawable.ic_skip_previous, R.color.dark_text); - changeDrawableColor(TootActivity.this, R.drawable.ic_skip_next, R.color.dark_text); - changeDrawableColor(TootActivity.this, R.drawable.ic_check, R.color.dark_text); - changeDrawableColor(TootActivity.this, R.drawable.emoji_one_category_smileysandpeople, R.color.dark_text); - //bottom action - changeDrawableColor(TootActivity.this, findViewById(R.id.toot_picture), R.color.dark_text); - changeDrawableColor(TootActivity.this, findViewById(R.id.poll_action), R.color.dark_text); - changeDrawableColor(TootActivity.this, findViewById(R.id.toot_visibility), R.color.dark_text); - changeDrawableColor(TootActivity.this, findViewById(R.id.toot_emoji), R.color.dark_text); - Helper.changeButtonTextColor(TootActivity.this, findViewById(R.id.toot_cw), R.color.dark_text); - - } else { - changeDrawableColor(TootActivity.this, R.drawable.ic_public_toot, R.color.white); - changeDrawableColor(TootActivity.this, R.drawable.ic_lock_open_toot, R.color.white); - changeDrawableColor(TootActivity.this, R.drawable.ic_lock_outline_toot, R.color.white); - changeDrawableColor(TootActivity.this, R.drawable.ic_mail_outline_toot, R.color.white); - changeDrawableColor(TootActivity.this, R.drawable.ic_insert_photo, R.color.white); - changeDrawableColor(TootActivity.this, R.drawable.ic_skip_previous, R.color.white); - changeDrawableColor(TootActivity.this, R.drawable.ic_skip_next, R.color.white); - changeDrawableColor(TootActivity.this, R.drawable.ic_check, R.color.white); - changeDrawableColor(TootActivity.this, R.drawable.emoji_one_category_smileysandpeople, R.color.black); - //bottom action - changeDrawableColor(TootActivity.this, findViewById(R.id.toot_picture), R.color.black); - changeDrawableColor(TootActivity.this, findViewById(R.id.poll_action), R.color.black); - changeDrawableColor(TootActivity.this, findViewById(R.id.toot_visibility), R.color.black); - changeDrawableColor(TootActivity.this, findViewById(R.id.toot_emoji), R.color.black); - Helper.changeButtonTextColor(TootActivity.this, findViewById(R.id.toot_cw), R.color.black); - - } - } @Override diff --git a/app/src/main/java/app/fedilab/android/drawers/NotificationsListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/NotificationsListAdapter.java index 76f30a6e6..0f6015214 100644 --- a/app/src/main/java/app/fedilab/android/drawers/NotificationsListAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/NotificationsListAdapter.java @@ -30,10 +30,12 @@ import android.os.CountDownTimer; import android.os.Handler; import androidx.annotation.NonNull; +import androidx.appcompat.content.res.AppCompatResources; import androidx.constraintlayout.widget.ConstraintLayout; import androidx.core.content.ContextCompat; import androidx.appcompat.app.AlertDialog; import androidx.appcompat.widget.PopupMenu; +import androidx.core.graphics.drawable.DrawableCompat; import androidx.preference.PreferenceManager; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -89,6 +91,7 @@ import app.fedilab.android.client.Entities.Status; import app.fedilab.android.helper.CrossActions; import app.fedilab.android.helper.CustomTextView; import app.fedilab.android.helper.Helper; +import app.fedilab.android.helper.ThemeHelper; import app.fedilab.android.interfaces.OnRetrieveImageInterface; import br.com.felix.horizontalbargraph.HorizontalBar; import br.com.felix.horizontalbargraph.model.BarItem; @@ -218,16 +221,6 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On - if (theme == Helper.THEME_DARK) { - holder.main_container_trans.setBackgroundColor(ContextCompat.getColor(context, R.color.notif_dark_1)); - holder.main_container_trans.setAlpha(.5f); - } else if (theme == Helper.THEME_BLACK) { - holder.main_container_trans.setBackgroundColor(ContextCompat.getColor(context, R.color.notif_black_1)); - holder.main_container_trans.setAlpha(.5f); - } else { - holder.main_container_trans.setBackgroundColor(ContextCompat.getColor(context, R.color.notif_light_1)); - holder.main_container_trans.setAlpha(.5f); - } if (theme == Helper.THEME_DARK) { style = R.style.DialogDark; } else if (theme == Helper.THEME_BLACK) { @@ -246,6 +239,7 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On holder.notification_delete.setVisibility(View.GONE); Drawable imgH = null; holder.status_date.setVisibility(View.VISIBLE); + holder.main_container_trans.setAlpha(.3f); switch (type) { case "mention": holder.status_action_container.setVisibility(View.VISIBLE); @@ -253,37 +247,19 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On typeString = String.format("%s %s", Helper.shortnameToUnicode(notification.getAccount().getDisplay_name(), true), context.getString(R.string.notif_mention)); else typeString = String.format("@%s %s", notification.getAccount().getUsername(), context.getString(R.string.notif_mention)); - if (theme == Helper.THEME_DARK) { - if (notification.getStatus().getVisibility().equals("direct")) - holder.card_status_container.setBackgroundColor(ContextCompat.getColor(context, R.color.notif_dark_private)); - else - holder.card_status_container.setBackgroundColor(ContextCompat.getColor(context, R.color.notif_dark_1)); - } else if (theme == Helper.THEME_BLACK) { - if (notification.getStatus().getVisibility().equals("direct")) - holder.card_status_container.setBackgroundColor(ContextCompat.getColor(context, R.color.notif_black_private)); - else - holder.card_status_container.setBackgroundColor(ContextCompat.getColor(context, R.color.notif_black_1)); - } else { - if (notification.getStatus().getVisibility().equals("direct")) - holder.card_status_container.setBackgroundColor(ContextCompat.getColor(context, R.color.notif_light_private)); - else - holder.card_status_container.setBackgroundColor(ContextCompat.getColor(context, R.color.notif_light_1)); - } imgH = ContextCompat.getDrawable(context, R.drawable.ic_chat_bubble_outline); - holder.main_container_trans.setVisibility(View.GONE); + if(notification.getStatus().getVisibility().equals("direct")) { + holder.main_container_trans.setVisibility(View.GONE); + }else{ + holder.main_container_trans.setVisibility(View.VISIBLE); + holder.main_container_trans.setAlpha(.1f); + } holder.status_more.setVisibility(View.VISIBLE); break; case "poll": holder.status_action_container.setVisibility(View.GONE); typeString = context.getString(R.string.notif_poll); ; - if (theme == Helper.THEME_DARK) { - holder.card_status_container.setBackgroundColor(ContextCompat.getColor(context, R.color.notif_dark_1)); - } else if (theme == Helper.THEME_BLACK) { - holder.card_status_container.setBackgroundColor(ContextCompat.getColor(context, R.color.notif_black_1)); - } else { - holder.card_status_container.setBackgroundColor(ContextCompat.getColor(context, R.color.notif_light_1)); - } imgH = ContextCompat.getDrawable(context, R.drawable.ic_view_list_poll_notif); holder.main_container_trans.setVisibility(View.VISIBLE); holder.status_more.setVisibility(View.GONE); @@ -294,13 +270,6 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On typeString = String.format("%s %s", Helper.shortnameToUnicode(notification.getAccount().getDisplay_name(), true), context.getString(R.string.notif_reblog)); else typeString = String.format("@%s %s", notification.getAccount().getUsername(), context.getString(R.string.notif_reblog)); - if (theme == Helper.THEME_DARK) { - holder.card_status_container.setBackgroundColor(ContextCompat.getColor(context, R.color.notif_dark_1)); - } else if (theme == Helper.THEME_BLACK) { - holder.card_status_container.setBackgroundColor(ContextCompat.getColor(context, R.color.notif_black_1)); - } else { - holder.card_status_container.setBackgroundColor(ContextCompat.getColor(context, R.color.notif_light_1)); - } imgH = ContextCompat.getDrawable(context, R.drawable.ic_repeat_head); holder.main_container_trans.setVisibility(View.VISIBLE); holder.status_more.setVisibility(View.GONE); @@ -311,13 +280,6 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On typeString = String.format("%s %s", Helper.shortnameToUnicode(notification.getAccount().getDisplay_name(), true), context.getString(R.string.notif_favourite)); else typeString = String.format("@%s %s", notification.getAccount().getUsername(), context.getString(R.string.notif_favourite)); - if (theme == Helper.THEME_DARK) { - holder.card_status_container.setBackgroundColor(ContextCompat.getColor(context, R.color.notif_dark_1)); - } else if (theme == Helper.THEME_BLACK) { - holder.card_status_container.setBackgroundColor(ContextCompat.getColor(context, R.color.notif_black_1)); - } else { - holder.card_status_container.setBackgroundColor(ContextCompat.getColor(context, R.color.notif_light_1)); - } imgH = ContextCompat.getDrawable(context, R.drawable.ic_star_border_header); holder.main_container_trans.setVisibility(View.VISIBLE); holder.status_more.setVisibility(View.GONE); @@ -329,41 +291,20 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On typeString = String.format("%s %s", Helper.shortnameToUnicode(notification.getAccount().getDisplay_name(), true), context.getString(R.string.notif_follow)); else typeString = String.format("@%s %s", notification.getAccount().getUsername(), context.getString(R.string.notif_follow)); - if (theme == Helper.THEME_DARK) { - holder.card_status_container.setBackgroundColor(ContextCompat.getColor(context, R.color.notif_dark_1)); - } else if (theme == Helper.THEME_BLACK) { - holder.card_status_container.setBackgroundColor(ContextCompat.getColor(context, R.color.notif_black_1)); - } else { - holder.card_status_container.setBackgroundColor(ContextCompat.getColor(context, R.color.notif_light_1)); - } imgH = ContextCompat.getDrawable(context, R.drawable.ic_follow_notif_header); holder.main_container_trans.setVisibility(View.GONE); break; } - if (theme == Helper.THEME_BLACK) { - Helper.changeDrawableColor(context, R.drawable.ic_chat_bubble_outline, R.color.dark_icon); - Helper.changeDrawableColor(context, R.drawable.ic_repeat_head, R.color.dark_icon); - Helper.changeDrawableColor(context, R.drawable.ic_star_border_header, R.color.dark_icon); - Helper.changeDrawableColor(context, R.drawable.ic_follow_notif_header, R.color.dark_icon); - Helper.changeDrawableColor(context, R.drawable.ic_view_list_poll_notif, R.color.dark_icon); - } else { - Helper.changeDrawableColor(context, R.drawable.ic_chat_bubble_outline, R.color.mastodonC4); - Helper.changeDrawableColor(context, R.drawable.ic_repeat_head, R.color.mastodonC4); - Helper.changeDrawableColor(context, R.drawable.ic_star_border_header, R.color.mastodonC4); - Helper.changeDrawableColor(context, R.drawable.ic_follow_notif_header, R.color.mastodonC4); - Helper.changeDrawableColor(context, R.drawable.ic_view_list_poll_notif, R.color.mastodonC4); - } - if (notification.getAccount().getdisplayNameSpan() == null) { holder.notification_type.setText(typeString); notification.getAccount().setStored_displayname(notification.getAccount().getDisplay_name()); - // notification.getAccount().setDisplay_name(typeString); } else holder.notification_type.setText(notification.getAccount().getdisplayNameSpan(), TextView.BufferType.SPANNABLE); if (imgH != null) { + DrawableCompat.setTint(imgH, ContextCompat.getColor(context, R.color.cyanea_accent)); holder.notification_type.setCompoundDrawablePadding((int) Helper.convertDpToPixel(5, context)); imgH.setBounds(0, 0, (int) (20 * iconSizePercent / 100 * scale + 0.5f), (int) (20 * iconSizePercent / 100 * scale + 0.5f)); } @@ -380,35 +321,6 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On holder.status_date.setTextSize(TypedValue.COMPLEX_UNIT_SP, 12 * textSizePercent / 100); - //Manages theme for icon colors - if (theme == Helper.THEME_BLACK) { - Helper.changeDrawableColor(context, R.drawable.ic_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_star_border, R.color.action_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); - Helper.changeDrawableColor(context, holder.notification_delete, R.color.dark_text); - } else if (theme == Helper.THEME_DARK) { - Helper.changeDrawableColor(context, R.drawable.ic_reply, R.color.action_dark); - Helper.changeDrawableColor(context, holder.status_more, R.color.action_dark); - Helper.changeDrawableColor(context, holder.status_privacy, R.color.action_dark); - Helper.changeDrawableColor(context, R.drawable.ic_repeat, R.color.action_dark); - Helper.changeDrawableColor(context, R.drawable.ic_star_border, R.color.action_dark); - 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, holder.notification_delete, R.color.dark_text); - } else { - Helper.changeDrawableColor(context, R.drawable.ic_reply, 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_star_border, R.color.action_light); - Helper.changeDrawableColor(context, R.drawable.ic_photo, R.color.black); - Helper.changeDrawableColor(context, R.drawable.ic_remove_red_eye, R.color.black); - Helper.changeDrawableColor(context, holder.notification_delete, R.color.black); - } holder.spark_button_fav.pressOnTouch(false); holder.spark_button_reblog.pressOnTouch(false); holder.spark_button_fav.setActiveImageTint(R.color.marked_icon); diff --git a/app/src/main/java/app/fedilab/android/drawers/PixelfedListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/PixelfedListAdapter.java index 1f48376c9..be9e37e02 100644 --- a/app/src/main/java/app/fedilab/android/drawers/PixelfedListAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/PixelfedListAdapter.java @@ -520,30 +520,6 @@ public class PixelfedListAdapter extends RecyclerView.Adapter implements OnPostA in_reply_to_status = status.getReblog() != null ? status.getReblog().getId() : status.getId(); tootReply = status; theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK); - if (theme == Helper.THEME_DARK || theme == Helper.THEME_BLACK) { - changeDrawableColor(context, R.drawable.emoji_one_category_smileysandpeople, R.color.dark_text); - changeDrawableColor(context, R.drawable.ic_public_toot, R.color.dark_text); - changeDrawableColor(context, R.drawable.ic_lock_open_toot, R.color.dark_text); - changeDrawableColor(context, R.drawable.ic_lock_outline_toot, R.color.dark_text); - changeDrawableColor(context, R.drawable.ic_mail_outline_toot, R.color.dark_text); - changeDrawableColor(context, holder.quick_reply_switch_to_full, R.color.dark_text); - if (theme == Helper.THEME_DARK) { - holder.quick_reply_container.setBackgroundResource(R.drawable.quick_reply_background); - changeDrawableColor(context, R.drawable.quick_reply_background, R.color.quick_reply_background_dark); - } else { - holder.quick_reply_container.setBackgroundResource(R.drawable.quick_reply_background_black); - changeDrawableColor(context, R.drawable.quick_reply_background, R.color.quick_reply_background_black); - } - } else { - holder.quick_reply_container.setBackgroundResource(R.drawable.quick_reply_background_light); - changeDrawableColor(context, R.drawable.emoji_one_category_smileysandpeople, R.color.black); - changeDrawableColor(context, R.drawable.ic_public_toot, R.color.black); - changeDrawableColor(context, R.drawable.ic_lock_open_toot, R.color.black); - changeDrawableColor(context, R.drawable.ic_lock_outline_toot, R.color.black); - changeDrawableColor(context, R.drawable.ic_mail_outline_toot, R.color.black); - changeDrawableColor(context, holder.quick_reply_switch_to_full, R.color.black); - - } final SQLiteDatabase db = Sqlite.getInstance(context, Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open(); String instance = sharedpreferences.getString(Helper.PREF_INSTANCE, null); diff --git a/app/src/main/java/app/fedilab/android/fragments/ContentSettingsFragment.java b/app/src/main/java/app/fedilab/android/fragments/ContentSettingsFragment.java index 959db1f91..ccede8a0d 100644 --- a/app/src/main/java/app/fedilab/android/fragments/ContentSettingsFragment.java +++ b/app/src/main/java/app/fedilab/android/fragments/ContentSettingsFragment.java @@ -1599,11 +1599,7 @@ public class ContentSettingsFragment extends Fragment implements OnRetrieveRemot final Account account = new AccountDAO(context, db).getUniqAccount(userId, instance); final ImageView set_toot_visibility = rootView.findViewById(R.id.set_toot_visibility); - if (theme == Helper.THEME_DARK) { - Helper.changeDrawableColor(context, set_toot_visibility, R.color.dark_text); - } else { - Helper.changeDrawableColor(context, set_toot_visibility, R.color.white); - } + //Only displayed for non locked accounts if (account != null) { String defaultVisibility = account.isLocked() ? "private" : "public"; diff --git a/app/src/main/java/app/fedilab/android/fragments/DisplayNotificationsFragment.java b/app/src/main/java/app/fedilab/android/fragments/DisplayNotificationsFragment.java index 1e4caf434..d2437289a 100644 --- a/app/src/main/java/app/fedilab/android/fragments/DisplayNotificationsFragment.java +++ b/app/src/main/java/app/fedilab/android/fragments/DisplayNotificationsFragment.java @@ -27,7 +27,6 @@ import android.os.Looper; import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; -import androidx.core.content.ContextCompat; import androidx.localbroadcastmanager.content.LocalBroadcastManager; import androidx.preference.PreferenceManager; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; @@ -40,6 +39,8 @@ import android.view.ViewGroup; import android.widget.RelativeLayout; import android.widget.Toast; +import org.jetbrains.annotations.NotNull; + import java.util.ArrayList; import java.util.List; @@ -215,27 +216,6 @@ public class DisplayNotificationsFragment extends Fragment implements OnRetrieve } }); SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); - int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK); - switch (theme) { - case Helper.THEME_LIGHT: - swipeRefreshLayout.setColorSchemeResources(R.color.mastodonC4, - R.color.mastodonC2, - R.color.mastodonC3); - swipeRefreshLayout.setProgressBackgroundColorSchemeColor(ContextCompat.getColor(context, R.color.white)); - break; - case Helper.THEME_DARK: - swipeRefreshLayout.setColorSchemeResources(R.color.mastodonC4__, - R.color.mastodonC4, - R.color.mastodonC4); - swipeRefreshLayout.setProgressBackgroundColorSchemeColor(ContextCompat.getColor(context, R.color.mastodonC1_)); - break; - case Helper.THEME_BLACK: - swipeRefreshLayout.setColorSchemeResources(R.color.dark_icon, - R.color.mastodonC2, - R.color.mastodonC3); - swipeRefreshLayout.setProgressBackgroundColorSchemeColor(ContextCompat.getColor(context, R.color.black_3)); - break; - } if (context != null) asyncTask = new RetrieveNotificationsAsyncTask(context, type, true, null, max_id, DisplayNotificationsFragment.this).execute(); else @@ -257,7 +237,7 @@ public class DisplayNotificationsFragment extends Fragment implements OnRetrieve @Override - public void onAttach(Context context) { + public void onAttach(@NotNull Context context) { super.onAttach(context); this.context = context; } diff --git a/app/src/main/java/app/fedilab/android/helper/Helper.java b/app/src/main/java/app/fedilab/android/helper/Helper.java index 851a84b34..1bc611b76 100644 --- a/app/src/main/java/app/fedilab/android/helper/Helper.java +++ b/app/src/main/java/app/fedilab/android/helper/Helper.java @@ -1499,15 +1499,6 @@ public class Helper { final SharedPreferences sharedpreferences = activity.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK); - if (theme == Helper.THEME_DARK || theme == Helper.THEME_BLACK) { - changeDrawableColor(activity, R.drawable.ic_person_add, R.color.dark_text); - changeDrawableColor(activity, R.drawable.ic_person, R.color.dark_text); - changeDrawableColor(activity, R.drawable.ic_cancel, R.color.dark_text); - } else { - changeDrawableColor(activity, R.drawable.ic_person_add, R.color.black); - changeDrawableColor(activity, R.drawable.ic_person, R.color.black); - changeDrawableColor(activity, R.drawable.ic_cancel, R.color.black); - } if (!menuAccountsOpened) { arrow.setImageResource(R.drawable.ic_arrow_drop_up); @@ -2284,15 +2275,6 @@ public class Helper { ImageView owner_accounts = headerLayout.findViewById(R.id.owner_accounts); ImageView header_option_info = headerLayout.findViewById(R.id.header_option_info); ImageView header_option_menu = headerLayout.findViewById(R.id.header_option_menu); - if (theme == Helper.THEME_DARK || theme == Helper.THEME_BLACK) { - changeDrawableColor(activity, owner_accounts, R.color.dark_text); - changeDrawableColor(activity, header_option_info, R.color.dark_text); - changeDrawableColor(activity, header_option_menu, R.color.dark_text); - } else { - changeDrawableColor(activity, owner_accounts, R.color.light_black); - changeDrawableColor(activity, header_option_info, R.color.light_black); - changeDrawableColor(activity, header_option_menu, R.color.light_black); - } if (!urlHeader.contains("missing.png")) { ImageView backgroundImage = headerLayout.findViewById(R.id.back_ground_image); Glide.with(activity.getApplicationContext()) diff --git a/app/src/main/res/layout/drawer_notification.xml b/app/src/main/res/layout/drawer_notification.xml index 212cbc1c0..65ef54ac7 100644 --- a/app/src/main/res/layout/drawer_notification.xml +++ b/app/src/main/res/layout/drawer_notification.xml @@ -101,6 +101,7 @@ android:layout_marginBottom="10dp" android:id="@+id/notification_delete" android:src="@drawable/ic_delete" + android:tint="?attr/iconColor" android:layout_width="25dp" android:layout_height="25dp" android:contentDescription="@string/delete_notification" /> @@ -181,6 +182,7 @@ android:layout_centerInParent="true" android:layout_width="20dp" android:src="@drawable/ic_play_arrow" + android:tint="@color/white" android:layout_height="20dp" android:contentDescription="@string/play_video" /> @@ -212,6 +214,7 @@ android:layout_centerInParent="true" android:layout_width="20dp" android:src="@drawable/ic_play_arrow" + android:tint="@color/white" android:layout_height="20dp" android:contentDescription="@string/play_video" /> @@ -241,13 +244,13 @@ android:layout_centerInParent="true" android:layout_width="20dp" android:src="@drawable/ic_play_arrow" + android:tint="@color/white" android:visibility="gone" android:layout_height="20dp" android:contentDescription="@string/play_video" /> @@ -277,7 +281,6 @@ android:id="@+id/status_show_more" android:visibility="gone" android:textAllCaps="false" - android:drawableLeft="@drawable/ic_photo" android:drawableStart="@drawable/ic_photo" android:gravity="center" android:drawablePadding="5dp" @@ -326,6 +329,7 @@ android:layout_width="30dp" android:layout_height="30dp" android:src="@drawable/ic_reply" + android:tint="?attr/iconColor" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -386,6 +390,7 @@ android:layout_width="25dp" android:layout_height="25dp" android:layout_marginEnd="15dp" + android:tint="?attr/iconColor" android:contentDescription="@string/toot_visibility_tilte" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/status_more" @@ -397,6 +402,7 @@ android:layout_height="25dp" android:contentDescription="@string/display_toot_truncate" android:src="@drawable/ic_more_horiz" + android:tint="?attr/iconColor" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -416,7 +422,7 @@ diff --git a/app/src/main/res/layout/drawer_status.xml b/app/src/main/res/layout/drawer_status.xml index 78005809b..54313b335 100644 --- a/app/src/main/res/layout/drawer_status.xml +++ b/app/src/main/res/layout/drawer_status.xml @@ -148,6 +148,7 @@ android:layout_height="24dp" android:contentDescription="@string/new_toot" android:src="@drawable/ic_fiber_new" + android:backgroundTint="?attr/colorAccent" android:visibility="gone" app:layout_constraintEnd_toStartOf="@id/guide_account_image_end" app:layout_constraintTop_toBottomOf="@id/status_boosted_by_info" /> @@ -228,7 +229,6 @@ android:layout_height="35dp" android:layout_marginTop="5dp" android:layout_marginBottom="5dp" - android:background="@color/mastodonC4" android:contentDescription="@string/app_features" android:padding="2dp" android:scaleType="fitCenter" @@ -254,6 +254,7 @@ android:layout_marginTop="5dp" android:contentDescription="@string/delete" android:src="@drawable/ic_clear_toot" + android:tint="?attr/iconColor" android:visibility="gone" app:layout_constraintEnd_toEndOf="@id/fedilab_features" app:layout_constraintStart_toStartOf="@id/fedilab_features" @@ -281,6 +282,7 @@ android:layout_marginEnd="5dp" android:contentDescription="@string/cached_status" android:src="@drawable/ic_cached_black" + android:tint="?attr/iconColor" android:visibility="gone" app:layout_constraintBottom_toBottomOf="@id/status_account_displayname_owner" app:layout_constraintEnd_toEndOf="parent" @@ -375,7 +377,7 @@ android:layout_height="wrap_content" android:layout_marginTop="-10dp" android:drawableStart="@drawable/ic_more_toot_content" - android:drawableLeft="@drawable/ic_more_toot_content" + android:tint="?attr/iconColor" android:drawablePadding="5dp" android:gravity="center_vertical" android:maxLines="1" @@ -391,7 +393,6 @@ android:layout_height="wrap_content" android:layout_gravity="end" android:layout_marginEnd="10dp" - android:layout_marginRight="10dp" android:layout_marginBottom="10dp" android:gravity="end" android:maxLines="1" @@ -542,7 +543,8 @@ android:layout_height="30dp" android:layout_centerInParent="true" android:contentDescription="@string/videos" - android:src="@drawable/video_preview" /> + android:src="@drawable/video_preview" + android:tint="@color/white"/> @@ -596,6 +598,7 @@ android:layout_centerInParent="true" android:contentDescription="@string/play_video" android:src="@drawable/ic_play_arrow" + android:tint="@color/white" android:visibility="gone" /> @@ -621,6 +624,7 @@ android:layout_centerInParent="true" android:contentDescription="@string/play_video" android:src="@drawable/ic_play_arrow" + android:tint="@color/white" android:visibility="gone" /> @@ -653,6 +657,7 @@ android:layout_centerInParent="true" android:contentDescription="@string/play_video" android:src="@drawable/ic_play_arrow" + android:tint="@color/white" android:visibility="gone" /> @@ -677,6 +682,7 @@ android:layout_centerInParent="true" android:contentDescription="@string/play_video" android:src="@drawable/ic_play_arrow" + android:tint="@color/white" android:visibility="gone" /> @@ -687,11 +693,11 @@ android:layout_width="34dp" android:layout_height="34dp" android:layout_alignParentStart="true" - android:layout_alignParentLeft="true" android:layout_alignParentTop="true" android:contentDescription="@string/show_media" android:padding="5dp" - android:src="@drawable/ic_remove_red_eye_img" /> + android:src="@drawable/ic_remove_red_eye_img" + android:tint="@color/white"/> + android:src="@drawable/ic_remove_red_eye_img" + android:tint="?attr/iconColor" + /> @@ -763,6 +770,7 @@ android:layout_centerInParent="true" android:contentDescription="@string/play_video" android:src="@drawable/ic_play_arrow" + android:tint="@color/white" android:visibility="gone" /> @@ -793,6 +801,7 @@ android:layout_centerInParent="true" android:contentDescription="@string/play_video" android:src="@drawable/ic_play_arrow" + android:tint="@color/white" android:visibility="gone" /> @@ -817,6 +826,7 @@ android:layout_centerInParent="true" android:contentDescription="@string/play_video" android:src="@drawable/ic_play_arrow" + android:tint="@color/white" android:visibility="gone" /> @@ -922,6 +932,7 @@ android:layout_width="30dp" android:layout_height="30dp" android:src="@drawable/ic_reply" + android:tint="?attr/iconColor" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -984,6 +995,7 @@ android:layout_marginStart="15dp" android:contentDescription="@string/pin_add" android:src="@drawable/ic_pin_drop" + android:tint="?attr/iconColor" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/status_favorite_count" app:layout_constraintTop_toTopOf="parent" /> @@ -1004,6 +1016,7 @@ android:layout_height="25dp" android:contentDescription="@string/display_toot_truncate" android:src="@drawable/ic_more_horiz" + android:tint="?attr/iconColor" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/drawer_status_compact.xml b/app/src/main/res/layout/drawer_status_compact.xml index e039556f5..a9f0f5b5b 100644 --- a/app/src/main/res/layout/drawer_status_compact.xml +++ b/app/src/main/res/layout/drawer_status_compact.xml @@ -261,6 +261,7 @@ android:layout_height="20dp" android:contentDescription="@string/cached_status" android:src="@drawable/ic_cached_black" + android:tint="?attr/iconColor" android:visibility="gone" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -492,7 +493,8 @@ android:layout_height="30dp" android:layout_centerInParent="true" android:contentDescription="@string/play_video" - android:src="@drawable/video_preview" /> + android:src="@drawable/video_preview" + android:tint="@color/white"/> @@ -572,6 +575,7 @@ android:layout_centerInParent="true" android:contentDescription="@string/play_video" android:src="@drawable/ic_play_arrow" + android:tint="@color/white" android:visibility="gone" /> @@ -606,6 +610,7 @@ android:layout_centerInParent="true" android:contentDescription="@string/play_video" android:src="@drawable/ic_play_arrow" + android:tint="@color/white" android:visibility="gone" /> @@ -630,6 +635,7 @@ android:layout_centerInParent="true" android:contentDescription="@string/play_video" android:src="@drawable/ic_play_arrow" + android:tint="@color/white" android:visibility="gone" /> @@ -640,11 +646,11 @@ android:layout_width="34dp" android:layout_height="34dp" android:layout_alignParentStart="true" - android:layout_alignParentLeft="true" android:layout_alignParentTop="true" android:contentDescription="@string/hide_media" android:padding="5dp" - android:src="@drawable/ic_remove_red_eye_img" /> + android:src="@drawable/ic_remove_red_eye_img" + android:tint="?attr/iconColor"/> + android:src="@drawable/ic_remove_red_eye_img" + android:tint="?attr/iconColor"/> @@ -716,6 +722,7 @@ android:layout_centerInParent="true" android:contentDescription="@string/play_video" android:src="@drawable/ic_play_arrow" + android:tint="@color/white" android:visibility="gone" /> @@ -746,6 +753,7 @@ android:layout_centerInParent="true" android:contentDescription="@string/play_video" android:src="@drawable/ic_play_arrow" + android:tint="@color/white" android:visibility="gone" /> @@ -770,6 +778,7 @@ android:layout_centerInParent="true" android:contentDescription="@string/play_video" android:src="@drawable/ic_play_arrow" + android:tint="@color/white" android:visibility="gone" /> @@ -878,6 +887,7 @@ android:layout_width="30dp" android:layout_height="30dp" android:src="@drawable/ic_reply" + android:tint="?attr/iconColor" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -943,10 +953,10 @@ android:layout_height="wrap_content" android:layout_gravity="center_horizontal" android:layout_marginStart="15dp" - android:layout_marginLeft="15dp" android:contentDescription="@string/new_toot" android:gravity="center_vertical" android:src="@drawable/ic_fiber_new" + android:backgroundTint="?attr/colorAccent" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/status_favorite_count" @@ -957,10 +967,10 @@ android:layout_width="20dp" android:layout_height="20dp" android:layout_marginStart="15dp" - android:layout_marginLeft="15dp" android:layout_marginTop="5dp" android:contentDescription="@string/delete" android:src="@drawable/ic_clear_toot" + android:tint="?attr/iconColor" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/new_element" @@ -971,9 +981,9 @@ android:layout_width="20dp" android:layout_height="20dp" android:layout_marginStart="15dp" - android:layout_marginLeft="15dp" android:contentDescription="@string/pin_add" android:src="@drawable/ic_pin_drop" + android:tint="?attr/iconColor" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/status_remove" app:layout_constraintTop_toTopOf="parent" /> @@ -983,7 +993,6 @@ android:layout_width="25dp" android:layout_height="25dp" android:layout_marginEnd="15dp" - android:layout_marginRight="15dp" android:contentDescription="@string/toot_visibility_tilte" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/status_more" @@ -995,6 +1004,7 @@ android:layout_height="25dp" android:contentDescription="@string/display_toot_truncate" android:src="@drawable/ic_more_horiz" + android:tint="?attr/iconColor" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/drawer_status_console.xml b/app/src/main/res/layout/drawer_status_console.xml index b5cb26e4f..e76f759d7 100644 --- a/app/src/main/res/layout/drawer_status_console.xml +++ b/app/src/main/res/layout/drawer_status_console.xml @@ -61,7 +61,6 @@ android:layout_height="15dp" android:layout_marginTop="5dp" android:layout_alignParentTop="true" - android:layout_alignParentLeft="true" android:src="@drawable/ic_bot" android:id="@+id/status_account_bot" android:layout_alignParentStart="true" /> @@ -193,6 +192,7 @@ @@ -485,6 +486,7 @@ android:layout_centerInParent="true" android:layout_width="30dp" android:src="@drawable/ic_play_arrow" + android:tint="@color/white" android:layout_height="30dp" android:contentDescription="@string/play_video" /> @@ -510,6 +512,7 @@ android:layout_centerInParent="true" android:layout_width="30dp" android:src="@drawable/ic_play_arrow" + android:tint="@color/white" android:layout_height="30dp" android:contentDescription="@string/play_video" /> @@ -544,6 +547,7 @@ android:layout_centerInParent="true" android:layout_width="30dp" android:src="@drawable/ic_play_arrow" + android:tint="@color/white" android:layout_height="30dp" android:contentDescription="@string/play_video" /> @@ -552,7 +556,6 @@ android:layout_width="0dp" android:layout_weight="1" android:layout_height="match_parent" - android:layout_marginLeft="1dp" android:layout_marginStart="1dp"> @@ -577,10 +581,10 @@ @@ -612,16 +616,17 @@ android:layout_centerInParent="true" android:layout_width="30dp" android:src="@drawable/ic_play_arrow" + android:tint="@color/white" android:layout_height="30dp" android:contentDescription="@string/play_video" /> @@ -630,7 +635,6 @@ @@ -683,6 +688,7 @@ android:layout_centerInParent="true" android:layout_width="30dp" android:src="@drawable/ic_play_arrow" + android:tint="@color/white" android:visibility="gone" android:layout_height="30dp" android:contentDescription="@string/play_video" /> @@ -708,6 +714,7 @@ android:visibility="gone" android:layout_width="30dp" android:src="@drawable/ic_play_arrow" + android:tint="@color/white" android:layout_height="30dp" android:contentDescription="@string/play_video" /> @@ -784,7 +791,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:contentDescription="@string/new_toot" - android:src="@drawable/ic_fiber_new" + android:backgroundTint="?attr/colorAccent" + android:tint="?attr/colorAccent" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -796,6 +804,7 @@ android:layout_height="30dp" android:layout_marginStart="15dp" android:src="@drawable/ic_reply" + android:tint="?attr/iconColor" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/new_element" app:layout_constraintTop_toTopOf="parent" @@ -861,6 +870,7 @@ android:layout_marginTop="5dp" android:contentDescription="@string/delete" android:src="@drawable/ic_clear_toot" + android:tint="?attr/iconColor" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/status_favorite_count" @@ -873,6 +883,7 @@ android:layout_marginStart="15dp" android:contentDescription="@string/pin_add" android:src="@drawable/ic_pin_drop" + android:tint="?attr/iconColor" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/status_remove" app:layout_constraintTop_toTopOf="parent" /> @@ -893,6 +904,7 @@ android:layout_height="25dp" android:contentDescription="@string/display_toot_truncate" android:src="@drawable/ic_more_horiz" + android:tint="?attr/iconColor" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/drawer_status_focused.xml b/app/src/main/res/layout/drawer_status_focused.xml index 877af0419..9ee6b5136 100644 --- a/app/src/main/res/layout/drawer_status_focused.xml +++ b/app/src/main/res/layout/drawer_status_focused.xml @@ -124,7 +124,6 @@ android:layout_width="20dp" android:layout_height="20dp" android:layout_alignParentStart="true" - android:layout_alignParentLeft="true" android:layout_alignParentTop="true" android:layout_marginTop="5dp" android:background="@drawable/bot_background_round_corner" @@ -136,7 +135,6 @@ android:layout_width="45dp" android:layout_height="45dp" android:layout_alignParentStart="true" - android:layout_alignParentLeft="true" android:layout_centerHorizontal="true" android:contentDescription="@string/profile_picture" android:visibility="gone" /> @@ -146,7 +144,6 @@ android:layout_width="30dp" android:layout_height="30dp" android:layout_alignParentEnd="true" - android:layout_alignParentRight="true" android:layout_marginTop="20dp" android:contentDescription="@string/profile_picture" android:visibility="gone" /> @@ -159,7 +156,8 @@ android:layout_gravity="center_horizontal" android:layout_marginTop="5dp" android:contentDescription="@string/profile_picture" - android:src="@drawable/ic_fiber_new" + android:backgroundTint="?attr/colorAccent" + android:tint="?attr/colorAccent" android:visibility="gone" /> @@ -173,7 +171,6 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="10dp" - android:layout_marginLeft="10dp" android:layout_weight="1" android:orientation="vertical"> @@ -196,6 +193,7 @@ android:layout_height="20dp" android:contentDescription="@string/cached_status" android:src="@drawable/ic_cached_black" + android:tint="?attr/colorAccent" android:visibility="gone" /> + android:src="@drawable/video_preview" + android:tint="@color/white"/> @@ -468,6 +467,7 @@ android:layout_centerInParent="true" android:contentDescription="@string/play_video" android:src="@drawable/ic_play_arrow" + android:tint="@color/white" android:visibility="gone" /> @@ -476,7 +476,6 @@ android:layout_width="0dp" android:layout_height="match_parent" android:layout_marginStart="1dp" - android:layout_marginLeft="1dp" android:layout_weight="1"> @@ -525,6 +525,7 @@ android:layout_centerInParent="true" android:contentDescription="@string/play_video" android:src="@drawable/ic_play_arrow" + android:tint="@color/white" android:visibility="gone" /> @@ -532,7 +533,6 @@ android:layout_width="0dp" android:layout_height="match_parent" android:layout_marginStart="1dp" - android:layout_marginLeft="1dp" android:layout_weight="1"> @@ -559,11 +560,11 @@ android:layout_width="34dp" android:layout_height="34dp" android:layout_alignParentStart="true" - android:layout_alignParentLeft="true" android:layout_alignParentTop="true" android:contentDescription="@string/hide_media" android:padding="5dp" - android:src="@drawable/ic_remove_red_eye_img" /> + android:src="@drawable/ic_remove_red_eye_img" + android:tint="?attr/iconColor"/> + android:src="@drawable/ic_remove_red_eye_img" + android:tint="?attr/iconColor"/> @@ -635,6 +636,7 @@ android:layout_centerInParent="true" android:contentDescription="@string/play_video" android:src="@drawable/ic_play_arrow" + android:tint="@color/white" android:visibility="gone" /> @@ -665,6 +667,7 @@ android:layout_centerInParent="true" android:contentDescription="@string/play_video" android:src="@drawable/ic_play_arrow" + android:tint="@color/white" android:visibility="gone" /> @@ -689,6 +692,7 @@ android:layout_centerInParent="true" android:contentDescription="@string/play_video" android:src="@drawable/ic_play_arrow" + android:tint="@color/white" android:visibility="gone" /> @@ -752,7 +756,6 @@ android:layout_height="35dp" android:layout_marginTop="5dp" android:layout_marginBottom="5dp" - android:background="@color/mastodonC4" android:contentDescription="@string/app_features" android:padding="2dp" android:scaleType="fitCenter" @@ -799,6 +802,7 @@ android:layout_width="30dp" android:layout_height="30dp" android:src="@drawable/ic_reply" + android:tint="?attr/iconColor" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -867,6 +871,7 @@ android:layout_marginTop="5dp" android:contentDescription="@string/delete" android:src="@drawable/ic_clear_toot" + android:tint="?attr/iconColor" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/status_favorite_count" @@ -878,9 +883,9 @@ android:layout_height="20dp" android:layout_gravity="center_vertical" android:layout_marginStart="20dp" - android:layout_marginLeft="20dp" android:contentDescription="@string/pin_add" android:src="@drawable/ic_pin_drop" + android:tint="?attr/iconColor" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/status_remove" app:layout_constraintTop_toTopOf="parent" /> @@ -890,7 +895,6 @@ android:layout_width="25dp" android:layout_height="25dp" android:layout_marginEnd="15dp" - android:layout_marginRight="15dp" android:contentDescription="@string/toot_visibility_tilte" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/status_more" @@ -902,6 +906,7 @@ android:layout_height="25dp" android:contentDescription="@string/display_toot_truncate" android:src="@drawable/ic_more_horiz" + android:tint="?attr/iconColor" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 5684b4d13..2ce7014af 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -177,4 +177,9 @@ #0288D1 #FFA000 + + + + #f3f3f3 + #606984 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 6cfc46e93..9f813ed44 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,57 +1,70 @@ + - -