kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2025-04-29 16:30:31 +05:30
Code Issues Projects Releases Wiki Activity

Merge pull request #1783 from Bnyro/master

Browse Source 
fix the subscription button
This commit is contained in:
Bnyro 2022-11-06 16:49:45 +01:00 committed by GitHub
commit 257a39aa14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
app/src/main/java/com/github/libretube/extensions/TAG.kt → app/src/main/java/com/github/libretube/extensions/Tag.kt
View File

4
app/src/main/java/com/github/libretube/ui/adapters/PlaylistAdapter.kt
View File

@ -12,9 +12,9 @@ import com.github.libretube.api.RetrofitInstance
import com.github.libretube.api.obj.PlaylistId import com.github.libretube.api.obj.PlaylistId
import com.github.libretube.databinding.PlaylistRowBinding import com.github.libretube.databinding.PlaylistRowBinding
import com.github.libretube.extensions.TAG import com.github.libretube.extensions.TAG
import com.github.libretube.extensions.setFormattedDuration
import com.github.libretube.extensions.setWatchProgressLength
import com.github.libretube.extensions.toID import com.github.libretube.extensions.toID
import com.github.libretube.ui.extensions.setFormattedDuration
import com.github.libretube.ui.extensions.setWatchProgressLength
import com.github.libretube.ui.sheets.VideoOptionsBottomSheet import com.github.libretube.ui.sheets.VideoOptionsBottomSheet
import com.github.libretube.ui.viewholders.PlaylistViewHolder import com.github.libretube.ui.viewholders.PlaylistViewHolder
import com.github.libretube.util.ImageHelper import com.github.libretube.util.ImageHelper

6
app/src/main/java/com/github/libretube/ui/adapters/SearchAdapter.kt
View File

@ -12,10 +12,10 @@ import com.github.libretube.databinding.ChannelRowBinding
import com.github.libretube.databinding.PlaylistsRowBinding import com.github.libretube.databinding.PlaylistsRowBinding
import com.github.libretube.databinding.VideoRowBinding import com.github.libretube.databinding.VideoRowBinding
import com.github.libretube.extensions.formatShort import com.github.libretube.extensions.formatShort
import com.github.libretube.extensions.setFormattedDuration
import com.github.libretube.extensions.setWatchProgressLength
import com.github.libretube.extensions.setupSubscriptionButton
import com.github.libretube.extensions.toID import com.github.libretube.extensions.toID
import com.github.libretube.ui.extensions.setFormattedDuration
import com.github.libretube.ui.extensions.setWatchProgressLength
import com.github.libretube.ui.extensions.setupSubscriptionButton
import com.github.libretube.ui.sheets.PlaylistOptionsBottomSheet import com.github.libretube.ui.sheets.PlaylistOptionsBottomSheet
import com.github.libretube.ui.sheets.VideoOptionsBottomSheet import com.github.libretube.ui.sheets.VideoOptionsBottomSheet
import com.github.libretube.ui.viewholders.SearchViewHolder import com.github.libretube.ui.viewholders.SearchViewHolder

2
app/src/main/java/com/github/libretube/ui/adapters/SubscriptionChannelAdapter.kt
View File

@ -5,8 +5,8 @@ import android.view.ViewGroup
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import com.github.libretube.api.obj.Subscription import com.github.libretube.api.obj.Subscription
import com.github.libretube.databinding.ChannelSubscriptionRowBinding import com.github.libretube.databinding.ChannelSubscriptionRowBinding
import com.github.libretube.extensions.setupSubscriptionButton
import com.github.libretube.extensions.toID import com.github.libretube.extensions.toID
import com.github.libretube.ui.extensions.setupSubscriptionButton
import com.github.libretube.ui.viewholders.SubscriptionChannelViewHolder import com.github.libretube.ui.viewholders.SubscriptionChannelViewHolder
import com.github.libretube.util.ImageHelper import com.github.libretube.util.ImageHelper
import com.github.libretube.util.NavigationHelper import com.github.libretube.util.NavigationHelper

