diff --git a/Project/android/app/build.gradle.kts b/Project/android/app/build.gradle.kts index b9d0b86..e0b9e67 100644 --- a/Project/android/app/build.gradle.kts +++ b/Project/android/app/build.gradle.kts @@ -4,17 +4,20 @@ plugins { } android { - namespace = "com.example.myapplication" + namespace = "sae.android.sae_2a" compileSdk = 34 defaultConfig { - applicationId = "com.example.myapplication" + applicationId = "sae.android.sae_2a" minSdk = 21 targetSdk = 34 versionCode = 1 versionName = "1.0" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + vectorDrawables { + useSupportLibrary = true + } } buildTypes { @@ -33,14 +36,34 @@ android { kotlinOptions { jvmTarget = "1.8" } + buildFeatures { + compose = true + } + composeOptions { + kotlinCompilerExtensionVersion = "1.5.1" + } + packaging { + resources { + excludes += "/META-INF/{AL2.0,LGPL2.1}" + } + } } dependencies { implementation("androidx.core:core-ktx:1.12.0") - implementation("androidx.appcompat:appcompat:1.6.1") - implementation("com.google.android.material:material:1.11.0") + implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.1") + implementation("androidx.activity:activity-compose:1.7.0") + implementation(platform("androidx.compose:compose-bom:2023.08.00")) + implementation("androidx.compose.ui:ui") + implementation("androidx.compose.ui:ui-graphics") + implementation("androidx.compose.ui:ui-tooling-preview") + implementation("androidx.compose.material3:material3") testImplementation("junit:junit:4.13.2") androidTestImplementation("androidx.test.ext:junit:1.1.5") androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1") + androidTestImplementation(platform("androidx.compose:compose-bom:2023.08.00")) + androidTestImplementation("androidx.compose.ui:ui-test-junit4") + debugImplementation("androidx.compose.ui:ui-tooling") + debugImplementation("androidx.compose.ui:ui-test-manifest") } \ No newline at end of file diff --git a/Project/android/app/src/androidTest/java/com/example/myapplication/ExampleInstrumentedTest.kt b/Project/android/app/src/androidTest/java/sae/android/sae_2a/ExampleInstrumentedTest.kt similarity index 83% rename from Project/android/app/src/androidTest/java/com/example/myapplication/ExampleInstrumentedTest.kt rename to Project/android/app/src/androidTest/java/sae/android/sae_2a/ExampleInstrumentedTest.kt index e9283cf..6218b74 100644 --- a/Project/android/app/src/androidTest/java/com/example/myapplication/ExampleInstrumentedTest.kt +++ b/Project/android/app/src/androidTest/java/sae/android/sae_2a/ExampleInstrumentedTest.kt @@ -1,4 +1,4 @@ -package com.example.myapplication +package sae.android.sae_2a import androidx.test.platform.app.InstrumentationRegistry import androidx.test.ext.junit.runners.AndroidJUnit4 @@ -19,6 +19,6 @@ class ExampleInstrumentedTest { fun useAppContext() { // Context of the app under test. val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("com.example.myapplication", appContext.packageName) + assertEquals("sae.android.sae_2a", appContext.packageName) } } \ No newline at end of file diff --git a/Project/android/app/src/main/AndroidManifest.xml b/Project/android/app/src/main/AndroidManifest.xml index 60d6a4c..211c0db 100644 --- a/Project/android/app/src/main/AndroidManifest.xml +++ b/Project/android/app/src/main/AndroidManifest.xml @@ -10,7 +10,19 @@ android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" - android:theme="@style/Theme.MyApplication" - tools:targetApi="31" /> + android:theme="@style/Theme.SAE_2A" + tools:targetApi="31"> + + + + + + + + \ No newline at end of file diff --git a/Project/android/app/src/main/java/sae/android/sae_2a/MainActivity.kt b/Project/android/app/src/main/java/sae/android/sae_2a/MainActivity.kt new file mode 100644 index 0000000..40ddff4 --- /dev/null +++ b/Project/android/app/src/main/java/sae/android/sae_2a/MainActivity.kt @@ -0,0 +1,46 @@ +package sae.android.sae_2a + +import android.os.Bundle +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.tooling.preview.Preview +import sae.android.sae_2a.ui.theme.SAE_2ATheme + +class MainActivity : ComponentActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContent { + SAE_2ATheme { + // A surface container using the 'background' color from the theme + Surface( + modifier = Modifier.fillMaxSize(), + color = MaterialTheme.colorScheme.background + ) { + Greeting("Android") + } + } + } + } +} + +@Composable +fun Greeting(name: String, modifier: Modifier = Modifier) { + Text( + text = "Hello $name!", + modifier = modifier + ) +} + +@Preview(showBackground = true) +@Composable +fun GreetingPreview() { + SAE_2ATheme { + Greeting("Android") + } +} \ No newline at end of file diff --git a/Project/android/app/src/main/java/sae/android/sae_2a/ui/theme/Color.kt b/Project/android/app/src/main/java/sae/android/sae_2a/ui/theme/Color.kt new file mode 100644 index 0000000..233b9fa --- /dev/null +++ b/Project/android/app/src/main/java/sae/android/sae_2a/ui/theme/Color.kt @@ -0,0 +1,11 @@ +package sae.android.sae_2a.ui.theme + +import androidx.compose.ui.graphics.Color + +val Purple80 = Color(0xFFD0BCFF) +val PurpleGrey80 = Color(0xFFCCC2DC) +val Pink80 = Color(0xFFEFB8C8) + +val Purple40 = Color(0xFF6650a4) +val PurpleGrey40 = Color(0xFF625b71) +val Pink40 = Color(0xFF7D5260) \ No newline at end of file diff --git a/Project/android/app/src/main/java/sae/android/sae_2a/ui/theme/Theme.kt b/Project/android/app/src/main/java/sae/android/sae_2a/ui/theme/Theme.kt new file mode 100644 index 0000000..30743f4 --- /dev/null +++ b/Project/android/app/src/main/java/sae/android/sae_2a/ui/theme/Theme.kt @@ -0,0 +1,70 @@ +package sae.android.sae_2a.ui.theme + +import android.app.Activity +import android.os.Build +import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.darkColorScheme +import androidx.compose.material3.dynamicDarkColorScheme +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.toArgb +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalView +import androidx.core.view.WindowCompat + +private val DarkColorScheme = darkColorScheme( + primary = Purple80, + secondary = PurpleGrey80, + tertiary = Pink80 +) + +private val LightColorScheme = lightColorScheme( + primary = Purple40, + secondary = PurpleGrey40, + tertiary = Pink40 + + /* Other default colors to override + background = Color(0xFFFFFBFE), + surface = Color(0xFFFFFBFE), + onPrimary = Color.White, + onSecondary = Color.White, + onTertiary = Color.White, + onBackground = Color(0xFF1C1B1F), + onSurface = Color(0xFF1C1B1F), + */ +) + +@Composable +fun SAE_2ATheme( + darkTheme: Boolean = isSystemInDarkTheme(), + // Dynamic color is available on Android 12+ + dynamicColor: Boolean = true, + 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 + } + val view = LocalView.current + if (!view.isInEditMode) { + SideEffect { + val window = (view.context as Activity).window + window.statusBarColor = colorScheme.primary.toArgb() + WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = darkTheme + } + } + + MaterialTheme( + colorScheme = colorScheme, + typography = Typography, + content = content + ) +} \ No newline at end of file diff --git a/Project/android/app/src/main/java/sae/android/sae_2a/ui/theme/Type.kt b/Project/android/app/src/main/java/sae/android/sae_2a/ui/theme/Type.kt new file mode 100644 index 0000000..865f4d4 --- /dev/null +++ b/Project/android/app/src/main/java/sae/android/sae_2a/ui/theme/Type.kt @@ -0,0 +1,34 @@ +package sae.android.sae_2a.ui.theme + +import androidx.compose.material3.Typography +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.sp + +// Set of Material typography styles to start with +val Typography = Typography( + bodyLarge = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 16.sp, + lineHeight = 24.sp, + letterSpacing = 0.5.sp + ) + /* Other default text styles to override + titleLarge = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 22.sp, + lineHeight = 28.sp, + letterSpacing = 0.sp + ), + labelSmall = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Medium, + fontSize = 11.sp, + lineHeight = 16.sp, + letterSpacing = 0.5.sp + ) + */ +) \ No newline at end of file diff --git a/Project/android/app/src/main/res/values-night/themes.xml b/Project/android/app/src/main/res/values-night/themes.xml deleted file mode 100644 index 54202f5..0000000 --- a/Project/android/app/src/main/res/values-night/themes.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - \ No newline at end of file diff --git a/Project/android/app/src/main/res/values/strings.xml b/Project/android/app/src/main/res/values/strings.xml index 3de1a39..4531638 100644 --- a/Project/android/app/src/main/res/values/strings.xml +++ b/Project/android/app/src/main/res/values/strings.xml @@ -1,3 +1,3 @@ - My Application + SAE_2A \ No newline at end of file diff --git a/Project/android/app/src/main/res/values/themes.xml b/Project/android/app/src/main/res/values/themes.xml index 503477b..77e1c63 100644 --- a/Project/android/app/src/main/res/values/themes.xml +++ b/Project/android/app/src/main/res/values/themes.xml @@ -1,16 +1,5 @@ - - - + + + +