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

convert fragments to viewbinding

Browse Source
This commit is contained in:
Bnyro 2022-07-01 11:11:24 +02:00
parent d120436d28
commit e6aefe3c93
12 changed files with 194 additions and 277 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/github/libretube/dialogs/CreatePlaylistDialog.kt
View File

@ -10,7 +10,7 @@ import androidx.fragment.app.DialogFragment
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import com.github.libretube.R import com.github.libretube.R
import com.github.libretube.databinding.DialogCreatePlaylistBinding import com.github.libretube.databinding.DialogCreatePlaylistBinding
import com.github.libretube.fragments.Library import com.github.libretube.fragments.LibraryFragment
import com.github.libretube.obj.Playlists import com.github.libretube.obj.Playlists
import com.github.libretube.util.PreferenceHelper import com.github.libretube.util.PreferenceHelper
import com.github.libretube.util.RetrofitInstance import com.github.libretube.util.RetrofitInstance
@ -82,7 +82,7 @@ class CreatePlaylistDialog : DialogFragment() {
} }
// refresh the playlists in the library // refresh the playlists in the library
try { try {
val parent = parentFragment as Library val parent = parentFragment as LibraryFragment
parent.fetchPlaylists() parent.fetchPlaylists()
} catch (e: Exception) { } catch (e: Exception) {
Log.e(TAG, e.toString()) Log.e(TAG, e.toString())

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

@ -6,16 +6,12 @@ import android.util.Log
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.widget.ImageView
import android.widget.ScrollView
import android.widget.TextView
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
import com.github.libretube.R import com.github.libretube.R
import com.github.libretube.adapters.ChannelAdapter import com.github.libretube.adapters.ChannelAdapter
import com.github.libretube.databinding.FragmentChannelBinding
import com.github.libretube.obj.Subscribe import com.github.libretube.obj.Subscribe
import com.github.libretube.util.PreferenceHelper import com.github.libretube.util.PreferenceHelper
import com.github.libretube.util.RetrofitInstance import com.github.libretube.util.RetrofitInstance
@ -26,19 +22,19 @@ import retrofit2.HttpException
import java.io.IOException import java.io.IOException
class ChannelFragment : Fragment() { class ChannelFragment : Fragment() {
private var channel_id: String? = null
private val TAG = "ChannelFragment" private val TAG = "ChannelFragment"
private lateinit var binding: FragmentChannelBinding
private var channelId: String? = null
var nextPage: String? = null var nextPage: String? = null
var channelAdapter: ChannelAdapter? = null private var channelAdapter: ChannelAdapter? = null
var isLoading = true private var isLoading = true
var isSubscribed: Boolean = false private var isSubscribed: Boolean = false
private var refreshLayout: SwipeRefreshLayout? = null
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
arguments?.let { arguments?.let {
channel_id = it.getString("channel_id") channelId = it.getString("channel_id")
} }
} }
@ -46,43 +42,39 @@ class ChannelFragment : Fragment() {
inflater: LayoutInflater, inflater: LayoutInflater,
container: ViewGroup?, container: ViewGroup?,
savedInstanceState: Bundle? savedInstanceState: Bundle?
): View? { ): View {
// Inflate the layout for this fragment binding = FragmentChannelBinding.inflate(layoutInflater, container, false)
return inflater.inflate(R.layout.fragment_channel, container, false) return binding.root
} }
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState) super.onViewCreated(view, savedInstanceState)
channel_id = channel_id!!.replace("/channel/", "") channelId = channelId!!.replace("/channel/", "")
view.findViewById<TextView>(R.id.channel_name).text = channel_id binding.channelName.text = channelId
val recyclerView = view.findViewById<RecyclerView>(R.id.channel_recView) binding.channelRecView.layoutManager = LinearLayoutManager(context)
recyclerView.layoutManager = LinearLayoutManager(context)
refreshLayout = view.findViewById(R.id.channel_refresh)
val refreshChannel = { val refreshChannel = {
refreshLayout?.isRefreshing = true binding.channelRefresh.isRefreshing = true
fetchChannel(view) fetchChannel()
val subButton = view.findViewById<MaterialButton>(R.id.channel_subscribe)
if (PreferenceHelper.getToken(requireContext()) != "") { if (PreferenceHelper.getToken(requireContext()) != "") {
isSubscribed(subButton) isSubscribed(binding.channelSubscribe)
} }
} }
refreshChannel() refreshChannel()
refreshLayout?.setOnRefreshListener { binding.channelRefresh.setOnRefreshListener {
refreshChannel() refreshChannel()
} }
val scrollView = view.findViewById<ScrollView>(R.id.channel_scrollView) binding.channelScrollView.viewTreeObserver
scrollView.viewTreeObserver
.addOnScrollChangedListener { .addOnScrollChangedListener {
if (scrollView.getChildAt(0).bottom if (binding.channelScrollView.getChildAt(0).bottom
== (scrollView.height + scrollView.scrollY) == (binding.channelScrollView.height + binding.channelScrollView.scrollY)
) { ) {
// scroll view is at bottom // scroll view is at bottom
if (nextPage != null && !isLoading) { if (nextPage != null && !isLoading) {
isLoading = true isLoading = true
refreshLayout?.isRefreshing = true binding.channelRefresh.isRefreshing = true
fetchNextPage() fetchNextPage()
} }
} }
@ -96,7 +88,7 @@ class ChannelFragment : Fragment() {
val response = try { val response = try {
val token = PreferenceHelper.getToken(requireContext()) val token = PreferenceHelper.getToken(requireContext())
RetrofitInstance.api.isSubscribed( RetrofitInstance.api.isSubscribed(
channel_id!!, channelId!!,
token token
) )
} catch (e: IOException) { } catch (e: IOException) {
@ -137,7 +129,7 @@ class ChannelFragment : Fragment() {
val token = PreferenceHelper.getToken(requireContext()) val token = PreferenceHelper.getToken(requireContext())
RetrofitInstance.api.subscribe( RetrofitInstance.api.subscribe(
token, token,
Subscribe(channel_id) Subscribe(channelId)
) )
} catch (e: IOException) { } catch (e: IOException) {
println(e) println(e)
@ -160,7 +152,7 @@ class ChannelFragment : Fragment() {
val token = PreferenceHelper.getToken(requireContext()) val token = PreferenceHelper.getToken(requireContext())
RetrofitInstance.api.unsubscribe( RetrofitInstance.api.unsubscribe(
token, token,
Subscribe(channel_id) Subscribe(channelId)
) )
} catch (e: IOException) { } catch (e: IOException) {
println(e) println(e)
@ -176,55 +168,52 @@ class ChannelFragment : Fragment() {
run() run()
} }
private fun fetchChannel(view: View) { private fun fetchChannel() {
fun run() { fun run() {
lifecycleScope.launchWhenCreated { lifecycleScope.launchWhenCreated {
val response = try { val response = try {
RetrofitInstance.api.getChannel(channel_id!!) RetrofitInstance.api.getChannel(channelId!!)
} catch (e: IOException) { } catch (e: IOException) {
refreshLayout?.isRefreshing = false binding.channelRefresh.isRefreshing = false
println(e) println(e)
Log.e(TAG, "IOException, you might not have internet connection") Log.e(TAG, "IOException, you might not have internet connection")
return@launchWhenCreated return@launchWhenCreated
} catch (e: HttpException) { } catch (e: HttpException) {
refreshLayout?.isRefreshing = false binding.channelRefresh.isRefreshing = false
Log.e(TAG, "HttpException, unexpected response") Log.e(TAG, "HttpException, unexpected response")
return@launchWhenCreated return@launchWhenCreated
} }
nextPage = response.nextpage nextPage = response.nextpage
isLoading = false isLoading = false
refreshLayout?.isRefreshing = false binding.channelRefresh.isRefreshing = false
runOnUiThread { runOnUiThread {
view.findViewById<ScrollView>(R.id.channel_scrollView).visibility = View.VISIBLE binding.channelScrollView.visibility = View.VISIBLE
val channelName = view.findViewById<TextView>(R.id.channel_name) binding.channelName.text = response.name
channelName.text = response.name
if (response.verified) { if (response.verified) {
channelName.setCompoundDrawablesWithIntrinsicBounds( binding.channelName.setCompoundDrawablesWithIntrinsicBounds(
0, 0,
0, 0,
R.drawable.ic_verified, R.drawable.ic_verified,
0 0
) )
} }
view.findViewById<TextView>(R.id.channel_subs).text = resources.getString( binding.channelSubs.text = resources.getString(
R.string.subscribers, R.string.subscribers,
response.subscriberCount.formatShort() response.subscriberCount.formatShort()
) )
val channelDescription = view.findViewById<TextView>(R.id.channel_description)
if (response.description?.trim() == "") { if (response.description?.trim() == "") {
channelDescription.visibility = View.GONE binding.channelDescription.visibility = View.GONE
} else { } else {
channelDescription.text = response.description?.trim() binding.channelDescription.text = response.description?.trim()
} }
val bannerImage = view.findViewById<ImageView>(R.id.channel_banner)
val channelImage = view.findViewById<ImageView>(R.id.channel_image) Picasso.get().load(response.bannerUrl).into(binding.channelBanner)
Picasso.get().load(response.bannerUrl).into(bannerImage) Picasso.get().load(response.avatarUrl).into(binding.channelImage)
Picasso.get().load(response.avatarUrl).into(channelImage)
channelAdapter = ChannelAdapter( channelAdapter = ChannelAdapter(
response.relatedStreams!!.toMutableList(), response.relatedStreams!!.toMutableList(),
childFragmentManager childFragmentManager
) )
view.findViewById<RecyclerView>(R.id.channel_recView).adapter = channelAdapter binding.channelRecView.adapter = channelAdapter
} }
} }
} }
@ -235,21 +224,21 @@ class ChannelFragment : Fragment() {
fun run() { fun run() {
lifecycleScope.launchWhenCreated { lifecycleScope.launchWhenCreated {
val response = try { val response = try {
RetrofitInstance.api.getChannelNextPage(channel_id!!, nextPage!!) RetrofitInstance.api.getChannelNextPage(channelId!!, nextPage!!)
} catch (e: IOException) { } catch (e: IOException) {
refreshLayout?.isRefreshing = false binding.channelRefresh.isRefreshing = false
println(e) println(e)
Log.e(TAG, "IOException, you might not have internet connection") Log.e(TAG, "IOException, you might not have internet connection")
return@launchWhenCreated return@launchWhenCreated
} catch (e: HttpException) { } catch (e: HttpException) {
refreshLayout?.isRefreshing = false binding.channelRefresh.isRefreshing = false
Log.e(TAG, "HttpException, unexpected response," + e.response()) Log.e(TAG, "HttpException, unexpected response," + e.response())
return@launchWhenCreated return@launchWhenCreated
} }
nextPage = response.nextpage nextPage = response.nextpage
channelAdapter?.updateItems(response.relatedStreams!!) channelAdapter?.updateItems(response.relatedStreams!!)
isLoading = false isLoading = false
refreshLayout?.isRefreshing = false binding.channelRefresh.isRefreshing = false
} }
} }
run() run()
@ -260,13 +249,4 @@ class ChannelFragment : Fragment() {
if (!isAdded) return // Fragment not attached to an Activity if (!isAdded) return // Fragment not attached to an Activity
activity?.runOnUiThread(action) activity?.runOnUiThread(action)
} }
override fun onDestroyView() {
val scrollView = view?.findViewById<ScrollView>(R.id.channel_scrollView)
scrollView?.viewTreeObserver?.removeOnScrollChangedListener {
}
channelAdapter = null
view?.findViewById<RecyclerView>(R.id.channel_recView)?.adapter = null
super.onDestroyView()
}
} }

36
app/src/main/java/com/github/libretube/fragments/Home.kt → app/src/main/java/com/github/libretube/fragments/HomeFragment.kt
View File

@ -11,18 +11,18 @@ import androidx.fragment.app.Fragment
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
import com.github.libretube.R import com.github.libretube.R
import com.github.libretube.adapters.TrendingAdapter import com.github.libretube.adapters.TrendingAdapter
import com.github.libretube.databinding.FragmentHomeBinding
import com.github.libretube.util.PreferenceHelper import com.github.libretube.util.PreferenceHelper
import com.github.libretube.util.RetrofitInstance import com.github.libretube.util.RetrofitInstance
import retrofit2.HttpException import retrofit2.HttpException
import java.io.IOException import java.io.IOException
class Home : Fragment() { class HomeFragment : Fragment() {
private val TAG = "HomeFragment" private val TAG = "HomeFragment"
private var refreshLayout: SwipeRefreshLayout? = null private lateinit var binding: FragmentHomeBinding
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
arguments?.let { arguments?.let {
@ -33,27 +33,24 @@ class Home : Fragment() {
inflater: LayoutInflater, inflater: LayoutInflater,
container: ViewGroup?, container: ViewGroup?,
savedInstanceState: Bundle? savedInstanceState: Bundle?
): View? { ): View {
// Inflate the layout for this fragment binding = FragmentHomeBinding.inflate(layoutInflater, container, false)
return inflater.inflate(R.layout.fragment_home, container, false) return binding.root
} }
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState) super.onViewCreated(view, savedInstanceState)
val recyclerView = view.findViewById<RecyclerView>(R.id.recview)
val grid = PreferenceHelper.getString( val grid = PreferenceHelper.getString(
requireContext(), requireContext(),
"grid", "grid",
resources.getInteger(R.integer.grid_items).toString() resources.getInteger(R.integer.grid_items).toString()
)!! )!!
recyclerView.layoutManager = GridLayoutManager(view.context, grid.toInt()) binding.recview.layoutManager = GridLayoutManager(view.context, grid.toInt())
val progressbar = view.findViewById<ProgressBar>(R.id.progressBar) fetchJson(binding.progressBar, binding.recview)
fetchJson(progressbar, recyclerView) binding.homeRefresh.isEnabled = true
refreshLayout = view.findViewById(R.id.home_refresh) binding.homeRefresh.setOnRefreshListener {
refreshLayout?.isEnabled = true
refreshLayout?.setOnRefreshListener {
Log.d(TAG, "hmm") Log.d(TAG, "hmm")
fetchJson(progressbar, recyclerView) fetchJson(binding.progressBar, binding.recview)
} }
} }
@ -73,7 +70,7 @@ class Home : Fragment() {
Toast.makeText(context, R.string.server_error, Toast.LENGTH_SHORT).show() Toast.makeText(context, R.string.server_error, Toast.LENGTH_SHORT).show()
return@launchWhenCreated return@launchWhenCreated
} finally { } finally {
refreshLayout?.isRefreshing = false binding.homeRefresh.isRefreshing = false
} }
runOnUiThread { runOnUiThread {
progressBar.visibility = View.GONE progressBar.visibility = View.GONE
@ -89,11 +86,4 @@ class Home : Fragment() {
if (!isAdded) return // Fragment not attached to an Activity if (!isAdded) return // Fragment not attached to an Activity
activity?.runOnUiThread(action) activity?.runOnUiThread(action)
} }
override fun onDestroyView() {
view?.findViewById<RecyclerView>(R.id.recview)?.adapter = null
refreshLayout = null
Log.e(TAG, "destroyview")
super.onDestroyView()
}
} }

63
app/src/main/java/com/github/libretube/fragments/Library.kt → app/src/main/java/com/github/libretube/fragments/LibraryFragment.kt
View File

@ -5,29 +5,24 @@ import android.util.Log
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.widget.ImageView
import android.widget.TextView
import android.widget.Toast import android.widget.Toast
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
import com.github.libretube.R import com.github.libretube.R
import com.github.libretube.adapters.PlaylistsAdapter import com.github.libretube.adapters.PlaylistsAdapter
import com.github.libretube.databinding.FragmentLibraryBinding
import com.github.libretube.dialogs.CreatePlaylistDialog import com.github.libretube.dialogs.CreatePlaylistDialog
import com.github.libretube.util.PreferenceHelper import com.github.libretube.util.PreferenceHelper
import com.github.libretube.util.RetrofitInstance import com.github.libretube.util.RetrofitInstance
import com.google.android.material.floatingactionbutton.FloatingActionButton
import retrofit2.HttpException import retrofit2.HttpException
import java.io.IOException import java.io.IOException
class Library : Fragment() { class LibraryFragment : Fragment() {
private val TAG = "LibraryFragment" private val TAG = "LibraryFragment"
lateinit var token: String lateinit var token: String
private lateinit var playlistRecyclerView: RecyclerView private lateinit var binding: FragmentLibraryBinding
private lateinit var refreshLayout: SwipeRefreshLayout
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
@ -39,48 +34,44 @@ class Library : Fragment() {
inflater: LayoutInflater, inflater: LayoutInflater,
container: ViewGroup?, container: ViewGroup?,
savedInstanceState: Bundle? savedInstanceState: Bundle?
): View? { ): View {
// Inflate the layout for this fragment binding = FragmentLibraryBinding.inflate(layoutInflater, container, false)
return inflater.inflate(R.layout.fragment_library, container, false) return binding.root
} }
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState) super.onViewCreated(view, savedInstanceState)
playlistRecyclerView = view.findViewById(R.id.playlist_recView) binding.playlistRecView.layoutManager = LinearLayoutManager(view.context)
playlistRecyclerView.layoutManager = LinearLayoutManager(view.context)
token = PreferenceHelper.getToken(requireContext()) token = PreferenceHelper.getToken(requireContext())
refreshLayout = view.findViewById(R.id.playlist_refresh)
if (token != "") { if (token != "") {
view.findViewById<ImageView>(R.id.boogh2).visibility = View.GONE binding.boogh.visibility = View.GONE
view.findViewById<TextView>(R.id.textLike2).visibility = View.GONE binding.textLike.visibility = View.GONE
fetchPlaylists() fetchPlaylists()
refreshLayout.isEnabled = true binding.playlistRefresh.isEnabled = true
refreshLayout.setOnRefreshListener { binding.playlistRefresh.setOnRefreshListener {
fetchPlaylists() fetchPlaylists()
} }
val createPlaylistButton = view.findViewById<FloatingActionButton>(R.id.create_playlist) binding.createPlaylist.setOnClickListener {
createPlaylistButton.setOnClickListener {
val newFragment = CreatePlaylistDialog() val newFragment = CreatePlaylistDialog()
newFragment.show(childFragmentManager, "Create Playlist") newFragment.show(childFragmentManager, "Create Playlist")
} }
} else { } else {
refreshLayout.isEnabled = false binding.playlistRefresh.isEnabled = false
view.findViewById<FloatingActionButton>(R.id.create_playlist).visibility = View.GONE binding.createPlaylist.visibility = View.GONE
} }
} }
override fun onResume() { override fun onResume() {
// optimize CreatePlaylistFab bottom margin if miniPlayer active // optimize CreatePlaylistFab bottom margin if miniPlayer active
val createPlaylistButton = view?.findViewById<FloatingActionButton>(R.id.create_playlist) val layoutParams = binding.createPlaylist.layoutParams as ViewGroup.MarginLayoutParams
val layoutParams = createPlaylistButton?.layoutParams as ViewGroup.MarginLayoutParams
layoutParams.bottomMargin = if (isMiniPlayerVisible) 180 else 64 layoutParams.bottomMargin = if (isMiniPlayerVisible) 180 else 64
createPlaylistButton?.layoutParams = layoutParams binding.createPlaylist.layoutParams = layoutParams
super.onResume() super.onResume()
} }
fun fetchPlaylists() { fun fetchPlaylists() {
fun run() { fun run() {
refreshLayout.isRefreshing = true binding.playlistRefresh.isRefreshing = true
lifecycleScope.launchWhenCreated { lifecycleScope.launchWhenCreated {
val response = try { val response = try {
RetrofitInstance.api.playlists(token) RetrofitInstance.api.playlists(token)
@ -94,27 +85,27 @@ class Library : Fragment() {
Toast.makeText(context, R.string.server_error, Toast.LENGTH_SHORT).show() Toast.makeText(context, R.string.server_error, Toast.LENGTH_SHORT).show()
return@launchWhenCreated return@launchWhenCreated
} finally { } finally {
refreshLayout.isRefreshing = false binding.playlistRefresh.isRefreshing = false
} }
if (response.isNotEmpty()) { if (response.isNotEmpty()) {
runOnUiThread { runOnUiThread {
view?.findViewById<ImageView>(R.id.boogh2)?.visibility = View.GONE binding.boogh.visibility = View.GONE
view?.findViewById<TextView>(R.id.textLike2)?.visibility = View.GONE binding.textLike.visibility = View.GONE
} }
val playlistsAdapter = PlaylistsAdapter( val playlistsAdapter = PlaylistsAdapter(
response.toMutableList(), response.toMutableList(),
requireActivity() requireActivity()
) )
playlistRecyclerView.adapter = playlistsAdapter binding.playlistRecView.adapter = playlistsAdapter
} else { } else {
runOnUiThread { runOnUiThread {
view?.findViewById<ImageView>(R.id.boogh2).apply { binding.boogh.apply {
this?.visibility = View.VISIBLE visibility = View.VISIBLE
this?.setImageResource(R.drawable.ic_list) setImageResource(R.drawable.ic_list)
} }
view?.findViewById<TextView>(R.id.textLike2).apply { binding.textLike.apply {
this?.visibility = View.VISIBLE visibility = View.VISIBLE
this?.text = getString(R.string.emptyList) text = getString(R.string.emptyList)
} }
} }
} }

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

@ -369,10 +369,7 @@ class PlayerFragment : Fragment() {
// pause player if screen off and setting enabled // pause player if screen off and setting enabled
if ( if (
this::exoPlayer.isInitialized && this::exoPlayer.isInitialized && !isScreenOn && pausePlayerOnScreenOffEnabled
exoPlayer != null &&
!isScreenOn &&
pausePlayerOnScreenOffEnabled
) { ) {
exoPlayer.pause() exoPlayer.pause()
} }
@ -518,7 +515,7 @@ class PlayerFragment : Fragment() {
// if it's not a playlist then use the next related video // if it's not a playlist then use the next related video
} else if (relatedStreams != null && relatedStreams!!.isNotEmpty()) { } else if (relatedStreams != null && relatedStreams!!.isNotEmpty()) {
// save next video from related streams for autoplay // save next video from related streams for autoplay
nextStreamId = relatedStreams!![0].url!!.replace("/watch?v=", "")!! nextStreamId = relatedStreams!![0].url!!.replace("/watch?v=", "")
} }
} }
} }
@ -792,7 +789,7 @@ class PlayerFragment : Fragment() {
val videoSource: MediaSource = val videoSource: MediaSource =
DefaultMediaSourceFactory(dataSourceFactory) DefaultMediaSourceFactory(dataSourceFactory)
.createMediaSource(videoItem) .createMediaSource(videoItem)
var audioSource: MediaSource = val audioSource: MediaSource =
ProgressiveMediaSource.Factory(dataSourceFactory) ProgressiveMediaSource.Factory(dataSourceFactory)
.createMediaSource(fromUri(audioUrl)) .createMediaSource(fromUri(audioUrl))
val mergeSource: MediaSource = val mergeSource: MediaSource =
@ -1178,10 +1175,7 @@ class PlayerFragment : Fragment() {
binding.playerScrollView.getHitRect(bounds) binding.playerScrollView.getHitRect(bounds)
if (SDK_INT >= Build.VERSION_CODES.O && if (SDK_INT >= Build.VERSION_CODES.O &&
exoPlayer.isPlaying && ( exoPlayer.isPlaying && (binding.playerScrollView.getLocalVisibleRect(bounds) || isFullScreen)
binding.playerScrollView.getLocalVisibleRect(bounds) == true ||
isFullScreen
)
) { ) {
activity?.enterPictureInPictureMode(updatePipParams()) activity?.enterPictureInPictureMode(updatePipParams())
} }

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

@ -5,15 +5,12 @@ import android.util.Log
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.widget.ProgressBar
import android.widget.ScrollView
import android.widget.TextView
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.github.libretube.R import com.github.libretube.R
import com.github.libretube.adapters.PlaylistAdapter import com.github.libretube.adapters.PlaylistAdapter
import com.github.libretube.databinding.FragmentPlaylistBinding
import com.github.libretube.util.PreferenceHelper import com.github.libretube.util.PreferenceHelper
import com.github.libretube.util.RetrofitInstance import com.github.libretube.util.RetrofitInstance
import retrofit2.HttpException import retrofit2.HttpException
@ -21,11 +18,13 @@ import java.io.IOException
class PlaylistFragment : Fragment() { class PlaylistFragment : Fragment() {
private val TAG = "PlaylistFragment" private val TAG = "PlaylistFragment"
private lateinit var binding: FragmentPlaylistBinding
private var playlistId: String? = null private var playlistId: String? = null
var nextPage: String? = null var nextPage: String? = null
var playlistAdapter: PlaylistAdapter? = null private var playlistAdapter: PlaylistAdapter? = null
var isLoading = true private var isLoading = true
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
arguments?.let { arguments?.let {
@ -37,24 +36,22 @@ class PlaylistFragment : Fragment() {
inflater: LayoutInflater, inflater: LayoutInflater,
container: ViewGroup?, container: ViewGroup?,
savedInstanceState: Bundle? savedInstanceState: Bundle?
): View? { ): View {
// Inflate the layout for this fragment binding = FragmentPlaylistBinding.inflate(layoutInflater, container, false)
return inflater.inflate(R.layout.fragment_playlist, container, false) return binding.root
} }
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState) super.onViewCreated(view, savedInstanceState)
playlistId = playlistId!!.replace("/playlist?list=", "") playlistId = playlistId!!.replace("/playlist?list=", "")
val recyclerView = view.findViewById<RecyclerView>(R.id.playlist_recView) binding.playlistRecView.layoutManager = LinearLayoutManager(context)
recyclerView.layoutManager = LinearLayoutManager(context)
val progressBar = view.findViewById<ProgressBar>(R.id.playlist_progress) binding.playlistProgress.visibility = View.VISIBLE
progressBar.visibility = View.VISIBLE fetchPlaylist()
fetchPlaylist(view)
} }
private fun fetchPlaylist(view: View) { private fun fetchPlaylist() {
fun run() { fun run() {
lifecycleScope.launchWhenCreated { lifecycleScope.launchWhenCreated {
val response = try { val response = try {
@ -70,10 +67,10 @@ class PlaylistFragment : Fragment() {
nextPage = response.nextpage nextPage = response.nextpage
isLoading = false isLoading = false
runOnUiThread { runOnUiThread {
view.findViewById<ProgressBar>(R.id.playlist_progress).visibility = View.GONE binding.playlistProgress.visibility = View.GONE
view.findViewById<TextView>(R.id.playlist_name).text = response.name binding.playlistName.text = response.name
view.findViewById<TextView>(R.id.playlist_uploader).text = response.uploader binding.playlistUploader.text = response.uploader
view.findViewById<TextView>(R.id.playlist_totVideos).text = binding.playlistTotVideos.text =
getString(R.string.videoCount, response.videos.toString()) getString(R.string.videoCount, response.videos.toString())
val user = PreferenceHelper.getUsername(requireContext()) val user = PreferenceHelper.getUsername(requireContext())
var isOwner = false var isOwner = false
@ -87,12 +84,11 @@ class PlaylistFragment : Fragment() {
requireActivity(), requireActivity(),
childFragmentManager childFragmentManager
) )
view.findViewById<RecyclerView>(R.id.playlist_recView).adapter = playlistAdapter binding.playlistRecView.adapter = playlistAdapter
val scrollView = view.findViewById<ScrollView>(R.id.playlist_scrollview) binding.playlistScrollview.viewTreeObserver
scrollView.viewTreeObserver
.addOnScrollChangedListener { .addOnScrollChangedListener {
if (scrollView.getChildAt(0).bottom if (binding.playlistScrollview.getChildAt(0).bottom
== (scrollView.height + scrollView.scrollY) == (binding.playlistScrollview.height + binding.playlistScrollview.scrollY)
) { ) {
// scroll view is at bottom // scroll view is at bottom
if (nextPage != null && !isLoading) { if (nextPage != null && !isLoading) {

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

@ -12,7 +12,6 @@ import android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN
import android.view.inputmethod.EditorInfo import android.view.inputmethod.EditorInfo
import android.view.inputmethod.InputMethodManager import android.view.inputmethod.InputMethodManager
import android.widget.EditText import android.widget.EditText
import android.widget.ImageView
import android.widget.TextView.GONE import android.widget.TextView.GONE
import android.widget.TextView.OnEditorActionListener import android.widget.TextView.OnEditorActionListener
import android.widget.TextView.VISIBLE import android.widget.TextView.VISIBLE
@ -20,28 +19,26 @@ import androidx.fragment.app.Fragment
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.github.libretube.R import com.github.libretube.R
import com.github.libretube.adapters.SearchAdapter import com.github.libretube.adapters.SearchAdapter
import com.github.libretube.adapters.SearchHistoryAdapter import com.github.libretube.adapters.SearchHistoryAdapter
import com.github.libretube.adapters.SearchSuggestionsAdapter import com.github.libretube.adapters.SearchSuggestionsAdapter
import com.github.libretube.databinding.FragmentSearchBinding
import com.github.libretube.hideKeyboard import com.github.libretube.hideKeyboard
import com.github.libretube.util.PreferenceHelper import com.github.libretube.util.PreferenceHelper
import com.github.libretube.util.RetrofitInstance import com.github.libretube.util.RetrofitInstance
import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.dialog.MaterialAlertDialogBuilder
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch
import retrofit2.HttpException import retrofit2.HttpException
import java.io.IOException import java.io.IOException
class SearchFragment : Fragment() { class SearchFragment : Fragment() {
private val TAG = "SearchFragment" private val TAG = "SearchFragment"
private lateinit var binding: FragmentSearchBinding
private var selectedFilter = 0 private var selectedFilter = 0
private var apiSearchFilter = "all" private var apiSearchFilter = "all"
private var nextPage: String? = null private var nextPage: String? = null
private lateinit var searchRecView: RecyclerView
private lateinit var historyRecView: RecyclerView
private lateinit var autoTextView: EditText
private var searchAdapter: SearchAdapter? = null private var searchAdapter: SearchAdapter? = null
private var isLoading: Boolean = true private var isLoading: Boolean = true
private var isFetchingSearch: Boolean = false private var isFetchingSearch: Boolean = false
@ -56,27 +53,21 @@ class SearchFragment : Fragment() {
inflater: LayoutInflater, inflater: LayoutInflater,
container: ViewGroup?, container: ViewGroup?,
savedInstanceState: Bundle? savedInstanceState: Bundle?
): View? { ): View {
// Inflate the layout for this fragment binding = FragmentSearchBinding.inflate(layoutInflater, container, false)
return inflater.inflate(R.layout.fragment_search, container, false) return binding.root
} }
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState) super.onViewCreated(view, savedInstanceState)
searchRecView = view.findViewById(R.id.search_recycler)
historyRecView = view.findViewById(R.id.history_recycler)
autoTextView = view.findViewById(R.id.autoCompleteTextView)
val clearSearchButton = view.findViewById<ImageView>(R.id.clearSearch_imageView)
val filterImageView = view.findViewById<ImageView>(R.id.filterMenu_imageView)
var tempSelectedItem = 0 var tempSelectedItem = 0
clearSearchButton.setOnClickListener { binding.clearSearchImageView.setOnClickListener {
autoTextView.text.clear() binding.autoCompleteTextView.text.clear()
} }
filterImageView.setOnClickListener { binding.filterMenuImageView.setOnClickListener {
val filterOptions = arrayOf( val filterOptions = arrayOf(
getString(R.string.all), getString(R.string.all),
getString(R.string.videos), getString(R.string.videos),
@ -108,7 +99,7 @@ class SearchFragment : Fragment() {
7 -> "music_playlists" 7 -> "music_playlists"
else -> "all" else -> "all"
} }
fetchSearch(autoTextView.text.toString()) fetchSearch(binding.autoCompleteTextView.text.toString())
} }
.setNegativeButton(getString(R.string.cancel), null) .setNegativeButton(getString(R.string.cancel), null)
.create() .create()
@ -116,16 +107,16 @@ class SearchFragment : Fragment() {
} }
// show search history // show search history
historyRecView.layoutManager = LinearLayoutManager(view.context) binding.historyRecycler.layoutManager = LinearLayoutManager(view.context)
showHistory() showHistory()
searchRecView.layoutManager = GridLayoutManager(view.context, 1) binding.searchRecycler.layoutManager = GridLayoutManager(view.context, 1)
autoTextView.requestFocus() binding.autoCompleteTextView.requestFocus()
val imm = val imm =
requireContext().getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager requireContext().getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
imm.showSoftInput(autoTextView, InputMethodManager.SHOW_IMPLICIT) imm.showSoftInput(binding.autoCompleteTextView, InputMethodManager.SHOW_IMPLICIT)
autoTextView.addTextChangedListener(object : TextWatcher { binding.autoCompleteTextView.addTextChangedListener(object : TextWatcher {
override fun beforeTextChanged( override fun beforeTextChanged(
s: CharSequence?, s: CharSequence?,
start: Int, start: Int,
@ -136,18 +127,15 @@ class SearchFragment : Fragment() {
override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
if (s!! != "") { if (s!! != "") {
searchRecView.adapter = null binding.searchRecycler.adapter = null
searchRecView.viewTreeObserver binding.searchRecycler.viewTreeObserver
.addOnScrollChangedListener { .addOnScrollChangedListener {
if (!searchRecView.canScrollVertically(1)) { if (!binding.searchRecycler.canScrollVertically(1)) {
fetchNextSearchItems(autoTextView.text.toString()) fetchNextSearchItems(binding.autoCompleteTextView.text.toString())
} }
} }
fetchSuggestions(s.toString(), binding.autoCompleteTextView)
GlobalScope.launch {
fetchSuggestions(s.toString(), autoTextView)
}
} }
} }
@ -157,13 +145,13 @@ class SearchFragment : Fragment() {
} }
} }
}) })
autoTextView.setOnEditorActionListener( binding.autoCompleteTextView.setOnEditorActionListener(
OnEditorActionListener { _, actionId, _ -> OnEditorActionListener { _, actionId, _ ->
if (actionId == EditorInfo.IME_ACTION_SEARCH) { if (actionId == EditorInfo.IME_ACTION_SEARCH) {
hideKeyboard() hideKeyboard()
searchRecView.visibility = VISIBLE binding.searchRecycler.visibility = VISIBLE
historyRecView.visibility = GONE binding.historyRecycler.visibility = GONE
fetchSearch(autoTextView.text.toString()) fetchSearch(binding.autoCompleteTextView.text.toString())
return@OnEditorActionListener true return@OnEditorActionListener true
} }
false false
@ -174,8 +162,8 @@ class SearchFragment : Fragment() {
private fun fetchSuggestions(query: String, autoTextView: EditText) { private fun fetchSuggestions(query: String, autoTextView: EditText) {
fun run() { fun run() {
lifecycleScope.launchWhenCreated { lifecycleScope.launchWhenCreated {
searchRecView.visibility = GONE binding.searchRecycler.visibility = GONE
historyRecView.visibility = VISIBLE binding.historyRecycler.visibility = VISIBLE
val response = try { val response = try {
RetrofitInstance.api.getSuggestions(query) RetrofitInstance.api.getSuggestions(query)
} catch (e: IOException) { } catch (e: IOException) {
@ -188,7 +176,7 @@ class SearchFragment : Fragment() {
} }
val suggestionsAdapter = val suggestionsAdapter =
SearchSuggestionsAdapter(response, autoTextView, this@SearchFragment) SearchSuggestionsAdapter(response, autoTextView, this@SearchFragment)
historyRecView.adapter = suggestionsAdapter binding.historyRecycler.adapter = suggestionsAdapter
} }
} }
if (!isFetchingSearch) run() if (!isFetchingSearch) run()
@ -211,10 +199,10 @@ class SearchFragment : Fragment() {
nextPage = response.nextpage nextPage = response.nextpage
if (response.items!!.isNotEmpty()) { if (response.items!!.isNotEmpty()) {
runOnUiThread { runOnUiThread {
historyRecView.visibility = GONE binding.historyRecycler.visibility = GONE
searchRecView.visibility = VISIBLE binding.searchRecycler.visibility = VISIBLE
searchAdapter = SearchAdapter(response.items, childFragmentManager) searchAdapter = SearchAdapter(response.items, childFragmentManager)
searchRecView.adapter = searchAdapter binding.searchRecycler.adapter = searchAdapter
} }
} }
addToHistory(query) addToHistory(query)
@ -265,12 +253,12 @@ class SearchFragment : Fragment() {
} }
private fun showHistory() { private fun showHistory() {
searchRecView.visibility = GONE binding.searchRecycler.visibility = GONE
val historyList = PreferenceHelper.getHistory(requireContext()) val historyList = PreferenceHelper.getHistory(requireContext())
if (historyList.isNotEmpty()) { if (historyList.isNotEmpty()) {
historyRecView.adapter = binding.historyRecycler.adapter =
SearchHistoryAdapter(requireContext(), historyList, autoTextView, this) SearchHistoryAdapter(requireContext(), historyList, binding.autoCompleteTextView, this)
historyRecView.visibility = VISIBLE binding.historyRecycler.visibility = VISIBLE
} }
} }

102
app/src/main/java/com/github/libretube/fragments/Subscriptions.kt → app/src/main/java/com/github/libretube/fragments/SubscriptionsFragment.kt
View File

@ -5,11 +5,7 @@ import android.util.Log
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.widget.ImageView
import android.widget.ProgressBar import android.widget.ProgressBar
import android.widget.RelativeLayout
import android.widget.ScrollView
import android.widget.TextView
import android.widget.Toast import android.widget.Toast
import androidx.core.view.isVisible import androidx.core.view.isVisible
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
@ -17,21 +13,23 @@ import androidx.lifecycle.lifecycleScope
import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
import com.github.libretube.R import com.github.libretube.R
import com.github.libretube.adapters.SubscriptionAdapter import com.github.libretube.adapters.SubscriptionAdapter
import com.github.libretube.adapters.SubscriptionChannelAdapter import com.github.libretube.adapters.SubscriptionChannelAdapter
import com.github.libretube.databinding.FragmentSubscriptionsBinding
import com.github.libretube.util.PreferenceHelper import com.github.libretube.util.PreferenceHelper
import com.github.libretube.util.RetrofitInstance import com.github.libretube.util.RetrofitInstance
import retrofit2.HttpException import retrofit2.HttpException
import java.io.IOException import java.io.IOException
class Subscriptions : Fragment() { class SubscriptionsFragment : Fragment() {
val TAG = "SubFragment" val TAG = "SubFragment"
private lateinit var binding: FragmentSubscriptionsBinding
lateinit var token: String lateinit var token: String
var isLoaded = false private var isLoaded = false
private var subscriptionAdapter: SubscriptionAdapter? = null private var subscriptionAdapter: SubscriptionAdapter? = null
private var refreshLayout: SwipeRefreshLayout? = null
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
arguments?.let { arguments?.let {
@ -42,84 +40,72 @@ class Subscriptions : Fragment() {
inflater: LayoutInflater, inflater: LayoutInflater,
container: ViewGroup?, container: ViewGroup?,
savedInstanceState: Bundle? savedInstanceState: Bundle?
): View? { ): View {
// Inflate the layout for this fragment binding = FragmentSubscriptionsBinding.inflate(layoutInflater, container, false)
return inflater.inflate(R.layout.fragment_subscriptions, container, false) return binding.root
} }
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState) super.onViewCreated(view, savedInstanceState)
token = PreferenceHelper.getToken(requireContext()) token = PreferenceHelper.getToken(requireContext())
refreshLayout = view.findViewById(R.id.sub_refresh)
if (token != "") { if (token != "") {
view.findViewById<RelativeLayout>(R.id.loginOrRegister).visibility = View.GONE binding.loginOrRegister.visibility = View.GONE
refreshLayout?.isEnabled = true binding.subRefresh.isEnabled = true
var progressBar = view.findViewById<ProgressBar>(R.id.sub_progress) binding.subProgress.visibility = View.VISIBLE
progressBar.visibility = View.VISIBLE
var channelRecView = view.findViewById<RecyclerView>(R.id.sub_channels)
var feedRecView = view.findViewById<RecyclerView>(R.id.sub_feed)
val grid = PreferenceHelper.getString( val grid = PreferenceHelper.getString(
requireContext(), requireContext(),
"grid", "grid",
resources.getInteger(R.integer.grid_items).toString() resources.getInteger(R.integer.grid_items).toString()
)!! )!!
feedRecView.layoutManager = GridLayoutManager(view.context, grid.toInt()) binding.subFeed.layoutManager = GridLayoutManager(view.context, grid.toInt())
fetchFeed(feedRecView, progressBar, view) fetchFeed(binding.subFeed, binding.subProgress)
refreshLayout?.setOnRefreshListener { binding.subRefresh.setOnRefreshListener {
fetchChannels(channelRecView) fetchChannels(binding.subChannels)
fetchFeed(feedRecView, progressBar, view) fetchFeed(binding.subFeed, binding.subProgress)
} }
var toggleSubs = view.findViewById<RelativeLayout>(R.id.toggle_subs) binding.toggleSubs.visibility = View.VISIBLE
val arrowImageView = view.findViewById<ImageView>(R.id.toggle)
toggleSubs.visibility = View.VISIBLE
var loadedSubbedChannels = false var loadedSubbedChannels = false
toggleSubs.setOnClickListener { binding.toggleSubs.setOnClickListener {
arrowImageView.animate().rotationBy(180F).setDuration(100).start() binding.toggle.animate().rotationBy(180F).setDuration(100).start()
if (!channelRecView.isVisible) { if (!binding.subChannels.isVisible) {
if (!loadedSubbedChannels) { if (!loadedSubbedChannels) {
channelRecView?.layoutManager = LinearLayoutManager(context) binding.subChannels.layoutManager = LinearLayoutManager(context)
fetchChannels(channelRecView) fetchChannels(binding.subChannels)
loadedSubbedChannels = true loadedSubbedChannels = true
} }
channelRecView.visibility = View.VISIBLE binding.subChannels.visibility = View.VISIBLE
feedRecView.visibility = View.GONE binding.subFeed.visibility = View.GONE
} else { } else {
channelRecView.visibility = View.GONE binding.subChannels.visibility = View.GONE
feedRecView.visibility = View.VISIBLE binding.subFeed.visibility = View.VISIBLE
// toggle button
val image = view.findViewById<ImageView>(R.id.toggle)
image.clearAnimation()
} }
} }
val scrollView = view.findViewById<ScrollView>(R.id.scrollview_sub) binding.scrollviewSub.viewTreeObserver
scrollView.viewTreeObserver
.addOnScrollChangedListener { .addOnScrollChangedListener {
if (scrollView.getChildAt(0).bottom if (binding.scrollviewSub.getChildAt(0).bottom
== (scrollView.height + scrollView.scrollY) == (binding.scrollviewSub.height + binding.scrollviewSub.scrollY)
) { ) {
// scroll view is at bottom // scroll view is at bottom
if (isLoaded) { if (isLoaded) {
refreshLayout?.isRefreshing = true binding.subRefresh.isRefreshing = true
subscriptionAdapter?.updateItems() subscriptionAdapter?.updateItems()
refreshLayout?.isRefreshing = false binding.subRefresh.isRefreshing = false
} }
} }
} }
} else { } else {
refreshLayout?.isEnabled = false binding.subRefresh.isEnabled = false
} }
} }
private fun fetchFeed(feedRecView: RecyclerView, progressBar: ProgressBar, view: View) { private fun fetchFeed(feedRecView: RecyclerView, progressBar: ProgressBar) {
fun run() { fun run() {
lifecycleScope.launchWhenCreated { lifecycleScope.launchWhenCreated {
val response = try { val response = try {
@ -132,7 +118,7 @@ class Subscriptions : Fragment() {
Log.e(TAG, "HttpException, unexpected response") Log.e(TAG, "HttpException, unexpected response")
return@launchWhenCreated return@launchWhenCreated
} finally { } finally {
refreshLayout?.isRefreshing = false binding.subRefresh.isRefreshing = false
} }
if (response.isNotEmpty()) { if (response.isNotEmpty()) {
subscriptionAdapter = SubscriptionAdapter(response, childFragmentManager) subscriptionAdapter = SubscriptionAdapter(response, childFragmentManager)
@ -140,16 +126,15 @@ class Subscriptions : Fragment() {
subscriptionAdapter?.updateItems() subscriptionAdapter?.updateItems()
} else { } else {
runOnUiThread { runOnUiThread {
with(view.findViewById<ImageView>(R.id.boogh)) { with(binding.boogh) {
visibility = View.VISIBLE visibility = View.VISIBLE
setImageResource(R.drawable.ic_list) setImageResource(R.drawable.ic_list)
} }
with(view.findViewById<TextView>(R.id.textLike)) { with(binding.textLike) {
visibility = View.VISIBLE visibility = View.VISIBLE
text = getString(R.string.emptyList) text = getString(R.string.emptyList)
} }
view.findViewById<RelativeLayout>(R.id.loginOrRegister) binding.loginOrRegister.visibility = View.VISIBLE
.visibility = View.VISIBLE
} }
} }
progressBar.visibility = View.GONE progressBar.visibility = View.GONE
@ -172,7 +157,7 @@ class Subscriptions : Fragment() {
Log.e(TAG, "HttpException, unexpected response") Log.e(TAG, "HttpException, unexpected response")
return@launchWhenCreated return@launchWhenCreated
} finally { } finally {
refreshLayout?.isRefreshing = false binding.subRefresh.isRefreshing = false
} }
if (response.isNotEmpty()) { if (response.isNotEmpty()) {
channelRecView.adapter = SubscriptionChannelAdapter(response.toMutableList()) channelRecView.adapter = SubscriptionChannelAdapter(response.toMutableList())
@ -184,13 +169,6 @@ class Subscriptions : Fragment() {
run() run()
} }
override fun onDestroy() {
Log.e(TAG, "Destroyed")
super.onDestroy()
subscriptionAdapter = null
view?.findViewById<RecyclerView>(R.id.sub_feed)?.adapter = null
}
private fun Fragment?.runOnUiThread(action: () -> Unit) { private fun Fragment?.runOnUiThread(action: () -> Unit) {
this ?: return this ?: return
if (!isAdded) return // Fragment not attached to an Activity if (!isAdded) return // Fragment not attached to an Activity

2
app/src/main/res/layout/fragment_home.xml
View File

@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context=".fragments.Home"> tools:context=".fragments.HomeFragment">
<ProgressBar <ProgressBar
android:id="@+id/progressBar" android:id="@+id/progressBar"

8
app/src/main/res/layout/fragment_library.xml
View File

@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context=".fragments.Library"> tools:context=".fragments.LibraryFragment">
<RelativeLayout <RelativeLayout
android:id="@+id/loginOrRegister2" android:id="@+id/loginOrRegister2"
@ -14,7 +14,7 @@
android:layout_centerVertical="true"> android:layout_centerVertical="true">
<ImageView <ImageView
android:id="@+id/boogh2" android:id="@+id/boogh"
android:layout_width="100dp" android:layout_width="100dp"
android:layout_height="100dp" android:layout_height="100dp"
android:layout_centerInParent="true" android:layout_centerInParent="true"
@ -22,10 +22,10 @@
android:src="@drawable/ic_login" /> android:src="@drawable/ic_login" />
<TextView <TextView
android:id="@+id/textLike2" android:id="@+id/text_like"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/boogh2" android:layout_below="@id/boogh"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:gravity="center" android:gravity="center"
android:text="@string/please_login" android:text="@string/please_login"

2
app/src/main/res/layout/fragment_subscriptions.xml
View File

@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context=".fragments.Subscriptions"> tools:context=".fragments.SubscriptionsFragment">
<ProgressBar <ProgressBar
android:id="@+id/sub_progress" android:id="@+id/sub_progress"

6
app/src/main/res/navigation/nav.xml
View File

@ -7,17 +7,17 @@
<fragment <fragment
android:id="@+id/home2" android:id="@+id/home2"
android:name="com.github.libretube.fragments.Home" android:name="com.github.libretube.fragments.HomeFragment"
android:label="fragment_home" android:label="fragment_home"
tools:layout="@layout/fragment_home" /> tools:layout="@layout/fragment_home" />
<fragment <fragment
android:id="@+id/subscriptions" android:id="@+id/subscriptions"
android:name="com.github.libretube.fragments.Subscriptions" android:name="com.github.libretube.fragments.SubscriptionsFragment"
android:label="fragment_subscriptions" android:label="fragment_subscriptions"
tools:layout="@layout/fragment_subscriptions" /> tools:layout="@layout/fragment_subscriptions" />
<fragment <fragment
android:id="@+id/library" android:id="@+id/library"
android:name="com.github.libretube.fragments.Library" android:name="com.github.libretube.fragments.LibraryFragment"
android:label="fragment_library" android:label="fragment_library"
tools:layout="@layout/fragment_library"></fragment> tools:layout="@layout/fragment_library"></fragment>
<fragment <fragment