# HG changeset patch # User Da Risk # Date 1683054925 14400 # Node ID 4e26459b46424ba2be123ff01fd7db50d4632649 # Parent bb30a0b89177b7e776c24a1dace9cc28fff3d95b start a sample app module diff -r bb30a0b89177 -r 4e26459b4642 gradle/libs.versions.toml --- a/gradle/libs.versions.toml Tue May 02 15:06:53 2023 -0400 +++ b/gradle/libs.versions.toml Tue May 02 15:15:25 2023 -0400 @@ -55,6 +55,12 @@ androidx-compose-material = { module = "androidx.compose.material:material" } androidx-compose-material3 = { module = "androidx.compose.material3:material3", version = "1.1.0-beta02" } +androidx-compose-ui = { group = "androidx.compose.ui", name = "ui" } +androidx-compose-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" } +androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" } +androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" } +androidx-compose-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" } +androidx-compose-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" } [plugins] diff -r bb30a0b89177 -r 4e26459b4642 sample/.gitignore --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sample/.gitignore Tue May 02 15:15:25 2023 -0400 @@ -0,0 +1,1 @@ +/build \ No newline at end of file diff -r bb30a0b89177 -r 4e26459b4642 sample/build.gradle.kts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sample/build.gradle.kts Tue May 02 15:15:25 2023 -0400 @@ -0,0 +1,92 @@ +/* + * AboutOss is an utility library to retrieve and display + * opensource licenses in Android applications. + * + * Copyright (C) 2023 by Frederic-Charles Barthelery. + * + * This file is part of AboutOss. + * + * AboutOss is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * AboutOss is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with AboutOss. If not, see . + */ +@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed +plugins { + id("com.android.application") + id("org.jetbrains.kotlin.android") + id("com.geekorum.build.source-license-checker") +} + +android { + namespace = "com.geekorum.aboutoss.sampleapp" + compileSdk = 33 + + defaultConfig { + applicationId = "com.geekorum.aboutoss.sampleapp" + 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 = libs.versions.androidx.compose.compiler.get() + } + packaging { + resources { + excludes += "/META-INF/{AL2.0,LGPL2.1}" + } + } +} + +dependencies { + implementation(project(":ui:material2")) + implementation(project(":ui:material3")) + + 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.androidx.compose.material3) + testImplementation(libs.junit) + androidTestImplementation(libs.androidx.test.ext.junit) + androidTestImplementation(libs.espresso.core) + androidTestImplementation(platform(libs.androidx.compose.bom)) + androidTestImplementation(libs.androidx.compose.ui.test.junit4) + debugImplementation(libs.androidx.compose.ui.tooling) + debugImplementation(libs.androidx.compose.ui.test.manifest) +} \ No newline at end of file diff -r bb30a0b89177 -r 4e26459b4642 sample/proguard-rules.pro --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sample/proguard-rules.pro Tue May 02 15:15:25 2023 -0400 @@ -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 -r bb30a0b89177 -r 4e26459b4642 sample/src/main/AndroidManifest.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sample/src/main/AndroidManifest.xml Tue May 02 15:15:25 2023 -0400 @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff -r bb30a0b89177 -r 4e26459b4642 sample/src/main/java/com/geekorum/aboutoss/sampleapp/MainActivity.kt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sample/src/main/java/com/geekorum/aboutoss/sampleapp/MainActivity.kt Tue May 02 15:15:25 2023 -0400 @@ -0,0 +1,67 @@ +/* + * AboutOss is an utility library to retrieve and display + * opensource licenses in Android applications. + * + * Copyright (C) 2023 by Frederic-Charles Barthelery. + * + * This file is part of AboutOss. + * + * AboutOss is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * AboutOss is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with AboutOss. If not, see . + */ +package com.geekorum.aboutoss.sampleapp + +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.geekorum.aboutoss.sampleapp.ui.theme.AboutOssTheme + +class MainActivity : ComponentActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContent { + AboutOssTheme { + // 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() { + AboutOssTheme { + Greeting("Android") + } +} \ No newline at end of file diff -r bb30a0b89177 -r 4e26459b4642 sample/src/main/java/com/geekorum/aboutoss/sampleapp/ui/theme/Color.kt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sample/src/main/java/com/geekorum/aboutoss/sampleapp/ui/theme/Color.kt Tue May 02 15:15:25 2023 -0400 @@ -0,0 +1,32 @@ +/* + * AboutOss is an utility library to retrieve and display + * opensource licenses in Android applications. + * + * Copyright (C) 2023 by Frederic-Charles Barthelery. + * + * This file is part of AboutOss. + * + * AboutOss is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * AboutOss is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with AboutOss. If not, see . + */ +package com.geekorum.aboutoss.sampleapp.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 -r bb30a0b89177 -r 4e26459b4642 sample/src/main/java/com/geekorum/aboutoss/sampleapp/ui/theme/Theme.kt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sample/src/main/java/com/geekorum/aboutoss/sampleapp/ui/theme/Theme.kt Tue May 02 15:15:25 2023 -0400 @@ -0,0 +1,91 @@ +/* + * AboutOss is an utility library to retrieve and display + * opensource licenses in Android applications. + * + * Copyright (C) 2023 by Frederic-Charles Barthelery. + * + * This file is part of AboutOss. + * + * AboutOss is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * AboutOss is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with AboutOss. If not, see . + */ +package com.geekorum.aboutoss.sampleapp.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 AboutOssTheme( + 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 -r bb30a0b89177 -r 4e26459b4642 sample/src/main/java/com/geekorum/aboutoss/sampleapp/ui/theme/Type.kt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sample/src/main/java/com/geekorum/aboutoss/sampleapp/ui/theme/Type.kt Tue May 02 15:15:25 2023 -0400 @@ -0,0 +1,55 @@ +/* + * AboutOss is an utility library to retrieve and display + * opensource licenses in Android applications. + * + * Copyright (C) 2023 by Frederic-Charles Barthelery. + * + * This file is part of AboutOss. + * + * AboutOss is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * AboutOss is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with AboutOss. If not, see . + */ +package com.geekorum.aboutoss.sampleapp.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 -r bb30a0b89177 -r 4e26459b4642 sample/src/main/res/drawable/ic_launcher_background.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sample/src/main/res/drawable/ic_launcher_background.xml Tue May 02 15:15:25 2023 -0400 @@ -0,0 +1,193 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r bb30a0b89177 -r 4e26459b4642 sample/src/main/res/drawable/ic_launcher_foreground.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sample/src/main/res/drawable/ic_launcher_foreground.xml Tue May 02 15:15:25 2023 -0400 @@ -0,0 +1,53 @@ + + + + + + + + + + + + \ No newline at end of file diff -r bb30a0b89177 -r 4e26459b4642 sample/src/main/res/mipmap-anydpi-v26/ic_launcher.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sample/src/main/res/mipmap-anydpi-v26/ic_launcher.xml Tue May 02 15:15:25 2023 -0400 @@ -0,0 +1,29 @@ + + + + + + + \ No newline at end of file diff -r bb30a0b89177 -r 4e26459b4642 sample/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sample/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml Tue May 02 15:15:25 2023 -0400 @@ -0,0 +1,29 @@ + + + + + + + \ No newline at end of file diff -r bb30a0b89177 -r 4e26459b4642 sample/src/main/res/mipmap-hdpi/ic_launcher.webp Binary file sample/src/main/res/mipmap-hdpi/ic_launcher.webp has changed diff -r bb30a0b89177 -r 4e26459b4642 sample/src/main/res/mipmap-hdpi/ic_launcher_round.webp Binary file sample/src/main/res/mipmap-hdpi/ic_launcher_round.webp has changed diff -r bb30a0b89177 -r 4e26459b4642 sample/src/main/res/mipmap-mdpi/ic_launcher.webp Binary file sample/src/main/res/mipmap-mdpi/ic_launcher.webp has changed diff -r bb30a0b89177 -r 4e26459b4642 sample/src/main/res/mipmap-mdpi/ic_launcher_round.webp Binary file sample/src/main/res/mipmap-mdpi/ic_launcher_round.webp has changed diff -r bb30a0b89177 -r 4e26459b4642 sample/src/main/res/mipmap-xhdpi/ic_launcher.webp Binary file sample/src/main/res/mipmap-xhdpi/ic_launcher.webp has changed diff -r bb30a0b89177 -r 4e26459b4642 sample/src/main/res/mipmap-xhdpi/ic_launcher_round.webp Binary file sample/src/main/res/mipmap-xhdpi/ic_launcher_round.webp has changed diff -r bb30a0b89177 -r 4e26459b4642 sample/src/main/res/mipmap-xxhdpi/ic_launcher.webp Binary file sample/src/main/res/mipmap-xxhdpi/ic_launcher.webp has changed diff -r bb30a0b89177 -r 4e26459b4642 sample/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp Binary file sample/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp has changed diff -r bb30a0b89177 -r 4e26459b4642 sample/src/main/res/mipmap-xxxhdpi/ic_launcher.webp Binary file sample/src/main/res/mipmap-xxxhdpi/ic_launcher.webp has changed diff -r bb30a0b89177 -r 4e26459b4642 sample/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp Binary file sample/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp has changed diff -r bb30a0b89177 -r 4e26459b4642 sample/src/main/res/values/colors.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sample/src/main/res/values/colors.xml Tue May 02 15:15:25 2023 -0400 @@ -0,0 +1,33 @@ + + + + #FFBB86FC + #FF6200EE + #FF3700B3 + #FF03DAC5 + #FF018786 + #FF000000 + #FFFFFFFF + \ No newline at end of file diff -r bb30a0b89177 -r 4e26459b4642 sample/src/main/res/values/strings.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sample/src/main/res/values/strings.xml Tue May 02 15:15:25 2023 -0400 @@ -0,0 +1,26 @@ + + + Sample app + \ No newline at end of file diff -r bb30a0b89177 -r 4e26459b4642 sample/src/main/res/values/themes.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sample/src/main/res/values/themes.xml Tue May 02 15:15:25 2023 -0400 @@ -0,0 +1,28 @@ + + + + +