diff --git a/app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt b/app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt index cb1486619..32286d1dd 100644 --- a/app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt +++ b/app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt @@ -432,7 +432,12 @@ class MainActivity : BaseActivity() { private fun unsetFullscreen() { window.clearFlags(WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS) - showSystemBars() + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) { + @Suppress("DEPRECATION") + window.clearFlags( + WindowManager.LayoutParams.FLAG_FULLSCREEN + ) + } if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) { window.attributes.layoutInDisplayCutoutMode = diff --git a/app/src/main/java/com/github/libretube/ui/fragments/ChannelFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/ChannelFragment.kt index 409f2a265..32cc1a575 100644 --- a/app/src/main/java/com/github/libretube/ui/fragments/ChannelFragment.kt +++ b/app/src/main/java/com/github/libretube/ui/fragments/ChannelFragment.kt @@ -5,6 +5,7 @@ import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.TextView import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.LinearLayoutManager import com.github.libretube.R @@ -29,7 +30,7 @@ class ChannelFragment : BaseFragment() { private var channelId: String? = null private var channelName: String? = null - var nextPage: String? = null + private var nextPage: String? = null private var channelAdapter: ChannelAdapter? = null private var isLoading = true private var isSubscribed: Boolean? = false @@ -57,7 +58,6 @@ class ChannelFragment : BaseFragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - binding.channelName.text = channelId binding.channelRecView.layoutManager = LinearLayoutManager(context) val refreshChannel = { @@ -94,7 +94,6 @@ class ChannelFragment : BaseFragment() { } } catch (e: IOException) { binding.channelRefresh.isRefreshing = false - println(e) Log.e(TAG(), "IOException, you might not have internet connection") return@launchWhenCreated } catch (e: HttpException) { @@ -157,6 +156,12 @@ class ChannelFragment : BaseFragment() { binding.channelDescription.text = response.description?.trim() } + binding.channelDescription.setOnClickListener { + (it as TextView).apply { + it.maxLines = if (it.maxLines == Int.MAX_VALUE) 2 else Int.MAX_VALUE + } + } + ImageHelper.loadImage(response.bannerUrl, binding.channelBanner) ImageHelper.loadImage(response.avatarUrl, binding.channelImage) diff --git a/app/src/main/res/layout/fragment_channel.xml b/app/src/main/res/layout/fragment_channel.xml index 36af85617..ae17f844c 100644 --- a/app/src/main/res/layout/fragment_channel.xml +++ b/app/src/main/res/layout/fragment_channel.xml @@ -28,6 +28,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_margin="10dp" + android:layout_gravity="center" android:orientation="horizontal"> + android:autoLink="web" + android:ellipsize="end" + android:maxLines="2" />