From 918161a299ad78f494193189afb46204c3ce0d9b Mon Sep 17 00:00:00 2001 From: Koen Date: Thu, 21 Dec 2023 11:20:53 +0100 Subject: [PATCH] Fixed margins for subscription groups and menu bar icons now show filled variant if existing. --- .../mainactivity/bottombar/MenuBottomBarFragment.kt | 8 ++++---- .../mainactivity/main/SubscriptionGroupFragment.kt | 5 ----- app/src/main/res/drawable/ic_help_square.xml | 10 ++++++++++ app/src/main/res/drawable/ic_help_square_fill.xml | 10 ++++++++++ app/src/main/res/drawable/ic_paid_filled.xml | 9 +++++++++ app/src/main/res/drawable/ic_quiz_fill.xml | 9 +++++++++ app/src/main/res/drawable/ic_settings_filled.xml | 9 +++++++++ .../main/res/layout/fragment_subscriptions_group.xml | 6 +----- app/src/main/res/layout/view_search_bar.xml | 5 ++++- app/src/main/res/values/strings.xml | 1 + 10 files changed, 57 insertions(+), 15 deletions(-) create mode 100644 app/src/main/res/drawable/ic_help_square.xml create mode 100644 app/src/main/res/drawable/ic_help_square_fill.xml create mode 100644 app/src/main/res/drawable/ic_paid_filled.xml create mode 100644 app/src/main/res/drawable/ic_quiz_fill.xml create mode 100644 app/src/main/res/drawable/ic_settings_filled.xml diff --git a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/bottombar/MenuBottomBarFragment.kt b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/bottombar/MenuBottomBarFragment.kt index 33727b91..0c3e9c72 100644 --- a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/bottombar/MenuBottomBarFragment.kt +++ b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/bottombar/MenuBottomBarFragment.kt @@ -297,9 +297,9 @@ class MenuBottomBarFragment : MainActivityFragment() { } if (!StatePayment.instance.hasPaid) { - newCurrentButtonDefinitions.add(ButtonDefinition(98, R.drawable.ic_paid, R.drawable.ic_paid, R.string.buy, canToggle = false, { it.currentMain is BuyFragment }, { it.navigate() })) + newCurrentButtonDefinitions.add(ButtonDefinition(98, R.drawable.ic_paid, R.drawable.ic_paid_filled, R.string.buy, canToggle = false, { it.currentMain is BuyFragment }, { it.navigate() })) } - newCurrentButtonDefinitions.add(ButtonDefinition(97, R.drawable.ic_quiz, R.drawable.ic_quiz, R.string.faq, canToggle = false, { false }, { + newCurrentButtonDefinitions.add(ButtonDefinition(97, R.drawable.ic_quiz, R.drawable.ic_quiz_fill, R.string.faq, canToggle = false, { false }, { it.navigate(Settings.URL_FAQ); })) @@ -356,8 +356,8 @@ class MenuBottomBarFragment : MainActivityFragment() { ButtonDefinition(6, R.drawable.ic_download, R.drawable.ic_download, R.string.downloads, canToggle = false, { it.currentMain is DownloadsFragment }, { it.navigate() }), ButtonDefinition(8, R.drawable.ic_chat, R.drawable.ic_chat_filled, R.string.comments, canToggle = true, { it.currentMain is CommentsFragment }, { it.navigate() }), ButtonDefinition(9, R.drawable.ic_subscriptions, R.drawable.ic_subscriptions_filled, R.string.subscription_group_menu, canToggle = true, { it.currentMain is SubscriptionGroupListFragment }, { it.navigate() }), - ButtonDefinition(10, R.drawable.ic_quiz, R.drawable.ic_quiz, R.string.tutorials, canToggle = true, { it.currentMain is TutorialFragment }, { it.navigate() }), - ButtonDefinition(7, R.drawable.ic_settings, R.drawable.ic_settings, R.string.settings, canToggle = false, { false }, { + ButtonDefinition(10, R.drawable.ic_help_square, R.drawable.ic_help_square_fill, R.string.tutorials, canToggle = true, { it.currentMain is TutorialFragment }, { it.navigate() }), + ButtonDefinition(7, R.drawable.ic_settings, R.drawable.ic_settings_filled, R.string.settings, canToggle = false, { false }, { val c = it.context ?: return@ButtonDefinition; Logger.i(TAG, "settings preventPictureInPicture()"); it.requireFragment().preventPictureInPicture(); diff --git a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/SubscriptionGroupFragment.kt b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/SubscriptionGroupFragment.kt index ac7613b5..54bc9ece 100644 --- a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/SubscriptionGroupFragment.kt +++ b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/SubscriptionGroupFragment.kt @@ -4,11 +4,9 @@ import android.annotation.SuppressLint import android.content.Context import android.graphics.Color import android.os.Bundle -import android.util.TypedValue import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.view.inputmethod.InputMethodManager import android.widget.Button import android.widget.FrameLayout import android.widget.ImageButton @@ -16,7 +14,6 @@ import android.widget.ImageView import android.widget.LinearLayout import android.widget.TextView import androidx.constraintlayout.widget.ConstraintLayout -import androidx.core.content.getSystemService import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView @@ -25,14 +22,12 @@ import com.futo.platformplayer.UIDialogs import com.futo.platformplayer.UISlideOverlays import com.futo.platformplayer.api.media.models.channels.IPlatformChannel import com.futo.platformplayer.dp -import com.futo.platformplayer.models.Subscription import com.futo.platformplayer.models.SubscriptionGroup import com.futo.platformplayer.states.StateSubscriptionGroups import com.futo.platformplayer.states.StateSubscriptions import com.futo.platformplayer.views.AnyAdapterView import com.futo.platformplayer.views.AnyAdapterView.Companion.asAny import com.futo.platformplayer.views.SearchView -import com.futo.platformplayer.views.adapters.AnyAdapter import com.futo.platformplayer.views.adapters.viewholders.CreatorBarViewHolder import com.futo.platformplayer.views.overlays.CreatorSelectOverlay import com.futo.platformplayer.views.overlays.ImageVariableOverlay diff --git a/app/src/main/res/drawable/ic_help_square.xml b/app/src/main/res/drawable/ic_help_square.xml new file mode 100644 index 00000000..506617b7 --- /dev/null +++ b/app/src/main/res/drawable/ic_help_square.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_help_square_fill.xml b/app/src/main/res/drawable/ic_help_square_fill.xml new file mode 100644 index 00000000..4941dc5f --- /dev/null +++ b/app/src/main/res/drawable/ic_help_square_fill.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_paid_filled.xml b/app/src/main/res/drawable/ic_paid_filled.xml new file mode 100644 index 00000000..fb6c878d --- /dev/null +++ b/app/src/main/res/drawable/ic_paid_filled.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_quiz_fill.xml b/app/src/main/res/drawable/ic_quiz_fill.xml new file mode 100644 index 00000000..51431cbe --- /dev/null +++ b/app/src/main/res/drawable/ic_quiz_fill.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_settings_filled.xml b/app/src/main/res/drawable/ic_settings_filled.xml new file mode 100644 index 00000000..4fe34785 --- /dev/null +++ b/app/src/main/res/drawable/ic_settings_filled.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/fragment_subscriptions_group.xml b/app/src/main/res/layout/fragment_subscriptions_group.xml index 9e094d0d..cad3a790 100644 --- a/app/src/main/res/layout/fragment_subscriptions_group.xml +++ b/app/src/main/res/layout/fragment_subscriptions_group.xml @@ -180,10 +180,6 @@ android:layout_height="0dp" app:layout_constraintTop_toBottomOf="@id/container_top" app:layout_constraintBottom_toTopOf="@id/button_creator_add" - android:layout_marginTop="10dp" - android:layout_marginLeft="5dp" - android:layout_marginRight="5dp" - android:paddingTop="10dp" android:paddingBottom="10dp" />