From fb3bb6793320e4931fc8517bcebae80e69a92b67 Mon Sep 17 00:00:00 2001 From: Bnyro Date: Mon, 11 Jul 2022 21:48:59 +0200 Subject: [PATCH] move urls to constants --- app/src/main/java/com/github/libretube/Constants.kt | 6 ++++++ .../main/java/com/github/libretube/dialogs/ShareDialog.kt | 6 ++++-- app/src/main/res/layout/channel_subscription_row.xml | 1 - app/src/main/res/layout/fragment_channel.xml | 1 - 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/github/libretube/Constants.kt b/app/src/main/java/com/github/libretube/Constants.kt index 26d940916..ea4486fb0 100644 --- a/app/src/main/java/com/github/libretube/Constants.kt +++ b/app/src/main/java/com/github/libretube/Constants.kt @@ -21,3 +21,9 @@ const val MATRIX_URL = "https://matrix.to/#/#LibreTube:matrix.org" const val DISCORD_URL = "https://discord.com/invite/Qc34xCj2GV" const val REDDIT_URL = "https://www.reddit.com/r/Libretube/" const val TWITTER_URL = "https://twitter.com/libretube" + +/** + * Share Dialog + */ +const val PIPED_FRONTEND_URL = "https://piped.kavin.rocks" +const val YOUTUBE_FRONTEND_URL = "https://www.youtube.com" \ No newline at end of file diff --git a/app/src/main/java/com/github/libretube/dialogs/ShareDialog.kt b/app/src/main/java/com/github/libretube/dialogs/ShareDialog.kt index a783b8e46..ff25e2a81 100644 --- a/app/src/main/java/com/github/libretube/dialogs/ShareDialog.kt +++ b/app/src/main/java/com/github/libretube/dialogs/ShareDialog.kt @@ -4,7 +4,9 @@ import android.app.Dialog import android.content.Intent import android.os.Bundle import androidx.fragment.app.DialogFragment +import com.github.libretube.PIPED_FRONTEND_URL import com.github.libretube.R +import com.github.libretube.YOUTUBE_FRONTEND_URL import com.github.libretube.preferences.PreferenceHelper import com.google.android.material.dialog.MaterialAlertDialogBuilder @@ -30,8 +32,8 @@ class ShareDialog( shareOptions ) { _, which -> val host = when (which) { - 0 -> "https://piped.kavin.rocks" - 1 -> "https://youtube.com" + 0 -> PIPED_FRONTEND_URL + 1 -> YOUTUBE_FRONTEND_URL // only available for custom instances else -> instanceUrl } diff --git a/app/src/main/res/layout/channel_subscription_row.xml b/app/src/main/res/layout/channel_subscription_row.xml index 878568aa8..591facca0 100644 --- a/app/src/main/res/layout/channel_subscription_row.xml +++ b/app/src/main/res/layout/channel_subscription_row.xml @@ -34,7 +34,6 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:elevation="1dp" android:text="@string/subscribe" android:textColor="?android:attr/textColorPrimary" android:textSize="12sp" diff --git a/app/src/main/res/layout/fragment_channel.xml b/app/src/main/res/layout/fragment_channel.xml index 90ead4037..45b4a8ff7 100644 --- a/app/src/main/res/layout/fragment_channel.xml +++ b/app/src/main/res/layout/fragment_channel.xml @@ -80,7 +80,6 @@ android:layout_height="wrap_content" android:drawableLeft="@drawable/ic_bell_small" android:drawableTint="?android:attr/textColorPrimary" - android:elevation="20dp" android:text="@string/subscribe" android:textColor="?android:attr/textColorPrimary" android:textSize="12sp"