Update to sdk 32

app/build.gradle

@@ -6,14 +6,13 @@ plugins {
 }
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 32
     defaultConfig {
         applicationId "org.libre.agosto.p2play"
         minSdkVersion 26
-        //noinspection OldTargetApi
+        targetSdkVersion 32
-        targetSdkVersion 28
+        versionCode 9
-        versionCode 8
+        versionName "0.6.0"
-        versionName "0.5.2"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -22,7 +21,6 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    buildToolsVersion '30.0.2'
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
@@ -31,6 +29,7 @@ android {
         checkReleaseBuilds false
         abortOnError false
     }
+    namespace 'org.libre.agosto.p2play'
 }
 
 dependencies {
@@ -40,7 +39,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.0.2'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'com.google.android.material:material:1.4.0'
+    implementation 'com.google.android.material:material:1.6.0'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test:runner:1.5.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0'

app/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    package="org.libre.agosto.p2play">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -13,10 +12,12 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.P2play">
         <activity android:name=".ChannelActivity"
-            android:theme="@style/Theme.P2play.NoActionBar" />
+            android:theme="@style/Theme.P2play.NoActionBar"
+            android:exported="false" />
         <activity
             android:name=".SplashActivity"
-            android:theme="@style/Theme.P2play.NoActionBar">
+            android:theme="@style/Theme.P2play.NoActionBar"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -25,22 +26,26 @@
         </activity>
         <activity
             android:name=".HostActivity"
-            android:theme="@style/Theme.P2play.NoActionBar"/>
+            android:theme="@style/Theme.P2play.NoActionBar"
+            android:exported="false" />
         <activity
             android:name=".MainActivity"
-            android:theme="@style/Theme.P2play.NoActionBar" />
+            android:theme="@style/Theme.P2play.NoActionBar"
+            android:exported="false" />
         <activity
             android:name=".ReproductorActivity"
             android:configChanges="orientation|screenSize"
             android:hardwareAccelerated="true"
-            android:theme="@style/Theme.P2play.NoActionBar" />
+            android:theme="@style/Theme.P2play.NoActionBar"
-        <activity android:name=".LoginActivity" />
+            android:exported="false" />
-        <activity android:name=".RegisterActivity" />
+        <activity android:name=".LoginActivity" android:exported="false" />
-        <activity android:name=".AboutActivity" />
+        <activity android:name=".RegisterActivity" android:exported="false" />
+        <activity android:name=".AboutActivity" android:exported="false" />
         <activity
             android:name=".SettingsActivity"
             android:label="@string/title_activity_settings"
-            android:theme="@style/Theme.P2play"/>
+            android:theme="@style/Theme.P2play"
+            android:exported="false"/>
     </application>
 
 </manifest>

app/src/main/java/org/libre/agosto/p2play/MainActivity.kt

@@ -50,8 +50,6 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
                     .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()
@@ -376,6 +374,8 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
                 myMenu.findItem(R.id.action_logout).isVisible = true
 
             }
+        } else {
+            nav_view.menu.findItem(R.id.ml).isVisible = false
         }
     }
 
@@ -394,7 +394,7 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
 
         this.refresh()
         ManagerSingleton.Toast(getString(R.string.logout_msg), this)
-
+        setSideData()
     }
 
     private fun loadMore(){

app/src/main/java/org/libre/agosto/p2play/adapters/CommentariesAdapter.kt

@@ -1,6 +1,7 @@
 package org.libre.agosto.p2play.adapters
 
 import android.content.Context
+import android.content.Intent
 import androidx.recyclerview.widget.RecyclerView
 import android.text.Html
 import android.view.LayoutInflater
@@ -9,6 +10,7 @@ import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
 import com.squareup.picasso.Picasso
+import kotlinx.android.synthetic.main.view_video.view.userImg
 import org.libre.agosto.p2play.*
 import org.libre.agosto.p2play.models.CommentaryModel
 
@@ -42,6 +44,7 @@ class CommentariesAdapter(private val myDataset: ArrayList<CommentaryModel>) :
         // create a new view
         val view = LayoutInflater.from(parent.context)
                 .inflate(R.layout.view_commentary, parent, false) as View
+
         // set the view's size, margins, paddings and layout parameters
         return ViewHolder(view)
     }
