Merge branch 'main' into widget

Author: ashnohe

JetLagged/.editorconfig

@@ -0,0 +1,27 @@
+# When authoring changes in .editorconfig, run ./gradlew spotlessApply --no-daemon
+# Reference: https://github.com/diffplug/spotless/issues/1924
+[*.{kt,kts}]
+ktlint_code_style = android_studio
+ij_kotlin_allow_trailing_comma = true
+ij_kotlin_allow_trailing_comma_on_call_site = true
+max_line_length = 140 # ktlint official
+ktlint_function_naming_ignore_when_annotated_with = Composable, Test
+ktlint_standard_filename = disabled
+ktlint_standard_package-name = disabled
+ktlint_standard_property-naming = disabled
+ktlint_standard_backing-property-naming = disabled
+ktlint_standard_argument-list-wrapping=disabled
+ktlint_standard_parameter-list-wrapping = disabled
+ktlint_standard_double-colon-spacing=disabled
+ktlint_standard_enum-entry-name-case=disabled
+ktlint_standard_multiline-if-else=disabled
+ktlint_standard_no-empty-first-line-in-method-block = disabled
+ktlint_standard_package-name = disabled
+ktlint_standard_trailing-comma = disabled
+ktlint_standard_spacing-around-angle-brackets = disabled
+ktlint_standard_spacing-between-declarations-with-annotations = disabled
+ktlint_standard_spacing-between-declarations-with-comments = disabled
+ktlint_standard_unary-op-spacing = disabled
+ktlint_standard_function-expression-body = disabled
+ktlint_standard_value-parameter-comment = disabled
+ktlint_argument_list_wrapping_ignore_when_parameter_count_greater_or_equal_than= unset

JetLagged/app/build.gradle.kts

@@ -5,7 +5,7 @@
  * 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
+ *     https://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,
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
@@ -49,22 +50,25 @@ android {
 
     buildTypes {
         getByName("debug") {
-
         }
 
         getByName("release") {
             isMinifyEnabled = true
             signingConfig = signingConfigs.getByName("release")
-            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"),
-                    "proguard-rules.pro")
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro",
+            )
         }
 
         create("benchmark") {
             initWith(getByName("release"))
             signingConfig = signingConfigs.getByName("release")
             matchingFallbacks.add("release")
-            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"),
-                    "proguard-benchmark-rules.pro")
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-benchmark-rules.pro",
+            )
             isDebuggable = false
         }
     }

JetLagged/app/src/main/java/com/example/jetlagged/HomeScreenCards.kt

@@ -68,20 +68,16 @@ import com.example.jetlagged.ui.theme.JetLaggedTheme
 import com.example.jetlagged.ui.theme.SmallHeadingStyle
 
 @Composable
