Updated third-party libraries to the latest versions

Author: TalbotGooday

.idea/misc.xml

@@ -2,15 +2,14 @@ apply plugin: 'com.android.application'
 
 apply plugin: 'kotlin-android'
 
-apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 33
     buildToolsVersion "30.0.3"
     defaultConfig {
         applicationId "com.gapps.videonoapi"
         minSdkVersion 21
-        targetSdkVersion 31
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -22,21 +21,24 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+    buildFeatures {
+        viewBinding true
+    }
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.appcompat:appcompat:1.4.2'
-    implementation 'androidx.core:core-ktx:1.8.0'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'androidx.core:core-ktx:1.10.0'
 
-    implementation 'com.squareup.okhttp3:okhttp:4.9.3'
-    implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3'
+    implementation 'com.squareup.okhttp3:okhttp:4.10.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0'
 
     //Gson
     implementation(project(':embedded_video_lib'))
 
-    implementation 'androidx.recyclerview:recyclerview:1.2.1'
-    implementation("io.coil-kt:coil:2.1.0")
-    implementation("io.coil-kt:coil-gif:2.1.0")
+    implementation 'androidx.recyclerview:recyclerview:1.3.0'
+    implementation("io.coil-kt:coil:2.3.0")
+    implementation("io.coil-kt:coil-gif:2.3.0")
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
 }

app/build.gradle

@@ -7,6 +7,7 @@ import com.gapps.library.api.VideoService
 import com.gapps.library.api.models.video.VideoPreviewModel
 import com.gapps.library.utils.isVideoUrl
 import com.gapps.videonoapi.R
+import com.gapps.videonoapi.databinding.ActivityMainBinding
 import com.gapps.videonoapi.ui.base.BaseActivity
 import com.gapps.videonoapi.ui.main.adapters.VideoAdapter
 import com.gapps.videonoapi.ui.text.TextActivity
@@ -16,7 +17,6 @@ import com.gapps.videonoapi.utils.recycler_view.MarginItemDecoration
 import com.gapps.videonoapi.utils.scroll.ScrollListener
 import com.gapps.videonoapi.video_utils.ultimedia.UltimediaVideoInfoModel
 import com.gapps.videonoapi.video_utils.youtube.MyYoutubeVideoInfoModel