4
app/src/main/java/com/github/libretube/ui/adapters/VideosAdapter.kt
View File

@ -13,9 +13,9 @@ import com.github.libretube.constants.PreferenceKeys
import com.github.libretube.databinding.TrendingRowBinding import com.github.libretube.databinding.TrendingRowBinding
import com.github.libretube.databinding.VideoRowBinding import com.github.libretube.databinding.VideoRowBinding
import com.github.libretube.extensions.formatShort import com.github.libretube.extensions.formatShort
import com.github.libretube.extensions.setFormattedDuration
import com.github.libretube.extensions.setWatchProgressLength
import com.github.libretube.extensions.toID import com.github.libretube.extensions.toID
import com.github.libretube.ui.extensions.setFormattedDuration
import com.github.libretube.ui.extensions.setWatchProgressLength
import com.github.libretube.ui.sheets.VideoOptionsBottomSheet import com.github.libretube.ui.sheets.VideoOptionsBottomSheet
import com.github.libretube.ui.viewholders.VideosViewHolder import com.github.libretube.ui.viewholders.VideosViewHolder
import com.github.libretube.util.ImageHelper import com.github.libretube.util.ImageHelper

4
app/src/main/java/com/github/libretube/ui/adapters/WatchHistoryAdapter.kt
View File

@ -7,8 +7,8 @@ import androidx.recyclerview.widget.RecyclerView
import com.github.libretube.databinding.WatchHistoryRowBinding import com.github.libretube.databinding.WatchHistoryRowBinding
import com.github.libretube.db.DatabaseHelper import com.github.libretube.db.DatabaseHelper
import com.github.libretube.db.obj.WatchHistoryItem import com.github.libretube.db.obj.WatchHistoryItem
import com.github.libretube.extensions.setFormattedDuration import com.github.libretube.ui.extensions.setFormattedDuration
import com.github.libretube.extensions.setWatchProgressLength import com.github.libretube.ui.extensions.setWatchProgressLength
import com.github.libretube.ui.sheets.VideoOptionsBottomSheet import com.github.libretube.ui.sheets.VideoOptionsBottomSheet
import com.github.libretube.ui.viewholders.WatchHistoryViewHolder import com.github.libretube.ui.viewholders.WatchHistoryViewHolder
import com.github.libretube.util.ImageHelper import com.github.libretube.util.ImageHelper

2
app/src/main/java/com/github/libretube/extensions/SetFormattedDuration.kt → app/src/main/java/com/github/libretube/ui/extensions/SetFormattedDuration.kt
View File

@ -1,4 +1,4 @@
package com.github.libretube.extensions package com.github.libretube.ui.extensions
import android.text.format.DateUtils import android.text.format.DateUtils
import android.widget.TextView import android.widget.TextView

3
app/src/main/java/com/github/libretube/extensions/SetWatchProgressLength.kt → app/src/main/java/com/github/libretube/ui/extensions/SetWatchProgressLength.kt
View File

