Merge pull request #13 from DevelopersBreach/v1.1.0

Improved view model usage, made changes for all fragments.

Author: RajashekarRaju

.idea/misc.xml

@@ -14,7 +14,7 @@ android {
 
     defaultConfig {
         applicationId "com.developerbreach.developerbreach"
-        minSdkVersion 21
+        minSdkVersion 24
         targetSdkVersion 31
         versionCode 2
         versionName "1.1.0"
@@ -49,13 +49,13 @@ dependencies {
     implementation 'androidx.core:core-ktx:1.7.0'
 
     // Degrade on older versions of Android
-    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation 'androidx.appcompat:appcompat:1.4.0'
 
     // Support library
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
 
     // Constraint Layout
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
 
     // Navigation Component
     implementation "androidx.navigation:navigation-fragment-ktx:2.3.5"
@@ -78,7 +78,7 @@ dependencies {
     implementation 'androidx.preference:preference-ktx:1.1.1'
 
     // Fragment
-    implementation "androidx.fragment:fragment-ktx:1.3.6"
+    implementation "androidx.fragment:fragment-ktx:1.4.0"
 
     // Glide
     implementation 'com.github.bumptech.glide:glide:4.11.0'
@@ -92,9 +92,6 @@ dependencies {
     implementation "androidx.room:room-runtime:2.3.0"
     kapt "androidx.room:room-compiler:2.3.0"
 
-    // Work Manager
-    implementation "androidx.work:work-runtime-ktx:2.7.0"
-
     // Firebase
     implementation 'com.google.firebase:firebase-messaging:23.0.0'
     implementation 'com.google.firebase:firebase-analytics:20.0.0'

.idea/render.experimental.xml

@@ -2,6 +2,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.developerbreach.developerbreach">
 
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+
     <application
         android:name="com.developerbreach.developerbreach.DevelopersBreachApp"
         android:allowBackup="false"

app/build.gradle

@@ -1,59 +1,16 @@
 package com.developerbreach.developerbreach
 
 import android.app.Application
-import android.os.Build
-import androidx.work.*
-import com.developerbreach.developerbreach.worker.ArticleRefreshWorker
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
 import timber.log.Timber
-import java.util.concurrent.TimeUnit
 
 @Suppress("unused")
 class DevelopersBreachApp : Application() {
 
-    private val applicationScope = CoroutineScope(Dispatchers.Default)
-
     override fun onCreate() {
         super.onCreate()
-        delayedInit()
 
         if (BuildConfig.DEBUG) {
             Timber.plant(Timber.DebugTree())
         }
     }
-
-    private fun setupRecurringWork() {
-
-        val constraints = Constraints.Builder()
-            .setRequiredNetworkType(NetworkType.UNMETERED)
-            .apply {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                    setRequiresDeviceIdle(true)
-                }
-            }.build()
-
-        // creates and executes the same work once a day.
-        val repeatingRequest: PeriodicWorkRequest =
-            PeriodicWorkRequestBuilder<ArticleRefreshWorker>(1, TimeUnit.DAYS)
-                .setConstraints(constraints)
-                .build()
-
-        /**
-         * Create an instance for [WorkManager] with context and work properties which are
-         * required by work manager do complete the task.
-         */
-        WorkManager.getInstance(applicationContext).enqueueUniquePeriodicWork(
-            ArticleRefreshWorker.WORKER_NAME,
-            ExistingPeriodicWorkPolicy.KEEP,
-            repeatingRequest
-        )
-    }
-
-    private fun delayedInit() {
-        applicationScope.launch {
-            setupRecurringWork()
-        }
-    }
 }

app/src/main/AndroidManifest.xml

@@ -114,5 +114,11 @@ class AppNavDirections(
     fun optionsToIntro() {
         navController.navigate(OptionsFragmentDirections.optionsToIntro())
     }
+
+    /** NetworkFragment **/
+
+    fun toNetworkFragment() {
+        navController.navigate(R.id.networkFragment)
+    }
 }
 

app/src/main/java/com/developerbreach/developerbreach/DevelopersBreachApp.kt

@@ -6,18 +6,23 @@ import android.os.Build
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.databinding.DataBindingUtil
+import androidx.navigation.NavController
 import androidx.navigation.Navigation
 import com.developerbreach.developerbreach.R
 import com.developerbreach.developerbreach.databinding.ActivityMainBinding
+import com.developerbreach.developerbreach.view.network.NetworkManager
+
 
 class MainActivity : AppCompatActivity() {
 
+    private lateinit var navController: NavController
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         DataBindingUtil.setContentView<ActivityMainBinding>(this, R.layout.activity_main)
 
         // NavigationController to set default NavHost as nav_host_fragment.
-        val navController = Navigation.findNavController(this, R.id.nav_host_fragment)
+        navController = Navigation.findNavController(this, R.id.nav_host_fragment)
 
         navController.addOnDestinationChangedListener { controller, destination, _ ->
             onDestinationChanged(destination, controller)
@@ -27,6 +32,16 @@ class MainActivity : AppCompatActivity() {
         setNotificationChannel()
     }
 
+    override fun onResume() {
+        super.onResume()
+        val connected = NetworkManager(applicationContext).isConnected
+        connected.observe(this, { available ->
+            if (!available) {
+                AppNavDirections(navController).toNetworkFragment()
+            }
+        })
+    }
+
     private fun setNotificationChannel() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             // Create channel to show notifications.

app/src/main/java/com/developerbreach/developerbreach/controller/AppNavDirections.kt

@@ -1,47 +1,11 @@
 package com.developerbreach.developerbreach.model
 
-import android.content.Context
 import android.graphics.drawable.Drawable
-import androidx.core.content.ContextCompat
-import com.developerbreach.developerbreach.R
 
 
 data class Intro(
     val id: Int,
     val subtitle: String,
     val banner: Drawable?,
     val background: Drawable?
-) {
-
-    companion object {
-
-        fun addIntroData(
-            context: Context,
-        ): List<Intro> = listOf(
-            Intro(
-                1,
-                context.getString(R.string.intro_pager_first_subtitle_text),
-                ContextCompat.getDrawable(context, R.drawable.ic_logo),
-                ContextCompat.getDrawable(context, R.drawable.ic_one_pager_intro)
-            ),
-            Intro(
-                2,
-                context.getString(R.string.intro_pager_second_subtitle_text),
-                ContextCompat.getDrawable(context, R.drawable.ic_mobile_apps),
-                ContextCompat.getDrawable(context, R.drawable.ic_two_pager_intro)
-            ),
-            Intro(
-                3,
-                context.getString(R.string.intro_pager_third_subtitle_text),
-                ContextCompat.getDrawable(context, R.drawable.ic_developer_activity),
-                ContextCompat.getDrawable(context, R.drawable.ic_three_pager_intro)
-            ),
-            Intro(
-                4,
-                context.getString(R.string.intro_pager_fourth_subtitle_text),
-                ContextCompat.getDrawable(context, R.drawable.ic_content_creation),
-                ContextCompat.getDrawable(context, R.drawable.ic_four_pager_intro)
-            )
-        )
-    }
-}
+)

app/src/main/java/com/developerbreach/developerbreach/controller/MainActivity.kt

@@ -1,24 +1,8 @@
 package com.developerbreach.developerbreach.model
 
-import android.content.Context
-import com.developerbreach.developerbreach.R
 
 data class Options(
     val optionsId: Int,
     val optionsTitle: String,
     val optionsIcon: Int,
-) {
-
-    companion object {
-
-        fun addOptionsData(
-            context: Context,
-        ): List<Options> = listOf(
-            Options(1, context.getString(R.string.item_options_favorites), R.drawable.ic_favorite_add),
-            Options(2, context.getString(R.string.item_options_search), R.drawable.ic_search),
-            Options(3, context.getString(R.string.item_options_authors), R.drawable.ic_author),
-            Options(4, context.getString(R.string.item_options_settings), R.drawable.ic_settings),
-            Options(5, context.getString(R.string.item_options_about), R.drawable.ic_about)
-        )
-    }
-}
+)

app/src/main/java/com/developerbreach/developerbreach/model/Intro.kt

@@ -1,6 +1,5 @@
 package com.developerbreach.developerbreach.repository
 
-import android.content.Context
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Transformations
 import com.developerbreach.developerbreach.model.*
@@ -11,7 +10,6 @@ import com.developerbreach.developerbreach.repository.network.*
 import com.developerbreach.developerbreach.repository.network.getArticles
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import java.io.IOException
 
 
 class AppRepository(
@@ -83,17 +81,6 @@ class AppRepository(
             favoritesEntityList.asDomainModel()
         }
 
-    suspend fun refreshArticles() {
-        withContext(Dispatchers.IO) {
-            try {
-                //val articlesList: List<Article> = getArticles()
-
-            } catch (e: IOException) {
-                e.printStackTrace()
-            }
-        }
-    }
-
     suspend fun insertArticleToFavorites(
         article: Article
     ) {
@@ -109,8 +96,4 @@ class AppRepository(
             database.favoriteDao.deleteFavoriteArticle(article.asDatabaseModel())
         }
     }
-
-    fun optionsList(context: Context): List<Options> {
-        return Options.addOptionsData(context)
-    }
 }