Add view manager helper

Add reponsive views
Fix scroll on player activity
2024-05-14 18:39:45 -06:00 · 2024-05-14 18:20:46 -06:00 · 2024-05-11 14:26:13 -06:00 · 2024-05-11 13:51:16 -06:00
14 changed files with 713 additions and 140 deletions
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@ -67,10 +67,10 @@

        <service
            android:name=".services.PlaybackService"
-            android:foregroundServiceType="mediaPlayback"
-            android:exported="true">
+            android:exported="true"
+            android:foregroundServiceType="mediaPlayback">
            <intent-filter>
-                <action android:name="androidx.media3.session.MediaSessionService"/>
+                <action android:name="androidx.media3.session.MediaSessionService" />
            </intent-filter>
        </service>
    </application>
--- a/app/src/main/java/org/libre/agosto/p2play/ChannelActivity.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/ChannelActivity.kt
@ -12,6 +12,7 @@ import org.libre.agosto.p2play.adapters.VideosAdapter
 import org.libre.agosto.p2play.ajax.Actions
 import org.libre.agosto.p2play.ajax.Channels
 import org.libre.agosto.p2play.ajax.Videos
+import org.libre.agosto.p2play.helpers.getViewManager
 import org.libre.agosto.p2play.models.ChannelModel
 import org.libre.agosto.p2play.models.VideoModel
 class ChannelActivity : AppCompatActivity() {
@ -32,7 +33,7 @@ class ChannelActivity : AppCompatActivity() {

        channelId = this.intent.extras?.getString("channel")!!

-        viewManager = LinearLayoutManager(this)
+        viewManager = getViewManager(this, resources)

        subcriptionBtn.setOnClickListener {
            subscribeAction()
--- a/app/src/main/java/org/libre/agosto/p2play/MainActivity.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/MainActivity.kt
@ -1,6 +1,7 @@
 package org.libre.agosto.p2play

 import android.content.Intent
+import android.content.res.Configuration
 import android.os.AsyncTask
 import android.os.Bundle
 import android.os.Handler
@ -11,6 +12,7 @@ import androidx.appcompat.app.ActionBarDrawerToggle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.SearchView
 import androidx.core.view.GravityCompat
+import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.navigation.NavigationView
@ -27,6 +29,7 @@ import kotlinx.android.synthetic.main.mini_player.mini_player_title
 import kotlinx.android.synthetic.main.nav_header_main.*
 import org.libre.agosto.p2play.adapters.VideosAdapter
 import org.libre.agosto.p2play.ajax.Videos
+import org.libre.agosto.p2play.helpers.getViewManager
 import org.libre.agosto.p2play.models.VideoModel
 import org.libre.agosto.p2play.singletons.PlaybackSingleton

@ -46,18 +49,13 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
        setContentView(R.layout.activity_main)
        setSupportActionBar(toolbar)

-        /* fab.setOnClickListener { view ->
-            Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
-                    .setAction("Action", null).show()
-        } */
-
        val toggle = ActionBarDrawerToggle(this, drawer_layout, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close)
        drawer_layout.addDrawerListener(toggle)
        toggle.syncState()

        nav_view.setNavigationItemSelectedListener(this)

-        viewManager = LinearLayoutManager(this)
+        viewManager = getViewManager(this, resources)

        // Init RecyclerView
        this.initRecycler()
--- a/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt
@ -20,6 +20,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.media3.common.MediaItem
 import androidx.media3.common.MediaMetadata
+import androidx.media3.common.Player
 import androidx.media3.exoplayer.DefaultLoadControl
 import androidx.media3.exoplayer.ExoPlayer
 import androidx.media3.exoplayer.upstream.DefaultAllocator
@ -32,6 +33,7 @@ import kotlinx.android.synthetic.main.comment_component.commentaryBtn
 import kotlinx.android.synthetic.main.comment_component.commentaryLayout
 import kotlinx.android.synthetic.main.comment_component.commentaryText
 import kotlinx.android.synthetic.main.comment_component.userImgCom
+import kotlinx.android.synthetic.main.custom_player_controls.view.exo_controls
 import org.libre.agosto.p2play.adapters.CommentariesAdapter
 import org.libre.agosto.p2play.ajax.Actions
 import org.libre.agosto.p2play.ajax.Comments
@ -151,9 +153,23 @@ class ReproductorActivity : AppCompatActivity() {
                            .setSeekForwardIncrementMs(10000)
                            .setLoadControl(loadControl).build()
                    }
+
                    player = PlaybackSingleton.player!!
                    exoPlayer.player = player

+                    player.addListener(
+                        object : Player.Listener {
+                            override fun onPlaybackStateChanged(playbackState: Int) {
+                                super.onPlaybackStateChanged(playbackState)
+                                if (playbackState == Player.STATE_BUFFERING || playbackState == Player.STATE_IDLE) {
+                                    exoPlayer.exo_controls.visibility = View.INVISIBLE
+                                } else if (playbackState == Player.STATE_READY) {
+                                    exoPlayer.exo_controls.visibility = View.VISIBLE
+                                }
+                            }
+                        }
+                    )
+
                    println("----- video --------")
                    println(videoPlayback.streamingData?.playlistUrl)

--- a/app/src/main/java/org/libre/agosto/p2play/helpers/GetViewManager.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/helpers/GetViewManager.kt
@ -0,0 +1,24 @@
+package org.libre.agosto.p2play.helpers
+
+import android.content.Context
+import android.content.res.Configuration
+import android.content.res.Resources
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView.LayoutManager
+
+fun getViewManager (context: Context, resources: Resources): LayoutManager {
+    val screenSize = resources.configuration.screenLayout and Configuration.SCREENLAYOUT_SIZE_MASK
+    val manager = if (screenSize > Configuration.SCREENLAYOUT_SIZE_LARGE) {
+        val orientation = resources.configuration.orientation
+        val gridItems = when (orientation) {
+            Configuration.ORIENTATION_LANDSCAPE -> 4
+            else -> 3
+        }
+        GridLayoutManager(context, gridItems)
+    } else {
+        LinearLayoutManager(context)
+    }
+
+    return manager
+}
--- a/app/src/main/res/drawable/ic_baseline_settings_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_settings_24.xml
@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#88ffffff" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58c0.18,-0.14 0.23,-0.41 0.12,-0.61l-1.92,-3.32c-0.12,-0.22 -0.37,-0.29 -0.59,-0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94L14.4,2.81c-0.04,-0.24 -0.24,-0.41 -0.48,-0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41L9.25,5.35C8.66,5.59 8.12,5.92 7.63,6.29L5.24,5.33c-0.22,-0.08 -0.47,0 -0.59,0.22L2.74,8.87C2.62,9.08 2.66,9.34 2.86,9.48l2.03,1.58C4.84,11.36 4.8,11.69 4.8,12s0.02,0.64 0.07,0.94l-2.03,1.58c-0.18,0.14 -0.23,0.41 -0.12,0.61l1.92,3.32c0.12,0.22 0.37,0.29 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.05,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96c0.22,0.08 0.47,0 0.59,-0.22l1.92,-3.32c0.12,-0.22 0.07,-0.47 -0.12,-0.61L19.14,12.94zM12,15.6c-1.98,0 -3.6,-1.62 -3.6,-3.6s1.62,-3.6 3.6,-3.6s3.6,1.62 3.6,3.6S13.98,15.6 12,15.6z"/>
+    
+</vector>
--- a/app/src/main/res/layout-large/activity_reproductor.xml
+++ b/app/src/main/res/layout-large/activity_reproductor.xml
@ -0,0 +1,361 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".ReproductorActivity">
+
+    <RelativeLayout
+        android:id="@+id/fullScreen"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentBottom="true"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <RelativeLayout
+        android:id="@+id/fullScreenExo"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentBottom="true"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" >
+        <androidx.media3.ui.PlayerView
+            android:id="@+id/fullscreenPlayer"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="#000"
+            app:use_controller="true"
+            app:show_buffering="always"
+            app:controller_layout_id="@layout/custom_player_controls"
+            app:player_layout_id="@layout/exo_player_view"/>
+    </RelativeLayout>
+
+
+    <androidx.core.widget.NestedScrollView
+        android:id="@+id/nonFullScreen"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="horizontal"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="2"
+                android:orientation="vertical"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent">
+
+                <WebView
+                    android:id="@+id/videoView"
+                    android:layout_width="match_parent"
+                    android:layout_height="205dp"
+                    android:layout_weight="1"
+                    android:visibility="gone" />
+
+                <androidx.media3.ui.PlayerView
+                    android:id="@+id/exoPlayer"
+                    android:layout_width="match_parent"
+                    android:layout_height="500dp"
+                    app:auto_show="true"
+                    app:controller_layout_id="@layout/custom_player_controls"
+                    app:repeat_toggle_modes="none"
+                    app:show_buffering="always"
+                    app:surface_type="surface_view"
+                    app:use_controller="true" />
+
+                <TextView
+                    android:id="@+id/tittleVideoTxt"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingStart="5dp"
+                    android:textAppearance="@android:style/TextAppearance.Material.Display1"
+                    android:textSize="18sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/viewsTxt"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="5dp"
+                    android:paddingRight="5dp"
+                    android:textSize="12sp" />
+
+                <androidx.appcompat.widget.LinearLayoutCompat
+                    android:id="@+id/actionsLayout"
+                    android:layout_width="match_parent"
+                    android:layout_height="50dp"
+                    android:gravity="top"
+                    android:orientation="horizontal"
+                    android:visibility="gone">
+
+                    <androidx.appcompat.widget.LinearLayoutCompat
+                        android:id="@+id/likeLayout"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:visibility="visible">
+
+                        <ImageView
+                            android:id="@+id/imageView"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_weight="1"
+                            android:adjustViewBounds="false"
+                            android:contentDescription="@string/likeBtn"
+                            android:cropToPadding="false"
+                            android:scaleType="center"
+                            android:visibility="visible"
+                            app:srcCompat="@drawable/ic_like" />
+
+                        <TextView
+                            android:id="@+id/textViewLike"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_weight="1"
+                            android:text="@string/likeBtn"
+                            android:textAlignment="center" />
+                    </androidx.appcompat.widget.LinearLayoutCompat>
+
+                    <LinearLayout
+                        android:id="@+id/dislikeLayout"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:visibility="visible">
+
+                        <ImageView
+                            android:id="@+id/imageView2"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_weight="1"
+                            android:adjustViewBounds="false"
+                            android:contentDescription="@string/dislikeBtn"
+                            android:cropToPadding="false"
+                            android:visibility="visible"
+                            app:srcCompat="@drawable/ic_dislike" />
+
+                        <TextView
+                            android:id="@+id/textViewDislike"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_weight="1"
+                            android:text="@string/dislikeBtn"
+                            android:textAlignment="center" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:id="@+id/reportLayout"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:visibility="visible">
+
+                        <ImageView
+                            android:id="@+id/imageViewAlert"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_weight="1"
+                            android:adjustViewBounds="false"
+                            android:contentDescription="@string/dislikeBtn"
+                            android:cropToPadding="false"
+                            android:visibility="visible"
+                            app:srcCompat="@drawable/ic_alert" />
+
+                        <TextView
+                            android:id="@+id/textViewAlert"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_weight="1"
+                            android:text="@string/reportBtn"
+                            android:textAlignment="center" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:id="@+id/shareLayout"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:visibility="visible">
+
+                        <ImageView
+                            android:id="@+id/imageViewShare"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_weight="1"
+                            android:adjustViewBounds="false"
+                            android:contentDescription="@string/shareBtn"
+                            android:cropToPadding="false"
+                            android:visibility="visible"
+                            app:srcCompat="@drawable/ic_share" />
+
+                        <TextView
+                            android:id="@+id/textViewShare"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_weight="1"
+                            android:text="@string/shareBtn"
+                            android:textAlignment="center" />
+                    </LinearLayout>
+                </androidx.appcompat.widget.LinearLayoutCompat>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="60dp"
+                    android:gravity="center|center_vertical"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:id="@+id/userImg"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="0dp"
+                        android:layout_weight="1"
+                        android:adjustViewBounds="true"
+                        android:cropToPadding="false"
+                        android:padding="5dp"
+                        android:scaleType="fitCenter"
+                        app:srcCompat="@drawable/default_avatar" />
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="3"
+                        android:orientation="vertical">
+
+                        <TextView
+                            android:id="@+id/userTxt"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:maxWidth="300dp"
+                            android:textAppearance="@android:style/TextAppearance.Material.Large"
+                            android:textSize="18sp"
+                            android:textStyle="bold" />
+
+                        <TextView
+                            android:id="@+id/hostTxt"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:textSize="10sp"
+                            android:textStyle="italic" />
+
+                    </LinearLayout>
+
+                    <com.google.android.material.button.MaterialButton
+                        android:id="@+id/subscribeBtn"
+                        style="@style/Widget.MaterialComponents.Button"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="@string/subscribeBtn"
+                        android:textSize="12sp"
+                        android:visibility="invisible" />
+                </LinearLayout>
+
+                <TextView
+                    android:id="@+id/descriptionTxt"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:maxLength="1000"
+                    android:maxLines="100"
+                    android:paddingLeft="5dp"
+                    android:text="@string/descriptionTxt"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/descriptionVideoTxt"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="2dp"
+                    android:layout_marginBottom="2dp"
+                    android:autoLink="web"
+                    android:linksClickable="true"
+                    android:maxLength="10000"
+                    android:maxLines="100"
+                    android:paddingLeft="10dp"
+                    android:paddingRight="10dp" />
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/showMoreBtn"
+                    style="@style/Widget.MaterialComponents.Button.TextButton"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/showMore"
+                    android:visibility="gone" />
+
+                <androidx.legacy.widget.Space
+                    android:layout_width="match_parent"
+                    android:layout_height="20dp" />
+
+
+            </LinearLayout>
+
+            <androidx.constraintlayout.widget.Barrier
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                app:barrierDirection="left" />
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:orientation="vertical"
+                android:layout_weight="1"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent">
+
+                <include layout="@layout/comment_component" />
+
+                <TextView
+                    android:id="@+id/commentariesTxt"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="5dp"
+                    android:text="@string/commentariesTxt"
+                    android:textStyle="bold" />
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/listCommentaries"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+            </LinearLayout>
+        </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/layout-large/custom_player_controls.xml
+++ b/app/src/main/res/layout-large/custom_player_controls.xml
@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/exo_controls"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#44000000">
+
+    <ImageView
+        android:id="@+id/exo_settings"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        android:layout_gravity="center"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_weight="0"
+        android:alpha="0.5"
+        android:src="@drawable/ic_baseline_settings_24"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:orientation="horizontal"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+            android:id="@+id/exo_rew"
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:src="@drawable/ic_replay_10_24" />
+
+        <ImageView
+            android:id="@+id/exo_play_pause"
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            android:layout_marginHorizontal="30dp" />
+
+        <ImageView
+            android:id="@+id/exo_ffwd"
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:src="@drawable/ic_forward_10_24" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/linearLayout4"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
+
+        <androidx.media3.ui.DefaultTimeBar
+            android:id="@+id/exo_progress"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_weight="1" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="60dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/exo_position"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="#fff"
+                android:textSize="20sp" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="4dp"
+                android:text="/"
+                android:textColor="#CBCDC8"
+                android:textSize="20sp" />
+
+            <TextView
+                android:id="@+id/exo_duration"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:textColor="#CBCDC8"
+                android:textSize="20sp" />
+
+            <ImageView
+                android:id="@+id/exo_fullscreen_custom"
+                android:layout_width="50dp"
+                android:layout_height="50dp"
+                android:layout_gravity="center"
+                android:layout_weight="0"
+                android:src="@drawable/ic_fullscreen_24" />
+        </LinearLayout>
+
+    </LinearLayout>
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/layout-large/dialog_thread.xml
+++ b/app/src/main/res/layout-large/dialog_thread.xml
@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#44000000">
+
+    <LinearLayout
+        android:id="@+id/linearLayout3"
+        android:layout_width="800dp"
+        android:layout_height="0dp"
+        android:background="?attr/colorSurface"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/materialToolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="?attr/actionBarSize" />
+
+        <include
+            layout="@layout/view_commentary"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="?android:attr/listDivider" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/listCommentaries"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp" />
+
+    </LinearLayout>
+
+    <include
+        layout="@layout/comment_component"
+        android:layout_width="700dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/layout/activity_channel.xml
+++ b/app/src/main/res/layout/activity_channel.xml
@ -6,9 +6,9 @@
    android:layout_height="wrap_content"
    tools:context=".ChannelActivity">

-    <ScrollView
+    <androidx.core.widget.NestedScrollView
        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
@ -56,8 +56,8 @@
                <LinearLayout
                    android:layout_width="match_parent"
                    android:layout_height="match_parent"
-                    android:orientation="horizontal"
-                    android:baselineAligned="false">
+                    android:baselineAligned="false"
+                    android:orientation="horizontal">

                    <LinearLayout
                        android:layout_width="match_parent"
@ -147,7 +147,7 @@
                android:layout_height="wrap_content" />

        </LinearLayout>
-    </ScrollView>
+    </androidx.core.widget.NestedScrollView>


 </androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@ -6,97 +6,92 @@
    android:layout_height="match_parent"
    tools:context=".LoginActivity">

-    <FrameLayout
+    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="match_parent"
-        android:layout_marginEnd="8dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="32dp"
-        app:layout_constraintBottom_toBottomOf="parent"
+        android:gravity="center"
+        android:orientation="vertical"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        app:layout_constraintWidth_max="500dp">

-        <LinearLayout
+        <ImageView
+            android:id="@+id/imageView2"
            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
+            android:layout_height="wrap_content"
+            android:contentDescription="Logo"
+            app:srcCompat="@drawable/icon" />

-            <ImageView
-                android:id="@+id/imageView2"
+        <androidx.legacy.widget.Space
+            android:layout_width="match_parent"
+            android:layout_height="30dp" />
+
+        <TextView
+            android:id="@+id/loginInfo"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/loginInfo"
+            android:textAlignment="center"
+            android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium" />
+
+        <androidx.legacy.widget.Space
+            android:layout_width="match_parent"
+            android:layout_height="30dp" />
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/userTxt"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="4dp"
+            android:hint="@string/userTxt"
+            android:maxWidth="600dp">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/userText"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
-                android:contentDescription="Logo"
-                app:srcCompat="@drawable/icon" />
+                android:ems="10"
+                android:hint="@string/userText"
+                android:inputType="text" />
+        </com.google.android.material.textfield.TextInputLayout>

-            <androidx.legacy.widget.Space
-                android:layout_width="match_parent"
-                android:layout_height="30dp" />
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/passwordTxt"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="4dp"
+            android:hint="@string/passwordTxt"
+            android:maxWidth="600dp"
+            android:maxEms="10"
+            app:endIconMode="password_toggle">

-            <TextView
-                android:id="@+id/loginInfo"
+            <EditText
+                android:id="@+id/passwordText"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
-                android:text="@string/loginInfo"
-                android:textAlignment="center"
-                android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium"/>
+                android:ems="10"
+                android:inputType="textPassword" />
+        </com.google.android.material.textfield.TextInputLayout>

-            <androidx.legacy.widget.Space
-                android:layout_width="match_parent"
-                android:layout_height="30dp" />
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/loginBtn"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/loginBtn"
+            android:textAlignment="center" />

-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/userTxt"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_margin="4dp"
-                android:hint="@string/userTxt">
+        <androidx.legacy.widget.Space
+            android:layout_width="match_parent"
+            android:layout_height="30dp" />

-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/userText"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:ems="10"
-                    android:hint="@string/userText"
-                    android:inputType="text" />
-            </com.google.android.material.textfield.TextInputLayout>
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/registerActionBtn"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/registerActionBtn"
+            android:visibility="invisible" />

-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/passwordTxt"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_margin="4dp"
-                app:endIconMode="password_toggle"
-                android:hint="@string/passwordTxt" >
+    </LinearLayout>

-                <EditText
-                    android:id="@+id/passwordText"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:ems="10"
-                    android:inputType="textPassword"/>
-            </com.google.android.material.textfield.TextInputLayout>
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/loginBtn"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/loginBtn"
-                android:textAlignment="center" />
-
-            <androidx.legacy.widget.Space
-                android:layout_width="match_parent"
-                android:layout_height="30dp" />
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/registerActionBtn"
-                style="@style/Widget.MaterialComponents.Button.TextButton"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/registerActionBtn"
-                android:visibility="invisible" />
-
-        </LinearLayout>
-
-    </FrameLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/layout/activity_reproductor.xml
+++ b/app/src/main/res/layout/activity_reproductor.xml
@ -39,15 +39,16 @@
            android:layout_height="match_parent"
            android:background="#000"
            app:use_controller="true"
+            app:show_buffering="always"
            app:controller_layout_id="@layout/custom_player_controls"
            app:player_layout_id="@layout/exo_player_view"/>
    </RelativeLayout>


-    <ScrollView
+    <androidx.core.widget.NestedScrollView
        android:id="@+id/nonFullScreen"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
@ -73,9 +74,12 @@
                android:id="@+id/exoPlayer"
                android:layout_width="match_parent"
                android:layout_height="205dp"
-                app:use_controller="true"
+                app:auto_show="true"
+                app:show_buffering="always"
                app:controller_layout_id="@layout/custom_player_controls"
-                app:player_layout_id="@layout/exo_player_view"/>
+                app:surface_type="surface_view"
+                app:use_controller="true"
+                app:repeat_toggle_modes="none"/>

            <TextView
                android:id="@+id/tittleVideoTxt"
@ -337,6 +341,6 @@


        </LinearLayout>
-    </ScrollView>
+    </androidx.core.widget.NestedScrollView>

 </androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/layout/content_main.xml
+++ b/app/src/main/res/layout/content_main.xml
@ -16,7 +16,7 @@
        android:visibility="visible"
        app:layout_constraintTop_toTopOf="parent">

-        <view class="androidx.recyclerview.widget.RecyclerView"
+        <androidx.recyclerview.widget.RecyclerView
            android:id="@+id/list"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
@ -37,4 +37,4 @@
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent" />

-</androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/layout/custom_player_controls.xml
+++ b/app/src/main/res/layout/custom_player_controls.xml
@ -1,10 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:background="#aa000000"
+    android:id="@+id/exo_controls"
    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="#44000000">
+
+    <ImageView
+        android:id="@+id/exo_settings"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        android:layout_gravity="center"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_weight="0"
+        android:alpha="0.5"
+        android:src="@drawable/ic_baseline_settings_24"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />

    <LinearLayout
        android:layout_width="match_parent"
@ -17,83 +30,78 @@
        app:layout_constraintTop_toTopOf="parent">

        <ImageView
-            android:layout_width="48dp"
-            android:layout_height="48dp"
            android:id="@+id/exo_rew"
-            android:src="@drawable/ic_replay_10_24"
-            />
+            android:layout_width="35dp"
+            android:layout_height="35dp"
+            android:src="@drawable/ic_replay_10_24" />

        <ImageView
            android:id="@+id/exo_play_pause"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:layout_marginHorizontal="30dp"/>
+            android:layout_width="43dp"
+            android:layout_height="43dp"
+            android:layout_marginHorizontal="30dp" />

        <ImageView
-            android:layout_width="48dp"
-            android:layout_height="48dp"
            android:id="@+id/exo_ffwd"
-            android:src="@drawable/ic_forward_10_24"
-            />
+            android:layout_width="35dp"
+            android:layout_height="35dp"
+            android:src="@drawable/ic_forward_10_24" />

    </LinearLayout>

    <LinearLayout
+        android:id="@+id/linearLayout4"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-        android:layout_marginStart="0dp"
-        android:layout_marginEnd="0dp"
-        android:layout_marginBottom="0dp"
        android:orientation="vertical"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent">

+        <androidx.media3.ui.DefaultTimeBar
+            android:id="@+id/exo_progress"
+            android:layout_width="wrap_content"
+            android:layout_height="10dp"
+            android:layout_weight="1" />
+
        <LinearLayout
            android:layout_width="match_parent"
-            android:layout_height="20dp"
+            android:layout_height="35dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"
+            android:gravity="center"
            android:orientation="horizontal">
+
            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
                android:id="@+id/exo_position"
-                android:textColor="#fff"/>
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="#fff" />
+
            <TextView
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="4dp"
                android:text="/"
-                android:textColor="#CBCDC8"
-                android:layout_marginHorizontal="4dp"/>
+                android:textColor="#CBCDC8" />
+
            <TextView
+                android:id="@+id/exo_duration"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_weight="1"
-                android:id="@+id/exo_duration"
-                android:textColor="#CBCDC8"/>
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:orientation="horizontal">
-
-            <androidx.media3.ui.DefaultTimeBar
-                android:id="@+id/exo_progress"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_weight="2" />
+                android:textColor="#CBCDC8" />

            <ImageView
                android:id="@+id/exo_fullscreen_custom"
-                android:layout_width="42dp"
+                android:layout_width="35dp"
                android:layout_height="42dp"
-                android:src="@drawable/ic_fullscreen_24"
+                android:layout_gravity="center"
                android:layout_weight="0"
-                android:layout_gravity="center"/>
+                android:src="@drawable/ic_fullscreen_24" />
        </LinearLayout>
+
    </LinearLayout>


-
-
 </androidx.constraintlayout.widget.ConstraintLayout>
Author	SHA1	Message	Date
Ivan Agosto	ff995e383d	Add view manager helper	2024-05-14 18:39:45 -06:00
Ivan Agosto	d3466f9cce	Add reponsive views	2024-05-14 18:20:46 -06:00
Ivan Agosto	f0fbd02cf4	Fix scroll on player activity	2024-05-11 14:26:13 -06:00
Ivan Agosto	3364f60d32	Update exo player with better UX	2024-05-11 13:51:16 -06:00