Develop (#36)

* fix gradle

* refactor main screen vm

Author: stslex

.idea/compiler.xml

@@ -1,7 +1,7 @@
 plugins {
-    id("com.google.devtools.ksp") version "1.7.0-1.0.6"
-    id("com.android.library") version "7.2.0" apply false
-    id("org.jetbrains.kotlin.android") version "1.7.0" apply false
+    id("com.google.devtools.ksp") version "1.7.20-1.0.8"
+    id("com.android.library") version "7.3.1" apply false
+    id("org.jetbrains.kotlin.android") version "1.7.20" apply false
     id("com.github.ben-manes.versions") version "0.41.0"
     id("nl.littlerobots.version-catalog-update") version "0.5.1"
 }

.idea/gradle.xml

@@ -3,6 +3,7 @@ package com.stslex.core_model.model
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.State
 import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.snapshots.SnapshotStateList
 
 data class NoteDynamicUI(
     val id: Int,
@@ -16,4 +17,11 @@ data class NoteDynamicUI(
     }
 
     fun isSelect(): State<Boolean> = select
+
+    fun selectNotes(notes: SnapshotStateList<NoteDynamicUI>) {
+        setSelect(!isSelect().value)
+        if (notes.contains(this)) {
+            notes.remove(this)
+        } else notes.add(this)
+    }
 }

.idea/misc.xml

@@ -13,6 +13,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.dp
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun CodeInputField(
     modifier: Modifier = Modifier,

build.gradle.kts

@@ -14,6 +14,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.dp
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun PhoneNumberField(
     modifier: Modifier = Modifier,

core-model/src/main/java/com/stslex/core_model/model/NoteDynamicUI.kt

@@ -23,13 +23,11 @@ import st.slex.feature_main.ui.components.AppCreator
 
 class MainActivity : ComponentActivity() {
 
-    private val firebaseAppInitialisationUtil: FirebaseAppInitialisationUtil by inject()
     private val shortcutBuilder: ShortcutBuilder by inject()
     private val activityComponent: ActivityComponent by inject()
 
     @OptIn(ExperimentalMaterial3WindowSizeClassApi::class, ExperimentalAnimationApi::class)
     override fun onCreate(savedInstanceState: Bundle?) {
-        firebaseAppInitialisationUtil()
         shortcutBuilder()
         super.onCreate(savedInstanceState)
         WindowCompat.setDecorFitsSystemWindows(window, false)

feature-auth-code/src/main/java/com/stslex/feature_auth_code/ui/components/CodeInputField.kt

@@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.List
 import androidx.compose.material.icons.outlined.List
+import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.ui.Modifier
 import androidx.navigation.NavGraphBuilder
 import com.google.accompanist.navigation.animation.composable
@@ -16,7 +17,7 @@ import com.stslex.core_navigation.destinations.NoteListDestination
 import com.stslex.feature_note_list.R
 import com.stslex.feature_note_list.ui.NotesScreen
 
-@OptIn(ExperimentalAnimationApi::class)
+@OptIn(ExperimentalAnimationApi::class, ExperimentalMaterial3Api::class)
 fun NavGraphBuilder.noteListGraph(
     nestedGraphs: NavGraphBuilder.() -> Unit
 ) {

feature-auth-phonenumber/src/main/java/com/stslex/feature_auth_phonenumber/ui/PhoneNumberField.kt

@@ -5,13 +5,8 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.rememberLazyListState
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.FabPosition
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Surface
+import androidx.compose.material3.*
 import androidx.compose.material3.TopAppBarDefaults.enterAlwaysScrollBehavior
-import androidx.compose.material3.TopAppBarScrollState
-import androidx.compose.material3.rememberTopAppBarScrollState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.ui.Modifier
@@ -31,51 +26,64 @@ fun NotesScreen(
     modifier: Modifier = Modifier,
     viewModel: NotesViewModel = getViewModel(),
     lazyListState: LazyListState = rememberLazyListState(),
-    scrollState: TopAppBarScrollState = rememberTopAppBarScrollState()
+    scrollState: TopAppBarState = rememberTopAppBarState()
 ) {
+    viewModel.isCreateButtonVisible.value = true
     val pagingItems = viewModel.allNotes.collectAsLazyPagingItems()
-    val scrollBehavior = enterAlwaysScrollBehavior(scrollState) { pagingItems.itemCount >= 6 }
+    val scrollBehavior = enterAlwaysScrollBehavior(
+        state = scrollState,
+        canScroll = { pagingItems.itemCount >= 6 }
+    )
     //TODO Add Error drawing
     val errorState = viewModel.errorState.collectAsState()
     Scaffold(
         modifier = modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
         floatingActionButton = {
-            AnimatedVisibility(visible = viewModel.isCreateButtonVisible.value) {
+            AnimatedVisibility(
+                visible = viewModel.isCreateButtonVisible.value
+            ) {
                 NotesFab(
                     lazyListState = lazyListState,
-                    viewModel = viewModel
+                    selectedNotes = viewModel.selectedNotes,
+                    onCreateButtonClicked = viewModel::onCreateButtonClicked
                 )
             }
         },
         topBar = {
             NoteMediumTopAppBar(
                 scrollBehavior = scrollBehavior,
-                viewModel = viewModel
+                selectedNotes = viewModel.selectedNotes,
+                onProfileButtonClicked = viewModel::onProfileButtonClicked
             )
         },
         floatingActionButtonPosition = FabPosition.End
     ) { paddingValues ->
-
-        Surface(
-            modifier = Modifier.padding(paddingValues)
+        LazyColumn(
+            modifier = Modifier.padding(paddingValues),
+            state = lazyListState
         ) {
-            LazyColumn(
-                state = lazyListState
-            ) {
-                items(pagingItems, key = { it.id }) { item ->
-                    item?.let {
-                        NotePagingItem(
-                            note = item,
-                            viewModel = viewModel
-                        )
-                    }
+            items(
+                items = pagingItems,
+                key = { it.id }
+            ) { item ->
+                item?.let {
+                    NotePagingItem(
+                        note = item,
+                        onNoteClick = {
+                            viewModel.onSingleNoteClick(item)
+                        },
+                        onNoteLongClick = {
+                            viewModel.onNotesSelect(item)
+                        }
+                    )
                 }
             }
         }
     }
 }
 
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Preview
 @Composable
 fun NotesPreview() {