Merge pull request #15 from DevelopersBreach/v1.1.0

Improved layouts design, dark/light theme support.

Author: RajashekarRaju

.idea/misc.xml

@@ -5,6 +5,7 @@ plugins {
     id 'kotlin-parcelize'
     id 'androidx.navigation.safeargs.kotlin'
     id 'com.google.gms.google-services'
+    id 'com.google.firebase.crashlytics'
 }
 
 android {
@@ -94,6 +95,7 @@ dependencies {
 
     // Firebase
     implementation 'com.google.firebase:firebase-messaging:23.0.0'
+    implementation 'com.google.firebase:firebase-crashlytics-ktx:18.2.4'
     implementation 'com.google.firebase:firebase-analytics:20.0.0'
 
     // Library to zoom view

app/build.gradle

@@ -6,7 +6,7 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
     <application
-        android:name="com.developerbreach.developerbreach.DevelopersBreachApp"
+        android:name=".DevelopersBreachApp"
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"

app/src/main/AndroidManifest.xml

@@ -1,16 +1,32 @@
 package com.developerbreach.developerbreach
 
 import android.app.Application
+import com.developerbreach.developerbreach.repository.AppRepository
+import com.developerbreach.developerbreach.repository.database.DatabaseRepository
+import com.developerbreach.developerbreach.repository.local.LocalRepository
+import com.developerbreach.developerbreach.repository.network.NetworkRepository
 import timber.log.Timber
 
-@Suppress("unused")
 class DevelopersBreachApp : Application() {
 
+    lateinit var databaseRepository: DatabaseRepository
+    lateinit var networkRepository: NetworkRepository
+    lateinit var localRepository: LocalRepository
+
     override fun onCreate() {
         super.onCreate()
 
+        initializeRepository()
+
         if (BuildConfig.DEBUG) {
             Timber.plant(Timber.DebugTree())
         }
     }
+
+    private fun initializeRepository() {
+        val repository = AppRepository(applicationContext)
+        databaseRepository = repository.databaseRepository
+        networkRepository = repository.networkRepository
+        localRepository = repository.localRepository
+    }
 }

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

@@ -21,10 +21,12 @@ import com.google.android.material.card.MaterialCardView
 
 
 class AppNavDirections(
-    private val navController: NavController,
+    private val navController: NavController
 ) {
 
-    private fun navigate(directions: NavDirections) {
+    private fun navigate(
+        directions: NavDirections
+    ) {
         navController.navigate(directions)
     }
 
@@ -55,7 +57,10 @@ class AppNavDirections(
     fun toNetworkFragment() = navigate(NetworkFragmentDirections.toNetworkFragmentGlobal())
 
     /** SearchFragment */
-    fun searchToDetail(articleId: Int, view: TextView) {
+    fun searchToDetail(
+        articleId: Int,
+        view: TextView
+    ) {
         navigateWithExtras(
             ArticleDetailFragmentDirections.toDetailFragmentGlobal(articleId),
             FragmentNavigatorExtras(view to articleId.toString())
@@ -78,19 +83,26 @@ class AppNavDirections(
     }
 
     /** DetailFragment */
-    fun detailToArticleWebView(articleUrlLink: String?) {
+    fun detailToArticleWebView(
+        articleUrlLink: String?
+    ) {
         navigate(ArticleDetailFragmentDirections.detailToArticleWebView(articleUrlLink))
     }
 
-    fun detailToBanner(bannerUrl: String?, view: ImageView) {
+    fun detailToBanner(
+        bannerUrl: String?,
+        view: ImageView
+    ) {
         navigateWithExtras(
             ArticleDetailFragmentDirections.detailToBanner(bannerUrl),
             FragmentNavigatorExtras(view as View to bannerUrl.toString())
         )
     }
 
     /** SettingsFragment */
-    fun settingsToCommonWebView(webUrl: String) {
+    fun settingsToCommonWebView(
+        webUrl: String
+    ) {
         navigate(SettingsFragmentDirections.settingsToCommonWebView(webUrl))
     }
 }

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

@@ -1,35 +1,32 @@
 package com.developerbreach.developerbreach.controller
 
-import android.app.NotificationChannel
-import android.app.NotificationManager
-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
+import com.developerbreach.developerbreach.fcm.setNotificationChannel
+import com.developerbreach.developerbreach.networkManager.NetworkManager
 
 
 class MainActivity : AppCompatActivity() {
 
-    private lateinit var navController: NavController
+    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.
         navController = Navigation.findNavController(this, R.id.nav_host_fragment)
-
-        navController.addOnDestinationChangedListener { controller, destination, _ ->
-            onDestinationChanged(destination, controller)
+        navController.addOnDestinationChangedListener { _, destination, _ ->
+            onDestinationChanged(destination)
         }
 
-        // Creates a notification channel based on version
-        setNotificationChannel()
+        // Creates a notification channel based on SDK level
+        setNotificationChannel(applicationContext)
     }
 
     override fun onResume() {
@@ -41,19 +38,4 @@ class MainActivity : AppCompatActivity() {
             }
         })
     }
-
-    private fun setNotificationChannel() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            // Create channel to show notifications.
-            val channelId = getString(R.string.default_notification_channel_id)
-            val channelName = getString(R.string.default_notification_channel_name)
-            val notificationManager = getSystemService(NotificationManager::class.java)
-            notificationManager?.createNotificationChannel(
-                NotificationChannel(
-                    channelId,
-                    channelName, NotificationManager.IMPORTANCE_LOW
-                )
-            )
-        }
-    }
 }

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

@@ -0,0 +1,58 @@
+package com.developerbreach.developerbreach.controller
+
+import androidx.activity.OnBackPressedCallback
+import androidx.core.content.ContextCompat
+import androidx.navigation.NavDestination
+import com.developerbreach.developerbreach.R
+
+
+fun MainActivity.onDestinationChanged(
+    destination: NavDestination,
+) {
+    when (destination.id) {
+
+        R.id.introFragment -> {
+            navigateUpOnBackPress()
+            setSystemUIColor(R.color.colorLowWave)
+        }
+
+        R.id.homeFragment -> {
+            finishActivityOnBackPress()
+            setSystemUIColor(R.color.colorBackground)
+        }
+
+        R.id.articleDetailFragment -> {
+            navigateUpOnBackPress()
+            setSystemUIColor(R.color.surfaceColor)
+        }
+
+        R.id.searchFragment, R.id.articleWebViewFragment, R.id.bannerFragment,
+        R.id.commonWebViewFragment, R.id.favoritesFragment, R.id.authorsFragment,
+        R.id.articleListFragment, R.id.settingsFragment, R.id.optionsFragment -> {
+            navigateUpOnBackPress()
+        }
+    }
+}
+
+private fun MainActivity.setSystemUIColor(
+    navigationBarColor: Int
+) {
+    window.navigationBarColor = ContextCompat.getColor(applicationContext, navigationBarColor)
+}
+
+private fun MainActivity.finishActivityOnBackPress() {
+    onBackPressedDispatcher.addCallback(object : OnBackPressedCallback(true) {
+        override fun handleOnBackPressed() {
+            finish()
+        }
+    })
+}
+
+private fun MainActivity.navigateUpOnBackPress() {
+    val activity = this
+    onBackPressedDispatcher.addCallback(object : OnBackPressedCallback(true) {
+        override fun handleOnBackPressed() {
+            activity.navController.navigateUp()
+        }
+    })
+}

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

@@ -1,16 +1,5 @@
 package com.developerbreach.developerbreach.fcm
 
-import android.annotation.SuppressLint
-import android.app.NotificationChannel
-import android.app.NotificationManager
-import android.app.PendingIntent
-import android.content.Context
-import android.content.Intent
-import android.media.RingtoneManager
-import android.os.Build
-import androidx.core.app.NotificationCompat
-import com.developerbreach.developerbreach.R
-import com.developerbreach.developerbreach.controller.MainActivity
 import com.google.firebase.messaging.FirebaseMessagingService
 import com.google.firebase.messaging.RemoteMessage
 
@@ -19,49 +8,12 @@ class AppFirebaseService : FirebaseMessagingService() {
 
     override fun onMessageReceived(remoteMessage: RemoteMessage) {
         super.onMessageReceived(remoteMessage)
-        val title: String? = remoteMessage.notification!!.title
-        val body: String? = remoteMessage.notification!!.body
-        sendNotification(title!!, body!!)
+        val title: String? = remoteMessage.notification?.title
+        val body: String? = remoteMessage.notification?.body
+        sendFirebaseNotification(title, body, applicationContext)
     }
 
-    override fun onNewToken(token: String) {}
-
-    /**
-     * Create and show a simple notification containing the received FCM message.
-     *
-     * @param body FCM message body received.
-     */
-    @SuppressLint("UnspecifiedImmutableFlag")
-    private fun sendNotification(title: String, body: String) {
-
-        val intent = Intent(this, MainActivity::class.java)
-        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
-        val pendingIntent = PendingIntent.getActivity(
-            this, 0, intent, PendingIntent.FLAG_ONE_SHOT
-        )
-        val channelId = getString(R.string.default_notification_channel_id)
-        val channelName = getString(R.string.default_notification_channel_name)
-        val defaultSoundUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION)
-
-        val notificationBuilder = NotificationCompat
-            .Builder(this, channelId)
-            .setSmallIcon(R.drawable.ic_logo)
-            .setContentTitle(title)
-            .setContentText(body)
-            .setAutoCancel(true)
-            .setSound(defaultSoundUri)
-            .setContentIntent(pendingIntent)
-        val notificationManager = getSystemService(Context.NOTIFICATION_SERVICE)
-                as NotificationManager
-
-        // Since android Oreo notification channel is needed.
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            val channel = NotificationChannel(
-                channelId, channelName,
-                NotificationManager.IMPORTANCE_DEFAULT
-            )
-            notificationManager.createNotificationChannel(channel)
-        }
-        notificationManager.notify(0, notificationBuilder.build())
+    override fun onNewToken(token: String) {
+        // Triggers when a new token is generated.
     }
 }