-fun BasicInformationalCard(
-    modifier: Modifier = Modifier,
-    borderColor: Color,
-    content: @Composable () -> Unit
-) {
+fun BasicInformationalCard(modifier: Modifier = Modifier, borderColor: Color, content: @Composable () -> Unit) {
     val shape = RoundedCornerShape(24.dp)
     Card(
         shape = shape,
         colors = CardDefaults.cardColors(
-            containerColor = JetLaggedTheme.extraColors.cardBackground
+            containerColor = JetLaggedTheme.extraColors.cardBackground,
         ),
         modifier = modifier
             .padding(8.dp),
-        border = BorderStroke(2.dp, borderColor)
+        border = BorderStroke(2.dp, borderColor),
     ) {
         Box {
             content()
@@ -90,20 +86,14 @@ fun BasicInformationalCard(
 }
 
 @Composable
-fun TwoLineInfoCard(
-    borderColor: Color,
-    firstLineText: String,
-    secondLineText: String,
-    icon: ImageVector,
-    modifier: Modifier = Modifier
-) {
+fun TwoLineInfoCard(borderColor: Color, firstLineText: String, secondLineText: String, icon: ImageVector, modifier: Modifier = Modifier) {
     BasicInformationalCard(
         borderColor = borderColor,
-        modifier = modifier.size(200.dp)
+        modifier = modifier.size(200.dp),
     ) {
         BubbleBackground(
             modifier = Modifier.fillMaxSize(),
-            numberBubbles = 3, bubbleColor = borderColor.copy(0.25f)
+            numberBubbles = 3, bubbleColor = borderColor.copy(0.25f),
         )
         BoxWithConstraints(
             modifier = Modifier
@@ -114,23 +104,23 @@ fun TwoLineInfoCard(
                 Row(
                     modifier = Modifier
                         .wrapContentSize()
-                        .align(CenterStart)
+                        .align(CenterStart),
                 ) {
                     Icon(
                         icon, contentDescription = null,
                         modifier = Modifier
                             .size(50.dp)
-                            .align(CenterVertically)
+                            .align(CenterVertically),
                     )
                     Spacer(modifier = Modifier.width(16.dp))
                     Column(
                         modifier = Modifier
                             .align(CenterVertically)
-                            .wrapContentSize()
+                            .wrapContentSize(),
                     ) {
                         Text(
                             firstLineText,
-                            style = SmallHeadingStyle
+                            style = SmallHeadingStyle,
                         )
                         Text(
                             secondLineText,
@@ -142,25 +132,25 @@ fun TwoLineInfoCard(
                 Column(
                     modifier = Modifier
                         .wrapContentSize()
-                        .align(Center)
+                        .align(Center),
                 ) {
                     Icon(
                         icon, contentDescription = null,
                         modifier = Modifier
                             .size(50.dp)
-                            .align(CenterHorizontally)
+                            .align(CenterHorizontally),
                     )
                     Spacer(modifier = Modifier.height(16.dp))
                     Column(modifier = Modifier.align(CenterHorizontally)) {
                         Text(
                             firstLineText,
                             style = SmallHeadingStyle,
-                            modifier = Modifier.align(CenterHorizontally)
+                            modifier = Modifier.align(CenterHorizontally),
                         )
                         Text(
                             secondLineText,
                             style = HeadingStyle,
-                            modifier = Modifier.align(CenterHorizontally)
+                            modifier = Modifier.align(CenterHorizontally),
                         )
                     }
                 }
@@ -180,7 +170,7 @@ fun AverageTimeInBedCard(modifier: Modifier = Modifier) {
         icon = Icons.Default.Watch,
         modifier = modifier
             .wrapContentWidth()
-            .heightIn(min = 156.dp)
+            .heightIn(min = 156.dp),
     )
 }
 
@@ -195,49 +185,46 @@ fun AverageTimeAsleepCard(modifier: Modifier = Modifier) {
         icon = Icons.Default.SingleBed,
         modifier = modifier
             .wrapContentWidth()
-            .heightIn(min = 156.dp)
+            .heightIn(min = 156.dp),
     )
 }
 
 @OptIn(ExperimentalLayoutApi::class)
 @Preview
 @Composable
-fun WellnessCard(
-    modifier: Modifier = Modifier,
-    wellnessData: WellnessData = WellnessData(0, 0, 0)
-) {
+fun WellnessCard(modifier: Modifier = Modifier, wellnessData: WellnessData = WellnessData(0, 0, 0)) {
     BasicInformationalCard(
         borderColor = JetLaggedTheme.extraColors.wellness,
         modifier = modifier
             .widthIn(max = 400.dp)
-            .heightIn(min = 200.dp)
+            .heightIn(min = 200.dp),
     ) {
         FadingCircleBackground(36.dp, JetLaggedTheme.extraColors.wellness.copy(0.25f))
         Column(
             horizontalAlignment = CenterHorizontally,
             modifier = Modifier
-                .fillMaxWidth()
+                .fillMaxWidth(),
         ) {
             HomeScreenCardHeading(text = stringResource(R.string.wellness_heading))
             FlowRow(
                 horizontalArrangement = Arrangement.Center,
                 verticalArrangement = Arrangement.Center,
-                modifier = Modifier.fillMaxHeight()
+                modifier = Modifier.fillMaxHeight(),
             ) {
                 WellnessBubble(
                     titleText = stringResource(R.string.snoring_heading),
                     countText = wellnessData.snoring.toString(),
-                    metric = "min"
+                    metric = "min",
                 )
                 WellnessBubble(
                     titleText = stringResource(R.string.coughing_heading),
                     countText = wellnessData.coughing.toString(),
-                    metric = "times"
+                    metric = "times",
                 )
                 WellnessBubble(
                     titleText = stringResource(R.string.respiration_heading),
                     countText = wellnessData.respiration.toString(),
-                    metric = "rpm"
+                    metric = "rpm",
                 )
             }
         }
@@ -250,7 +237,7 @@ fun WellnessBubble(
     countText: String,
     metric: String,
     modifier: Modifier = Modifier,
-    bubbleColor: Color = JetLaggedTheme.extraColors.wellness
+    bubbleColor: Color = JetLaggedTheme.extraColors.wellness,
 ) {
     Column(
         modifier = modifier
@@ -261,7 +248,7 @@ fun WellnessBubble(
                 drawCircle(bubbleColor)
             },
         verticalArrangement = Arrangement.Center,
-        horizontalAlignment = CenterHorizontally
+        horizontalAlignment = CenterHorizontally,
     ) {
         Text(titleText, fontSize = 12.sp)
         Text(countText, fontSize = 36.sp)
@@ -277,6 +264,6 @@ fun HomeScreenCardHeading(text: String) {
             .fillMaxWidth()
             .padding(top = 8.dp),
         textAlign = TextAlign.Center,
-        style = HeadingStyle
+        style = HeadingStyle,
     )
 }