From d1ae44db1861b0b34919e6d77467f4cbaf7456bd Mon Sep 17 00:00:00 2001 From: schordas Date: Thu, 21 Sep 2023 13:03:45 -0700 Subject: [PATCH 1/8] Update main branch with e2e --- app/build.gradle.kts | 12 ++++----- .../com/example/affirmations/MainActivity.kt | 19 ++++++++++++-- .../example/affirmations/ui/theme/Theme.kt | 26 ++++++++++++++++--- build.gradle.kts | 6 ++--- gradle/wrapper/gradle-wrapper.properties | 2 +- 5 files changed, 50 insertions(+), 15 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 87be2e5..f4280b5 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -20,12 +20,12 @@ plugins { android { namespace = "com.example.affirmations" - compileSdk = 33 + compileSdk = 34 defaultConfig { applicationId = "com.example.affirmations" minSdk = 24 - targetSdk = 33 + targetSdk = 34 versionCode = 1 versionName = "1.0" @@ -55,7 +55,7 @@ android { compose = true } composeOptions { - kotlinCompilerExtensionVersion = "1.4.7" + kotlinCompilerExtensionVersion = "1.5.3" } packaging { resources { @@ -65,14 +65,14 @@ android { } dependencies { - implementation(platform("androidx.compose:compose-bom:2023.05.01")) + implementation(platform("androidx.compose:compose-bom:2023.09.00")) implementation("androidx.activity:activity-compose:1.7.2") implementation("androidx.compose.material3:material3") implementation("androidx.compose.ui:ui") implementation("androidx.compose.ui:ui-graphics") implementation("androidx.compose.ui:ui-tooling-preview") - implementation("androidx.core:core-ktx:1.10.1") - implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.1") + implementation("androidx.core:core-ktx:1.12.0") + implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2") debugImplementation("androidx.compose.ui:ui-test-manifest") debugImplementation("androidx.compose.ui:ui-tooling") diff --git a/app/src/main/java/com/example/affirmations/MainActivity.kt b/app/src/main/java/com/example/affirmations/MainActivity.kt index fc480af..b32fea6 100644 --- a/app/src/main/java/com/example/affirmations/MainActivity.kt +++ b/app/src/main/java/com/example/affirmations/MainActivity.kt @@ -20,10 +20,16 @@ import androidx.activity.ComponentActivity import androidx.activity.compose.setContent import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.WindowInsets +import androidx.compose.foundation.layout.asPaddingValues +import androidx.compose.foundation.layout.calculateEndPadding +import androidx.compose.foundation.layout.calculateStartPadding import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.safeDrawing +import androidx.compose.foundation.layout.statusBarsPadding import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items import androidx.compose.material3.Card @@ -34,6 +40,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalLayoutDirection import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview @@ -48,10 +55,18 @@ class MainActivity : ComponentActivity() { super.onCreate(savedInstanceState) setContent { AffirmationsTheme { + val layoutDirection = LocalLayoutDirection.current // A surface container using the 'background' color from the theme Surface( - modifier = Modifier.fillMaxSize(), - color = MaterialTheme.colorScheme.background + modifier = Modifier + .fillMaxSize() + .statusBarsPadding() + .padding( + start = WindowInsets.safeDrawing.asPaddingValues() + .calculateStartPadding(layoutDirection), + end = WindowInsets.safeDrawing.asPaddingValues() + .calculateEndPadding(layoutDirection) + ), ) { AffirmationsApp() } diff --git a/app/src/main/java/com/example/affirmations/ui/theme/Theme.kt b/app/src/main/java/com/example/affirmations/ui/theme/Theme.kt index e7de411..cf85e26 100644 --- a/app/src/main/java/com/example/affirmations/ui/theme/Theme.kt +++ b/app/src/main/java/com/example/affirmations/ui/theme/Theme.kt @@ -17,6 +17,7 @@ package com.example.affirmations.ui.theme import android.app.Activity import android.os.Build +import android.view.View import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.material3.MaterialTheme import androidx.compose.material3.darkColorScheme @@ -25,6 +26,7 @@ import androidx.compose.material3.dynamicLightColorScheme import androidx.compose.material3.lightColorScheme import androidx.compose.runtime.Composable import androidx.compose.runtime.SideEffect +import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.toArgb import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalView @@ -61,9 +63,7 @@ fun AffirmationsTheme( val view = LocalView.current if (!view.isInEditMode) { SideEffect { - val window = (view.context as Activity).window - window.statusBarColor = colorScheme.background.toArgb() - WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = !darkTheme + setUpEdgeToEdge(view, darkTheme) } } @@ -72,3 +72,23 @@ fun AffirmationsTheme( content = content ) } + +/** + * Sets up edge-to-edge for the window of this [view]. The system icon colors are set to either + * light or dark depending on whether the [darkTheme] is enabled or not. + */ +private fun setUpEdgeToEdge(view: View, darkTheme: Boolean) { + val window = (view.context as Activity).window + WindowCompat.setDecorFitsSystemWindows(window, false) + window.statusBarColor = Color.Transparent.toArgb() + val navigationBarColor = when { + Build.VERSION.SDK_INT >= 29 -> Color.Transparent.toArgb() + Build.VERSION.SDK_INT >= 26 -> Color(0xFF, 0xFF, 0xFF, 0x63).toArgb() + // Min sdk version for this app is 24, this block is for SDK versions 24 and 25 + else -> Color(0x00, 0x00, 0x00, 0x50).toArgb() + } + window.navigationBarColor = navigationBarColor + val controller = WindowCompat.getInsetsController(window, view) + controller.isAppearanceLightStatusBars = !darkTheme + controller.isAppearanceLightNavigationBars = !darkTheme +} diff --git a/build.gradle.kts b/build.gradle.kts index 76adc6b..23d077a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -15,7 +15,7 @@ */ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id("com.android.application") version "8.0.2" apply false - id("com.android.library") version "8.0.2" apply false - id("org.jetbrains.kotlin.android") version "1.8.21" apply false + id("com.android.application") version "8.1.1" apply false + id("com.android.library") version "8.1.1" apply false + id("org.jetbrains.kotlin.android") version "1.9.10" apply false } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 58b9abb..6012ae1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Wed Mar 15 18:26:52 PDT 2023 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From c4c9927ca3efe7d6ebf2be1f03a776de9e62b941 Mon Sep 17 00:00:00 2001 From: schordas Date: Thu, 21 Sep 2023 13:03:45 -0700 Subject: [PATCH 2/8] Update main branch with e2e --- .../com/example/affirmations/MainActivity.kt | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/com/example/affirmations/MainActivity.kt b/app/src/main/java/com/example/affirmations/MainActivity.kt index b32fea6..9d44b8e 100644 --- a/app/src/main/java/com/example/affirmations/MainActivity.kt +++ b/app/src/main/java/com/example/affirmations/MainActivity.kt @@ -55,18 +55,9 @@ class MainActivity : ComponentActivity() { super.onCreate(savedInstanceState) setContent { AffirmationsTheme { - val layoutDirection = LocalLayoutDirection.current - // A surface container using the 'background' color from the theme Surface( modifier = Modifier .fillMaxSize() - .statusBarsPadding() - .padding( - start = WindowInsets.safeDrawing.asPaddingValues() - .calculateStartPadding(layoutDirection), - end = WindowInsets.safeDrawing.asPaddingValues() - .calculateEndPadding(layoutDirection) - ), ) { AffirmationsApp() } @@ -77,9 +68,22 @@ class MainActivity : ComponentActivity() { @Composable fun AffirmationsApp() { - AffirmationList( - affirmationList = Datasource().loadAffirmations(), - ) + val layoutDirection = LocalLayoutDirection.current + Surface( + modifier = Modifier + .fillMaxSize() + .statusBarsPadding() + .padding( + start = WindowInsets.safeDrawing.asPaddingValues() + .calculateStartPadding(layoutDirection), + end = WindowInsets.safeDrawing.asPaddingValues() + .calculateEndPadding(layoutDirection) + ), + ) { + AffirmationList( + affirmationList = Datasource().loadAffirmations(), + ) + } } @Composable From 7a5eb8a49c3ad67da0956be740c0642348e8eef4 Mon Sep 17 00:00:00 2001 From: schordas Date: Thu, 21 Sep 2023 13:03:45 -0700 Subject: [PATCH 3/8] Update main branch with e2e --- app/src/main/AndroidManifest.xml | 28 +++++++++--------- .../res/drawable/ic_launcher_background.xml | 28 +++++++++--------- .../res/drawable/ic_launcher_foreground.xml | 29 +++++++++---------- .../res/mipmap-anydpi-v26/ic_launcher.xml | 28 +++++++++--------- .../mipmap-anydpi-v26/ic_launcher_round.xml | 28 +++++++++--------- app/src/main/res/values/strings.xml | 28 +++++++++--------- app/src/main/res/values/themes.xml | 28 +++++++++--------- 7 files changed, 98 insertions(+), 99 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2984fb4..03ae17d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,19 +1,19 @@ + Copyright (C) 2023 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 + + 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, + 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. +--> diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml index 3f9a0dd..4f7467b 100644 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -1,19 +1,19 @@ + Copyright (C) 2023 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 + + 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, + 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. +--> + Copyright (C) 2023 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 + + 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, + 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. +--> + Copyright (C) 2023 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 + + 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, + 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. +--> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 4b94d74..5a09a0f 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,19 +1,19 @@ + Copyright (C) 2023 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 + + 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, + 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. +--> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index dfd03b1..6ea9c0f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,18 +1,18 @@ + Copyright (C) 2023 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 + + 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, + 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. +--> Affirmations I am strong. diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 3d5a1d7..b819777 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -1,19 +1,19 @@ + Copyright (C) 2023 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 + + 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, + 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. +-->