Merge pull request #215 from PatilShreyas/v1.2.0

PatilShreyas · web-flow · commit 3fc3ad7fc839 · 2021-08-29T12:10:17.000+05:30
Release v1.2.0
diff --git a/docs/pages/changelog.md b/docs/pages/changelog.md
@@ -4,6 +4,29 @@ You can see [GitHub releases](https://github.com/PatilShreyas/NotyKT/releases) w
 
 ---
 
+## _v1.2.0_ (2021-08-29)
+
+This release includes User experience improvements in the Jetpack Compose Application. Minor fixes in Simple app.
+
+### 🔮 What's New?
+
+- [[#209](https://github.com/PatilShreyas/NotyKT/issues/209)] Added connectivity indicator in compose app.
+
+### ✅ Bug Fixes / Improvements
+
+- [[#202](https://github.com/PatilShreyas/NotyKT/issues/202)] Fixed continuous flickering issue after Signup/Login in compose app.
+- [[#203](https://github.com/PatilShreyas/NotyKT/issues/203)] Avoided/Fixed re-syncing of notes after configuration changes in compose app.
+
+### 🎯 Codebase Improvements
+
+- [[#201](https://github.com/PatilShreyas/NotyKT/issues/201)] Optimized APK size by enabling R8.
+- [[#206](https://github.com/PatilShreyas/NotyKT/issues/206)] Fixed memory leak of `mAdapter` in simple app.
+- Set flag `android:exported="true"` for Activity to support Android 12 and above.
+- Provide content padding to `LazyColumn` _(to achieve same behavior as `clipToPadding` in RecyclerView)_.
+- Cleaned up code.
+
+---
+
 ## _v1.1.0_ (2021-08-06)
 
 This release includes User experience improvements in the Jetpack Compose Application. No change in simple app.
diff --git a/noty-android/app/composeapp/src/main/AndroidManifest.xml b/noty-android/app/composeapp/src/main/AndroidManifest.xml
@@ -32,6 +32,7 @@
         <activity
             android:name=".ui.MainActivity"
             android:configChanges="keyboard|keyboardHidden|orientation|navigation|screenSize|screenLayout"
+            android:exported="true"
             android:label="@string/app_name"
             android:theme="@style/AppTheme.Splash">
             <intent-filter>
diff --git a/noty-android/app/composeapp/src/main/java/dev/shreyaspatil/noty/composeapp/component/NotesList.kt b/noty-android/app/composeapp/src/main/java/dev/shreyaspatil/noty/composeapp/component/NotesList.kt
@@ -16,14 +16,16 @@
 
 package dev.shreyaspatil.noty.composeapp.component
 
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.unit.dp
 import dev.shreyaspatil.noty.core.model.Note
 
 @Composable
 fun NotesList(notes: List<Note>, onClick: (Note) -> Unit) {
-    LazyColumn {
+    LazyColumn(contentPadding = PaddingValues(vertical = 4.dp)) {
         items(
             items = notes,
             itemContent = { note ->
diff --git a/noty-android/app/composeapp/src/main/java/dev/shreyaspatil/noty/composeapp/component/action/NotyActions.kt b/noty-android/app/composeapp/src/main/java/dev/shreyaspatil/noty/composeapp/component/action/NotyActions.kt
@@ -32,7 +32,7 @@ fun DeleteAction(onClick: () -> Unit) {
         painter = icon,
         contentDescription = "Delete",
         modifier = Modifier
-            .padding(end = 8.dp)
+            .padding(8.dp)
             .clickable(onClick = onClick)
     )
 }
@@ -44,7 +44,7 @@ fun ShareAction(onClick: () -> Unit) {
         icon,
         "share",
         Modifier
-            .padding(end = 8.dp)
+            .padding(8.dp)
             .clickable(onClick = onClick)
     )
 }
@@ -56,7 +56,7 @@ fun ThemeSwitchAction(onToggle: () -> Unit) {
         icon,
         "Theme switch",
         Modifier
-            .padding(end = 8.dp)
+            .padding(8.dp)
             .clickable(onClick = onToggle)
     )
 }
@@ -68,7 +68,7 @@ fun LogoutAction(onLogout: () -> Unit) {
         icon,
         "Logout",
         Modifier
-            .padding(end = 8.dp)
+            .padding(8.dp)
             .clickable(onClick = onLogout)
     )
 }
@@ -80,7 +80,7 @@ fun AboutAction(onClick: () -> Unit) {
         icon,
         "About",
         Modifier
-            .padding(end = 8.dp)
+            .padding(8.dp)
             .clickable(onClick = onClick)
     )
 }
diff --git a/noty-android/app/composeapp/src/main/java/dev/shreyaspatil/noty/composeapp/ui/screens/AddNotesScreen.kt b/noty-android/app/composeapp/src/main/java/dev/shreyaspatil/noty/composeapp/ui/screens/AddNotesScreen.kt
@@ -97,7 +97,7 @@ fun AddNoteScreen(
                         )
                     }
                 },
-                backgroundColor = MaterialTheme.colors.background,
+                backgroundColor = MaterialTheme.colors.surface,
                 contentColor = MaterialTheme.colors.onPrimary,
                 elevation = 0.dp,
             )
@@ -107,13 +107,12 @@ fun AddNoteScreen(
                 Modifier.scrollable(
                     rememberScrollState(),
                     orientation = Orientation.Vertical
-                )
+                ).padding(16.dp)
             ) {
 
                 NoteTitleField(
                     modifier = Modifier
                         .fillMaxWidth()
-                        .padding(16.dp, 0.dp, 16.dp, 0.dp)
                         .background(MaterialTheme.colors.background),
                     value = titleText.value,
                     onTextChange = { titleText.value = it },
@@ -123,7 +122,7 @@ fun AddNoteScreen(
                     modifier = Modifier
                         .fillMaxWidth()
                         .fillMaxHeight()
-                        .padding(16.dp, 8.dp, 16.dp, 0.dp)
+                        .padding(top = 8.dp)
                         .background(MaterialTheme.colors.background),
                     value = noteText.value,
                     onTextChange = { noteText.value = it }
diff --git a/noty-android/app/composeapp/src/main/java/dev/shreyaspatil/noty/composeapp/ui/screens/NoteDetailsScreen.kt b/noty-android/app/composeapp/src/main/java/dev/shreyaspatil/noty/composeapp/ui/screens/NoteDetailsScreen.kt
@@ -105,7 +105,7 @@ fun NoteDetailsScreen(
                             )
                         }
                     },
-                    backgroundColor = MaterialTheme.colors.background,
+                    backgroundColor = MaterialTheme.colors.surface,
                     contentColor = MaterialTheme.colors.onPrimary,
                     elevation = 0.dp,
                     actions = {
@@ -119,12 +119,11 @@ fun NoteDetailsScreen(
                     Modifier.scrollable(
                         rememberScrollState(),
                         orientation = Orientation.Vertical
-                    )
+                    ).padding(16.dp)
                 ) {
                     NoteTitleField(
                         modifier = Modifier
                             .fillMaxWidth()
-                            .padding(16.dp, 0.dp, 16.dp, 0.dp)
                             .background(MaterialTheme.colors.background),
                         value = titleText,
                         onTextChange = { titleText = it }
@@ -134,7 +133,7 @@ fun NoteDetailsScreen(
                         modifier = Modifier
                             .fillMaxWidth()
                             .wrapContentHeight()
-                            .padding(16.dp, 8.dp, 16.dp, 0.dp)
+                            .padding(top = 8.dp)
                             .background(MaterialTheme.colors.background),
                         value = noteText,
                         onTextChange = { noteText = it }
diff --git a/noty-android/app/composeapp/src/main/java/dev/shreyaspatil/noty/composeapp/ui/screens/NotesScreen.kt b/noty-android/app/composeapp/src/main/java/dev/shreyaspatil/noty/composeapp/ui/screens/NotesScreen.kt
@@ -49,6 +49,7 @@ import dev.shreyaspatil.noty.composeapp.component.action.AboutAction
 import dev.shreyaspatil.noty.composeapp.component.action.LogoutAction
 import dev.shreyaspatil.noty.composeapp.component.action.ThemeSwitchAction
 import dev.shreyaspatil.noty.composeapp.component.dialog.FailureDialog
+import dev.shreyaspatil.noty.composeapp.navigation.NOTY_NAV_HOST_ROUTE
 import dev.shreyaspatil.noty.composeapp.ui.Screen
 import dev.shreyaspatil.noty.core.ui.UIDataState
 import dev.shreyaspatil.noty.view.viewmodel.NotesViewModel
@@ -61,7 +62,9 @@ import kotlinx.coroutines.launch
 @ExperimentalCoroutinesApi
 @Composable
 fun NotesScreen(navController: NavHostController, viewModel: NotesViewModel) {
-    if (!viewModel.isUserLoggedIn()) {
+    val isUserLoggedIn by viewModel.userLoggedInState.collectAsState()
+
+    if (!isUserLoggedIn) {
         navigateToLogin(navController)
         return
     }
@@ -81,7 +84,7 @@ fun NotesScreen(navController: NavHostController, viewModel: NotesViewModel) {
                         modifier = Modifier.fillMaxWidth()
                     )
                 },
-                backgroundColor = MaterialTheme.colors.background,
+                backgroundColor = MaterialTheme.colors.surface,
                 contentColor = MaterialTheme.colors.onPrimary,
                 elevation = 0.dp,
                 actions = {
@@ -93,10 +96,7 @@ fun NotesScreen(navController: NavHostController, viewModel: NotesViewModel) {
                     }
                     LogoutAction(
                         onLogout = {
-                            scope.launch {
-                                viewModel.clearUserSession()
-                                navigateToLogin(navController)
-                            }
+                            scope.launch { viewModel.clearUserSession() }
                         }
                     )
                 }
@@ -157,6 +157,7 @@ private fun navigateToLogin(navController: NavHostController) {
     navController.navigate(
         Screen.Login.route,
         builder = {
+            popUpTo(NOTY_NAV_HOST_ROUTE)
             launchSingleTop = true
         }
     )
diff --git a/noty-android/app/composeapp/src/main/java/dev/shreyaspatil/noty/composeapp/ui/screens/SignUpScreen.kt b/noty-android/app/composeapp/src/main/java/dev/shreyaspatil/noty/composeapp/ui/screens/SignUpScreen.kt
@@ -45,7 +45,6 @@ import dev.shreyaspatil.noty.composeapp.component.text.ConfirmPasswordTextField
 import dev.shreyaspatil.noty.composeapp.component.text.PasswordTextField
 import dev.shreyaspatil.noty.composeapp.component.text.TextFieldValue.Valid
 import dev.shreyaspatil.noty.composeapp.component.text.UsernameTextField
-import dev.shreyaspatil.noty.composeapp.navigation.NOTY_NAV_HOST_ROUTE
 import dev.shreyaspatil.noty.composeapp.ui.Screen
 import dev.shreyaspatil.noty.composeapp.ui.theme.typography
 import dev.shreyaspatil.noty.core.ui.UIDataState
@@ -64,13 +63,10 @@ fun SignUpScreen(
     when (viewState) {
         is UIDataState.Loading -> LoaderDialog()
         is UIDataState.Success -> {
-            navController.navigate(
-                route = Screen.Notes.route,
-                builder = {
-                    launchSingleTop = true
-                    popUpTo(NOTY_NAV_HOST_ROUTE) { inclusive = true }
-                }
-            )
+            navController.navigate(Screen.Notes.route) {
+                launchSingleTop = true
+                popUpTo(Screen.SignUp.route) { inclusive = true }
+            }
         }
         is UIDataState.Failed -> FailureDialog(viewState.message)
     }
diff --git a/noty-android/app/simpleapp/src/main/AndroidManifest.xml b/noty-android/app/simpleapp/src/main/AndroidManifest.xml
@@ -32,6 +32,7 @@
         <activity
             android:name=".view.MainActivity"
             android:configChanges="keyboard|keyboardHidden|orientation|navigation|screenSize|screenLayout"
+            android:exported="true"
             android:windowSoftInputMode="adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/noty-android/app/simpleapp/src/main/java/dev/shreyaspatil/noty/simpleapp/view/notes/NotesFragment.kt b/noty-android/app/simpleapp/src/main/java/dev/shreyaspatil/noty/simpleapp/view/notes/NotesFragment.kt
@@ -159,9 +159,13 @@ class NotesFragment : BaseFragment<NotesFragmentBinding, NotesViewModel>() {
     }
 
     private fun checkAuthentication() {
-        if (!viewModel.isUserLoggedIn()) {
-            logout()
-        }
+        viewModel.userLoggedInState
+            .shareWhileObserved(viewLifecycleOwner.lifecycleScope)
+            .asLiveData().observe(viewLifecycleOwner) { isLoggedIn ->
+                if (!isLoggedIn) {
+                    logout()
+                }
+            }
     }
 
     private fun onNoteClicked(note: Note) {
diff --git a/noty-android/app/src/main/java/dev/shreyaspatil/noty/view/viewmodel/NotesViewModel.kt b/noty-android/app/src/main/java/dev/shreyaspatil/noty/view/viewmodel/NotesViewModel.kt
@@ -34,7 +34,9 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharedFlow
+import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.first
@@ -58,6 +60,9 @@ class NotesViewModel @Inject constructor(
     private val _syncState = MutableSharedFlow<UIDataState<Unit>>()
     val syncState: SharedFlow<UIDataState<Unit>> = _syncState.shareWhileObserved(viewModelScope)
 
+    private val _loggedInState = MutableStateFlow(isUserLoggedIn())
+    val userLoggedInState: StateFlow<Boolean> = _loggedInState
+
     val notes: SharedFlow<UIDataState<List<Note>>> = notyNoteRepository.getAllNotes()
         .distinctUntilChanged()
         .map { result ->
@@ -89,12 +94,13 @@ class NotesViewModel @Inject constructor(
         }
     }
 
-    fun isUserLoggedIn() = sessionManager.getToken() != null
+    private fun isUserLoggedIn() = sessionManager.getToken() != null
 
     suspend fun clearUserSession() = withContext(Dispatchers.IO) {
         sessionManager.saveToken(null)
         notyTaskManager.abortAllTasks()
         notyNoteRepository.deleteAllNotes()
+        _loggedInState.value = false
     }
 
     suspend fun isDarkModeEnabled() = preferenceManager.uiModeFlow.first()
diff --git a/noty-android/dependencies.gradle b/noty-android/dependencies.gradle
@@ -16,7 +16,7 @@
 
 ext {
     // Android Plugin
-    androidGradlePluginVersion = '7.0.0'
+    androidGradlePluginVersion = '7.0.1'
 
     // Kotlin
     kotlinVersion = "1.5.21"
@@ -67,7 +67,7 @@ ext {
     composeConstraintLayoutVersion = "1.0.0-beta01"
 
     // Jetpack Compose Navigation
-    composeNavVersion = "2.4.0-alpha05"
+    composeNavVersion = "2.4.0-alpha07"
 
     // Hilt Compose Navigation
     hiltComposeNavVersion = "1.0.0-alpha03"
diff --git a/noty-android/projectConfig.gradle b/noty-android/projectConfig.gradle
@@ -16,11 +16,11 @@
 
 ext {
     ProjectConfig = [
-            compileSdkVersion: 30,
+            compileSdkVersion: 31,
             buildToolsVersion: "30.0.2",
             minSdkVersion    : 21,
-            targetSdkVersion : 30,
-            versionCode      : 20210806,
-            versionName      : "1.1.0"
+            targetSdkVersion : 31,
+            versionCode      : 20210829,
+            versionName      : "1.2.0"
     ]
 }

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ fun DeleteAction(onClick: () -> Unit) {`
`32`	`32`	`painter = icon,`
`33`	`33`	`contentDescription = "Delete",`
`34`	`34`	`modifier = Modifier`
`35`		`- .padding(end = 8.dp)`
	`35`	`+ .padding(8.dp)`
`36`	`36`	`.clickable(onClick = onClick)`
`37`	`37`	`)`
`38`	`38`	`}`
`@@ -44,7 +44,7 @@ fun ShareAction(onClick: () -> Unit) {`
`44`	`44`	`icon,`
`45`	`45`	`"share",`
`46`	`46`	`Modifier`
`47`		`- .padding(end = 8.dp)`
	`47`	`+ .padding(8.dp)`
`48`	`48`	`.clickable(onClick = onClick)`
`49`	`49`	`)`
`50`	`50`	`}`
`@@ -56,7 +56,7 @@ fun ThemeSwitchAction(onToggle: () -> Unit) {`
`56`	`56`	`icon,`
`57`	`57`	`"Theme switch",`
`58`	`58`	`Modifier`
`59`		`- .padding(end = 8.dp)`
	`59`	`+ .padding(8.dp)`
`60`	`60`	`.clickable(onClick = onToggle)`
`61`	`61`	`)`
`62`	`62`	`}`
`@@ -68,7 +68,7 @@ fun LogoutAction(onLogout: () -> Unit) {`
`68`	`68`	`icon,`
`69`	`69`	`"Logout",`
`70`	`70`	`Modifier`
`71`		`- .padding(end = 8.dp)`
	`71`	`+ .padding(8.dp)`
`72`	`72`	`.clickable(onClick = onLogout)`
`73`	`73`	`)`
`74`	`74`	`}`
`@@ -80,7 +80,7 @@ fun AboutAction(onClick: () -> Unit) {`
`80`	`80`	`icon,`
`81`	`81`	`"About",`
`82`	`82`	`Modifier`
`83`		`- .padding(end = 8.dp)`
	`83`	`+ .padding(8.dp)`
`84`	`84`	`.clickable(onClick = onClick)`
`85`	`85`	`)`
`86`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,7 @@ import dev.shreyaspatil.noty.composeapp.component.action.AboutAction`
`49`	`49`	`import dev.shreyaspatil.noty.composeapp.component.action.LogoutAction`
`50`	`50`	`import dev.shreyaspatil.noty.composeapp.component.action.ThemeSwitchAction`
`51`	`51`	`import dev.shreyaspatil.noty.composeapp.component.dialog.FailureDialog`
	`52`	`+import dev.shreyaspatil.noty.composeapp.navigation.NOTY_NAV_HOST_ROUTE`
`52`	`53`	`import dev.shreyaspatil.noty.composeapp.ui.Screen`
`53`	`54`	`import dev.shreyaspatil.noty.core.ui.UIDataState`
`54`	`55`	`import dev.shreyaspatil.noty.view.viewmodel.NotesViewModel`
`@@ -61,7 +62,9 @@ import kotlinx.coroutines.launch`
`61`	`62`	`@ExperimentalCoroutinesApi`
`62`	`63`	`@Composable`
`63`	`64`	`fun NotesScreen(navController: NavHostController, viewModel: NotesViewModel) {`
`64`		`- if (!viewModel.isUserLoggedIn()) {`
	`65`	`+ val isUserLoggedIn by viewModel.userLoggedInState.collectAsState()`
	`66`	`+`
	`67`	`+ if (!isUserLoggedIn) {`
`65`	`68`	`navigateToLogin(navController)`
`66`	`69`	`return`
`67`	`70`	`}`
`@@ -81,7 +84,7 @@ fun NotesScreen(navController: NavHostController, viewModel: NotesViewModel) {`
`81`	`84`	`modifier = Modifier.fillMaxWidth()`
`82`	`85`	`)`
`83`	`86`	`},`
`84`		`- backgroundColor = MaterialTheme.colors.background,`
	`87`	`+ backgroundColor = MaterialTheme.colors.surface,`
`85`	`88`	`contentColor = MaterialTheme.colors.onPrimary,`
`86`	`89`	`elevation = 0.dp,`
`87`	`90`	`actions = {`
`@@ -93,10 +96,7 @@ fun NotesScreen(navController: NavHostController, viewModel: NotesViewModel) {`
`93`	`96`	`}`
`94`	`97`	`LogoutAction(`
`95`	`98`	`onLogout = {`
`96`		`- scope.launch {`
`97`		`- viewModel.clearUserSession()`
`98`		`- navigateToLogin(navController)`
`99`		`- }`
	`99`	`+ scope.launch { viewModel.clearUserSession() }`
`100`	`100`	`}`
`101`	`101`	`)`
`102`	`102`	`}`
`@@ -157,6 +157,7 @@ private fun navigateToLogin(navController: NavHostController) {`
`157`	`157`	`navController.navigate(`
`158`	`158`	`Screen.Login.route,`
`159`	`159`	`builder = {`
	`160`	`+ popUpTo(NOTY_NAV_HOST_ROUTE)`
`160`	`161`	`launchSingleTop = true`
`161`	`162`	`}`
`162`	`163`	`)`