ComposeMail - Clean up and build.gradle update

Author: oscar-ad

demoProjects/ComposeMail/app/build.gradle

@@ -35,10 +35,24 @@ android {
         }
     }
 
+    signingConfigs {
+        debug {
+            // For Linux & mac:
+            storeFile file(System.getenv("HOME") + '/.android/debug.keystore')
+            // For Windows:
+            // storeFile file('/Users/USERNAME/.android/debug.keystore')
+            storePassword 'android'
+            keyAlias 'androiddebugkey'
+            keyPassword 'android'
+        }
+    }
+
     buildTypes {
         release {
+            // Prefer to use release build variant to run the app for better performance
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            signingConfig signingConfigs.debug
         }
     }
     compileOptions {
@@ -64,21 +78,21 @@ android {
 dependencies {
     implementation 'androidx.core:core-ktx:1.7.0'
 
-    implementation 'androidx.paging:paging-common:3.1.1'
-    implementation 'androidx.paging:paging-common-ktx:3.1.1'
+    implementation "androidx.paging:paging-common:$paging_version"
+    implementation "androidx.paging:paging-common-ktx:$paging_version"
 
-    implementation 'androidx.compose.material3:material3-window-size-class:1.0.0-alpha10'
+    implementation 'androidx.compose.material3:material3-window-size-class:1.0.0-alpha12'
 
     implementation "androidx.compose.ui:ui:$compose_version"
     implementation "androidx.compose.material:material:$compose_version"
     implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
     implementation "androidx.compose.material:material-icons-extended:$compose_version"
 
-    implementation "androidx.paging:paging-compose:1.0.0-alpha14"
+    implementation "androidx.paging:paging-compose:$paging_compose_version"
 
-    // implementation "androidx.constraintlayout:constraintlayout-compose:1.0.0"
-    implementation project(':core')
-    implementation project(':compose')
+     implementation "androidx.constraintlayout:constraintlayout-compose:1.1.0-alpha01"
+//    implementation project(':core')
+//    implementation project(':compose')
 
     implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.4.1'
 
@@ -101,7 +115,6 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
         freeCompilerArgs += "-opt-in=androidx.compose.ui.ExperimentalComposeUiApi"
         freeCompilerArgs += "-opt-in=androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi"
 
-
         // For older than Kotlin 1.6.0
 //        freeCompilerArgs += "-Xopt-in=androidx.constraintlayout.compose.ExperimentalMotionApi"
 //        freeCompilerArgs += "-Xopt-in=androidx.compose.ui.ExperimentalComposeUiApi"

demoProjects/ComposeMail/app/src/main/java/com/example/composemail/MainActivity.kt

@@ -24,15 +24,13 @@ import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Surface
 import androidx.compose.material.Text
 import androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi
-import androidx.compose.material3.windowsizeclass.WindowHeightSizeClass
-import androidx.compose.material3.windowsizeclass.WindowWidthSizeClass
 import androidx.compose.material3.windowsizeclass.calculateWindowSizeClass
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
-import androidx.compose.runtime.ProvidableCompositionLocal
-import androidx.compose.runtime.compositionLocalOf
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
+import com.example.composemail.ui.compositionlocal.LocalHeightSizeClass
+import com.example.composemail.ui.compositionlocal.LocalWidthSizeClass
 import com.example.composemail.ui.home.ComposeMailHome
 import com.example.composemail.ui.theme.ComposeMailTheme
 
@@ -61,12 +59,6 @@ class MainActivity : ComponentActivity() {
     }
 }
 
-val LocalHeightSizeClass: ProvidableCompositionLocal<WindowHeightSizeClass> =
-    compositionLocalOf { WindowHeightSizeClass.Compact }
-
-val LocalWidthSizeClass: ProvidableCompositionLocal<WindowWidthSizeClass> =
-    compositionLocalOf { WindowWidthSizeClass.Compact }
-
 @Composable
 fun Greeting(name: String) {
     Text(text = "Hello $name!")

demoProjects/ComposeMail/app/src/main/java/com/example/composemail/model/ComposeMailModel.kt

@@ -53,10 +53,10 @@ class ComposeMailModel(application: Application) : AndroidViewModel(application)
     }.flow
 
     fun openMail(id: Int) {
-        // TODO: Support opening a conversation
+        // TODO: Support opening a mail/thread
     }
 
     fun closeMail() {
-
+        // TODO: Support opening a mail/thread
     }
 }

demoProjects/ComposeMail/app/src/main/java/com/example/composemail/model/repo/OfflineRepo.kt

@@ -51,7 +51,7 @@ private val names = listOf(
     "Daniel",
 )
 
-private val contentLines = LoremIpsum(200).values.first().split(" ")
+private val contentLines = LoremIpsum(100).values.first().filter { it != '\n' }.split(" ")
 
 class OfflineRepository(
     private val resources: Resources

demoProjects/ComposeMail/app/src/main/java/com/example/composemail/ui/components/CheapText.kt

@@ -16,27 +16,61 @@
 
 package com.example.composemail.ui.components
 
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.width
 import androidx.compose.material.LocalTextStyle
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
 
+/**
+ * [Text] Composable constrained to one line for better animation performance.
+ */
 @Suppress("NOTHING_TO_INLINE")
 @Composable
 inline fun CheapText(
     text: String,
     modifier: Modifier = Modifier,
     color: Color = Color.Unspecified,
-    style: TextStyle = LocalTextStyle.current
+    style: TextStyle = LocalTextStyle.current,
+    overflow: TextOverflow = TextOverflow.Clip
 ) {
     Text(
         text = text,
         modifier = modifier,
         color = color,
         style = style,
         maxLines = 1,
-        softWrap = false
+        overflow = overflow,
     )
+}
+
+@Preview
+@Composable
+private fun CheapTextPreview() {
+    Column(Modifier.fillMaxSize()) {
+        Text(text = "Normal")
+        Column(
+            Modifier
+                .width(40.dp)
+                .background(Color.LightGray)) {
+            Text(text = "Hello \nWorld!")
+            Text(text = "This is a very very long text")
+        }
+        Text(text = "Cheap")
+        Column(
+            Modifier
+                .width(40.dp)
+                .background(Color.LightGray)) {
+            CheapText(text = "Hello \nWorld!")
+            CheapText(text = "This is a very very long text")
+        }
+    }
 }

demoProjects/ComposeMail/app/src/main/java/com/example/composemail/ui/compositionlocal/WindowSizeClass.kt

@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.example.composemail.ui.compositionlocal
+
+import androidx.compose.material3.windowsizeclass.WindowHeightSizeClass
+import androidx.compose.material3.windowsizeclass.WindowWidthSizeClass
+import androidx.compose.runtime.ProvidableCompositionLocal
+import androidx.compose.runtime.compositionLocalOf
+
+val LocalHeightSizeClass: ProvidableCompositionLocal<WindowHeightSizeClass> =
+    compositionLocalOf { WindowHeightSizeClass.Compact }
+
+val LocalWidthSizeClass: ProvidableCompositionLocal<WindowWidthSizeClass> =
+    compositionLocalOf { WindowWidthSizeClass.Compact }

demoProjects/ComposeMail/app/src/main/java/com/example/composemail/ui/home/Home.kt

@@ -34,8 +34,8 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
-import com.example.composemail.LocalWidthSizeClass
 import com.example.composemail.model.ComposeMailModel
+import com.example.composemail.ui.compositionlocal.LocalWidthSizeClass
 import com.example.composemail.ui.home.toptoolbar.TopToolbar
 import com.example.composemail.ui.mails.MailList
 import com.example.composemail.ui.mails.MailListState
@@ -44,7 +44,7 @@ import com.example.composemail.ui.newmail.NewMailLayoutState
 import com.example.composemail.ui.newmail.rememberNewMailState
 
 @Composable
-fun ComposeMailHome(modifier: Modifier = Modifier) {
+fun ComposeMailHome() {
     val mailModel: ComposeMailModel = viewModel()
     val listState = remember { MailListState() }
     val newMailState = rememberNewMailState(initialLayoutState = NewMailLayoutState.Fab)
@@ -86,27 +86,15 @@ fun ComposeMailHome(modifier: Modifier = Modifier) {
             )
         }
         if (LocalWidthSizeClass.current != WindowWidthSizeClass.Compact) {
+            // TODO: Use MotionLayout to transition between size changes
             OutlinedButton(
                 modifier = Modifier
                     .fillMaxHeight()
                     .weight(1f),
                 onClick = { /*TODO*/ }
             ) {
-                Text(text = "Hello World!")
+                Text(text = "Not Yet Implemented")
             }
         }
     }
-}
-
-
-@Composable
-fun Home2(modifier: Modifier = Modifier) {
-    when (LocalWidthSizeClass.current) {
-        WindowWidthSizeClass.Expanded -> {
-
-        }
-        else -> {
-
-        }
-    }
 }

demoProjects/ComposeMail/app/src/main/java/com/example/composemail/ui/home/toptoolbar/SearchBar.kt

@@ -33,47 +33,29 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
-import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.focus.FocusRequester
-import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.focus.onFocusChanged
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.input.key.Key
-import androidx.compose.ui.input.key.key
-import androidx.compose.ui.input.key.onKeyEvent
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.example.composemail.ui.theme.textBackgroundColor
 
-@OptIn(ExperimentalComposeUiApi::class)
 @Composable
 fun SearchBar(
     modifier: Modifier = Modifier
 ) {
     var placeholder: String by remember { mutableStateOf("Search in mails") }
-    val focusRequester = remember { FocusRequester() }
     OutlinedTextField(
         modifier = modifier
             .clip(RoundedCornerShape(32.dp))
             .background(MaterialTheme.colors.textBackgroundColor)
-            .focusRequester(focusRequester)
             .onFocusChanged {
                 placeholder = if (it.isFocused) {
                     "I'm not implemented yet!"
                 } else {
                     "Search in mails"
                 }
-            }
-            .onKeyEvent {
-                if (it.key == Key.Back) {
-                    // TODO: DOESN'T WORK
-                    focusRequester.freeFocus()
-                    true
-                } else {
-                    false
-                }
             },
 
         value = "",

demoProjects/ComposeMail/app/src/main/java/com/example/composemail/ui/home/toptoolbar/TopToolbar.kt

@@ -68,7 +68,6 @@ fun TopToolbar(
         } else {
             SearchToolbar(modifier = modifier.padding(4.dp))
         }
-
     }
 }
 

demoProjects/ComposeMail/app/src/main/java/com/example/composemail/ui/mails/MailItem.kt

@@ -55,6 +55,7 @@ import androidx.constraintlayout.compose.MotionLayout
 import androidx.constraintlayout.compose.MotionScene
 import coil.compose.rememberImagePainter
 import com.example.composemail.model.data.MailEntryInfo
+import com.example.composemail.ui.components.CheapText
 import com.example.composemail.ui.theme.textBackgroundColor
 
 @Composable
@@ -259,22 +260,20 @@ inline fun MailContent(
         verticalArrangement = Arrangement.SpaceBetween
     ) {
         Row(horizontalArrangement = Arrangement.SpaceBetween) {
-            Text(
+            CheapText(
                 modifier = Modifier.weight(1.0f, true),
                 text = info.from.name,
                 style = MaterialTheme.typography.body1,
-                maxLines = 1,
                 overflow = TextOverflow.Ellipsis
             )
-            Text(
+            CheapText(
                 text = info.timestamp,
                 style = MaterialTheme.typography.body2,
             )
         }
-        Text(
+        CheapText(
             text = info.shortContent,
             style = MaterialTheme.typography.body2,
-            maxLines = 1,
             overflow = TextOverflow.Ellipsis
         )
     }

demoProjects/ComposeMail/app/src/main/java/com/example/composemail/ui/mails/MailList.kt

@@ -41,7 +41,7 @@ fun MailList(
         modifier = modifier,
         verticalArrangement = Arrangement.spacedBy(4.dp)
     ) {
-        itemsIndexed(lazyMailItems) { index, mailItem ->
+        itemsIndexed(lazyMailItems) { _, mailItem ->
             MailItem(
                 info = mailItem,
                 state = listState.stateFor(mailItem?.id)

demoProjects/ComposeMail/app/src/main/java/com/example/composemail/ui/mails/MailListState.kt

@@ -25,17 +25,26 @@ class MailListState {
 
     private val _selectedCount = mutableStateOf(0)
 
+    val selectedIDs: Collection<Int>
+        get() = selectedTracker.toList()
+
     val selectedCount
         get() = _selectedCount.value
 
     fun unselectAll() {
         conversationStatesById.values.forEach { it.setSelected(false) }
     }
 
+    /**
+     * Returns an instance of [MailItemState] for the given [id].
+     *
+     * Repeated calls for the same [id] will return the same [MailItemState] instance.
+     */
     fun stateFor(id: Int?): MailItemState {
         val nextId = id ?: -1
         return conversationStatesById.computeIfAbsent(nextId) {
             MailItemState(nextId) { id, isSelected ->
+                // Track which items are selected
                 if (isSelected) {
                     selectedTracker.add(id)
                 } else {

demoProjects/ComposeMail/app/src/main/java/com/example/composemail/ui/utils/ConstraintUtils.kt

@@ -24,10 +24,10 @@ import androidx.constraintlayout.compose.ConstraintSetScope
 
 @Composable
 fun rememberConstraintSet(
-    vararg keys: Any = emptyArray(),
+    key: Any = Unit,
     constraints: ConstraintSetScope.() -> Unit
 ): ConstraintSet {
-    val constraintSet = remember(keys) {
+    val constraintSet = remember(key) {
         ConstraintSet(constraints)
     }
     return constraintSet