update

luisansal · Feb 23, 2021 · bb60cf1 · bb60cf1
1 parent 4f10365
commit bb60cf1
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -67,18 +67,27 @@ dependencies {
     def coroutines_version = "1.4.1"
     def playservices_version = "17.0.0"
     def androidx_core_version = "1.3.1"
+    def androidx_activity_version = "1.2.0-alpha02"
+    def androidx_fragment_version = "1.3.0-alpha02"
+    def androidx_compat_version = "1.3.0-beta01"
 
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.appcompat:appcompat:1.3.0-alpha02'
+    implementation "androidx.appcompat:appcompat:$androidx_compat_version"
+    implementation "androidx.activity:activity-ktx:$androidx_activity_version"
+    implementation "androidx.fragment:fragment-ktx:$androidx_fragment_version"
+    implementation "com.google.android.material:material:$androidx_compat_version"
+
     implementation 'androidx.constraintlayout:constraintlayout:2.0.0'
-    implementation 'com.google.android.material:material:1.3.0-alpha02'
+
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation "androidx.core:core-ktx:$androidx_core_version"
-    implementation 'androidx.fragment:fragment-ktx'
     implementation "androidx.viewpager2:viewpager2:1.1.0-alpha01"
+
+    //Navigation
     implementation "androidx.navigation:navigation-runtime-ktx:$navigation_version"
     implementation "androidx.navigation:navigation-fragment-ktx:$navigation_version"
     implementation "androidx.navigation:navigation-ui-ktx:$navigation_version"
+    //End Navigation
 
     //ViewModel and LiveData
     //Lifecycle components
@@ -154,9 +163,9 @@ dependencies {
     //retrofit
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.7.1'
-        //okhttp
+    //okhttp
     implementation 'com.squareup.okhttp3:logging-interceptor:4.3.1'
-        //end-okhttp
+    //end-okhttp
 
 
     //TEST

diff --git a/app/src/main/java/com/luisansal/jetpack/base/BaseActivity.kt b/app/src/main/java/com/luisansal/jetpack/base/BaseActivity.kt
@@ -4,16 +4,15 @@ import android.annotation.SuppressLint
 import android.app.Activity
 import android.os.Bundle
 import android.util.Log
-import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
 import android.view.LayoutInflater
 import android.view.View
 import android.view.inputmethod.InputMethodManager
 import android.widget.FrameLayout
 import android.widget.ImageView
-import android.widget.ProgressBar
 import android.widget.TextView
 import androidx.annotation.StringRes
+import androidx.appcompat.app.AppCompatActivity
 
 import com.luisansal.jetpack.R
 import com.luisansal.jetpack.components.dialogs.AlertDialogFragment

diff --git a/app/src/main/java/com/luisansal/jetpack/base/BaseFragment.kt b/app/src/main/java/com/luisansal/jetpack/base/BaseFragment.kt
@@ -4,10 +4,8 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.FrameLayout
 import androidx.annotation.StringRes
 import androidx.fragment.app.Fragment
-import com.luisansal.jetpack.R
 
 abstract class BaseFragment : Fragment() {
 

diff --git a/app/src/main/java/com/luisansal/jetpack/features/multimedia/MultimediaFragment.kt b/app/src/main/java/com/luisansal/jetpack/features/multimedia/MultimediaFragment.kt
@@ -16,7 +16,6 @@ import android.widget.Toast
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.content.FileProvider
-import androidx.lifecycle.Observer
 import com.luisansal.jetpack.BuildConfig
 import com.luisansal.jetpack.features.main.MainActivity
 import com.luisansal.jetpack.R
@@ -59,7 +58,7 @@ class MultimediaFragment : BaseFragment(), TitleListener {
         client.newWebSocket(request, webSocketListener)
     }
 
-    fun setupWebSocket() {
+    private fun setupWebSocket() {
         val jsonObject = JSONObject()
         jsonObject.put("command", "subscribe")
         jsonObject.put("channel", CHANNEL_ID)