kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2024-12-13 22:00:30 +05:30
Code Issues Projects Releases Wiki Activity

Merge pull request #1134 from Bnyro/master

Browse Source 
add legacy subscriptions view
This commit is contained in:
Bnyro 2022-08-24 17:57:42 +02:00 committed by GitHub
commit c55e7061bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
29 changed files with 357 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
app/src/main/java/com/github/libretube/activities/MainActivity.kt
View File

@ -62,8 +62,11 @@ class MainActivity : BaseActivity() {
autoRotationEnabled = PreferenceHelper.getBoolean(PreferenceKeys.AUTO_ROTATION, false)
// enable auto rotation if turned on
requestedOrientation = if (autoRotationEnabled) ActivityInfo.SCREEN_ORIENTATION_USER
else ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT
requestedOrientation = if (autoRotationEnabled) {
ActivityInfo.SCREEN_ORIENTATION_USER
} else {
ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT
}
// start service that gets called on closure
try {
@ -98,8 +101,10 @@ class MainActivity : BaseActivity() {
// hide the trending page if enabled
val hideTrendingPage =
PreferenceHelper.getBoolean(PreferenceKeys.HIDE_TRENDING_PAGE, false)
if (hideTrendingPage) binding.bottomNav.menu.findItem(R.id.homeFragment).isVisible =
false
if (hideTrendingPage) {
binding.bottomNav.menu.findItem(R.id.homeFragment).isVisible =
false
}
// save start tab fragment id
startFragmentId =
@ -166,14 +171,18 @@ class MainActivity : BaseActivity() {
PreferenceKeys.BREAK_REMINDER_TOGGLE,
false
)
) return
) {
return
}
val breakReminderPref = PreferenceHelper.getString(
PreferenceKeys.BREAK_REMINDER,
"0"
)
if (!breakReminderPref.all { Character.isDigit(it) } ||
breakReminderPref == "" || breakReminderPref == "0"
) return
) {
return
}
Handler(Looper.getMainLooper()).postDelayed(
{
try {
@ -403,8 +412,11 @@ class MainActivity : BaseActivity() {
) {
Log.i(TAG(), "Uri Type: Channel")
val bundle = if (channelId != null) bundleOf("channel_id" to channelId)
else bundleOf("channel_name" to channelName)
val bundle = if (channelId != null) {
bundleOf("channel_id" to channelId)
} else {
bundleOf("channel_name" to channelName)
}
navController.navigate(R.id.channelFragment, bundle)
}
@ -452,8 +464,11 @@ class MainActivity : BaseActivity() {
findViewById<LinearLayout>(R.id.linLayout).visibility = View.VISIBLE
val playerViewModel = ViewModelProvider(this)[PlayerViewModel::class.java]
playerViewModel.isFullscreen.value = false
requestedOrientation = if (autoRotationEnabled) ActivityInfo.SCREEN_ORIENTATION_USER
else ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT
requestedOrientation = if (autoRotationEnabled) {
ActivityInfo.SCREEN_ORIENTATION_USER
} else {
ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT
}
}
override fun onConfigurationChanged(newConfig: Configuration) {

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

@ -33,7 +33,9 @@ class ChaptersAdapter(
val color =
ThemeHelper.getThemeColor(root.context, android.R.attr.colorControlHighlight)
chapterLL.setBackgroundColor(color)
} else chapterLL.setBackgroundColor(Color.TRANSPARENT)
} else {
chapterLL.setBackgroundColor(Color.TRANSPARENT)
}
root.setOnClickListener {
updateSelectedPosition(position)
val chapterStart = chapter.start!! * 1000 // s -> ms

49
app/src/main/java/com/github/libretube/adapters/LegacySubscriptionAdapter.kt Normal file
View File

@ -0,0 +1,49 @@
package com.github.libretube.adapters
import android.view.LayoutInflater
import android.view.ViewGroup
import androidx.recyclerview.widget.RecyclerView
import com.github.libretube.databinding.LegacySubscriptionChannelBinding
import com.github.libretube.obj.Subscription
import com.github.libretube.util.ImageHelper
import com.github.libretube.util.NavigationHelper
import com.github.libretube.util.toID
class LegacySubscriptionAdapter(
private val subscriptions: List<Subscription>
) : RecyclerView.Adapter<LegacySubscriptionViewHolder>() {
override fun onCreateViewHolder(
parent: ViewGroup,
viewType: Int
): LegacySubscriptionViewHolder {
val layoutInflater = LayoutInflater.from(parent.context)
val binding = LegacySubscriptionChannelBinding.inflate(layoutInflater, parent, false)
return LegacySubscriptionViewHolder(binding)
}
override fun onBindViewHolder(holder: LegacySubscriptionViewHolder, position: Int) {
val subscription = subscriptions[position]
holder.binding.apply {
channelName.text = subscription.name
ImageHelper.loadImage(
subscription.avatar,
channelAvatar
)
root.setOnClickListener {
NavigationHelper.navigateChannel(
root.context,
subscription.url.toID()
)
}
}
}
override fun getItemCount(): Int {
return subscriptions.size
}
}
class LegacySubscriptionViewHolder(
val binding: LegacySubscriptionChannelBinding
) : RecyclerView.ViewHolder(binding.root)

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

@ -63,9 +63,11 @@ class SearchAdapter(
val channelRowBinding = holder.channelRowBinding
val playlistRowBinding = holder.playlistRowBinding
if (videoRowBinding != null) bindWatch(searchItem, videoRowBinding)
else if (channelRowBinding != null) bindChannel(searchItem, channelRowBinding)
else if (playlistRowBinding != null) bindPlaylist(searchItem, playlistRowBinding)
if (videoRowBinding != null) {
bindWatch(searchItem, videoRowBinding)
} else if (channelRowBinding != null) {
bindChannel(searchItem, channelRowBinding)
} else if (playlistRowBinding != null) bindPlaylist(searchItem, playlistRowBinding)
}
override fun getItemViewType(position: Int): Int {

10
app/src/main/java/com/github/libretube/adapters/TrendingAdapter.kt
View File

@ -24,9 +24,13 @@ class TrendingAdapter(
var index = 10
override fun getItemCount(): Int {
return if (showAllAtOne) streamItems.size
else if (index >= streamItems.size) streamItems.size - 1
else index
return if (showAllAtOne) {
streamItems.size
} else if (index >= streamItems.size) {
streamItems.size - 1
} else {
index
}
}
fun updateItems() {

6
app/src/main/java/com/github/libretube/dialogs/AddToPlaylistDialog.kt
View File

@ -72,8 +72,10 @@ class AddToPlaylistDialog : DialogFragment() {
if (viewModel.lastSelectedPlaylistId != null) {
var selectionIndex = 0
response.forEachIndexed { index, playlist ->
if (playlist.id == viewModel.lastSelectedPlaylistId) selectionIndex =
index
if (playlist.id == viewModel.lastSelectedPlaylistId) {
selectionIndex =
index
}
}
binding.playlistsSpinner.setSelection(selectionIndex)
}

7
app/src/main/java/com/github/libretube/dialogs/PlaylistOptionsDialog.kt
View File

@ -56,8 +56,11 @@ class PlaylistOptionsDialog(
context?.getString(R.string.playOnBackground) -> {
runBlocking {
val playlist =
if (isOwner) RetrofitInstance.authApi.getPlaylist(playlistId)
else RetrofitInstance.api.getPlaylist(playlistId)
if (isOwner) {
RetrofitInstance.authApi.getPlaylist(playlistId)
} else {
RetrofitInstance.api.getPlaylist(playlistId)
}
BackgroundHelper.playOnBackground(
context = requireContext(),
videoId = playlist.relatedStreams!![0].url.toID(),

7
app/src/main/java/com/github/libretube/extensions/SetFormattedDuration.kt
View File

@ -8,7 +8,10 @@ fun TextView?.setFormattedDuration(duration: Long) {
val text = if (duration < 0L) {
this!!.setBackgroundColor(R.attr.colorPrimaryDark)
this.context.getString(R.string.live)
} else if (duration == 0L) this!!.context.getString(R.string.yt_shorts)
else DateUtils.formatElapsedTime(duration)
} else if (duration == 0L) {
this!!.context.getString(R.string.yt_shorts)
} else {
DateUtils.formatElapsedTime(duration)
}
this!!.text = text
}

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

@ -110,8 +110,11 @@ class ChannelFragment : BaseFragment() {
fun run() {
lifecycleScope.launchWhenCreated {
val response = try {
if (channelId != null) RetrofitInstance.api.getChannel(channelId!!)
else RetrofitInstance.api.getChannelByName(channelName!!)
if (channelId != null) {
RetrofitInstance.api.getChannel(channelId!!)
} else {
RetrofitInstance.api.getChannelByName(channelName!!)
}
} catch (e: IOException) {
binding.channelRefresh.isRefreshing = false
println(e)

4
app/src/main/java/com/github/libretube/fragments/HomeFragment.kt
View File

@ -53,7 +53,9 @@ class HomeFragment : BaseFragment() {
LocaleHelper
.getDetectedCountry(requireContext(), "UK")
.uppercase()
} else regionPref
} else {
regionPref
}
binding.recview.layoutManager = GridLayoutManager(view.context, grid.toInt())
fetchJson()

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

@ -585,13 +585,18 @@ class PlayerFragment : BaseFragment() {
val bottomSheetFragment = PlayerOptionsBottomSheet().apply {
setOnClickListeners(playerOptionsInterface)
// set the auto play mode
currentAutoplayMode = if (autoplayEnabled) context.getString(R.string.enabled)
else context.getString(R.string.disabled)
currentAutoplayMode = if (autoplayEnabled) {
context.getString(R.string.enabled)
} else {
context.getString(R.string.disabled)
}
// set the current caption language
currentCaptions =
if (trackSelector.parameters.preferredTextLanguages.isNotEmpty()) {
trackSelector.parameters.preferredTextLanguages[0]
} else context.getString(R.string.none)
} else {
context.getString(R.string.none)
}
// set the playback speed
val playbackSpeeds = context.resources.getStringArray(R.array.playbackSpeed)
val playbackSpeedValues =
@ -603,14 +608,19 @@ class PlayerFragment : BaseFragment() {
val quality = exoPlayer.videoSize.height
if (quality != 0) {
currentQuality =
if (isAdaptive) "${context.getString(R.string.hls)} • ${quality}p"
else "${quality}p"
if (isAdaptive) {
"${context.getString(R.string.hls)} • ${quality}p"
} else {
"${quality}p"
}
}
// set the repeat mode
currentRepeatMode =
if (exoPlayer.repeatMode == RepeatModeUtil.REPEAT_TOGGLE_MODE_NONE) {
context.getString(R.string.repeat_mode_none)
} else context.getString(R.string.repeat_mode_current)
} else {
context.getString(R.string.repeat_mode_current)
}
// set the aspect ratio mode
currentResizeMode = when (exoPlayerView.resizeMode) {
AspectRatioFrameLayout.RESIZE_MODE_FIT -> context.getString(R.string.resize_mode_fit)
@ -729,9 +739,12 @@ class PlayerFragment : BaseFragment() {
"ratio" -> {
val videoSize = exoPlayer.videoSize
// probably a youtube shorts video
if (videoSize.height > videoSize.width) ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT
// a video with normal aspect ratio
else ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE
if (videoSize.height > videoSize.width) {
ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT
} // a video with normal aspect ratio
else {
ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE
}
}
"auto" -> ActivityInfo.SCREEN_ORIENTATION_SENSOR
"landscape" -> ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE
@ -816,8 +829,11 @@ class PlayerFragment : BaseFragment() {
saveWatchPosition()
nowPlayingNotification.destroy()
activity?.requestedOrientation =
if ((activity as MainActivity).autoRotationEnabled) ActivityInfo.SCREEN_ORIENTATION_USER
else ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT
if ((activity as MainActivity).autoRotationEnabled) {
ActivityInfo.SCREEN_ORIENTATION_USER
} else {
ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT
}
} catch (e: Exception) {
}
}
@ -1199,7 +1215,11 @@ class PlayerFragment : BaseFragment() {
// next and previous buttons
playerBinding.skipPrev.visibility = if (
skipButtonsEnabled && Globals.playingQueue.indexOf(videoId!!) != 0
) View.VISIBLE else View.INVISIBLE
) {
View.VISIBLE
} else {
View.INVISIBLE
}
playerBinding.skipNext.visibility = if (skipButtonsEnabled) View.VISIBLE else View.INVISIBLE
playerBinding.skipPrev.setOnClickListener {
@ -1545,7 +1565,11 @@ class PlayerFragment : BaseFragment() {
playerBinding.exoTitle.visibility =
if (isLocked &&
viewModel.isFullscreen.value == true
) View.VISIBLE else View.INVISIBLE
) {
View.VISIBLE
} else {
View.INVISIBLE
}
// disable double tap to seek when the player is locked
if (isLocked) {

25
app/src/main/java/com/github/libretube/fragments/PlaylistFragment.kt
View File

@ -61,8 +61,11 @@ class PlaylistFragment : BaseFragment() {
lifecycleScope.launchWhenCreated {
val response = try {
// load locally stored playlists with the auth api
if (isOwner) RetrofitInstance.authApi.getPlaylist(playlistId!!)
else RetrofitInstance.api.getPlaylist(playlistId!!)
if (isOwner) {
RetrofitInstance.authApi.getPlaylist(playlistId!!)
} else {
RetrofitInstance.api.getPlaylist(playlistId!!)
}
} catch (e: IOException) {
println(e)
Log.e(TAG(), "IOException, you might not have internet connection")
@ -163,13 +166,17 @@ class PlaylistFragment : BaseFragment() {
lifecycleScope.launchWhenCreated {
val response = try {
// load locally stored playlists with the auth api
if (isOwner) RetrofitInstance.authApi.getPlaylistNextPage(
playlistId!!,
nextPage!!
) else RetrofitInstance.api.getPlaylistNextPage(
playlistId!!,
nextPage!!
)
if (isOwner) {
RetrofitInstance.authApi.getPlaylistNextPage(
playlistId!!,
nextPage!!
)
} else {
RetrofitInstance.api.getPlaylistNextPage(
playlistId!!,
nextPage!!
)
}
} catch (e: IOException) {
println(e)
Log.e(TAG(), "IOException, you might not have internet connection")

7
app/src/main/java/com/github/libretube/fragments/SearchFragment.kt
View File

@ -56,8 +56,11 @@ class SearchFragment() : BaseFragment() {
// fetch the search or history
binding.historyEmpty.visibility = View.GONE
binding.suggestionsRecycler.visibility = View.VISIBLE
if (query == null || query == "") showHistory()
else fetchSuggestions(query)
if (query == null || query == "") {
showHistory()
} else {
fetchSuggestions(query)
}
}
private fun fetchSuggestions(query: String) {

40
app/src/main/java/com/github/libretube/fragments/SubscriptionsFragment.kt
View File

@ -11,6 +11,7 @@ import androidx.lifecycle.lifecycleScope
import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.LinearLayoutManager
import com.github.libretube.R
import com.github.libretube.adapters.LegacySubscriptionAdapter
import com.github.libretube.adapters.SubscriptionChannelAdapter
import com.github.libretube.adapters.TrendingAdapter
import com.github.libretube.api.RetrofitInstance
@ -125,10 +126,13 @@ class SubscriptionsFragment : BaseFragment() {
fun run() {
lifecycleScope.launchWhenCreated {
feed = try {
if (token != "") RetrofitInstance.authApi.getFeed(token)
else RetrofitInstance.authApi.getUnauthenticatedFeed(
SubscriptionHelper.getFormattedLocalSubscriptions()
)
if (token != "") {
RetrofitInstance.authApi.getFeed(token)
} else {
RetrofitInstance.authApi.getUnauthenticatedFeed(
SubscriptionHelper.getFormattedLocalSubscriptions()
)
}
} catch (e: IOException) {
Log.e(TAG(), e.toString())
Log.e(TAG(), "IOException, you might not have internet connection")
@ -175,10 +179,13 @@ class SubscriptionsFragment : BaseFragment() {
fun run() {
lifecycleScope.launchWhenCreated {
val response = try {
if (token != "") RetrofitInstance.authApi.subscriptions(token)
else RetrofitInstance.authApi.unauthenticatedSubscriptions(
SubscriptionHelper.getFormattedLocalSubscriptions()
)
if (token != "") {
RetrofitInstance.authApi.subscriptions(token)
} else {
RetrofitInstance.authApi.unauthenticatedSubscriptions(
SubscriptionHelper.getFormattedLocalSubscriptions()
)
}
} catch (e: IOException) {
Log.e(TAG(), e.toString())
Log.e(TAG(), "IOException, you might not have internet connection")
@ -191,7 +198,22 @@ class SubscriptionsFragment : BaseFragment() {
}
if (response.isNotEmpty()) {
binding.subChannels.adapter =
SubscriptionChannelAdapter(response.toMutableList())
if (PreferenceHelper.getBoolean(
PreferenceKeys.LEGACY_SUBSCRIPTIONS,
false
)
) {
binding.subChannels.layoutManager = GridLayoutManager(
context,
PreferenceHelper.getString(
PreferenceKeys.LEGACY_SUBSCRIPTIONS_COLUMNS,
"4"
).toInt()
)
LegacySubscriptionAdapter(response)
} else {
SubscriptionChannelAdapter(response.toMutableList())
}
} else {
Toast.makeText(context, R.string.subscribeIsEmpty, Toast.LENGTH_SHORT).show()
}

8
app/src/main/java/com/github/libretube/preferences/AppearanceSettings.kt
View File

@ -77,6 +77,14 @@ class AppearanceSettings : MaterialPreferenceFragment() {
}
true
}
val legacySubscriptionView = findPreference<SwitchPreferenceCompat>(PreferenceKeys.LEGACY_SUBSCRIPTIONS)
val legacySubscriptionColumns = findPreference<ListPreference>(PreferenceKeys.LEGACY_SUBSCRIPTIONS_COLUMNS)
legacySubscriptionColumns?.isVisible = legacySubscriptionView?.isChecked!!
legacySubscriptionView.setOnPreferenceChangeListener { _, newValue ->
legacySubscriptionColumns?.isVisible = newValue as Boolean
true
}
}
// remove material you from accent color option if not available

16
app/src/main/java/com/github/libretube/preferences/InstanceSettings.kt
View File

@ -89,8 +89,11 @@ class InstanceSettings : MaterialPreferenceFragment() {
authInstance.isVisible = newValue == true
logout()
// either use new auth url or the normal api url if auth instance disabled
RetrofitInstance.authUrl = if (newValue == false) RetrofitInstance.url
else authInstance.value
RetrofitInstance.authUrl = if (newValue == false) {
RetrofitInstance.url
} else {
authInstance.value
}
RetrofitInstance.lazyMgr.reset()
activity?.recreate()
true
@ -144,9 +147,12 @@ class InstanceSettings : MaterialPreferenceFragment() {
val accessGranted =
PermissionHelper.isStoragePermissionGranted(requireActivity())
// import subscriptions
if (accessGranted) getContent.launch("*/*")
// request permissions if not granted
else PermissionHelper.requestReadWrite(requireActivity())
if (accessGranted) {
getContent.launch("*/*")
} // request permissions if not granted
else {
PermissionHelper.requestReadWrite(requireActivity())
}
true
}

7
app/src/main/java/com/github/libretube/preferences/MainSettings.kt
View File

@ -79,8 +79,11 @@ class MainSettings : MaterialPreferenceFragment() {
val update = findPreference<Preference>("update")
// set the version of the update preference
val versionString = if (BuildConfig.DEBUG) "${BuildConfig.VERSION_NAME} Debug"
else getString(R.string.version, BuildConfig.VERSION_NAME)
val versionString = if (BuildConfig.DEBUG) {
"${BuildConfig.VERSION_NAME} Debug"
} else {
getString(R.string.version, BuildConfig.VERSION_NAME)
}
update?.title = versionString
// checking for update: yes -> dialog, no -> snackBar

2
app/src/main/java/com/github/libretube/preferences/PreferenceKeys.kt
View File

@ -31,6 +31,8 @@ object PreferenceKeys {
const val LABEL_VISIBILITY = "label_visibility"
const val HIDE_TRENDING_PAGE = "hide_trending_page"
const val APP_ICON = "icon_change"
const val LEGACY_SUBSCRIPTIONS = "legacy_subscriptions"
const val LEGACY_SUBSCRIPTIONS_COLUMNS = "legacy_subscriptions_columns"
/**
* Instance

10
app/src/main/java/com/github/libretube/services/DownloadService.kt
View File

@ -53,9 +53,13 @@ class DownloadService : Service() {
videoUrl = intent.getStringExtra("videoUrl")!!
audioUrl = intent.getStringExtra("audioUrl")!!
downloadType = if (audioUrl != "") DownloadType.AUDIO
else if (videoUrl != "") DownloadType.VIDEO
else DownloadType.NONE
downloadType = if (audioUrl != "") {
DownloadType.AUDIO
} else if (videoUrl != "") {
DownloadType.VIDEO
} else {
DownloadType.NONE
}
if (downloadType != DownloadType.NONE) {
downloadNotification(intent)
downloadManager()

50
app/src/main/java/com/github/libretube/util/AutoPlayHelper.kt
View File

@ -23,12 +23,16 @@ class AutoPlayHelper(
return if (Globals.playingQueue.last() != currentVideoId) {
val currentVideoIndex = Globals.playingQueue.indexOf(currentVideoId)
Globals.playingQueue[currentVideoIndex + 1]
} else if (playlistId == null) getNextTrendingVideoId(
currentVideoId,
relatedStreams
) else getNextPlaylistVideoId(
currentVideoId
)
} else if (playlistId == null) {
getNextTrendingVideoId(
currentVideoId,
relatedStreams
)
} else {
getNextPlaylistVideoId(
currentVideoId
)
}
}
/**
@ -51,8 +55,11 @@ class AutoPlayHelper(
)
) {
nextStreamId = relatedStreams[index].url.toID()
if (index + 1 < relatedStreams.size) index += 1
else break
if (index + 1 < relatedStreams.size) {
index += 1
} else {
break
}
}
return nextStreamId
}
@ -65,19 +72,26 @@ class AutoPlayHelper(
if (playlistStreamIds.contains(currentVideoId)) {
val index = playlistStreamIds.indexOf(currentVideoId)
// check whether there's a next video
return if (index + 1 < playlistStreamIds.size) playlistStreamIds[index + 1]
else if (playlistNextPage == null) null
else getNextPlaylistVideoId(currentVideoId)
return if (index + 1 < playlistStreamIds.size) {
playlistStreamIds[index + 1]
} else if (playlistNextPage == null) {
null
} else {
getNextPlaylistVideoId(currentVideoId)
}
} else if (playlistStreamIds.isEmpty() || playlistNextPage != null) {
// fetch the next page of the playlist
return withContext(Dispatchers.IO) {
// fetch the playlists or its nextPage's videos
val playlist =
if (playlistNextPage == null) RetrofitInstance.authApi.getPlaylist(playlistId!!)
else RetrofitInstance.authApi.getPlaylistNextPage(
playlistId!!,
playlistNextPage!!
)
if (playlistNextPage == null) {
RetrofitInstance.authApi.getPlaylist(playlistId!!)
} else {
RetrofitInstance.authApi.getPlaylistNextPage(
playlistId!!,
playlistNextPage!!
)
}
// save the playlist urls to the list
playlistStreamIds += playlist.relatedStreams!!.map { it.url.toID() }
// save playlistNextPage for usage if video is not contained
@ -98,6 +112,8 @@ class AutoPlayHelper(
return if (Globals.playingQueue.last() != currentVideoId) {
val currentVideoIndex = Globals.playingQueue.indexOf(currentVideoId)
Globals.playingQueue[currentVideoIndex + 1]
} else null
} else {
null
}
}
}

14
app/src/main/java/com/github/libretube/util/BackupHelper.kt
View File

@ -66,11 +66,15 @@ class BackupHelper(
// decide for each preference which type it is and save it to the preferences
for ((key, value) in entries) {
if (value is Boolean) editor.putBoolean(key, value)
else if (value is Float) editor.putFloat(key, value)
else if (value is Int) editor.putInt(key, value)
else if (value is Long) editor.putLong(key, value)
else if (value is String) editor.putString(key, value)
if (value is Boolean) {
editor.putBoolean(key, value)
} else if (value is Float) {
editor.putFloat(key, value)
} else if (value is Int) {
editor.putInt(key, value)
} else if (value is Long) {
editor.putLong(key, value)
} else if (value is String) editor.putString(key, value)
}
editor.commit()
} catch (e: Exception) {

4
app/src/main/java/com/github/libretube/util/DoubleTapListener.kt
View File

@ -34,7 +34,9 @@ abstract class DoubleTapListener : View.OnClickListener {
private val runnable = Runnable {
if (!isSingleEvent ||
SystemClock.elapsedRealtime() - timeStampLastDoubleClick < maximumTimeDifference
) return@Runnable
) {
return@Runnable
}
onSingleClick()
}
}

11
app/src/main/java/com/github/libretube/util/ImportHelper.kt
View File

@ -99,10 +99,13 @@ class ImportHelper(
val mapper = ObjectMapper()
val token = PreferenceHelper.getToken()
runBlocking {
val subs = if (token != "") RetrofitInstance.authApi.subscriptions(token)
else RetrofitInstance.authApi.unauthenticatedSubscriptions(
SubscriptionHelper.getFormattedLocalSubscriptions()
)
val subs = if (token != "") {
RetrofitInstance.authApi.subscriptions(token)
} else {
RetrofitInstance.authApi.unauthenticatedSubscriptions(
SubscriptionHelper.getFormattedLocalSubscriptions()
)
}
val newPipeChannels = mutableListOf<NewPipeSubscription>()
subs.forEach {
newPipeChannels += NewPipeSubscription(

5
app/src/main/java/com/github/libretube/util/LocaleHelper.kt
View File

@ -11,8 +11,9 @@ object LocaleHelper {
fun updateLanguage(context: Context) {
val languageName = PreferenceHelper.getString(PreferenceKeys.LANGUAGE, "sys")
if (languageName == "sys") updateLocaleConf(context, Locale.getDefault())
else if (languageName?.contains("-") == true) {
if (languageName == "sys") {
updateLocaleConf(context, Locale.getDefault())
} else if (languageName?.contains("-") == true) {
val languageParts = languageName.split("-")
val locale = Locale(
languageParts[0],

16
app/src/main/java/com/github/libretube/util/NotificationHelper.kt
View File

@ -93,10 +93,13 @@ object NotificationHelper {
val token = PreferenceHelper.getToken()
runBlocking {
val task = async {
if (token != "") RetrofitInstance.authApi.getFeed(token)
else RetrofitInstance.authApi.getUnauthenticatedFeed(
SubscriptionHelper.getFormattedLocalSubscriptions()
)
if (token != "") {
RetrofitInstance.authApi.getFeed(token)
} else {
RetrofitInstance.authApi.getUnauthenticatedFeed(
SubscriptionHelper.getFormattedLocalSubscriptions()
)
}
}
// fetch the users feed
val videoFeed = try {
@ -110,8 +113,9 @@ object NotificationHelper {
val latestFeedStreamId = videoFeed[0].url.toID()
// first time notifications enabled
if (lastSeenStreamId == "") PreferenceHelper.setLatestVideoId(lastSeenStreamId)
else if (lastSeenStreamId != latestFeedStreamId) {
if (lastSeenStreamId == "") {
PreferenceHelper.setLatestVideoId(lastSeenStreamId)
} else if (lastSeenStreamId != latestFeedStreamId) {
// get the index of the last user-seen video
var newStreamIndex = -1
videoFeed.forEachIndexed { index, stream ->

21
app/src/main/java/com/github/libretube/util/ThemeHelper.kt
View File

@ -43,8 +43,11 @@ object ThemeHelper {
) {
"my" -> {
applyDynamicColors(activity)
if (pureThemeEnabled) R.style.BaseTheme_Pure
else R.style.BaseTheme
if (pureThemeEnabled) {
R.style.BaseTheme_Pure
} else {
R.style.BaseTheme
}
}
// set the theme, use the pure theme if enabled
"red" -> if (pureThemeEnabled) R.style.Theme_Red_Pure else R.style.Theme_Red
@ -85,8 +88,11 @@ object ThemeHelper {
// Disable Old Icon(s)
for (activityAlias in activityAliases) {
val activityClass = "com.github.libretube." +
if (activityAlias == activityAliases[0]) "activities.MainActivity" // default icon/activity
else activityAlias
if (activityAlias == activityAliases[0]) {
"activities.MainActivity" // default icon/activity
} else {
activityAlias
}
// remove old icons
context.packageManager.setComponentEnabledSetting(
@ -98,8 +104,11 @@ object ThemeHelper {
// set the class name for the activity alias
val newLogoActivityClass = "com.github.libretube." +
if (newLogoActivityAlias == activityAliases[0]) "activities.MainActivity" // default icon/activity
else newLogoActivityAlias
if (newLogoActivityAlias == activityAliases[0]) {
"activities.MainActivity" // default icon/activity
} else {
newLogoActivityAlias
}
// Enable New Icon
context.packageManager.setComponentEnabledSetting(
ComponentName(context.packageName, newLogoActivityClass),

24
app/src/main/res/layout/legacy_subscription_channel.xml Normal file
View File

@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:orientation="vertical"
android:paddingHorizontal="4dp"
android:paddingVertical="8dp">
<de.hdodenhof.circleimageview.CircleImageView
android:id="@+id/channel_avatar"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_gravity="center" />
<TextView
android:id="@+id/channel_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:ellipsize="end"
android:maxLines="1" />
</LinearLayout>

1
app/src/main/res/values/strings.xml
View File

@ -311,4 +311,5 @@
<string name="copied_to_clipboard">Copied to clipboard</string>
<string name="open_copied">Open</string>
<string name="break_reminder_time">Minutes before being reminded</string>
<string name="legacy_subscriptions">Legacy subscriptions view</string>
</resources>

19
app/src/main/res/xml/appearance_settings.xml
View File

@ -77,4 +77,23 @@
</PreferenceCategory>
<PreferenceCategory app:title="@string/misc">
<SwitchPreferenceCompat
app:defaultValue="false"
app:icon="@drawable/ic_list"
app:key="legacy_subscriptions"
app:title="@string/legacy_subscriptions" />
<ListPreference
android:entries="@array/grid"
android:entryValues="@array/grid"
app:defaultValue="3"
app:icon="@drawable/ic_grid"
app:isPreferenceVisible="false"
app:key="legacy_subscriptions_columns"
app:title="@string/grid" />
</PreferenceCategory>
</PreferenceScreen>