mirrors/grayjay
0
0
Fork 0
mirror of https://gitlab.futo.org/videostreaming/grayjay.git synced 2025-08-04 23:30:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refs, ui fixes

Browse source
This commit is contained in:
Kelvin 2023-12-21 19:24:30 +01:00
commit f1d01642cd
6 changed files with 23 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/com/futo/platformplayer/views/overlays/ImageVariableOverlay.kt
View file

@ -11,6 +11,7 @@ import android.view.ViewGroup
import android.widget.Button import android.widget.Button
import android.widget.ImageView import android.widget.ImageView
import android.widget.LinearLayout import android.widget.LinearLayout
import android.widget.TextView
import androidx.activity.result.contract.ActivityResultContracts import androidx.activity.result.contract.ActivityResultContracts
import androidx.constraintlayout.widget.ConstraintLayout import androidx.constraintlayout.widget.ConstraintLayout
import androidx.core.net.toFile import androidx.core.net.toFile
@ -48,7 +49,7 @@ class ImageVariableOverlay: ConstraintLayout {
private val _buttonGallery: BigButton; private val _buttonGallery: BigButton;
private val _imageGallerySelected: ImageView; private val _imageGallerySelected: ImageView;
private val _imageGallerySelectedContainer: LinearLayout; private val _imageGallerySelectedContainer: LinearLayout;
private val _buttonSelect: Button; private val _buttonSelect: TextView;
private val _topbar: OverlayTopbar; private val _topbar: OverlayTopbar;
private val _recyclerPresets: AnyAdapterView<PresetImage, PresetViewHolder>; private val _recyclerPresets: AnyAdapterView<PresetImage, PresetViewHolder>;
private val _recyclerCreators: AnyAdapterView<SelectableCreatorBarViewHolder.Selectable, SelectableCreatorBarViewHolder>; private val _recyclerCreators: AnyAdapterView<SelectableCreatorBarViewHolder.Selectable, SelectableCreatorBarViewHolder>;

2
app/src/main/res/layout/fragment_subscriptions_group.xml
View file

@ -190,7 +190,7 @@
android:layout_marginStart="5dp" android:layout_marginStart="5dp"
android:layout_marginEnd="5dp" android:layout_marginEnd="5dp"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:layout_marginBottom="5dp" android:layout_marginBottom="10dp"
app:layout_constraintBottom_toBottomOf="parent"> app:layout_constraintBottom_toBottomOf="parent">
<TextView <TextView

2
app/src/main/res/layout/overlay_creator_select.xml
View file

@ -38,7 +38,7 @@
android:layout_marginStart="5dp" android:layout_marginStart="5dp"
android:layout_marginEnd="5dp" android:layout_marginEnd="5dp"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:layout_marginBottom="5dp" android:layout_marginBottom="10dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="50dp" android:layout_height="50dp"
android:background="@drawable/background_button_primary" android:background="@drawable/background_button_primary"

25
app/src/main/res/layout/overlay_image_variable.xml
View file

@ -116,20 +116,29 @@
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>
<LinearLayout
<FrameLayout
android:id="@+id/container_select" 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_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_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"> app:layout_constraintRight_toRightOf="parent">
<Button
<TextView
android:id="@+id/button_select" android:id="@+id/button_select"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_margin="10dp" android:fontFamily="@font/inter_regular"
android:background="@drawable/background_button_primary" android:text="@string/select"
android:text="Select" /> android:textSize="16dp"
</LinearLayout> android:gravity="center"
android:layout_gravity="center" />
</FrameLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

2
app/src/main/res/values/strings.xml
View file

@ -724,7 +724,7 @@
<string name="position">Position</string> <string name="position">Position</string>
<string name="tutorials">Tutorials</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="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 name="select">Select</string>
<string-array name="home_screen_array"> <string-array name="home_screen_array">
<item>Recommendations</item> <item>Recommendations</item>

2
app/src/unstable/assets/sources/youtube

@ -1 +1 @@
Subproject commit 058e37525756c285848f0774e4e3eb6f65282280 Subproject commit a1980eeac4e917c21fed3feb97b3dee24e536726