diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 9f38799..928a17c 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,40 +1,55 @@ plugins { alias(libs.plugins.android.application) + alias(libs.plugins.kotlin.compose) } - android { +android { namespace = "com.example.mear" - compileSdk { - version = release(37) - } + compileSdk { + version = release(37) + } - defaultConfig { - applicationId = "com.example.mear" - minSdk = 34 - targetSdk = 37 - versionCode = 1 - versionName = "1.0" + defaultConfig { + applicationId = "com.example.mear" + minSdk = 34 + targetSdk = 37 + versionCode = 1 + versionName = "1.0" - testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } buildTypes { - release { - optimization { - enable = true - packageScope = setOf("androidx.**", "kotlin.**", "kotlinx.**") - } - } - } - compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + release { + optimization { + enable = true + packageScope = setOf("androidx.**", "kotlin.**", "kotlinx.**") + } } } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 + } + buildFeatures { + compose = true + } +} - dependencies { - implementation(libs.androidx.core.ktx) - testImplementation(libs.junit) - androidTestImplementation(libs.androidx.espresso.core) - androidTestImplementation(libs.androidx.junit) - } \ No newline at end of file +dependencies { + implementation(platform(libs.androidx.compose.bom)) + implementation(libs.androidx.activity.compose) + implementation(libs.androidx.compose.material3) + implementation(libs.androidx.compose.ui) + implementation(libs.androidx.compose.ui.graphics) + implementation(libs.androidx.compose.ui.tooling.preview) + implementation(libs.androidx.core.ktx) + implementation(libs.androidx.lifecycle.runtime.ktx) + testImplementation(libs.junit) + androidTestImplementation(platform(libs.androidx.compose.bom)) + androidTestImplementation(libs.androidx.compose.ui.test.junit4) + androidTestImplementation(libs.androidx.espresso.core) + androidTestImplementation(libs.androidx.junit) + debugImplementation(libs.androidx.compose.ui.test.manifest) + debugImplementation(libs.androidx.compose.ui.tooling) +} \ No newline at end of file diff --git a/app/src/androidTest/java/com/example/mear/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/example/mear/ExampleInstrumentedTest.kt index d5af89e..ee25d5f 100644 --- a/app/src/androidTest/java/com/example/mear/ExampleInstrumentedTest.kt +++ b/app/src/androidTest/java/com/example/mear/ExampleInstrumentedTest.kt @@ -1,24 +1,24 @@ package com.example.mear - import androidx.test.platform.app.InstrumentationRegistry - import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 - import org.junit.Test - import org.junit.runner.RunWith +import org.junit.Test +import org.junit.runner.RunWith - import org.junit.Assert.* +import org.junit.Assert.* - /** - * Instrumented test, which will execute on an Android device. - * - * See [testing documentation](http://d.android.com/tools/testing). - */ - @RunWith(AndroidJUnit4::class) - class ExampleInstrumentedTest { +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { @Test fun useAppContext() { - // Context of the app under test. - val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("com.example.mear", appContext.packageName) + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("com.example.mear", appContext.packageName) } - } \ No newline at end of file +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0be28f4..d1c642f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,16 +1,28 @@ - + + android:allowBackup="true" + android:dataExtractionRules="@xml/data_extraction_rules" + android:fullBackupContent="@xml/backup_rules" + android:icon="@mipmap/ic_launcher" + android:label="@string/app_name" + android:roundIcon="@mipmap/ic_launcher_round" + android:supportsRtl="true" + android:theme="@style/Theme.Mear"> + + + - \ No newline at end of file + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/example/mear/MainActivity.kt b/app/src/main/java/com/example/mear/MainActivity.kt index e2fb534..f1aeaed 100644 --- a/app/src/main/java/com/example/mear/MainActivity.kt +++ b/app/src/main/java/com/example/mear/MainActivity.kt @@ -19,7 +19,7 @@ class MainActivity : ComponentActivity() { enableEdgeToEdge() setContent { MearTheme { - Scaffold( modifier = Modifier.fillMaxSize() ) { innerPadding -> + Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding -> Greeting( name = "Android", modifier = Modifier.padding(innerPadding) diff --git a/app/src/main/java/com/example/mear/ui/theme/Theme.kt b/app/src/main/java/com/example/mear/ui/theme/Theme.kt index 270c4a0..1cd1525 100644 --- a/app/src/main/java/com/example/mear/ui/theme/Theme.kt +++ b/app/src/main/java/com/example/mear/ui/theme/Theme.kt @@ -41,17 +41,18 @@ fun MearTheme( content: @Composable () -> Unit ) { val colorScheme = when { - dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> { - val context = LocalContext.current - if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context) - } - darkTheme -> DarkColorScheme - else -> LightColorScheme + dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> { + val context = LocalContext.current + if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context) + } + + darkTheme -> DarkColorScheme + else -> LightColorScheme } MaterialTheme( - colorScheme = colorScheme, - typography = Typography, - content = content + colorScheme = colorScheme, + typography = Typography, + content = content ) } \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml index ca3826a..07d5da9 100644 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -1,74 +1,170 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:viewportHeight="108"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml index da1dcd9..2b068d1 100644 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -4,14 +4,13 @@ android:height="108dp" android:viewportWidth="108" android:viewportHeight="108"> - + + android:strokeColor="#00000000" /> \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi/ic_launcher.xml b/app/src/main/res/mipmap-anydpi/ic_launcher.xml index 50ec886..6f3b755 100644 --- a/app/src/main/res/mipmap-anydpi/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi/ic_launcher.xml @@ -1,6 +1,6 @@ - - - + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml index 50ec886..6f3b755 100644 --- a/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml @@ -1,6 +1,6 @@ - - - + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 59c82d8..f8c6127 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,10 +1,10 @@ - - #FFBB86FC - #FF6200EE - #FF3700B3 - #FF03DAC5 - #FF018786 - #FF000000 - #FFFFFFFF - \ No newline at end of file + + #FFBB86FC + #FF6200EE + #FF3700B3 + #FF03DAC5 + #FF018786 + #FF000000 + #FFFFFFFF + \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 440c4e5..417bb7a 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -1,4 +1,5 @@ +