diff --git a/app/src/main/java/com/futo/platformplayer/views/overlays/ImageVariableOverlay.kt b/app/src/main/java/com/futo/platformplayer/views/overlays/ImageVariableOverlay.kt index 0971d577e219f8e1a909d41953bf01caf12e2b57..5d5a6a502b7678683b56ed22ffe0ef769b720ff4 100644 --- a/app/src/main/java/com/futo/platformplayer/views/overlays/ImageVariableOverlay.kt +++ b/app/src/main/java/com/futo/platformplayer/views/overlays/ImageVariableOverlay.kt @@ -11,6 +11,7 @@ import android.view.ViewGroup import android.widget.Button import android.widget.ImageView import android.widget.LinearLayout +import android.widget.TextView import androidx.activity.result.contract.ActivityResultContracts import androidx.constraintlayout.widget.ConstraintLayout import androidx.core.net.toFile @@ -48,7 +49,7 @@ class ImageVariableOverlay: ConstraintLayout { private val _buttonGallery: BigButton; private val _imageGallerySelected: ImageView; private val _imageGallerySelectedContainer: LinearLayout; - private val _buttonSelect: Button; + private val _buttonSelect: TextView; private val _topbar: OverlayTopbar; private val _recyclerPresets: AnyAdapterView<PresetImage, PresetViewHolder>; private val _recyclerCreators: AnyAdapterView<SelectableCreatorBarViewHolder.Selectable, SelectableCreatorBarViewHolder>; diff --git a/app/src/main/res/layout/fragment_subscriptions_group.xml b/app/src/main/res/layout/fragment_subscriptions_group.xml index b96b7cd073906d69f5ed86252578120b1d515883..a26789cc557eb9cada91d05621b63cc7b3d61faa 100644 --- a/app/src/main/res/layout/fragment_subscriptions_group.xml +++ b/app/src/main/res/layout/fragment_subscriptions_group.xml @@ -190,7 +190,7 @@ android:layout_marginStart="5dp" android:layout_marginEnd="5dp" android:layout_marginTop="5dp" - android:layout_marginBottom="5dp" + android:layout_marginBottom="10dp" app:layout_constraintBottom_toBottomOf="parent"> <TextView diff --git a/app/src/main/res/layout/overlay_creator_select.xml b/app/src/main/res/layout/overlay_creator_select.xml index 21f59212111818a989cf1d7f6d825c4e44f6a561..6114c6bf204d4cce6e0e0ca53b0ecdec9b4cbf4e 100644 --- a/app/src/main/res/layout/overlay_creator_select.xml +++ b/app/src/main/res/layout/overlay_creator_select.xml @@ -38,7 +38,7 @@ android:layout_marginStart="5dp" android:layout_marginEnd="5dp" android:layout_marginTop="5dp" - android:layout_marginBottom="5dp" + android:layout_marginBottom="10dp" android:layout_width="match_parent" android:layout_height="50dp" android:background="@drawable/background_button_primary" diff --git a/app/src/main/res/layout/overlay_image_variable.xml b/app/src/main/res/layout/overlay_image_variable.xml index a2e84bb1ba156222fbef3e757c83d35fd4d2d6c5..521b3cfd6b3977a1776dc3974da8c74f6db8894a 100644 --- a/app/src/main/res/layout/overlay_image_variable.xml +++ b/app/src/main/res/layout/overlay_image_variable.xml @@ -116,20 +116,29 @@ </LinearLayout> </ScrollView> - <LinearLayout + + <FrameLayout android:id="@+id/container_select" + android:layout_marginStart="5dp" + android:layout_marginEnd="5dp" + android:layout_marginTop="5dp" + android:layout_marginBottom="10dp" android:layout_width="match_parent" - android:layout_height="wrap_content" + android:layout_height="50dp" + android:background="@drawable/background_button_primary" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent"> - <Button + + <TextView android:id="@+id/button_select" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="10dp" - android:background="@drawable/background_button_primary" - android:text="Select" /> - </LinearLayout> + android:layout_height="match_parent" + android:fontFamily="@font/inter_regular" + android:text="@string/select" + android:textSize="16dp" + android:gravity="center" + android:layout_gravity="center" /> + </FrameLayout> </androidx.constraintlayout.widget.ConstraintLayout> \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index fde7ad28d18787dfc32d6aed185e098e9d6f4fca..6ae83fe2210b4d717178b0c6f5befcd28e291d02 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -724,7 +724,7 @@ <string name="position">Position</string> <string name="tutorials">Tutorials</string> <string name="do_you_want_to_see_the_tutorials_you_can_find_them_at_any_time_through_the_more_button">Do you want to see the tutorials? You can find them at any time through the more button.</string> - <string name="add_creator">Add More</string> + <string name="add_creator">Add Creators</string> <string name="select">Select</string> <string-array name="home_screen_array"> <item>Recommendations</item> diff --git a/app/src/unstable/assets/sources/youtube b/app/src/unstable/assets/sources/youtube index 058e37525756c285848f0774e4e3eb6f65282280..a1980eeac4e917c21fed3feb97b3dee24e536726 160000 --- a/app/src/unstable/assets/sources/youtube +++ b/app/src/unstable/assets/sources/youtube @@ -1 +1 @@ -Subproject commit 058e37525756c285848f0774e4e3eb6f65282280 +Subproject commit a1980eeac4e917c21fed3feb97b3dee24e536726