diff options
33 files changed, 105 insertions, 194 deletions
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 @@ <vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" - android:tint="?attr/iconColor" + android:tint="?attr/colorControlNormal" android:viewportWidth="24" android:viewportHeight="24"> <path - android:fillColor="?attr/iconColor" + android:fillColor="?attr/colorControlNormal" android:pathData="M17,3H7c-1.1,0 -1.99,0.9 -1.99,2L5,21l7,-3 7,3V5c0,-1.1 -0.9,-2 -2,-2z" /> </vector> 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 @@ <vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" - android:tint="?attr/iconColor" + android:tint="?attr/colorControlNormal" android:viewportWidth="24" android:viewportHeight="24"> <path - android:fillColor="?attr/iconColor" + android:fillColor="?attr/colorControlNormal" android:pathData="M17,3L7,3c-1.1,0 -1.99,0.9 -1.99,2L5,21l7,-3 7,3L19,5c0,-1.1 -0.9,-2 -2,-2zM17,18l-5,-2.18L7,18L7,5h10v13z" /> </vector> 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"> <path - android:fillColor="?attr/iconColor" + android:fillColor="?attr/colorControlNormal" android:pathData="M7,7h10v1.79c0,0.45 0.54,0.67 0.85,0.35l2.79,-2.79c0.2,-0.2 0.2,-0.51 0,-0.71l-2.79,-2.79c-0.31,-0.31 -0.85,-0.09 -0.85,0.36L17,5L6,5c-0.55,0 -1,0.45 -1,1v4c0,0.55 0.45,1 1,1s1,-0.45 1,-1L7,7zM17,17L7,17v-1.79c0,-0.45 -0.54,-0.67 -0.85,-0.35l-2.79,2.79c-0.2,0.2 -0.2,0.51 0,0.71l2.79,2.79c0.31,0.31 0.85,0.09 0.85,-0.36L7,19h11c0.55,0 1,-0.45 1,-1v-4c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1v3z" /> </vector> 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 @@ <vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="28dp" android:height="28dp" - android:tint="?attr/iconColor" + android:tint="?attr/colorControlNormal" android:viewportWidth="28" android:viewportHeight="28"> <path - android:fillColor="?attr/iconColor" + android:fillColor="?attr/colorControlNormal" android:pathData="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z" /> </vector> 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 @@ -<?xml version="1.0" encoding="utf-8"?> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:drawable="?attr/colorAccent" android:state_checked="true" /> - <item android:drawable="?attr/colorAccent" android:state_pressed="true" /> - <item android:drawable="?attr/colorAccent" android:state_focused="true" /> - <item android:drawable="@color/transparent" /> -</selector>
\ 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 @@ -<?xml version="1.0" encoding="utf-8"?> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:drawable="?attr/colorAccent" android:state_checked="true" /> - <item android:drawable="?attr/colorAccent" android:state_pressed="true" /> - <item android:drawable="?attr/colorAccent" android:state_focused="true" /> - <item android:drawable="@color/transparent" /> -</selector>
\ 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" /> </LinearLayout> 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"> <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" @@ -86,39 +86,49 @@ <com.google.android.material.button.MaterialButton android:id="@+id/mute" - style="@style/Widget.Material3.Button.IconButton" - android:layout_width="36dp" - android:layout_height="36dp" - android:padding="6dp" + style="@style/Widget.Material3.Button.OutlinedButton.Icon" + android:layout_width="48dp" + android:layout_height="48dp" + android:padding="0dp" + app:iconGravity="textStart" + app:iconPadding="0dp" app:icon="@drawable/ic_baseline_volume_mute_24" app:strokeWidth="1dp" /> <com.google.android.material.button.MaterialButton android:id="@+id/mute_notification" - style="@style/Widget.Material3.Button.IconButton" - android:layout_width="36dp" - android:layout_height="36dp" - android:padding="6dp" - app:icon="@drawable/ic_baseline_notifications_off_24" /> + |