diff --git a/example/compose-material3/README.md b/example/compose-material3/README.md new file mode 100644 index 000000000..59ba7265e --- /dev/null +++ b/example/compose-material3/README.md @@ -0,0 +1,37 @@ +Go bind example using Kotlin + Compose + Material 3 + +Android project generated using Android Studio: `File > New > New Project > Empty Compose Activity (Material 3)` + +### Requirements + +1. `ANDROID_HOME` is set (e.g: `export ANDROID_HOME="$HOME/Android/Sdk"`) +2. `gomobile` and `gobind` is available - (e.g: `go install golang.org/x/mobile/cmd/gomobile@latest`) +3. Android NDK 19 to 23 is installed + + +### Installing the NDK + +1. Download [latest Android NDK LTS - r23c](https://dl.google.com/android/repository/android-ndk-r23c-linux.zip) +2. Extract it under `~/Android/Sdk/ndk/` +3. Create the `ndk-bundle` folder as symbolic link: + ``` + ln -sf ~/Android/Sdk/ndk/android-ndk-r23c ~/Android/Sdk/ndk-bundle + ``` + +_For context: https://github.com/golang/go/issues/35030#issuecomment-641319703_ + + +### Building project + +1. From this directory run: + ``` + gomobile bind -o android/app/libs/hello.aar -androidapi 32 ./hello + ``` + +2. Import this project in Android Studio and build; + +During tests `-androidapi` also worked with: `19`, `21`, `22`, `23`, `24`, `26`, `27`, `28`, `29`, `30`, `31` and `32` + +> Note that Compose Previews that uses external modules is not working in Android Studio Chipmunk | 2021.2.1 Patch 1 - [see thread](https://issuetracker.google.com/issues/206862224?pli=1) + +> You need to run the `gomobile bind` command again every time you make a change to Go code. diff --git a/example/compose-material3/android/.gitignore b/example/compose-material3/android/.gitignore new file mode 100644 index 000000000..aa724b770 --- /dev/null +++ b/example/compose-material3/android/.gitignore @@ -0,0 +1,15 @@ +*.iml +.gradle +/local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml +.DS_Store +/build +/captures +.externalNativeBuild +.cxx +local.properties diff --git a/example/compose-material3/android/app/.gitignore b/example/compose-material3/android/app/.gitignore new file mode 100644 index 000000000..42afabfd2 --- /dev/null +++ b/example/compose-material3/android/app/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/example/compose-material3/android/app/build.gradle b/example/compose-material3/android/app/build.gradle new file mode 100644 index 000000000..2236fa26c --- /dev/null +++ b/example/compose-material3/android/app/build.gradle @@ -0,0 +1,64 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' +} + +android { + compileSdk 32 + + defaultConfig { + applicationId "com.example.composematerial3" + minSdk 30 + 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' + } + buildFeatures { + compose true + } + composeOptions { + kotlinCompilerExtensionVersion compose_version + } + packagingOptions { + resources { + excludes += '/META-INF/{AL2.0,LGPL2.1}' + } + } +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.7.0' + implementation "androidx.compose.ui:ui:$compose_version" + implementation 'androidx.compose.material3:material3:1.0.0-alpha01' + implementation "androidx.compose.ui:ui-tooling-preview:$compose_version" + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1' + implementation 'androidx.activity:activity-compose:1.3.1' + 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" + debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_version" + + implementation files('libs/hello.aar') +} \ No newline at end of file diff --git a/example/compose-material3/android/app/proguard-rules.pro b/example/compose-material3/android/app/proguard-rules.pro new file mode 100644 index 000000000..481bb4348 --- /dev/null +++ b/example/compose-material3/android/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/example/compose-material3/android/app/src/androidTest/java/com/example/composematerial3/ExampleInstrumentedTest.kt b/example/compose-material3/android/app/src/androidTest/java/com/example/composematerial3/ExampleInstrumentedTest.kt new file mode 100644 index 000000000..fd715f943 --- /dev/null +++ b/example/compose-material3/android/app/src/androidTest/java/com/example/composematerial3/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package com.example.composematerial3 + +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.example.composematerial3", appContext.packageName) + } +} \ No newline at end of file diff --git a/example/compose-material3/android/app/src/main/AndroidManifest.xml b/example/compose-material3/android/app/src/main/AndroidManifest.xml new file mode 100644 index 000000000..c1b2470d1 --- /dev/null +++ b/example/compose-material3/android/app/src/main/AndroidManifest.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/example/compose-material3/android/app/src/main/java/com/example/composematerial3/MainActivity.kt b/example/compose-material3/android/app/src/main/java/com/example/composematerial3/MainActivity.kt new file mode 100644 index 000000000..ad36a7080 --- /dev/null +++ b/example/compose-material3/android/app/src/main/java/com/example/composematerial3/MainActivity.kt @@ -0,0 +1,44 @@ +package com.example.composematerial3 + +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.example.composematerial3.ui.theme.ComposeMaterial3Theme +import hello.Hello + +class MainActivity : ComponentActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContent { + ComposeMaterial3Theme { + // A surface container using the 'background' color from the theme + Surface( + modifier = Modifier.fillMaxSize(), + color = MaterialTheme.colorScheme.background + ) { + Greeting("Android and Gopher") + } + } + } + } +} + +@Composable +fun Greeting(name: String) { + Text(text = Hello.greetings(name)) +} + +@Preview(showBackground = true) +@Composable +fun DefaultPreview() { + ComposeMaterial3Theme { + Greeting("Android and Gopher") + } +} diff --git a/example/compose-material3/android/app/src/main/java/com/example/composematerial3/ui/theme/Color.kt b/example/compose-material3/android/app/src/main/java/com/example/composematerial3/ui/theme/Color.kt new file mode 100644 index 000000000..bedebd3ce --- /dev/null +++ b/example/compose-material3/android/app/src/main/java/com/example/composematerial3/ui/theme/Color.kt @@ -0,0 +1,11 @@ +package com.example.composematerial3.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/example/compose-material3/android/app/src/main/java/com/example/composematerial3/ui/theme/Theme.kt b/example/compose-material3/android/app/src/main/java/com/example/composematerial3/ui/theme/Theme.kt new file mode 100644 index 000000000..67a485619 --- /dev/null +++ b/example/compose-material3/android/app/src/main/java/com/example/composematerial3/ui/theme/Theme.kt @@ -0,0 +1,68 @@ +package com.example.composematerial3.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.ViewCompat + +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 ComposeMaterial3Theme( + 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 { + (view.context as Activity).window.statusBarColor = colorScheme.primary.toArgb() + ViewCompat.getWindowInsetsController(view)?.isAppearanceLightStatusBars = darkTheme + } + } + + MaterialTheme( + colorScheme = colorScheme, + typography = Typography, + content = content + ) +} \ No newline at end of file diff --git a/example/compose-material3/android/app/src/main/java/com/example/composematerial3/ui/theme/Type.kt b/example/compose-material3/android/app/src/main/java/com/example/composematerial3/ui/theme/Type.kt new file mode 100644 index 000000000..968facdde --- /dev/null +++ b/example/compose-material3/android/app/src/main/java/com/example/composematerial3/ui/theme/Type.kt @@ -0,0 +1,34 @@ +package com.example.composematerial3.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/example/compose-material3/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/example/compose-material3/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 000000000..2b068d114 --- /dev/null +++ b/example/compose-material3/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/example/compose-material3/android/app/src/main/res/drawable/ic_launcher_background.xml b/example/compose-material3/android/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 000000000..07d5da9cb --- /dev/null +++ b/example/compose-material3/android/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/example/compose-material3/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/example/compose-material3/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 000000000..eca70cfe5 --- /dev/null +++ b/example/compose-material3/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/example/compose-material3/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/example/compose-material3/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 000000000..eca70cfe5 --- /dev/null +++ b/example/compose-material3/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/example/compose-material3/android/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/example/compose-material3/android/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 000000000..c209e78ec Binary files /dev/null and b/example/compose-material3/android/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/example/compose-material3/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/example/compose-material3/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 000000000..b2dfe3d1b Binary files /dev/null and b/example/compose-material3/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/example/compose-material3/android/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/example/compose-material3/android/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 000000000..4f0f1d64e Binary files /dev/null and b/example/compose-material3/android/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/example/compose-material3/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/example/compose-material3/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 000000000..62b611da0 Binary files /dev/null and b/example/compose-material3/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/example/compose-material3/android/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/example/compose-material3/android/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 000000000..948a3070f Binary files /dev/null and b/example/compose-material3/android/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/example/compose-material3/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/example/compose-material3/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 000000000..1b9a6956b Binary files /dev/null and b/example/compose-material3/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/example/compose-material3/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/example/compose-material3/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 000000000..28d4b77f9 Binary files /dev/null and b/example/compose-material3/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/example/compose-material3/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/example/compose-material3/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 000000000..9287f5083 Binary files /dev/null and b/example/compose-material3/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/example/compose-material3/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/example/compose-material3/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 000000000..aa7d6427e Binary files /dev/null and b/example/compose-material3/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/example/compose-material3/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/example/compose-material3/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 000000000..9126ae37c Binary files /dev/null and b/example/compose-material3/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/example/compose-material3/android/app/src/main/res/values/colors.xml b/example/compose-material3/android/app/src/main/res/values/colors.xml new file mode 100644 index 000000000..f8c6127d3 --- /dev/null +++ b/example/compose-material3/android/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/example/compose-material3/android/app/src/main/res/values/strings.xml b/example/compose-material3/android/app/src/main/res/values/strings.xml new file mode 100644 index 000000000..56d68cac1 --- /dev/null +++ b/example/compose-material3/android/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + Compose Material 3 + \ No newline at end of file diff --git a/example/compose-material3/android/app/src/main/res/values/themes.xml b/example/compose-material3/android/app/src/main/res/values/themes.xml new file mode 100644 index 000000000..9fbcd873c --- /dev/null +++ b/example/compose-material3/android/app/src/main/res/values/themes.xml @@ -0,0 +1,5 @@ + + + +