diff --git a/build.gradle.kts b/build.gradle.kts index dbca9edf6d..47f83c711b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -27,6 +27,8 @@ plugins { id("artifacts-check") id("dependency-guard") alias(libs.plugins.ktlint) + alias(libs.plugins.com.android.application) apply false + alias(libs.plugins.org.jetbrains.kotlin.android) apply false } shardConnectedCheckTasks(project) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 06fb5abd7f..4a53c87d00 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -85,6 +85,8 @@ timber = "5.0.1" truth = "1.1.5" turbine = "1.0.0" vanniktech-publish = "0.25.2" +agp = "7.4.2" +org-jetbrains-kotlin-android = "1.8.10" [plugins] @@ -100,6 +102,8 @@ kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", versi ktlint = { id = "com.rickbusarow.ktlint", version.ref = "ktlint-gradle" } kotlinx-apiBinaryCompatibility = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "kotlinx-binary-compatibility" } mavenPublish = { id = "com.vanniktech.maven.publish", version.ref = "vanniktech-publish" } +com-android-application = { id = "com.android.application", version.ref = "agp" } +org-jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "org-jetbrains-kotlin-android" } [libraries] @@ -254,5 +258,7 @@ truth = { module = "com.google.truth:truth", version.ref = "truth" } turbine = { module = "app.cash.turbine:turbine", version.ref = "turbine" } vanniktech-publish = { module = "com.vanniktech:gradle-maven-publish-plugin", version.ref = "vanniktech-publish" } +ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" } +material3 = { group = "androidx.compose.material3", name = "material3" } [bundles] diff --git a/samples/petfinder/.gitignore b/samples/petfinder/.gitignore new file mode 100644 index 0000000000..42afabfd2a --- /dev/null +++ b/samples/petfinder/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/samples/petfinder/build.gradle.kts b/samples/petfinder/build.gradle.kts new file mode 100644 index 0000000000..20d8ede482 --- /dev/null +++ b/samples/petfinder/build.gradle.kts @@ -0,0 +1,70 @@ +@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed +plugins { + alias(libs.plugins.com.android.application) + alias(libs.plugins.org.jetbrains.kotlin.android) +} + +android { + namespace = "com.squareup.sample.petfinder" + compileSdk = 33 + + defaultConfig { + applicationId = "com.squareup.sample.petfinder" + minSdk = 24 + targetSdk = 33 + versionCode = 1 + versionName = "1.0" + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + vectorDrawables { + useSupportLibrary = true + } + } + + buildTypes { + release { + isMinifyEnabled = 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" + } + buildFeatures { + compose = true + } + composeOptions { + kotlinCompilerExtensionVersion = "1.4.3" + } + packagingOptions { + resources { + excludes += "/META-INF/{AL2.0,LGPL2.1}" + } + } +} + +dependencies { + + implementation(libs.androidx.core) + implementation(libs.androidx.lifecycle.ktx) + implementation(libs.androidx.activity.compose) + implementation(platform(libs.androidx.compose.bom)) + implementation(libs.androidx.compose.ui) + implementation(libs.androidx.compose.ui.graphics) + implementation(libs.androidx.compose.ui.tooling.preview) + implementation(libs.material3) + testImplementation(libs.junit) + androidTestImplementation(libs.androidx.test.junit) + androidTestImplementation(libs.androidx.test.espresso.core) + androidTestImplementation(platform(libs.androidx.compose.bom)) + androidTestImplementation(libs.androidx.compose.ui.test.junit4) + debugImplementation(libs.androidx.compose.ui.tooling) + debugImplementation(libs.ui.test.manifest) +} diff --git a/samples/petfinder/proguard-rules.pro b/samples/petfinder/proguard-rules.pro new file mode 100644 index 0000000000..481bb43481 --- /dev/null +++ b/samples/petfinder/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/samples/petfinder/src/androidTest/java/com/squareup/sample/petfinder/ExampleInstrumentedTest.kt b/samples/petfinder/src/androidTest/java/com/squareup/sample/petfinder/ExampleInstrumentedTest.kt new file mode 100644 index 0000000000..41f7548f70 --- /dev/null +++ b/samples/petfinder/src/androidTest/java/com/squareup/sample/petfinder/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package com.squareup.sample.petfinder + +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("com.squareup.sample.petfinder", appContext.packageName) + } +} diff --git a/samples/petfinder/src/main/AndroidManifest.xml b/samples/petfinder/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..5b1da1974b --- /dev/null +++ b/samples/petfinder/src/main/AndroidManifest.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + diff --git a/samples/petfinder/src/main/java/com/squareup/sample/petfinder/MainActivity.kt b/samples/petfinder/src/main/java/com/squareup/sample/petfinder/MainActivity.kt new file mode 100644 index 0000000000..a350bedce2 --- /dev/null +++ b/samples/petfinder/src/main/java/com/squareup/sample/petfinder/MainActivity.kt @@ -0,0 +1,46 @@ +package com.squareup.sample.petfinder + +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 com.squareup.sample.petfinder.ui.theme.WorkflowTheme + +class MainActivity : ComponentActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContent { + WorkflowTheme { + // 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() { + WorkflowTheme { + Greeting("Android") + } +} diff --git a/samples/petfinder/src/main/java/com/squareup/sample/petfinder/ui/theme/Color.kt b/samples/petfinder/src/main/java/com/squareup/sample/petfinder/ui/theme/Color.kt new file mode 100644 index 0000000000..7189afe8d7 --- /dev/null +++ b/samples/petfinder/src/main/java/com/squareup/sample/petfinder/ui/theme/Color.kt @@ -0,0 +1,11 @@ +package com.squareup.sample.petfinder.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/samples/petfinder/src/main/java/com/squareup/sample/petfinder/ui/theme/Theme.kt b/samples/petfinder/src/main/java/com/squareup/sample/petfinder/ui/theme/Theme.kt new file mode 100644 index 0000000000..235536da48 --- /dev/null +++ b/samples/petfinder/src/main/java/com/squareup/sample/petfinder/ui/theme/Theme.kt @@ -0,0 +1,70 @@ +package com.squareup.sample.petfinder.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 WorkflowTheme( + 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 + ) +} diff --git a/samples/petfinder/src/main/java/com/squareup/sample/petfinder/ui/theme/Type.kt b/samples/petfinder/src/main/java/com/squareup/sample/petfinder/ui/theme/Type.kt new file mode 100644 index 0000000000..525a789b36 --- /dev/null +++ b/samples/petfinder/src/main/java/com/squareup/sample/petfinder/ui/theme/Type.kt @@ -0,0 +1,34 @@ +package com.squareup.sample.petfinder.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/samples/petfinder/src/main/res/drawable/ic_launcher_background.xml b/samples/petfinder/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000000..07d5da9cbf --- /dev/null +++ b/samples/petfinder/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/samples/petfinder/src/main/res/drawable/ic_launcher_foreground.xml b/samples/petfinder/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000000..7706ab9e6d --- /dev/null +++ b/samples/petfinder/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + diff --git a/samples/petfinder/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/samples/petfinder/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000000..b3e26b4c60 --- /dev/null +++ b/samples/petfinder/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/samples/petfinder/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/samples/petfinder/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000000..b3e26b4c60 --- /dev/null +++ b/samples/petfinder/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/samples/petfinder/src/main/res/mipmap-hdpi/ic_launcher.webp b/samples/petfinder/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000000..c209e78ecd Binary files /dev/null and b/samples/petfinder/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/samples/petfinder/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/samples/petfinder/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000000..b2dfe3d1ba Binary files /dev/null and b/samples/petfinder/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/samples/petfinder/src/main/res/mipmap-mdpi/ic_launcher.webp b/samples/petfinder/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000000..4f0f1d64e5 Binary files /dev/null and b/samples/petfinder/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/samples/petfinder/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/samples/petfinder/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 0000000000..62b611da08 Binary files /dev/null and b/samples/petfinder/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/samples/petfinder/src/main/res/mipmap-xhdpi/ic_launcher.webp b/samples/petfinder/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000000..948a3070fe Binary files /dev/null and b/samples/petfinder/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/samples/petfinder/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/samples/petfinder/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000000..1b9a6956b3 Binary files /dev/null and b/samples/petfinder/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/samples/petfinder/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/samples/petfinder/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 0000000000..28d4b77f9f Binary files /dev/null and b/samples/petfinder/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/samples/petfinder/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/samples/petfinder/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000000..9287f50836 Binary files /dev/null and b/samples/petfinder/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/samples/petfinder/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/samples/petfinder/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 0000000000..aa7d6427e6 Binary files /dev/null and b/samples/petfinder/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/samples/petfinder/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/samples/petfinder/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000000..9126ae37cb Binary files /dev/null and b/samples/petfinder/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/samples/petfinder/src/main/res/values/colors.xml b/samples/petfinder/src/main/res/values/colors.xml new file mode 100644 index 0000000000..ca1931bca9 --- /dev/null +++ b/samples/petfinder/src/main/res/values/colors.xml @@ -0,0 +1,10 @@ + + + #FFBB86FC + #FF6200EE + #FF3700B3 + #FF03DAC5 + #FF018786 + #FF000000 + #FFFFFFFF + diff --git a/samples/petfinder/src/main/res/values/strings.xml b/samples/petfinder/src/main/res/values/strings.xml new file mode 100644 index 0000000000..6a4f457899 --- /dev/null +++ b/samples/petfinder/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + PetFinder + \ No newline at end of file diff --git a/samples/petfinder/src/main/res/values/themes.xml b/samples/petfinder/src/main/res/values/themes.xml new file mode 100644 index 0000000000..2bbc4b726d --- /dev/null +++ b/samples/petfinder/src/main/res/values/themes.xml @@ -0,0 +1,5 @@ + + + +