@ -1,9 +1,10 @@
package com.github.libretube.extensions package com.github.libretube.ui.extensions
import android.view.View import android.view.View
import android.view.ViewTreeObserver import android.view.ViewTreeObserver
import android.widget.LinearLayout import android.widget.LinearLayout
import com.github.libretube.db.DatabaseHolder.Companion.Database import com.github.libretube.db.DatabaseHolder.Companion.Database
import com.github.libretube.extensions.awaitQuery
/** /**
* shows the already watched time under the video * shows the already watched time under the video

2
app/src/main/java/com/github/libretube/extensions/SetupNotificationBell.kt → app/src/main/java/com/github/libretube/ui/extensions/SetupNotificationBell.kt
View File

@ -1,4 +1,4 @@
package com.github.libretube.extensions package com.github.libretube.ui.extensions
import android.util.Log import android.util.Log
import com.github.libretube.R import com.github.libretube.R

12
app/src/main/java/com/github/libretube/extensions/SetupSubscriptionButton.kt → app/src/main/java/com/github/libretube/ui/extensions/SetupSubscriptionButton.kt
View File

@ -1,4 +1,4 @@
package com.github.libretube.extensions package com.github.libretube.ui.extensions
import android.view.View import android.view.View
import android.widget.TextView import android.widget.TextView
@ -22,12 +22,14 @@ fun TextView.setupSubscriptionButton(
CoroutineScope(Dispatchers.IO).launch { CoroutineScope(Dispatchers.IO).launch {
subscribed = isSubscribed ?: SubscriptionHelper.isSubscribed(channelId) subscribed = isSubscribed ?: SubscriptionHelper.isSubscribed(channelId)
if (subscribed == true) {
withContext(Dispatchers.Main) { withContext(Dispatchers.Main) {
if (subscribed == true) {
this@setupSubscriptionButton.text = context.getString(R.string.unsubscribe) this@setupSubscriptionButton.text = context.getString(R.string.unsubscribe)
} else {
notificationBell?.visibility = View.GONE
} }
} else { this@setupSubscriptionButton.visibility = View.VISIBLE
notificationBell?.visibility = View.GONE
} }
} }

2
app/src/main/java/com/github/libretube/ui/fragments/ChannelFragment.kt
View File

@ -17,13 +17,13 @@ import com.github.libretube.databinding.FragmentChannelBinding
import com.github.libretube.enums.ShareObjectType import com.github.libretube.enums.ShareObjectType
import com.github.libretube.extensions.TAG import com.github.libretube.extensions.TAG
import com.github.libretube.extensions.formatShort import com.github.libretube.extensions.formatShort
import com.github.libretube.extensions.setupSubscriptionButton
import com.github.libretube.extensions.toID import com.github.libretube.extensions.toID
import com.github.libretube.obj.ShareData import com.github.libretube.obj.ShareData
import com.github.libretube.ui.adapters.SearchAdapter import com.github.libretube.ui.adapters.SearchAdapter
import com.github.libretube.ui.adapters.VideosAdapter import com.github.libretube.ui.adapters.VideosAdapter
import com.github.libretube.ui.base.BaseFragment import com.github.libretube.ui.base.BaseFragment
import com.github.libretube.ui.dialogs.ShareDialog import com.github.libretube.ui.dialogs.ShareDialog
import com.github.libretube.ui.extensions.setupSubscriptionButton
import com.github.libretube.util.ImageHelper import com.github.libretube.util.ImageHelper
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers

2
app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt
View File

@ -52,7 +52,6 @@ import com.github.libretube.extensions.awaitQuery
import com.github.libretube.extensions.formatShort import com.github.libretube.extensions.formatShort
import com.github.libretube.extensions.hideKeyboard import com.github.libretube.extensions.hideKeyboard
import com.github.libretube.extensions.query import com.github.libretube.extensions.query
import com.github.libretube.extensions.setupSubscriptionButton
import com.github.libretube.extensions.toID import com.github.libretube.extensions.toID
import com.github.libretube.extensions.toStreamItem import com.github.libretube.extensions.toStreamItem
import com.github.libretube.obj.ShareData import com.github.libretube.obj.ShareData
@ -66,6 +65,7 @@ import com.github.libretube.ui.base.BaseFragment
import com.github.libretube.ui.dialogs.AddToPlaylistDialog import com.github.libretube.ui.dialogs.AddToPlaylistDialog
import com.github.libretube.ui.dialogs.DownloadDialog import com.github.libretube.ui.dialogs.DownloadDialog
import com.github.libretube.ui.dialogs.ShareDialog import com.github.libretube.ui.dialogs.ShareDialog
import com.github.libretube.ui.extensions.setupSubscriptionButton
import com.github.libretube.ui.interfaces.OnlinePlayerOptions import com.github.libretube.ui.interfaces.OnlinePlayerOptions
import com.github.libretube.ui.models.PlayerViewModel import com.github.libretube.ui.models.PlayerViewModel
import com.github.libretube.ui.sheets.BaseBottomSheet import com.github.libretube.ui.sheets.BaseBottomSheet