mirror of
https://gitlab.futo.org/videostreaming/grayjay.git
synced 2026-05-16 04:52:39 +02:00
Fixed spacing issue in bottom bar when button sizes vary. Potential fix for crash that happens in ShapeableImageView.
This commit is contained in:
+2
-2
@@ -290,8 +290,8 @@ class SubscriptionGroupFragment : MainFragment() {
|
|||||||
image.setImageView(_imageGroup);
|
image.setImageView(_imageGroup);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
_imageGroupBackground.setImageResource(0);
|
_imageGroupBackground.setImageDrawable(null);
|
||||||
_imageGroup.setImageResource(0);
|
_imageGroup.setImageDrawable(null);
|
||||||
}
|
}
|
||||||
updateMeta();
|
updateMeta();
|
||||||
reloadCreators(group);
|
reloadCreators(group);
|
||||||
|
|||||||
@@ -126,7 +126,7 @@ open class PlaylistView : LinearLayout {
|
|||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
currentPlaylist = null;
|
currentPlaylist = null;
|
||||||
_imageThumbnail.setImageResource(0);
|
_imageThumbnail.setImageDrawable(null);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -76,8 +76,8 @@ class PreviewLockedView : LinearLayout {
|
|||||||
_textLockedUrl.text = content.unlockUrl ?: "";
|
_textLockedUrl.text = content.unlockUrl ?: "";
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
_imageChannelThumbnail.setImageResource(0);
|
_imageChannelThumbnail.setImageDrawable(null);
|
||||||
_imageVideoThumbnail.setImageResource(0);
|
_imageVideoThumbnail.setImageDrawable(null);
|
||||||
_textLockedDescription.text = "";
|
_textLockedDescription.text = "";
|
||||||
_textLockedUrl.text = "";
|
_textLockedUrl.text = "";
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -233,7 +233,7 @@ open class PreviewVideoView : LinearLayout {
|
|||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
currentVideo = null;
|
currentVideo = null;
|
||||||
_imageVideo.setImageResource(0);
|
_imageVideo.setImageDrawable(null);
|
||||||
_containerDuration.visibility = GONE;
|
_containerDuration.visibility = GONE;
|
||||||
_containerLive.visibility = GONE;
|
_containerLive.visibility = GONE;
|
||||||
_timeBar?.visibility = GONE;
|
_timeBar?.visibility = GONE;
|
||||||
|
|||||||
+1
-1
@@ -47,7 +47,7 @@ class SubscriptionGroupBarViewHolder(private val _viewGroup: ViewGroup) : AnyAda
|
|||||||
if(img != null) {
|
if(img != null) {
|
||||||
img.setImageView(_image)
|
img.setImageView(_image)
|
||||||
} else {
|
} else {
|
||||||
_image.setImageResource(0);
|
_image.setImageDrawable(null);
|
||||||
|
|
||||||
if(value is SubscriptionGroup.Add)
|
if(value is SubscriptionGroup.Add)
|
||||||
_image.setBackgroundColor(Color.DKGRAY);
|
_image.setBackgroundColor(Color.DKGRAY);
|
||||||
|
|||||||
+1
-1
@@ -88,7 +88,7 @@ class SubscriptionGroupListViewHolder(private val _viewGroup: ViewGroup) : AnyAd
|
|||||||
if(img != null)
|
if(img != null)
|
||||||
img.setImageView(_image)
|
img.setImageView(_image)
|
||||||
else {
|
else {
|
||||||
_image.setImageResource(0);
|
_image.setImageDrawable(null);
|
||||||
|
|
||||||
if(value is SubscriptionGroup.Add)
|
if(value is SubscriptionGroup.Add)
|
||||||
_image.setBackgroundColor(Color.DKGRAY);
|
_image.setBackgroundColor(Color.DKGRAY);
|
||||||
|
|||||||
@@ -9,28 +9,28 @@ class PlatformIndicator : androidx.appcompat.widget.AppCompatImageView {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fun clearPlatform() {
|
fun clearPlatform() {
|
||||||
setImageResource(0);
|
setImageDrawable(null);
|
||||||
}
|
}
|
||||||
fun setPlatformFromClientID(platformType : String?) {
|
fun setPlatformFromClientID(platformType : String?) {
|
||||||
if(platformType == null)
|
if(platformType == null)
|
||||||
setImageResource(0);
|
setImageDrawable(null);
|
||||||
else {
|
else {
|
||||||
val result = StatePlatform.instance.getPlatformIcon(platformType);
|
val result = StatePlatform.instance.getPlatformIcon(platformType);
|
||||||
if (result != null)
|
if (result != null)
|
||||||
result.setImageView(this);
|
result.setImageView(this);
|
||||||
else
|
else
|
||||||
setImageResource(0);
|
setImageDrawable(null);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
fun setPlatformFromClientName(name: String?) {
|
fun setPlatformFromClientName(name: String?) {
|
||||||
if(name == null)
|
if(name == null)
|
||||||
setImageResource(0);
|
setImageDrawable(null);
|
||||||
else {
|
else {
|
||||||
val result = StatePlatform.instance.getPlatformIconByName(name);
|
val result = StatePlatform.instance.getPlatformIconByName(name);
|
||||||
if (result != null)
|
if (result != null)
|
||||||
result.setImageView(this);
|
result.setImageView(this);
|
||||||
else
|
else
|
||||||
setImageResource(0);
|
setImageDrawable(null);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:layout_width="65dp"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="52dp"
|
android:layout_height="52dp"
|
||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
@@ -9,14 +9,14 @@
|
|||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/image_button"
|
android:id="@+id/image_button"
|
||||||
android:layout_width="25dp"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="25dp"
|
android:layout_height="25dp"
|
||||||
android:scaleType="fitCenter"
|
android:scaleType="fitCenter"
|
||||||
tools:srcCompat="@drawable/ic_sources"/>
|
tools:srcCompat="@drawable/ic_sources"/>
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/text_button"
|
android:id="@+id/text_button"
|
||||||
android:layout_width="65dp"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
tools:text="Home"
|
tools:text="Home"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
|
|||||||
+1
-1
Submodule dep/futopay updated: 21afe43dff...3e99ed522a
Reference in New Issue
Block a user