-import kotlinx.android.synthetic.main.activity_main.*
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import java.util.concurrent.TimeUnit
@@ -25,6 +25,8 @@ class MainActivity : BaseActivity() {
 
     private lateinit var videoService: VideoService
 
+    private lateinit var binding: ActivityMainBinding
+
     private val videoUrls = listOf(
         "https://www.youtube.com/watch?v=M4BSGZ07NNA",
         "https://music.youtube.com/watch?v=lFMOYjVCLUo",
@@ -47,7 +49,8 @@ class MainActivity : BaseActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
+        binding = ActivityMainBinding.inflate(layoutInflater)
+        setContentView(binding.root)
 
         initService()
 
@@ -73,8 +76,8 @@ class MainActivity : BaseActivity() {
         }
     }
 
-    private fun initViews() {
-        videos_list.apply {
+    private fun initViews() = with(binding) {
+        videosList.apply {
             layoutManager = LinearLayoutManager(this@MainActivity)
             val videoAdapter =
                 VideoAdapter(
@@ -92,22 +95,20 @@ class MainActivity : BaseActivity() {
             }
 
             addOnScrollListener(ScrollListener(convertDpToPx(100f)) {
-                buttons_container.alphaSmooth(if (it) .1f else 1f)
+                buttonsContainer.alphaSmooth(if (it) .1f else 1f)
             })
-
-//            addItemDecoration(MarginItemDecoration(videoAdapter, top = false, bottom = true))
         }
 
-        text_test.setOnClickListener {
-            startActivity(Intent(this, TextActivity::class.java))
+        textTest.setOnClickListener {
+            startActivity(Intent(this@MainActivity, TextActivity::class.java))
         }
 
-        collapse_all.setOnClickListener {
-            (videos_list.adapter as VideoAdapter).collapseAll()
+        collapseAll.setOnClickListener {
+            (videosList.adapter as VideoAdapter).collapseAll()
         }
 
         swiperefresh.setOnRefreshListener {
-            (videos_list.adapter as VideoAdapter).swapData(getValidUrls())
+            (videosList.adapter as VideoAdapter).swapData(getValidUrls())
             swiperefresh.isRefreshing = false
         }
     }

app/src/main/java/com/gapps/videonoapi/ui/main/MainActivity.kt

@@ -15,12 +15,12 @@ import com.gapps.library.api.models.api.*
 import com.gapps.library.api.models.api.builder.EmbeddingRequest
 import com.gapps.library.api.models.video.VideoPreviewModel
 import com.gapps.videonoapi.R
+import com.gapps.videonoapi.databinding.ItemVideoBinding
 import com.gapps.videonoapi.utils.extensions.collapse
 import com.gapps.videonoapi.utils.extensions.convertDpToPx
 import com.gapps.videonoapi.utils.extensions.expand
 import com.gapps.videonoapi.utils.extensions.toggleArrow
 import com.gapps.videonoapi.utils.recycler_view.MarginItemDecoration
-import kotlinx.android.synthetic.main.item_video.view.*
 
 
 class VideoAdapter(
@@ -33,10 +33,10 @@ class VideoAdapter(
     private var data: MutableList<String> = mutableListOf()
     private val dataExpanded: SparseArray<Boolean> = SparseArray()
     private val loadedData: SparseArray<VideoPreviewModel?> = SparseArray()
-    private val inflater = LayoutInflater.from(context)
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): Holder {
-        return Holder(inflater.inflate(R.layout.item_video, parent, false))
+        val inflater = LayoutInflater.from(context)
+        return Holder(ItemVideoBinding.inflate(inflater, parent, false))
     }
 
     override fun getItemCount() = data.size
@@ -73,23 +73,24 @@ class VideoAdapter(
         this.notifyDataSetChanged()
     }
 
-    inner class Holder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+    inner class Holder(private val binding: ItemVideoBinding) :
+        RecyclerView.ViewHolder(binding.root) {
         private var loadedDataItem: VideoPreviewModel? = null
 
-        fun bind(item: String, listener: Listener) = with(itemView) {
+        fun bind(item: String, listener: Listener) = with(binding) {
             loadedDataItem = loadedData[adapterPosition]
 
             val isVideoDataVisible = dataExpanded[adapterPosition] ?: false
             val isNeedToLoadData = loadedDataItem == null
 
-            video_link.text = item
+            videoLink.text = item
 
             progress.isVisible = isNeedToLoadData
-            icon_drop_down.isVisible = isNeedToLoadData.not()
-            video_preview_container.isVisible = isVideoDataVisible
-            text_preview.isVisible = loadedDataItem?.videoTitle != null
+            iconDropDown.isVisible = isNeedToLoadData.not()
+            videoPreviewContainer.isVisible = isVideoDataVisible
+            textPreview.isVisible = loadedDataItem?.videoTitle != null
 
-            icon_drop_down.toggleArrow(isVideoDataVisible, 0)
+            iconDropDown.toggleArrow(isVideoDataVisible, 0)
 
             if (loadedDataItem == null) {
                 videoService.loadVideoPreview(
@@ -119,43 +120,43 @@ class VideoAdapter(
                 initVideoView(loadedDataItem)
             }
 
-            video_data_container.setOnClickListener {
+            videoDataContainer.setOnClickListener {
                 loadedDataItem ?: return@setOnClickListener
 
                 val isExpanded = toggleLayoutExpand(
                     (dataExpanded[bindingAdapterPosition] ?: false).not(),
-                    icon_drop_down,
-                    video_preview_container
+                    iconDropDown,
+                    videoPreviewContainer
                 )
 
                 dataExpanded.put(bindingAdapterPosition, isExpanded)
             }
         }
 
-        private fun initVideoView(video: VideoPreviewModel?) = with(itemView) {
-            video ?: return
+        private fun initVideoView(video: VideoPreviewModel?) = with(binding) {
+            video ?: return@with
 
             val isError = video.errorMessage.isNullOrBlank().not()
 
             progress.isVisible = false
-            icon_drop_down.isVisible = true
-            text_preview.isVisible = video.videoTitle.isNullOrBlank().not()
+            iconDropDown.isVisible = true
+            textPreview.isVisible = video.videoTitle.isNullOrBlank().not()
 
-            image_preview.load(video.thumbnailUrl) {
+            imagePreview.load(video.thumbnailUrl) {
                 placeholder(R.drawable.image_shop_1)
                 error(R.drawable.image_shop_1)
             }
 
-            text_preview.text = video.videoTitle
+            textPreview.text = video.videoTitle
 
-            image_play.isVisible = isError.not()
+            imagePlay.isVisible = isError.not()
 
-            setVideoHostingLogo(video_host_logo, video.videoHosting)
+            setVideoHostingLogo(videoHostLogo, video.videoHosting)
 
             if (isError) {
-                video_preview_container.setOnClickListener(null)
+                videoPreviewContainer.setOnClickListener(null)
             } else {
-                video_preview_container.setOnClickListener {
+                videoPreviewContainer.setOnClickListener {
                     val model = loadedDataItem ?: return@setOnClickListener
 
                     listener.onItemClick(model)

app/src/main/java/com/gapps/videonoapi/ui/main/adapters/VideoAdapter.kt

@@ -9,19 +9,19 @@ import android.text.style.ClickableSpan
 import android.view.View
 import android.widget.Toast
 import com.gapps.library.api.VideoService
-import com.gapps.library.utils.patterns.PatternVideoLinksBuilder
 import com.gapps.library.utils.findVideos
-import com.gapps.videonoapi.R
-import com.gapps.videonoapi.video_utils.ultimedia.UltimediaVideoInfoModel
+import com.gapps.library.utils.patterns.PatternVideoLinksBuilder
+import com.gapps.videonoapi.databinding.ActivityTextBinding
 import com.gapps.videonoapi.ui.base.BaseActivity
-import kotlinx.android.synthetic.main.activity_text.*
+import com.gapps.videonoapi.video_utils.ultimedia.UltimediaVideoInfoModel
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import java.util.concurrent.TimeUnit
 
 
 class TextActivity : BaseActivity() {
 
+    private lateinit var binding: ActivityTextBinding
     private lateinit var videoService: VideoService
 
     private val textString =
@@ -37,7 +37,8 @@ class TextActivity : BaseActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_text)
+        binding = ActivityTextBinding.inflate(layoutInflater)
+        setContentView(binding.root)
 
         initService()
 
@@ -66,7 +67,7 @@ class TextActivity : BaseActivity() {
     private fun initViews() {
         initTextView(false)
 
-        clearLinks.setOnCheckedChangeListener { _, isChecked ->
+        binding.clearLinks.setOnCheckedChangeListener { _, isChecked ->
             initTextView(isChecked)
         }
     }
@@ -87,9 +88,11 @@ class TextActivity : BaseActivity() {
             )
         }
 
-        text.text = spannableString
-        text.movementMethod = LinkMovementMethod.getInstance()
-        text.highlightColor = Color.TRANSPARENT
+        binding.text.run {
+            text = spannableString
+            movementMethod = LinkMovementMethod.getInstance()
+            highlightColor = Color.TRANSPARENT
+        }
     }
 
     private fun loadVideoInfo(url: String) {

app/src/main/java/com/gapps/videonoapi/ui/text/TextActivity.kt

@@ -1,14 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.5.20'
+    ext.kotlin_version = '1.8.0'
 
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:7.0.4"
+        classpath "com.android.tools.build:gradle:7.4.2"
         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

build.gradle

@@ -1,13 +1,12 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 android {
-    compileSdkVersion 31
+    compileSdkVersion 33
     buildToolsVersion "30.0.3"
 
     defaultConfig {
         minSdkVersion 19
-        targetSdkVersion 31
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
 
@@ -23,20 +22,22 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
-
+    buildFeatures {
+        viewBinding true
+    }
 }
 
 dependencies {
     //AndroidX
-    api 'androidx.appcompat:appcompat:1.4.1'
-    api 'com.google.android.material:material:1.5.0'
-    api 'androidx.core:core-ktx:1.7.0'
+    api 'androidx.appcompat:appcompat:1.6.1'
+    api 'com.google.android.material:material:1.8.0'
+    api 'androidx.core:core-ktx:1.10.0'
 
     //Gson
-    api 'com.google.code.gson:gson:2.8.7'
+    api 'com.google.code.gson:gson:2.9.0'
     //Coroutines
-    api 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2'
+    api 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
 
     //OkHttp
-    api 'com.squareup.okhttp3:okhttp:4.9.3'
+    api 'com.squareup.okhttp3:okhttp:4.10.0'
 }

embedded_video_lib/build.gradle

@@ -1,6 +1,6 @@
-#Wed Mar 02 20:57:14 EET 2022
+#Wed Apr 12 22:46:23 GMT+02:00 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME