Download image

app/src/main/kotlin/org/michaelbel/movies/MainActivity.kt

@@ -4,22 +4,10 @@ import android.os.Bundle
 import androidx.activity.compose.setContent
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
-import androidx.compose.runtime.getValue
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.core.view.WindowCompat
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import androidx.navigation.NavHostController
-import androidx.navigation.compose.rememberNavController
-import androidx.work.OneTimeWorkRequestBuilder
-import androidx.work.WorkManager
-import androidx.work.workDataOf
 import dagger.hilt.android.AndroidEntryPoint
-import org.michaelbel.movies.work.AccountUpdateWorker
-import org.michaelbel.movies.common.theme.AppTheme
-import org.michaelbel.movies.work.MoviesDatabaseWorker
-import org.michaelbel.movies.navigation.ktx.addOnDestinationChangedListener
 import org.michaelbel.movies.ui.shortcuts.installShortcuts
-import org.michaelbel.movies.ui.theme.MoviesTheme
 
 /**
  * Per-App Language depends on AppCompatActivity (not ComponentActivity).
@@ -38,38 +26,9 @@ internal class MainActivity: AppCompatActivity() {
 
         installShortcuts()
         setContent {
-            val currentTheme: AppTheme by viewModel.currentTheme.collectAsStateWithLifecycle()
-            val dynamicColors: Boolean by viewModel.dynamicColors.collectAsStateWithLifecycle()
-
-            val navHostController: NavHostController = rememberNavController().apply {
-                addOnDestinationChangedListener(viewModel::analyticsTrackDestination)
-            }
-
-            MoviesTheme(
-                theme = currentTheme,
-                dynamicColors = dynamicColors
-            ) {
-                MainActivityContent(
-                    navHostController = navHostController,
-                    onStartUpdateFlow = { viewModel.startUpdateFlow(this) }
-                )
-            }
+            MainActivityContent(
+                onStartUpdateFlow = { viewModel.startUpdateFlow(this) }
+            )
         }
-
-        prepopulateDatabase()
-        updateAccountDetails()
-    }
-
-    private fun prepopulateDatabase() {
-        val request = OneTimeWorkRequestBuilder<MoviesDatabaseWorker>()
-            .setInputData(workDataOf(MoviesDatabaseWorker.KEY_FILENAME to MainViewModel.MOVIES_DATA_FILENAME))
-            .build()
-        WorkManager.getInstance(this).enqueue(request)
-    }
-
-    private fun updateAccountDetails() {
-        val request = OneTimeWorkRequestBuilder<AccountUpdateWorker>()
-            .build()
-        WorkManager.getInstance(this).enqueue(request)
     }
 }

app/src/main/kotlin/org/michaelbel/movies/MainActivityContent.kt

@@ -1,54 +1,70 @@
 package org.michaelbel.movies
 
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.rememberNavController
 import org.michaelbel.movies.auth.accountGraph
 import org.michaelbel.movies.auth.authGraph
 import org.michaelbel.movies.auth.navigateToAccount
 import org.michaelbel.movies.auth.navigateToAuth
+import org.michaelbel.movies.common.theme.AppTheme
 import org.michaelbel.movies.details.detailsGraph
 import org.michaelbel.movies.details.navigateToDetails
 import org.michaelbel.movies.feed.FeedDestination
 import org.michaelbel.movies.feed.feedGraph
 import org.michaelbel.movies.gallery.galleryGraph
 import org.michaelbel.movies.gallery.navigateToGallery
+import org.michaelbel.movies.navigation.ktx.addOnDestinationChangedListener
 import org.michaelbel.movies.settings.navigateToSettings
 import org.michaelbel.movies.settings.settingsGraph
+import org.michaelbel.movies.ui.theme.MoviesTheme
 
 @Composable
 internal fun MainActivityContent(
-    navHostController: NavHostController = rememberNavController(),
-    startDestination: String = FeedDestination.route,
+    viewModel: MainViewModel = hiltViewModel(),
     onStartUpdateFlow: () -> Unit
 ) {
-    NavHost(
-        navController = navHostController,
-        startDestination = startDestination
+    val currentTheme: AppTheme by viewModel.currentTheme.collectAsStateWithLifecycle()
+    val dynamicColors: Boolean by viewModel.dynamicColors.collectAsStateWithLifecycle()
+    val navHostController: NavHostController = rememberNavController().apply {
+        addOnDestinationChangedListener(viewModel::analyticsTrackDestination)
+    }
+
+    MoviesTheme(
+        theme = currentTheme,
+        dynamicColors = dynamicColors
     ) {
-        authGraph(
-            navigateBack = navHostController::popBackStack
-        )
-        accountGraph(
-            navigateBack = navHostController::popBackStack
-        )
-        feedGraph(
-            navigateToAuth = navHostController::navigateToAuth,
-            navigateToAccount = navHostController::navigateToAccount,
-            navigateToSettings = navHostController::navigateToSettings,
-            navigateToDetails = navHostController::navigateToDetails,
-            onStartUpdateFlow = onStartUpdateFlow
-        )
-        detailsGraph(
-            navigateBack = navHostController::popBackStack,
-            navigateToGallery = navHostController::navigateToGallery
-        )
-        galleryGraph(
-            navigateBack = navHostController::popBackStack
-        )
-        settingsGraph(
-            navigateBack = navHostController::popBackStack
-        )
+        NavHost(
+            navController = navHostController,
+            startDestination = FeedDestination.route
+        ) {
+            authGraph(
+                navigateBack = navHostController::popBackStack
+            )
+            accountGraph(
+                navigateBack = navHostController::popBackStack
+            )
+            feedGraph(
+                navigateToAuth = navHostController::navigateToAuth,
+                navigateToAccount = navHostController::navigateToAccount,
+                navigateToSettings = navHostController::navigateToSettings,
+                navigateToDetails = navHostController::navigateToDetails,
+                onStartUpdateFlow = onStartUpdateFlow
+            )
+            detailsGraph(
+                navigateBack = navHostController::popBackStack,
+                navigateToGallery = navHostController::navigateToGallery
+            )
+            galleryGraph(
+                navigateBack = navHostController::popBackStack
+            )
+            settingsGraph(
+                navigateBack = navHostController::popBackStack
+            )
+        }
     }
 }

app/src/main/kotlin/org/michaelbel/movies/MainViewModel.kt

@@ -3,6 +3,9 @@ package org.michaelbel.movies
 import android.app.Activity
 import android.os.Bundle
 import androidx.navigation.NavDestination
+import androidx.work.OneTimeWorkRequestBuilder
+import androidx.work.WorkManager
+import androidx.work.workDataOf
 import com.google.firebase.messaging.FirebaseMessaging
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
@@ -16,13 +19,16 @@ import org.michaelbel.movies.common.ktx.printlnDebug
 import org.michaelbel.movies.common.theme.AppTheme
 import org.michaelbel.movies.common.viewmodel.BaseViewModel
 import org.michaelbel.movies.interactor.Interactor
+import org.michaelbel.movies.work.AccountUpdateWorker
+import org.michaelbel.movies.work.MoviesDatabaseWorker
 
 @HiltViewModel
 internal class MainViewModel @Inject constructor(
     private val interactor: Interactor,
     private val inAppUpdate: InAppUpdate,
     private val analytics: MoviesAnalytics,
-    private val firebaseMessaging: FirebaseMessaging
+    private val firebaseMessaging: FirebaseMessaging,
+    private val workManager: WorkManager
 ): BaseViewModel() {
 
     val currentTheme: StateFlow<AppTheme> = interactor.currentTheme
@@ -42,6 +48,8 @@ internal class MainViewModel @Inject constructor(
     init {
         fetchRemoteConfig()
         fetchFirebaseMessagingToken()
+        prepopulateDatabase()
+        updateAccountDetails()
     }
 
     fun analyticsTrackDestination(destination: NavDestination, arguments: Bundle?) {
@@ -63,6 +71,19 @@ internal class MainViewModel @Inject constructor(
         }
     }
 
+    private fun prepopulateDatabase() {
+        val request = OneTimeWorkRequestBuilder<MoviesDatabaseWorker>()
+            .setInputData(workDataOf(MoviesDatabaseWorker.KEY_FILENAME to MOVIES_DATA_FILENAME))
+            .build()
+        workManager.enqueue(request)
+    }
+
+    private fun updateAccountDetails() {
+        val request = OneTimeWorkRequestBuilder<AccountUpdateWorker>()
+            .build()
+        workManager.enqueue(request)
+    }
+
     companion object {
         const val MOVIES_DATA_FILENAME = "movies.json"
     }

core/common/src/main/kotlin/org/michaelbel/movies/common/ktx/TimeKtx.kt

@@ -1,5 +1,17 @@
 package org.michaelbel.movies.common.ktx
 
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+
+private const val DATE_TIME_FORMAT = "yyyyMMdd_HHmmss"
+
+val currentDateTime: String
+    get() {
+        val simpleDateFormat = SimpleDateFormat(DATE_TIME_FORMAT, Locale.getDefault())
+        return simpleDateFormat.format(Date())
+    }
+
 fun isTimePasses(interval: Long, expireTime: Long, currentTime: Long): Boolean {
     return expireTime == 0L || currentTime.minus(expireTime) >= interval
 }

core/notifications/build.gradle.kts

@@ -38,5 +38,6 @@ android {
 dependencies {
     implementation(project(":core:common"))
     implementation(project(":core:interactor"))
+    implementation(project(":core:ui"))
     api(libs.firebase.messaging.ktx)
 }

core/notifications/src/main/AndroidManifest.xml

@@ -16,7 +16,7 @@
 
         <meta-data
             android:name="com.google.firebase.messaging.default_notification_channel_id"
-            android:value="@string/notification_channel_id" />
+            android:value="@string/notification_new_movies_channel_id" />
 
         <!-- Set custom default icon. This is used when no icon is set for incoming notification
              messages. -->

core/notifications/src/main/kotlin/org/michaelbel/movies/notifications/NotificationClient.kt

@@ -1,33 +1,33 @@
 package org.michaelbel.movies.notifications
 
+import android.annotation.SuppressLint
 import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
 import android.media.RingtoneManager
+import androidx.annotation.StringRes
 import androidx.core.app.NotificationChannelCompat
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.content.ContextCompat
 import androidx.core.net.toUri
 import dagger.hilt.android.qualifiers.ApplicationContext
+import java.util.concurrent.TimeUnit
+import javax.inject.Inject
 import kotlinx.coroutines.delay
 import org.michaelbel.movies.common.ktx.isTimePasses
+import org.michaelbel.movies.interactor.Interactor
 import org.michaelbel.movies.notifications.ktx.isPostNotificationsPermissionGranted
 import org.michaelbel.movies.notifications.model.MoviesPush
-import org.michaelbel.movies.persistence.datastore.MoviesPreferences
-import java.util.concurrent.TimeUnit
-import javax.inject.Inject
-import org.michaelbel.movies.interactor.Interactor
+import org.michaelbel.movies.ui.icons.MoviesIcons
 
+@SuppressLint("MissingPermission")
 class NotificationClient @Inject constructor(
     @ApplicationContext private val context: Context,
     private val notificationManager: NotificationManagerCompat,
     private val interactor: Interactor
 ) {
 
-    private val channelId: String
-        get() = context.getString(R.string.notification_channel_id)
-
     suspend fun notificationsPermissionRequired(time: Long): Boolean {
         val expireTime: Long = interactor.notificationExpireTime()
         val currentTime: Long = System.currentTimeMillis()
@@ -41,12 +41,19 @@ class NotificationClient @Inject constructor(
     }
 
     fun send(push: MoviesPush) {
-        createChannel()
+        createChannel(
+            channelId = R.string.notification_new_movies_channel_id,
+            channelName = R.string.notification_channel_name,
+            channelDescription = R.string.notification_channel_description
+        )
 
-        val notification = NotificationCompat.Builder(context, channelId).apply {
+        val notification = NotificationCompat.Builder(
+            context,
+            context.getString(R.string.notification_new_movies_channel_id)
+        ).apply {
             setContentTitle(push.notificationTitle)
             setContentText(push.notificationDescription)
-            setSmallIcon(R.drawable.ic_movie_filter_24)
+            setSmallIcon(MoviesIcons.MovieFilter24)
             setBadgeIconType(NotificationCompat.BADGE_ICON_SMALL)
             color = ContextCompat.getColor(context, R.color.primary)
             setDefaults(NotificationCompat.DEFAULT_LIGHTS)
@@ -59,16 +66,59 @@ class NotificationClient @Inject constructor(
             setSound(RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION))
         }.build()
 
-        notificationManager.notify(TAG, push.notificationId, notification)
+        if (context.isPostNotificationsPermissionGranted) {
+            notificationManager.notify(TAG, push.notificationId, notification)
+        }
+    }
+
+    fun sendDownloadImageNotification(
+        notificationId: Int,
+        @StringRes contentTitleRes: Int,
+        @StringRes contentTextRes: Int
+    ) {
+        createChannel(
+            channelId = R.string.notification_gallery_download_channel_id,
+            channelName = R.string.notification_gallery_channel_name,
+            channelDescription = R.string.notification_gallery_channel_description
+        )
+
+        val notification = NotificationCompat.Builder(
+            context,
+            context.getString(R.string.notification_gallery_download_channel_id)
+        ).apply {
+            setContentTitle(context.getString(contentTitleRes))
+            setContentText(context.getString(contentTextRes))
+            setSmallIcon(MoviesIcons.FileDownload24)
+            setBadgeIconType(NotificationCompat.BADGE_ICON_SMALL)
+            color = ContextCompat.getColor(context, R.color.primary)
+            setDefaults(NotificationCompat.DEFAULT_LIGHTS)
+            setVibrate(VIBRATE_PATTERN)
+            priority = NotificationCompat.PRIORITY_HIGH
+            setSound(null)
+            setOngoing(true)
+            setProgress(0, 0, true)
+        }.build()
+
+        if (context.isPostNotificationsPermissionGranted) {
+            notificationManager.notify(DOWNLOAD_IMAGE_NOTIFICATION_TAG, notificationId, notification)
+        }
+    }
+
+    fun cancelDownloadImageNotification(notificationId: Int) {
+        notificationManager.cancel(DOWNLOAD_IMAGE_NOTIFICATION_TAG, notificationId)
     }
 
-    private fun createChannel() {
+    private fun createChannel(
+        @StringRes channelId: Int,
+        @StringRes channelName: Int,
+        @StringRes channelDescription: Int
+    ) {
         val notificationChannel: NotificationChannelCompat = NotificationChannelCompat.Builder(
-            channelId,
+            context.getString(channelId),
             NotificationManagerCompat.IMPORTANCE_HIGH
         ).apply {
-            setName(context.getString(R.string.notification_channel_name))
-            setDescription(context.getString(R.string.notification_channel_description))
+            setName(context.getString(channelName))
+            setDescription(context.getString(channelDescription))
             setShowBadge(true)
         }.build()
         notificationManager.createNotificationChannel(notificationChannel)
@@ -85,6 +135,7 @@ class NotificationClient @Inject constructor(
 
     private companion object {
         private const val TAG = "PUSH"
+        private const val DOWNLOAD_IMAGE_NOTIFICATION_TAG = "DOWNLOAD_IMAGE"
         private const val GROUP_NAME = "App"
         private val VIBRATE_PATTERN: LongArray = longArrayOf(1000)
         private val ONE_DAY_MILLS: Long = TimeUnit.DAYS.toMillis(1)