diff --git a/.gitignore b/.gitignore index c70b517..dba6309 100644 --- a/.gitignore +++ b/.gitignore @@ -86,3 +86,5 @@ lint/generated/ lint/outputs/ lint/tmp/ # lint/reports/ + +.idea/ diff --git a/.idea/misc.xml b/.idea/misc.xml index 1763e15..8ca1baa 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,27 @@ - - + + + + + + + + \ No newline at end of file diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000..3d4fb63 --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,65 @@ +plugins { + id 'com.android.application' + id 'kotlin-android' +} + +android { + compileSdk 32 + + defaultConfig { + applicationId "ch.mathieubroillet.jarvis.android" + minSdk 29 + targetSdk 32 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + vectorDrawables { + useSupportLibrary true + } + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + useIR = true + } + buildFeatures { + compose true + } + composeOptions { + kotlinCompilerExtensionVersion compose_version + kotlinCompilerVersion '1.5.21' + } + packagingOptions { + resources { + excludes += '/META-INF/{AL2.0,LGPL2.1}' + } + } +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.appcompat:appcompat:1.4.0' + implementation 'com.google.android.material:material:1.4.0' + 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.lifecycle:lifecycle-runtime-ktx:2.4.0' + implementation 'androidx.activity:activity-compose:1.4.0' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.3' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' + androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version" + debugImplementation "androidx.compose.ui:ui-tooling:$compose_version" +} \ No newline at end of file diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/app/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/app/src/androidTest/java/ch/mathieubroillet/jarvis/android/ExampleInstrumentedTest.kt b/app/src/androidTest/java/ch/mathieubroillet/jarvis/android/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..b9fce6e --- /dev/null +++ b/app/src/androidTest/java/ch/mathieubroillet/jarvis/android/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package ch.mathieubroillet.jarvis.android + +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.Assert.* + +/** + * 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("ch.mathieubroillet.jarvis.android", appContext.packageName) + } +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..e519bf7 --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/ch/mathieubroillet/jarvis/android/MainActivity.kt b/app/src/main/java/ch/mathieubroillet/jarvis/android/MainActivity.kt new file mode 100644 index 0000000..ea90822 --- /dev/null +++ b/app/src/main/java/ch/mathieubroillet/jarvis/android/MainActivity.kt @@ -0,0 +1,141 @@ +package ch.mathieubroillet.jarvis.android + +import android.os.Bundle +import android.view.WindowManager +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.compose.foundation.Image +import androidx.compose.foundation.background +import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.foundation.layout.* +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.* +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.text.font.Font +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import androidx.core.view.WindowCompat +import androidx.core.view.WindowInsetsControllerCompat +import ch.mathieubroillet.jarvis.android.ui.theme.JarvisComposeTheme +import ch.mathieubroillet.jarvis.android.ui.theme.productSansFont + +class MainActivity : ComponentActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + WindowCompat.setDecorFitsSystemWindows(window, false) + window.setFlags( + WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS, + WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS + ) + + setContent { + // Fix the status & navigation bars staying white when white theme is on with activity in fullscreen + val wic = WindowInsetsControllerCompat(window, window.decorView) + wic.isAppearanceLightStatusBars = !isSystemInDarkTheme() + wic.isAppearanceLightNavigationBars = !isSystemInDarkTheme() + + JarvisComposeTheme { + // A surface container using the 'background' color from the theme + Surface( + color = MaterialTheme.colors.background, modifier = Modifier + .fillMaxWidth() + .fillMaxHeight() + ) { + //TODO: check if this is okay??? + DefaultPreview() + } + } + } + } +} + + +//Draws the base of the main activity, that includes the 3-dots menu and the "hi text". +@Composable +fun Base() { + Column(Modifier.padding(bottom = 25.dp)) { + Row(Modifier.align(Alignment.End)) { + IconButton(onClick = { /*TODO*/ }) { + Icon( + painter = painterResource(id = R.drawable.ic_baseline_more_vert_24), + contentDescription = "3 dots button" + ) + } + } + + Text( + text = "Bonjour, comment puis-je vous aider ?", + fontFamily = productSansFont, + fontSize = 30.sp, + modifier = Modifier.padding(top = 50.dp) + ) + } +} + +@Composable +fun MessageFromJarvis(text: String) { + Row(Modifier.padding(bottom = 25.dp)) { + Image( + painter = painterResource(id = R.drawable.robot256), + contentDescription = "robot", + Modifier + .size(50.dp) + .padding(end = 10.dp) + ) + + Box( + modifier = Modifier + .fillMaxWidth(fraction = 0.9F) + .clip(RoundedCornerShape(15.dp)) + .background(color = MaterialTheme.colors.secondaryVariant) + .padding(horizontal = 10.dp, vertical = 5.dp) + + ) { + Text(text = text, fontFamily = productSansFont) + } + } +} + +@Composable +fun MessageFromUser(text: String) { + Row( + Modifier + .padding(bottom = 25.dp) + .fillMaxWidth(), horizontalArrangement = Arrangement.End) { + Box( + modifier = Modifier + .fillMaxWidth(fraction = 0.8F) + .clip(RoundedCornerShape(15.dp)) + .background(color = MaterialTheme.colors.secondary) + .padding(horizontal = 10.dp, vertical = 5.dp) + ) { + Text( + text = text, + fontFamily = productSansFont, + color = if (!isSystemInDarkTheme()) Color.White else Color(15, 15, 15, 255)) + } + } + + +} + +@Preview(showBackground = true) +@Composable +fun DefaultPreview() { + JarvisComposeTheme { + Column(Modifier.padding(top = 40.dp, start = 20.dp, end = 20.dp)) { + Base() + MessageFromJarvis(text = "Salut, je suis Jarvis! \nPose moi une question et je ferais de mon mieux pour te renseigner.") + MessageFromUser(text = "Quel temps fait-il à Paris en ce moment ?") + MessageFromJarvis(text = "A Paris, il fait actuellement 10 degrés et le ciel est nuageux.") + + } + } +} \ No newline at end of file diff --git a/app/src/main/java/ch/mathieubroillet/jarvis/android/ui/theme/Color.kt b/app/src/main/java/ch/mathieubroillet/jarvis/android/ui/theme/Color.kt new file mode 100644 index 0000000..050f2ca --- /dev/null +++ b/app/src/main/java/ch/mathieubroillet/jarvis/android/ui/theme/Color.kt @@ -0,0 +1,58 @@ +package ch.mathieubroillet.jarvis.android.ui.theme + +import androidx.compose.ui.graphics.Color + +val md_theme_light_primary = Color(0xFF006d40) +val md_theme_light_onPrimary = Color(0xFFffffff) +val md_theme_light_primaryContainer = Color(0xFF73fcb2) +val md_theme_light_onPrimaryContainer = Color(0xFF002110) +val md_theme_light_secondary = Color(0xFF4e6355) +val md_theme_light_onSecondary = Color(0xFFffffff) +val md_theme_light_secondaryContainer = Color(0xFFd1e9d6) +val md_theme_light_onSecondaryContainer = Color(0xFF0c1f14) +val md_theme_light_tertiary = Color(0xFF3b6471) +val md_theme_light_onTertiary = Color(0xFFffffff) +val md_theme_light_tertiaryContainer = Color(0xFFbee9f8) +val md_theme_light_onTertiaryContainer = Color(0xFF001f27) +val md_theme_light_error = Color(0xFFba1b1b) +val md_theme_light_errorContainer = Color(0xFFffdad4) +val md_theme_light_onError = Color(0xFFffffff) +val md_theme_light_onErrorContainer = Color(0xFF410001) +val md_theme_light_background = Color(0xFFfbfdf8) +val md_theme_light_onBackground = Color(0xFF191c1a) +val md_theme_light_surface = Color(0xFFfbfdf8) +val md_theme_light_onSurface = Color(0xFF191c1a) +val md_theme_light_surfaceVariant = Color(0xFFdce5dc) +val md_theme_light_onSurfaceVariant = Color(0xFF404942) +val md_theme_light_outline = Color(0xFF717972) +val md_theme_light_inverseOnSurface = Color(0xFFeff1ec) +val md_theme_light_inverseSurface = Color(0xFF2e312e) + +val md_theme_dark_primary = Color(0xFF53df98) +val md_theme_dark_onPrimary = Color(0xFF00391f) +val md_theme_dark_primaryContainer = Color(0xFF00522f) +val md_theme_dark_onPrimaryContainer = Color(0xFF73fcb2) +val md_theme_dark_secondary = Color(0xFFb5ccba) +val md_theme_dark_onSecondary = Color(0xFF213528) +val md_theme_dark_secondaryContainer = Color(0xFF374b3e) +val md_theme_dark_onSecondaryContainer = Color(0xFFd1e9d6) +val md_theme_dark_tertiary = Color(0xFFa3cddc) +val md_theme_dark_onTertiary = Color(0xFF033541) +val md_theme_dark_tertiaryContainer = Color(0xFF224c58) +val md_theme_dark_onTertiaryContainer = Color(0xFFbee9f8) +val md_theme_dark_error = Color(0xFFffb4a9) +val md_theme_dark_errorContainer = Color(0xFF930006) +val md_theme_dark_onError = Color(0xFF680003) +val md_theme_dark_onErrorContainer = Color(0xFFffdad4) +val md_theme_dark_background = Color(0xFF191c1a) +val md_theme_dark_onBackground = Color(0xFFe2e3df) +val md_theme_dark_surface = Color(0xFF191c1a) +val md_theme_dark_onSurface = Color(0xFFe2e3df) +val md_theme_dark_surfaceVariant = Color(0xFF404942) +val md_theme_dark_onSurfaceVariant = Color(0xFFc0c9c0) +val md_theme_dark_outline = Color(0xFF8a938b) +val md_theme_dark_inverseOnSurface = Color(0xFF191c1a) +val md_theme_dark_inverseSurface = Color(0xFFe2e3df) + +val seed = Color(0xFF2ec27e) +val error = Color(0xFFba1b1b) \ No newline at end of file diff --git a/app/src/main/java/ch/mathieubroillet/jarvis/android/ui/theme/Shape.kt b/app/src/main/java/ch/mathieubroillet/jarvis/android/ui/theme/Shape.kt new file mode 100644 index 0000000..8634fe9 --- /dev/null +++ b/app/src/main/java/ch/mathieubroillet/jarvis/android/ui/theme/Shape.kt @@ -0,0 +1,11 @@ +package ch.mathieubroillet.jarvis.android.ui.theme + +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.Shapes +import androidx.compose.ui.unit.dp + +val Shapes = Shapes( + small = RoundedCornerShape(4.dp), + medium = RoundedCornerShape(4.dp), + large = RoundedCornerShape(0.dp) +) \ No newline at end of file diff --git a/app/src/main/java/ch/mathieubroillet/jarvis/android/ui/theme/Theme.kt b/app/src/main/java/ch/mathieubroillet/jarvis/android/ui/theme/Theme.kt new file mode 100644 index 0000000..633e7ed --- /dev/null +++ b/app/src/main/java/ch/mathieubroillet/jarvis/android/ui/theme/Theme.kt @@ -0,0 +1,57 @@ +package ch.mathieubroillet.jarvis.android.ui.theme + +import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.material.MaterialTheme +import androidx.compose.material.darkColors +import androidx.compose.material.lightColors +import androidx.compose.runtime.Composable + +private val LightThemeColors = lightColors( + + primary = md_theme_light_primary, + primaryVariant = md_theme_light_primaryContainer, + onPrimary = md_theme_light_onPrimary, + secondary = md_theme_light_secondary, + secondaryVariant = md_theme_light_secondaryContainer, + onSecondary = md_theme_light_onSecondary, + error = md_theme_light_error, + onError = md_theme_light_onError, + background = md_theme_light_background, + onBackground = md_theme_light_onBackground, + surface = md_theme_light_surface, + onSurface = md_theme_light_onSurface +) +private val DarkThemeColors = darkColors( + + primary = md_theme_dark_primary, + primaryVariant = md_theme_dark_primaryContainer, + onPrimary = md_theme_dark_onPrimary, + secondary = md_theme_dark_secondary, + secondaryVariant = md_theme_dark_secondaryContainer, + onSecondary = md_theme_dark_onSecondary, + error = md_theme_dark_error, + onError = md_theme_dark_onError, + background = md_theme_dark_background, + onBackground = md_theme_dark_onBackground, + surface = md_theme_dark_surface, + onSurface = md_theme_dark_onSurface +) + +@Composable +fun JarvisComposeTheme( + darkTheme: Boolean = isSystemInDarkTheme(), + content: @Composable() () -> Unit +) { + val colors = if (darkTheme) { + DarkThemeColors + } else { + LightThemeColors + } + + MaterialTheme( + colors = colors, + typography = Typography, + shapes = Shapes, + content = content + ) +} \ No newline at end of file diff --git a/app/src/main/java/ch/mathieubroillet/jarvis/android/ui/theme/Type.kt b/app/src/main/java/ch/mathieubroillet/jarvis/android/ui/theme/Type.kt new file mode 100644 index 0000000..0750dd6 --- /dev/null +++ b/app/src/main/java/ch/mathieubroillet/jarvis/android/ui/theme/Type.kt @@ -0,0 +1,47 @@ +package ch.mathieubroillet.jarvis.android.ui.theme + +import androidx.compose.material.Typography +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.Font +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontStyle +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.sp +import ch.mathieubroillet.jarvis.android.R + +// Adding the Product Sans fonts +val productSansFont = FontFamily( + Font(R.font.google_regular), + Font(R.font.google_thin, weight = FontWeight.Thin), + Font(R.font.google_thin_italic, weight = FontWeight.Thin, style = FontStyle.Italic), + Font(R.font.google_light, weight = FontWeight.Light), + Font(R.font.google_light_italic, weight = FontWeight.Light, style = FontStyle.Italic), + Font(R.font.google_medium, weight = FontWeight.Medium), + Font(R.font.google_medium_italic, weight = FontWeight.Medium, style = FontStyle.Italic), + Font(R.font.google_bold, weight = FontWeight.Bold), + Font(R.font.google_bold_italic, weight = FontWeight.Bold, style = FontStyle.Italic), + Font(R.font.google_black, weight = FontWeight.Black), + Font(R.font.google_black_italic, weight = FontWeight.Black, style = FontStyle.Italic) +) + +// Set of Material typography styles to start with +val Typography = Typography( + body1 = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 16.sp + ) + /* Other default text styles to override + button = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.W500, + fontSize = 14.sp + ), + caption = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 12.sp + ) + */ +) + diff --git a/app/src/main/res/drawable/ic_baseline_more_vert_24.xml b/app/src/main/res/drawable/ic_baseline_more_vert_24.xml new file mode 100644 index 0000000..34b93ec --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_more_vert_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_baseline_person_24.xml b/app/src/main/res/drawable/ic_baseline_person_24.xml new file mode 100644 index 0000000..6bdced2 --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_person_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/robot256.png b/app/src/main/res/drawable/robot256.png new file mode 100644 index 0000000..d9060f6 Binary files /dev/null and b/app/src/main/res/drawable/robot256.png differ diff --git a/app/src/main/res/font/font/google_black.ttf b/app/src/main/res/font/font/google_black.ttf new file mode 100644 index 0000000..5864e26 Binary files /dev/null and b/app/src/main/res/font/font/google_black.ttf differ diff --git a/app/src/main/res/font/font/google_black_italic.ttf b/app/src/main/res/font/font/google_black_italic.ttf new file mode 100644 index 0000000..869037b Binary files /dev/null and b/app/src/main/res/font/font/google_black_italic.ttf differ diff --git a/app/src/main/res/font/font/google_bold.ttf b/app/src/main/res/font/font/google_bold.ttf new file mode 100644 index 0000000..96619df Binary files /dev/null and b/app/src/main/res/font/font/google_bold.ttf differ diff --git a/app/src/main/res/font/font/google_bold_italic.ttf b/app/src/main/res/font/font/google_bold_italic.ttf new file mode 100644 index 0000000..bdd22b0 Binary files /dev/null and b/app/src/main/res/font/font/google_bold_italic.ttf differ diff --git a/app/src/main/res/font/font/google_italic.ttf b/app/src/main/res/font/font/google_italic.ttf new file mode 100644 index 0000000..5b44037 Binary files /dev/null and b/app/src/main/res/font/font/google_italic.ttf differ diff --git a/app/src/main/res/font/font/google_light.ttf b/app/src/main/res/font/font/google_light.ttf new file mode 100644 index 0000000..33de1c3 Binary files /dev/null and b/app/src/main/res/font/font/google_light.ttf differ diff --git a/app/src/main/res/font/font/google_light_italic.ttf b/app/src/main/res/font/font/google_light_italic.ttf new file mode 100644 index 0000000..00c76b8 Binary files /dev/null and b/app/src/main/res/font/font/google_light_italic.ttf differ diff --git a/app/src/main/res/font/font/google_medium.ttf b/app/src/main/res/font/font/google_medium.ttf new file mode 100644 index 0000000..fd818d6 Binary files /dev/null and b/app/src/main/res/font/font/google_medium.ttf differ diff --git a/app/src/main/res/font/font/google_medium_italic.ttf b/app/src/main/res/font/font/google_medium_italic.ttf new file mode 100644 index 0000000..ec70cd3 Binary files /dev/null and b/app/src/main/res/font/font/google_medium_italic.ttf differ diff --git a/app/src/main/res/font/font/google_regular.ttf b/app/src/main/res/font/font/google_regular.ttf new file mode 100644 index 0000000..e2c69c3 Binary files /dev/null and b/app/src/main/res/font/font/google_regular.ttf differ diff --git a/app/src/main/res/font/font/google_thin.ttf b/app/src/main/res/font/font/google_thin.ttf new file mode 100644 index 0000000..5e046b5 Binary files /dev/null and b/app/src/main/res/font/font/google_thin.ttf differ diff --git a/app/src/main/res/font/font/google_thin_italic.ttf b/app/src/main/res/font/font/google_thin_italic.ttf new file mode 100644 index 0000000..7b04955 Binary files /dev/null and b/app/src/main/res/font/font/google_thin_italic.ttf differ diff --git a/app/src/main/res/font/google_black.ttf b/app/src/main/res/font/google_black.ttf new file mode 100644 index 0000000..5864e26 Binary files /dev/null and b/app/src/main/res/font/google_black.ttf differ diff --git a/app/src/main/res/font/google_black_italic.ttf b/app/src/main/res/font/google_black_italic.ttf new file mode 100644 index 0000000..869037b Binary files /dev/null and b/app/src/main/res/font/google_black_italic.ttf differ diff --git a/app/src/main/res/font/google_bold.ttf b/app/src/main/res/font/google_bold.ttf new file mode 100644 index 0000000..96619df Binary files /dev/null and b/app/src/main/res/font/google_bold.ttf differ diff --git a/app/src/main/res/font/google_bold_italic.ttf b/app/src/main/res/font/google_bold_italic.ttf new file mode 100644 index 0000000..bdd22b0 Binary files /dev/null and b/app/src/main/res/font/google_bold_italic.ttf differ diff --git a/app/src/main/res/font/google_italic.ttf b/app/src/main/res/font/google_italic.ttf new file mode 100644 index 0000000..5b44037 Binary files /dev/null and b/app/src/main/res/font/google_italic.ttf differ diff --git a/app/src/main/res/font/google_light.ttf b/app/src/main/res/font/google_light.ttf new file mode 100644 index 0000000..33de1c3 Binary files /dev/null and b/app/src/main/res/font/google_light.ttf differ diff --git a/app/src/main/res/font/google_light_italic.ttf b/app/src/main/res/font/google_light_italic.ttf new file mode 100644 index 0000000..00c76b8 Binary files /dev/null and b/app/src/main/res/font/google_light_italic.ttf differ diff --git a/app/src/main/res/font/google_medium.ttf b/app/src/main/res/font/google_medium.ttf new file mode 100644 index 0000000..fd818d6 Binary files /dev/null and b/app/src/main/res/font/google_medium.ttf differ diff --git a/app/src/main/res/font/google_medium_italic.ttf b/app/src/main/res/font/google_medium_italic.ttf new file mode 100644 index 0000000..ec70cd3 Binary files /dev/null and b/app/src/main/res/font/google_medium_italic.ttf differ diff --git a/app/src/main/res/font/google_regular.ttf b/app/src/main/res/font/google_regular.ttf new file mode 100644 index 0000000..e2c69c3 Binary files /dev/null and b/app/src/main/res/font/google_regular.ttf differ diff --git a/app/src/main/res/font/google_thin.ttf b/app/src/main/res/font/google_thin.ttf new file mode 100644 index 0000000..5e046b5 Binary files /dev/null and b/app/src/main/res/font/google_thin.ttf differ diff --git a/app/src/main/res/font/google_thin_italic.ttf b/app/src/main/res/font/google_thin_italic.ttf new file mode 100644 index 0000000..7b04955 Binary files /dev/null and b/app/src/main/res/font/google_thin_italic.ttf differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..8376d06 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..8742799 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..fb09852 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..8f209e7 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..90da082 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..4e8fe64 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..3f34398 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..da5e548 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..f38cf5c Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..750f95e Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml new file mode 100644 index 0000000..af5f3ca --- /dev/null +++ b/app/src/main/res/values-night/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..f8c6127 --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,10 @@ + + + #FFBB86FC + #FF6200EE + #FF3700B3 + #FF03DAC5 + #FF018786 + #FF000000 + #FFFFFFFF + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..d61f292 --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + Jarvis Compose + \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..1817c95 --- /dev/null +++ b/app/src/main/res/values/themes.xml @@ -0,0 +1,22 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/test/java/ch/mathieubroillet/jarvis/android/ExampleUnitTest.kt b/app/src/test/java/ch/mathieubroillet/jarvis/android/ExampleUnitTest.kt new file mode 100644 index 0000000..23ffacb --- /dev/null +++ b/app/src/test/java/ch/mathieubroillet/jarvis/android/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package ch.mathieubroillet.jarvis.android + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..93253ac --- /dev/null +++ b/build.gradle @@ -0,0 +1,21 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. +buildscript { + ext { + compose_version = '1.0.5' + } + repositories { + google() + mavenCentral() + } + dependencies { + classpath "com.android.tools.build:gradle:7.0.4" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31" + + // NOTE: Do not place your application dependencies here; they belong + // in the individual module build.gradle files + } +} + +task clean(type: Delete) { + delete rootProject.buildDir +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..98bed16 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,21 @@ +# Project-wide Gradle settings. +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true +# AndroidX package structure to make it clearer which packages are bundled with the +# Android operating system, and which are packaged with your app"s APK +# https://developer.android.com/topic/libraries/support-library/androidx-rn +android.useAndroidX=true +# Automatically convert third-party libraries to use AndroidX +android.enableJetifier=true +# Kotlin code style for this project: "official" or "obsolete": +kotlin.code.style=official \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..e708b1c Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..5735c6c --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Sun Jan 02 15:36:04 CET 2022 +distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip +distributionPath=wrapper/dists +zipStorePath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..4f906e0 --- /dev/null +++ b/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# 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. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..ac1b06f --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..3d269fb --- /dev/null +++ b/settings.gradle @@ -0,0 +1,10 @@ +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + jcenter() // Warning: this repository is going to shut down soon + } +} +rootProject.name = "Jarvis Compose" +include ':app'