From f109d82537af49fa98915f4ce87dbeb159018782 Mon Sep 17 00:00:00 2001 From: Koen Date: Fri, 8 Dec 2023 12:02:17 +0100 Subject: [PATCH 1/2] Fixed clickable area of likes/dislikes. --- .../views/pills/PillRatingLikesDislikes.kt | 6 +- .../main/res/layout/rating_likesdislikes.xml | 96 +++++++++++-------- 2 files changed, 60 insertions(+), 42 deletions(-) diff --git a/app/src/main/java/com/futo/platformplayer/views/pills/PillRatingLikesDislikes.kt b/app/src/main/java/com/futo/platformplayer/views/pills/PillRatingLikesDislikes.kt index 8854f606..3cd12fd7 100644 --- a/app/src/main/java/com/futo/platformplayer/views/pills/PillRatingLikesDislikes.kt +++ b/app/src/main/java/com/futo/platformplayer/views/pills/PillRatingLikesDislikes.kt @@ -54,10 +54,8 @@ class PillRatingLikesDislikes : LinearLayout { _loaderViewLikes = findViewById(R.id.loader_likes) _loaderViewDislikes = findViewById(R.id.loader_dislikes) - _iconLikes.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) }; }; - _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) }; }; + findViewById(R.id.layout_like).setOnClickListener { if (!_isLoading) StatePolycentric.instance.requireLogin(context, context.getString(R.string.please_login_to_like)) { like(it) }; }; + findViewById(R.id.layout_dislike).setOnClickListener { if (!_isLoading) StatePolycentric.instance.requireLogin(context, context.getString(R.string.please_login_to_dislike)) { dislike(it) }; }; } fun setLoading(loading: Boolean) { diff --git a/app/src/main/res/layout/rating_likesdislikes.xml b/app/src/main/res/layout/rating_likesdislikes.xml index a4c6599c..c6de57a3 100644 --- a/app/src/main/res/layout/rating_likesdislikes.xml +++ b/app/src/main/res/layout/rating_likesdislikes.xml @@ -4,56 +4,76 @@ android:layout_height="32dp" xmlns:app="http://schemas.android.com/apk/res-auto" 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:gravity="center_vertical"> - - - + android:orientation="horizontal" + android:paddingStart="7dp" + android:paddingTop="6dp" + android:paddingBottom="7dp" + android:paddingEnd="8dp"> + + + + + + - - - + android:orientation="horizontal" + android:paddingEnd="12dp" + android:paddingTop="6dp" + android:paddingBottom="7dp"> + + + + + \ No newline at end of file From f7d2cb405523715b6b5dca0b8b336d32698666d6 Mon Sep 17 00:00:00 2001 From: Koen Date: Fri, 8 Dec 2023 12:03:24 +0100 Subject: [PATCH 2/2] Updated Odysee. --- app/src/stable/assets/sources/odysee | 2 +- app/src/unstable/assets/sources/odysee | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/stable/assets/sources/odysee b/app/src/stable/assets/sources/odysee index a05feced..a21ad568 160000 --- a/app/src/stable/assets/sources/odysee +++ b/app/src/stable/assets/sources/odysee @@ -1 +1 @@ -Subproject commit a05feced804a5b664c75568162a7b3fa5562d8b3 +Subproject commit a21ad56829b0f0b45bbd677979f3d260e13abb34 diff --git a/app/src/unstable/assets/sources/odysee b/app/src/unstable/assets/sources/odysee index a05feced..a21ad568 160000 --- a/app/src/unstable/assets/sources/odysee +++ b/app/src/unstable/assets/sources/odysee @@ -1 +1 @@ -Subproject commit a05feced804a5b664c75568162a7b3fa5562d8b3 +Subproject commit a21ad56829b0f0b45bbd677979f3d260e13abb34