@@ -63,6 +66,12 @@ class CommentariesAdapter(private val myDataset: ArrayList<CommentaryModel>) :
 
         holder.commentary.text = Html.fromHtml(myDataset[position].commentary)
 
+        // TODO: Support for view and account (is different than a video channel)
+        // holder.userImg.setOnClickListener {
+        //    val intent = Intent(holder.context, ChannelActivity::class.java)
+        //    intent.putExtra("channel", myDataset[position].getAccount())
+        //    holder.context.startActivity(intent)
+        // }
     }
 
     // Return the size of your dataset (invoked by the layout manager)

app/src/main/java/org/libre/agosto/p2play/adapters/VideosAdapter.kt

@@ -56,11 +56,12 @@ class VideosAdapter(private val myDataset: ArrayList<VideoModel>) :
         // - get element from your dataset at this position
         // - replace the contents of the view with that element
         holder.tittle.text = myDataset[position].name
+        holder.tittle.setOnClickListener {
+            this.launchChannelActivity(myDataset[position] as Serializable, holder.context)
+        }
         Picasso.get().load("https://"+ManagerSingleton.url+myDataset[position].thumbUrl).into(holder.thumb)
         holder.thumb.setOnClickListener {
-            val intent = Intent(holder.context, ReproductorActivity::class.java)
+            this.launchChannelActivity(myDataset[position] as Serializable, holder.context)
-            intent.putExtra("video", myDataset[position] as Serializable)
-            holder.context.startActivity(intent)
         }
 
         holder.userImg.setOnClickListener {
@@ -98,5 +99,9 @@ class VideosAdapter(private val myDataset: ArrayList<VideoModel>) :
         notifyItemRangeInserted(lastPos, newItems.size)
     }
 
-
+    private fun launchChannelActivity (data: Serializable, context: Context) {
+        val intent = Intent(context, ReproductorActivity::class.java)
+        intent.putExtra("video", data)
+        context.startActivity(intent)
+    }
 }

app/src/main/java/org/libre/agosto/p2play/models/CommentaryModel.kt

@@ -11,7 +11,8 @@ class CommentaryModel (
         var userImageUrl: String = "",
         var commentary: String = "",
         var userHost: String = "",
-        var replies: Int = 0
+        var replies: Int = 0,
+        var nameChannel: String = ""
 ) {
     fun parseCommentary(data: JsonReader) {
         data.beginObject()
@@ -46,6 +47,7 @@ class CommentaryModel (
                             }
                             "uuid" -> this.userUuid = data.nextString()
                             "host" -> this.userHost = data.nextString()
+                            "name" -> this.nameChannel = data.nextString()
                             else -> data.skipValue()
                         }
                     }
@@ -56,4 +58,9 @@ class CommentaryModel (
         }
         data.endObject()
     }
+
+    fun getAccount(): String {
+            return "$nameChannel@$userHost"
+    }
+
 }

app/src/main/res/layout/view_video.xml

@@ -16,12 +16,15 @@
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="match_parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
 
             <ImageView
                 android:id="@+id/thumb"
                 android:layout_width="match_parent"
                 android:layout_height="230dp"
+                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"

build.gradle

@@ -1,13 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.6.20'
+    ext.kotlin_version = '1.6.21'
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.3.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

gradle.properties

@@ -9,6 +9,9 @@
 org.gradle.jvmargs=-Xmx1536m
 android.enableJetifier=true
 android.useAndroidX=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Mon Mar 18 13:17:32 CST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists