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

Merge branch 'master' of gitlab.futo.org:videostreaming/grayjay

Browse source
This commit is contained in:
Kelvin 2023-12-08 13:24:06 +01:00
commit d713f2bd55
4 changed files with 62 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/com/futo/platformplayer/views/pills/PillRatingLikesDislikes.kt
View file

@ -54,10 +54,8 @@ class PillRatingLikesDislikes : LinearLayout {
_loaderViewLikes = findViewById(R.id.loader_likes) _loaderViewLikes = findViewById(R.id.loader_likes)
_loaderViewDislikes = findViewById(R.id.loader_dislikes) _loaderViewDislikes = findViewById(R.id.loader_dislikes)
_iconLikes.setOnClickListener { if (!_isLoading) StatePolycentric.instance.requireLogin(context, context.getString(R.string.please_login_to_like)) { like(it) }; }; findViewById<LinearLayout>(R.id.layout_like).setOnClickListener { if (!_isLoading) StatePolycentric.instance.requireLogin(context, context.getString(R.string.please_login_to_like)) { like(it) }; };
_textLikes.setOnClickListener { if (!_isLoading) StatePolycentric.instance.requireLogin(context, context.getString(R.string.please_login_to_like)) { like(it) }; }; findViewById<LinearLayout>(R.id.layout_dislike).setOnClickListener { if (!_isLoading) StatePolycentric.instance.requireLogin(context, context.getString(R.string.please_login_to_dislike)) { dislike(it) }; };
_iconDislikes.setOnClickListener { if (!_isLoading) StatePolycentric.instance.requireLogin(context, context.getString(R.string.please_login_to_dislike)) { dislike(it) }; };
_textDislikes.setOnClickListener { if (!_isLoading) StatePolycentric.instance.requireLogin(context, context.getString(R.string.please_login_to_dislike)) { dislike(it) }; };
} }
fun setLoading(loading: Boolean) { fun setLoading(loading: Boolean) {

30
app/src/main/res/layout/rating_likesdislikes.xml
View file

@ -4,12 +4,19 @@
android:layout_height="32dp" android:layout_height="32dp"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:paddingTop="6dp"
android:paddingBottom="7dp"
android:paddingLeft="7dp"
android:paddingRight="12dp"
android:background="@drawable/background_pill" android:background="@drawable/background_pill"
android:gravity="center_vertical"> android:gravity="center_vertical">
<LinearLayout
android:id="@+id/layout_like"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="horizontal"
android:paddingStart="7dp"
android:paddingTop="6dp"
android:paddingBottom="7dp"
android:paddingEnd="8dp">
<ImageView <ImageView
android:id="@+id/pill_like_icon" android:id="@+id/pill_like_icon"
android:layout_width="30dp" android:layout_width="30dp"
@ -23,19 +30,31 @@
android:textSize="13dp" android:textSize="13dp"
android:gravity="center_vertical" android:gravity="center_vertical"
tools:text="500K" /> tools:text="500K" />
<com.futo.platformplayer.views.LoaderView <com.futo.platformplayer.views.LoaderView
android:id="@+id/loader_likes" android:id="@+id/loader_likes"
android:layout_width="14dp" android:layout_width="14dp"
android:layout_height="14dp" android:layout_height="14dp"
app:isWhite="true" /> app:isWhite="true" />
</LinearLayout>
<View <View
android:id="@+id/pill_seperator" android:id="@+id/pill_seperator"
android:layout_width="1dp" android:layout_width="1dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:background="#808080"/> android:background="#808080"/>
<LinearLayout
android:id="@+id/layout_dislike"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="horizontal"
android:paddingEnd="12dp"
android:paddingTop="6dp"
android:paddingBottom="7dp">
<ImageView <ImageView
android:id="@+id/pill_dislike_icon" android:id="@+id/pill_dislike_icon"
android:layout_width="30dp" android:layout_width="30dp"
@ -55,5 +74,6 @@
android:layout_width="14dp" android:layout_width="14dp"
android:layout_height="14dp" android:layout_height="14dp"
app:isWhite="true" /> app:isWhite="true" />
</LinearLayout>
</LinearLayout> </LinearLayout>

2
app/src/stable/assets/sources/odysee

@ -1 +1 @@
Subproject commit a05feced804a5b664c75568162a7b3fa5562d8b3 Subproject commit a21ad56829b0f0b45bbd677979f3d260e13abb34

2
app/src/unstable/assets/sources/odysee

@ -1 +1 @@
Subproject commit a05feced804a5b664c75568162a7b3fa5562d8b3 Subproject commit a21ad56829b0f0b45bbd677979f3d260e13abb34