From 320f913c634824ed09d6720aaab8b97ca8c417aa Mon Sep 17 00:00:00 2001 From: Thomas Date: Mon, 28 Nov 2022 15:03:17 +0100 Subject: remove useless elements --- .../java/app/fedilab/android/BaseMainActivity.java | 4 -- .../app/fedilab/android/helper/ThemeHelper.java | 20 ------- .../fragment/settings/FragmentThemingSettings.java | 9 +-- .../fragment/timeline/FragmentMastodonAccount.java | 5 -- .../timeline/FragmentMastodonAnnouncement.java | 5 -- .../fragment/timeline/FragmentMastodonContext.java | 5 -- .../timeline/FragmentMastodonConversation.java | 6 -- .../timeline/FragmentMastodonDomainBlock.java | 5 -- .../timeline/FragmentMastodonNotification.java | 5 -- .../timeline/FragmentMastodonSuggestion.java | 5 -- .../ui/fragment/timeline/FragmentMastodonTag.java | 5 -- .../timeline/FragmentMastodonTimeline.java | 8 --- .../main/res/drawable/ic_baseline_bookmark_24.xml | 4 +- .../drawable/ic_baseline_bookmark_border_24.xml | 4 +- app/src/main/res/drawable/ic_repeat.xml | 4 +- app/src/main/res/drawable/ic_star_outline.xml | 4 +- app/src/main/res/drawable/menu_selector_dark.xml | 7 --- app/src/main/res/drawable/menu_selector_light.xml | 7 --- app/src/main/res/layout/activity_main.xml | 2 +- app/src/main/res/layout/activity_reorder_tabs.xml | 4 +- app/src/main/res/layout/drawer_account.xml | 58 +++++++++++-------- app/src/main/res/layout/drawer_announcement.xml | 6 +- app/src/main/res/layout/drawer_conversation.xml | 4 -- app/src/main/res/layout/drawer_status.xml | 10 +--- app/src/main/res/layout/drawer_status_history.xml | 3 - app/src/main/res/layout/drawer_status_simple.xml | 3 - app/src/main/res/layout/nav_header_main.xml | 6 +- app/src/main/res/layout/popup_links.xml | 8 +-- app/src/main/res/layout/popup_status_theme.xml | 10 +--- .../main/res/layout/tab_custom_default_view.xml | 1 - app/src/main/res/layout/tab_custom_view.xml | 1 - app/src/main/res/values/colors.xml | 5 ++ app/src/main/res/values/styles.xml | 66 +++++++++++++--------- 33 files changed, 105 insertions(+), 194 deletions(-) delete mode 100644 app/src/main/res/drawable/menu_selector_dark.xml delete mode 100644 app/src/main/res/drawable/menu_selector_light.xml diff --git a/app/src/main/java/app/fedilab/android/BaseMainActivity.java b/app/src/main/java/app/fedilab/android/BaseMainActivity.java index c5f751e7a..a68279d50 100644 --- a/app/src/main/java/app/fedilab/android/BaseMainActivity.java +++ b/app/src/main/java/app/fedilab/android/BaseMainActivity.java @@ -139,7 +139,6 @@ import app.fedilab.android.helper.Helper; import app.fedilab.android.helper.MastodonHelper; import app.fedilab.android.helper.PinnedTimelineHelper; import app.fedilab.android.helper.PushHelper; -import app.fedilab.android.helper.ThemeHelper; import app.fedilab.android.ui.fragment.timeline.FragmentMastodonConversation; import app.fedilab.android.ui.fragment.timeline.FragmentMastodonTimeline; import app.fedilab.android.ui.fragment.timeline.FragmentNotificationContainer; @@ -191,7 +190,6 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt intentCompose.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); context.startActivity(intentCompose); }) - .setTextColor(ThemeHelper.getAttColor(BaseMainActivity.this, R.attr.mTextColor)) .show(); } } @@ -264,7 +262,6 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt intentContext.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); startActivity(intentContext); }) - .setTextColor(ThemeHelper.getAttColor(BaseMainActivity.this, R.attr.mTextColor)) .show(); //The message was edited, we need to update the timeline if (statusEditId != null) { @@ -307,7 +304,6 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt mamageNewIntent(getIntent()); - ThemeHelper.initiliazeColors(BaseMainActivity.this); filterFetched = false; networkStateReceiver = new NetworkStateReceiver(); networkStateReceiver.addListener(this); diff --git a/app/src/main/java/app/fedilab/android/helper/ThemeHelper.java b/app/src/main/java/app/fedilab/android/helper/ThemeHelper.java index 088557a10..3ce1b2d63 100644 --- a/app/src/main/java/app/fedilab/android/helper/ThemeHelper.java +++ b/app/src/main/java/app/fedilab/android/helper/ThemeHelper.java @@ -88,26 +88,6 @@ public class ThemeHelper { return new ColorStateList(states, colors); } - /** - * Initialize colors in a static variable - * Currently link_color cannot be retrieved with getAttColor in ViewModel due to application and theme - * - * @param activity Activity - */ - public static void initiliazeColors(Activity activity) { - TypedValue typedValue = new TypedValue(); - Resources.Theme theme = activity.getTheme(); - theme.resolveAttribute(R.attr.linkColor, typedValue, true); - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(activity); - linkColor = -1; - if (prefs.getBoolean("use_custom_theme", false)) { - linkColor = prefs.getInt("theme_link_color", -1); - } - if (linkColor == -1) { - linkColor = typedValue.data; - } - } - /** diff --git a/app/src/main/java/app/fedilab/android/ui/fragment/settings/FragmentThemingSettings.java b/app/src/main/java/app/fedilab/android/ui/fragment/settings/FragmentThemingSettings.java index 9816b48b3..0ca7432c7 100644 --- a/app/src/main/java/app/fedilab/android/ui/fragment/settings/FragmentThemingSettings.java +++ b/app/src/main/java/app/fedilab/android/ui/fragment/settings/FragmentThemingSettings.java @@ -209,10 +209,10 @@ public class FragmentThemingSettings extends PreferenceFragmentCompat implements if (linksColor != -1) { binding.cardUrl.setTextColor(linksColor); } else { - binding.cardUrl.setTextColor(ThemeHelper.getAttColor(requireActivity(), R.attr.linkColor)); + binding.cardUrl.setTextColor(ThemeHelper.getAttColor(requireActivity(), R.attr.colorPrimary)); } if (iconsColor == -1) { - iconsColor = ThemeHelper.getAttColor(requireActivity(), R.attr.iconColor); + iconsColor = ThemeHelper.getAttColor(requireActivity(), R.attr.colorControlNormal); } Helper.changeDrawableColor(requireActivity(), binding.actionButtonReply, iconsColor); Helper.changeDrawableColor(requireActivity(), binding.actionButtonMore, iconsColor); @@ -221,15 +221,10 @@ public class FragmentThemingSettings extends PreferenceFragmentCompat implements Helper.changeDrawableColor(requireActivity(), R.drawable.ic_person, iconsColor); if (displayNameColor != -1) { binding.displayName.setTextColor(displayNameColor); - } else { - binding.displayName.setTextColor(ThemeHelper.getAttColor(requireActivity(), R.attr.statusTextColor)); } if (userNameColor != -1) { binding.username.setTextColor(userNameColor); Helper.changeDrawableColor(requireActivity(), binding.statusBoostIcon, userNameColor); - } else { - binding.username.setTextColor(ThemeHelper.getAttColor(requireActivity(), R.attr.statusTextColor)); - Helper.changeDrawableColor(requireActivity(), binding.statusBoostIcon, ThemeHelper.getAttColor(requireActivity(), R.attr.statusTextColor)); } Glide.with(binding.getRoot().getContext()) .load(R.drawable.fedilab_logo_bubbles) diff --git a/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonAccount.java b/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonAccount.java index e160e3f5a..988aab259 100644 --- a/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonAccount.java +++ b/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonAccount.java @@ -40,7 +40,6 @@ import app.fedilab.android.client.entities.app.Timeline; import app.fedilab.android.databinding.FragmentPaginationBinding; import app.fedilab.android.helper.Helper; import app.fedilab.android.helper.MastodonHelper; -import app.fedilab.android.helper.ThemeHelper; import app.fedilab.android.ui.drawer.AccountAdapter; import app.fedilab.android.ui.pageadapter.FedilabProfileTLPageAdapter; import app.fedilab.android.viewmodel.mastodon.AccountsVM; @@ -80,10 +79,6 @@ public class FragmentMastodonAccount extends Fragment { @Override public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); - int c1 = ThemeHelper.getAttColor(requireActivity(), R.attr.colorAccent); - binding.swipeContainer.setColorSchemeColors( - c1, c1, c1 - ); binding.loader.setVisibility(View.VISIBLE); binding.recyclerView.setVisibility(View.GONE); accountsVM = new ViewModelProvider(FragmentMastodonAccount.this).get(viewModelKey, AccountsVM.class); diff --git a/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonAnnouncement.java b/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonAnnouncement.java index 8684584c7..d2407698d 100644 --- a/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonAnnouncement.java +++ b/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonAnnouncement.java @@ -30,7 +30,6 @@ import app.fedilab.android.BaseMainActivity; import app.fedilab.android.R; import app.fedilab.android.client.entities.api.Announcement; import app.fedilab.android.databinding.FragmentPaginationBinding; -import app.fedilab.android.helper.ThemeHelper; import app.fedilab.android.ui.drawer.AnnouncementAdapter; import app.fedilab.android.viewmodel.mastodon.AnnouncementsVM; @@ -47,10 +46,6 @@ public class FragmentMastodonAnnouncement extends Fragment { binding = FragmentPaginationBinding.inflate(inflater, container, false); View root = binding.getRoot(); - int c1 = ThemeHelper.getAttColor(requireActivity(), R.attr.colorAccent); - binding.swipeContainer.setColorSchemeColors( - c1, c1, c1 - ); announcementsVM = new ViewModelProvider(FragmentMastodonAnnouncement.this).get(AnnouncementsVM.class); binding.loader.setVisibility(View.VISIBLE); binding.recyclerView.setVisibility(View.GONE); diff --git a/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonContext.java b/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonContext.java index bd38e85d2..b3fd472d8 100644 --- a/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonContext.java +++ b/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonContext.java @@ -43,7 +43,6 @@ import app.fedilab.android.client.entities.app.Timeline; import app.fedilab.android.databinding.FragmentPaginationBinding; import app.fedilab.android.helper.DividerDecoration; import app.fedilab.android.helper.Helper; -import app.fedilab.android.helper.ThemeHelper; import app.fedilab.android.ui.drawer.StatusAdapter; import app.fedilab.android.viewmodel.mastodon.StatusesVM; @@ -151,10 +150,6 @@ public class FragmentMastodonContext extends Fragment { getChildFragmentManager().beginTransaction().remove(this).commit(); } binding = FragmentPaginationBinding.inflate(inflater, container, false); - int c1 = ThemeHelper.getAttColor(requireActivity(), R.attr.colorAccent); - binding.swipeContainer.setColorSchemeColors( - c1, c1, c1 - ); statusesVM = new ViewModelProvider(FragmentMastodonContext.this).get(StatusesVM.class); binding.recyclerView.setNestedScrollingEnabled(true); this.statuses = new ArrayList<>(); diff --git a/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonConversation.java b/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonConversation.java index 5e2aecfbf..2262edd1c 100644 --- a/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonConversation.java +++ b/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonConversation.java @@ -42,7 +42,6 @@ import app.fedilab.android.databinding.FragmentPaginationBinding; import app.fedilab.android.exception.DBException; import app.fedilab.android.helper.Helper; import app.fedilab.android.helper.MastodonHelper; -import app.fedilab.android.helper.ThemeHelper; import app.fedilab.android.ui.drawer.ConversationAdapter; import app.fedilab.android.viewmodel.mastodon.TimelinesVM; @@ -237,11 +236,6 @@ public class FragmentMastodonConversation extends Fragment implements Conversati public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); - - int c1 = ThemeHelper.getAttColor(requireActivity(), R.attr.colorAccent); - binding.swipeContainer.setColorSchemeColors( - c1, c1, c1 - ); initialConversations = null; binding.loader.setVisibility(View.VISIBLE); binding.recyclerView.setVisibility(View.GONE); diff --git a/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonDomainBlock.java b/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonDomainBlock.java index b255ca163..038ccaf26 100644 --- a/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonDomainBlock.java +++ b/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonDomainBlock.java @@ -34,7 +34,6 @@ import app.fedilab.android.R; import app.fedilab.android.activities.MainActivity; import app.fedilab.android.client.entities.api.Domains; import app.fedilab.android.databinding.FragmentPaginationBinding; -import app.fedilab.android.helper.ThemeHelper; import app.fedilab.android.ui.drawer.DomainBlockAdapter; import app.fedilab.android.viewmodel.mastodon.AccountsVM; @@ -59,10 +58,6 @@ public class FragmentMastodonDomainBlock extends Fragment { @Override public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); - int c1 = ThemeHelper.getAttColor(requireActivity(), R.attr.colorAccent); - binding.swipeContainer.setColorSchemeColors( - c1, c1, c1 - ); binding.loader.setVisibility(View.VISIBLE); binding.recyclerView.setVisibility(View.GONE); accountsVM = new ViewModelProvider(FragmentMastodonDomainBlock.this).get(AccountsVM.class); diff --git a/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonNotification.java b/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonNotification.java index 14b632e3a..3a07d55ed 100644 --- a/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonNotification.java +++ b/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonNotification.java @@ -50,7 +50,6 @@ import app.fedilab.android.databinding.FragmentPaginationBinding; import app.fedilab.android.exception.DBException; import app.fedilab.android.helper.Helper; import app.fedilab.android.helper.MastodonHelper; -import app.fedilab.android.helper.ThemeHelper; import app.fedilab.android.ui.drawer.NotificationAdapter; import app.fedilab.android.viewmodel.mastodon.NotificationsVM; import app.fedilab.android.viewmodel.mastodon.TimelinesVM; @@ -190,10 +189,6 @@ public class FragmentMastodonNotification extends Fragment implements Notificati notificationType = (NotificationTypeEnum) getArguments().get(Helper.ARG_NOTIFICATION_TYPE); } aggregateNotification = false; - int c1 = ThemeHelper.getAttColor(requireActivity(), R.attr.colorAccent); - binding.swipeContainer.setColorSchemeColors( - c1, c1, c1 - ); LocalBroadcastManager.getInstance(requireActivity()).registerReceiver(receive_action, new IntentFilter(Helper.RECEIVE_STATUS_ACTION)); return root; diff --git a/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonSuggestion.java b/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonSuggestion.java index 9448f4eca..f82eb52c2 100644 --- a/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonSuggestion.java +++ b/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonSuggestion.java @@ -34,7 +34,6 @@ import app.fedilab.android.R; import app.fedilab.android.client.entities.api.Suggestion; import app.fedilab.android.client.entities.api.Suggestions; import app.fedilab.android.databinding.FragmentPaginationBinding; -import app.fedilab.android.helper.ThemeHelper; import app.fedilab.android.ui.drawer.SuggestionAdapter; import app.fedilab.android.viewmodel.mastodon.AccountsVM; @@ -58,10 +57,6 @@ public class FragmentMastodonSuggestion extends Fragment { @Override public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); - int c1 = ThemeHelper.getAttColor(requireActivity(), R.attr.colorAccent); - binding.swipeContainer.setColorSchemeColors( - c1, c1, c1 - ); binding.loader.setVisibility(View.VISIBLE); binding.recyclerView.setVisibility(View.GONE); accountsVM = new ViewModelProvider(FragmentMastodonSuggestion.this).get(AccountsVM.class); diff --git a/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonTag.java b/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonTag.java index ff429c73b..45f9d33d8 100644 --- a/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonTag.java +++ b/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonTag.java @@ -37,7 +37,6 @@ import app.fedilab.android.client.entities.app.Timeline; import app.fedilab.android.databinding.FragmentPaginationBinding; import app.fedilab.android.helper.Helper; import app.fedilab.android.helper.MastodonHelper; -import app.fedilab.android.helper.ThemeHelper; import app.fedilab.android.ui.drawer.TagAdapter; import app.fedilab.android.viewmodel.mastodon.SearchVM; import app.fedilab.android.viewmodel.mastodon.TimelinesVM; @@ -65,10 +64,6 @@ public class FragmentMastodonTag extends Fragment { @Override public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); - int c1 = ThemeHelper.getAttColor(requireActivity(), R.attr.colorAccent); - binding.swipeContainer.setColorSchemeColors( - c1, c1, c1 - ); binding.loader.setVisibility(View.VISIBLE); binding.recyclerView.setVisibility(View.GONE); router(); diff --git a/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonTimeline.java b/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonTimeline.java index 5289b647b..8b3e977f2 100644 --- a/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonTimeline.java +++ b/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonTimeline.java @@ -61,7 +61,6 @@ import app.fedilab.android.exception.DBException; import app.fedilab.android.helper.CrossActionHelper; import app.fedilab.android.helper.Helper; import app.fedilab.android.helper.MastodonHelper; -import app.fedilab.android.helper.ThemeHelper; import app.fedilab.android.ui.drawer.StatusAdapter; import app.fedilab.android.viewmodel.mastodon.AccountsVM; import app.fedilab.android.viewmodel.mastodon.SearchVM; @@ -364,13 +363,6 @@ public class FragmentMastodonTimeline extends Fragment implements StatusAdapter. LocalBroadcastManager.getInstance(requireActivity()).registerReceiver(receive_action, new IntentFilter(Helper.RECEIVE_STATUS_ACTION)); binding = FragmentPaginationBinding.inflate(inflater, container, false); - - int c1 = ThemeHelper.getAttColor(requireActivity(), R.attr.colorAccent); - binding.swipeContainer.setColorSchemeColors( - c1, c1, c1 - ); - - return binding.getRoot(); } diff --git a/app/src/main/res/drawable/ic_baseline_bookmark_24.xml b/app/src/main/res/drawable/ic_baseline_bookmark_24.xml index 2c2418e9f..1355573fa 100644 --- a/app/src/main/res/drawable/ic_baseline_bookmark_24.xml +++ b/app/src/main/res/drawable/ic_baseline_bookmark_24.xml @@ -1,10 +1,10 @@ diff --git a/app/src/main/res/drawable/ic_baseline_bookmark_border_24.xml b/app/src/main/res/drawable/ic_baseline_bookmark_border_24.xml index b1d59a29c..45fef5ac6 100644 --- a/app/src/main/res/drawable/ic_baseline_bookmark_border_24.xml +++ b/app/src/main/res/drawable/ic_baseline_bookmark_border_24.xml @@ -1,10 +1,10 @@ diff --git a/app/src/main/res/drawable/ic_repeat.xml b/app/src/main/res/drawable/ic_repeat.xml index e99b64ad7..6b566159d 100644 --- a/app/src/main/res/drawable/ic_repeat.xml +++ b/app/src/main/res/drawable/ic_repeat.xml @@ -2,10 +2,10 @@ android:width="28dp" android:height="28dp" android:autoMirrored="true" - android:tint="?attr/iconColor" + android:tint="?attr/colorControlNormal" android:viewportWidth="28" android:viewportHeight="28"> diff --git a/app/src/main/res/drawable/ic_star_outline.xml b/app/src/main/res/drawable/ic_star_outline.xml index 162182baf..70463a76a 100644 --- a/app/src/main/res/drawable/ic_star_outline.xml +++ b/app/src/main/res/drawable/ic_star_outline.xml @@ -1,10 +1,10 @@ diff --git a/app/src/main/res/drawable/menu_selector_dark.xml b/app/src/main/res/drawable/menu_selector_dark.xml deleted file mode 100644 index 4ec5c80b6..000000000 --- a/app/src/main/res/drawable/menu_selector_dark.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/menu_selector_light.xml b/app/src/main/res/drawable/menu_selector_light.xml deleted file mode 100644 index 4ec5c80b6..000000000 --- a/app/src/main/res/drawable/menu_selector_light.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 1e002c163..0624292ea 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -79,7 +79,7 @@ android:gravity="end" android:contentDescription="@string/display_timelines" android:src="@drawable/ic_baseline_more_horiz_24" - android:tint="?attr/iconColor" + android:tint="?attr/colorControlNormal" android:visibility="gone" /> diff --git a/app/src/main/res/layout/activity_reorder_tabs.xml b/app/src/main/res/layout/activity_reorder_tabs.xml index 2d4fdd423..6ebb794d1 100644 --- a/app/src/main/res/layout/activity_reorder_tabs.xml +++ b/app/src/main/res/layout/activity_reorder_tabs.xml @@ -32,7 +32,7 @@ android:layout_height="wrap_content" android:layout_marginTop="20dp" android:text="@string/bottom_menu" - android:textColor="?colorAccent" + android:textColor="?colorPrimary" android:textSize="16sp" app:layout_constraintTop_toTopOf="parent" /> @@ -56,7 +56,7 @@ android:layout_height="wrap_content" android:layout_marginTop="20dp" android:text="@string/top_menu" - android:textColor="?colorAccent" + android:textColor="?colorPrimary" android:textSize="16sp" app:layout_constraintTop_toBottomOf="@+id/lv_reorder_bottom_container" /> diff --git a/app/src/main/res/layout/drawer_account.xml b/app/src/main/res/layout/drawer_account.xml index 7e0c216e6..5dca860be 100644 --- a/app/src/main/res/layout/drawer_account.xml +++ b/app/src/main/res/layout/drawer_account.xml @@ -21,7 +21,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="6dp" android:layout_marginTop="6dp" - app:cardElevation="0dp"> + app:cardElevation="1dp"> + style="@style/Widget.Material3.Button.OutlinedButton" + android:layout_width="48dp" + android:layout_height="48dp" + android:padding="0dp" + app:icon="@drawable/ic_baseline_notifications_off_24" + app:iconGravity="textStart" + app:iconPadding="0dp" + app:strokeWidth="1dp" /> + style="@style/Widget.Material3.Button.OutlinedButton" + android:layout_width="48dp" + android:layout_height="48dp" + android:padding="0dp" + app:icon="@drawable/ic_baseline_access_time_filled_24" + app:iconGravity="textStart" + app:iconPadding="0dp" + app:strokeWidth="1dp" /> @@ -126,13 +136,13 @@ diff --git a/app/src/main/res/layout/drawer_announcement.xml b/app/src/main/res/layout/drawer_announcement.xml index ae2f18dd2..a25b64d72 100644 --- a/app/src/main/res/layout/drawer_announcement.xml +++ b/app/src/main/res/layout/drawer_announcement.xml @@ -77,8 +77,7 @@ android:layout_height="28dp" android:contentDescription="@string/add_reaction" android:padding="3dp" - android:src="@drawable/ic_baseline_emoji_emotions_24" - app:tint="?attr/iconColor" /> + android:src="@drawable/ic_baseline_emoji_emotions_24" /> + android:src="@drawable/ic_baseline_add_reaction_24" /> diff --git a/app/src/main/res/layout/drawer_conversation.xml b/app/src/main/res/layout/drawer_conversation.xml index 7f07c14d5..a4848935a 100644 --- a/app/src/main/res/layout/drawer_conversation.xml +++ b/app/src/main/res/layout/drawer_conversation.xml @@ -69,10 +69,6 @@ android:textAlignment="textEnd" /> - - + app:cardElevation="1dp"> - + android:textAllCaps="false" /> diff --git a/app/src/main/res/layout/drawer_status_history.xml b/app/src/main/res/layout/drawer_status_history.xml index 5a0d8d7ee..23423a8c7 100644 --- a/app/src/main/res/layout/drawer_status_history.xml +++ b/app/src/main/res/layout/drawer_status_history.xml @@ -77,9 +77,6 @@ android:layout_marginBottom="5dp" tools:text="@tools:sample/date/ddmmyy" /> - - + app:tint="?colorControlNormal" /> + app:tint="?colorControlNormal" /> @@ -101,7 +101,7 @@ android:layout_gravity="center_vertical|end" android:contentDescription="@string/information" android:src="@drawable/ic_baseline_info_24" - app:tint="?iconColor" /> + app:tint="?colorControlNormal" /> diff --git a/app/src/main/res/layout/popup_links.xml b/app/src/main/res/layout/popup_links.xml index b666231fe..d83a0e2c7 100644 --- a/app/src/main/res/layout/popup_links.xml +++ b/app/src/main/res/layout/popup_links.xml @@ -15,9 +15,9 @@ android:layout_marginBottom="10dp" android:drawableEnd="@drawable/ic_baseline_navigate_next_24" android:text="@string/display_full_link" - android:textColor="?colorAccent" + android:textColor="?colorPrimary" android:textSize="16sp" - app:drawableTint="?colorAccent" /> + app:drawableTint="?colorPrimary" /> + app:drawableTint="?colorPrimary" /> + android:textAppearance="@style/TextAppearance.AppCompat.Caption" /> @@ -295,7 +294,6 @@ android:id="@+id/time" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="?statusTextColor" tools:text="1 January 2021, 12:00" /> + tools:text="10" /> @@ -339,8 +336,7 @@ android:id="@+id/favorites_count" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="10" - android:textColor="?statusTextColor" /> + tools:text="10" /> diff --git a/app/src/main/res/layout/tab_custom_default_view.xml b/app/src/main/res/layout/tab_custom_default_view.xml index fb282e400..3d9f39ecf 100644 --- a/app/src/main/res/layout/tab_custom_default_view.xml +++ b/app/src/main/res/layout/tab_custom_default_view.xml @@ -29,7 +29,6 @@ android:background="@drawable/shape_counter" android:paddingLeft="2dp" android:paddingRight="2dp" - android:textColor="?mTextColor" android:textSize="12sp" android:visibility="gone" tools:text="35" diff --git a/app/src/main/res/layout/tab_custom_view.xml b/app/src/main/res/layout/tab_custom_view.xml index 5ae18c73d..14fe5edf6 100644 --- a/app/src/main/res/layout/tab_custom_view.xml +++ b/app/src/main/res/layout/tab_custom_view.xml @@ -35,7 +35,6 @@ android:background="@drawable/shape_counter" android:paddingLeft="2dp" android:paddingRight="2dp" - android:textColor="?mTextColor" android:textSize="12sp" android:visibility="gone" tools:text="35" diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 363caea06..1cbe9e4ff 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,6 +1,11 @@ + #6200EE + #03DAC6 + #000 + #3700B3 + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 11bf5ab80..14c5d7365 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,17 +1,16 @@ - - - - - -- cgit v1.2.3