Skip to content

Commit bb2d203

Browse files
jimgoogjimgoog
committed
Demonstrate using Compose with pre-release builds of Kotlin Compiler and Compose Compiler.
0 parents  commit bb2d203

37 files changed

+904
-0
lines changed

‎.gitignore

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
*.iml
2+
.gradle
3+
/local.properties
4+
/.idea
5+
/.idea/caches
6+
/.idea/libraries
7+
/.idea/modules.xml
8+
/.idea/workspace.xml
9+
/.idea/navEditor.xml
10+
/.idea/assetWizardSettings.xml
11+
.DS_Store
12+
/build
13+
/captures
14+
.externalNativeBuild
15+
.cxx
16+
local.properties

‎README.md

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
# Using Compose Compiler to support different versions of Kotlin
2+
3+
For the purposes of testing, development, or just living on the edge... some people want to use
4+
versions of Kotlin that are not yet officially supported by the Compose Compiler. For this purpose,
5+
we publish some branches the Compose Compiler that follow various versions of the Kotlin Compiler.
6+
7+
It is worth noting that these builds of the Compose Compiler typically undergo less testing than
8+
the final builds published on Gmaven, so adopt at your own risk.
9+
10+
# Compatibility table
11+
12+
| Kotlin Version | Compose Compiler Version |
13+
|----------------|----------------------------------|
14+
| 1.6.20-M1 | 1.2.0-dev-k1.6.20-M1-5b767693182 |
15+
16+
# Project Configuration
17+
18+
This repository contains an example Compose project using pre-release builds of both the Kotlin and
19+
the Compose Compiler, while pointing to stable versions of the Compose UI libraries.
20+
21+
Specifically, there are two things to point out:
22+
23+
- [settings.gradle:14](https://github.com/jimgoog/ComposeAppUsingPrereleaseComposeCompiler/blob/main/settings.gradle#L14) adds the maven repository:
24+
25+
```
26+
maven {
27+
url "https://androidx.dev/storage/compose-compiler/repository/"
28+
}
29+
```
30+
- [app/build.gradle:39](https://github.com/jimgoog/ComposeAppUsingPrereleaseComposeCompiler/blob/main/app/build.gradle#L39) specifies the compose compiler version:
31+
32+
```
33+
composeOptions {
34+
kotlinCompilerExtensionVersion "1.2.0-dev-k1.6.20-M1-5b767693182"
35+
}
36+
```

‎app/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/build

‎app/build.gradle

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
plugins {
2+
id 'com.android.application'
3+
id 'org.jetbrains.kotlin.android'
4+
}
5+
6+
android {
7+
compileSdk 31
8+
9+
defaultConfig {
10+
applicationId "com.example.composeappusingprereleasecomposecompiler"
11+
minSdk 21
12+
targetSdk 31
13+
versionCode 1
14+
versionName "1.0"
15+
16+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
17+
vectorDrawables {
18+
useSupportLibrary true
19+
}
20+
}
21+
22+
buildTypes {
23+
release {
24+
minifyEnabled false
25+
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
26+
}
27+
}
28+
compileOptions {
29+
sourceCompatibility JavaVersion.VERSION_1_8
30+
targetCompatibility JavaVersion.VERSION_1_8
31+
}
32+
kotlinOptions {
33+
jvmTarget = '1.8'
34+
}
35+
buildFeatures {
36+
compose true
37+
}
38+
composeOptions {
39+
kotlinCompilerExtensionVersion "1.2.0-dev-k1.6.20-M1-5b767693182"
40+
}
41+
packagingOptions {
42+
resources {
43+
excludes += '/META-INF/{AL2.0,LGPL2.1}'
44+
}
45+
}
46+
}
47+
48+
dependencies {
49+
50+
implementation 'androidx.core:core-ktx:1.7.0'
51+
implementation "androidx.compose.ui:ui:$compose_version"
52+
implementation "androidx.compose.material:material:$compose_version"
53+
implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
54+
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1'
55+
implementation 'androidx.activity:activity-compose:1.3.1'
56+
testImplementation 'junit:junit:4.13.2'
57+
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
58+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
59+
androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version"
60+
debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
61+
}

‎app/proguard-rules.pro

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Add project specific ProGuard rules here.
2+
# You can control the set of applied configuration files using the
3+
# proguardFiles setting in build.gradle.
4+
#
5+
# For more details, see
6+
# http://developer.android.com/guide/developing/tools/proguard.html
7+
8+
# If your project uses WebView with JS, uncomment the following
9+
# and specify the fully qualified class name to the JavaScript interface
10+
# class:
11+
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
12+
# public *;
13+
#}
14+
15+
# Uncomment this to preserve the line number information for
16+
# debugging stack traces.
17+
#-keepattributes SourceFile,LineNumberTable
18+
19+
# If you keep the line number information, uncomment this to
20+
# hide the original source file name.
21+
#-renamesourcefileattribute SourceFile

‎app/src/androidTest/java/com/example/composeappusingprereleasecomposecompiler/ExampleInstrumentedTest.kt

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
package com.example.composeappusingprereleasecomposecompiler
2+
3+
import androidx.test.platform.app.InstrumentationRegistry
4+
import androidx.test.ext.junit.runners.AndroidJUnit4
5+
6+
import org.junit.Test
7+
import org.junit.runner.RunWith
8+
9+
import org.junit.Assert.*
10+
11+
/**
12+
* Instrumented test, which will execute on an Android device.
13+
*
14+
* See [testing documentation](http://d.android.com/tools/testing).
15+
*/
16+
@RunWith(AndroidJUnit4::class)
17+
class ExampleInstrumentedTest {
18+
@Test
19+
fun useAppContext() {
20+
// Context of the app under test.
21+
val appContext = InstrumentationRegistry.getInstrumentation().targetContext
22+
assertEquals("com.example.composeappusingprereleasecomposecompiler", appContext.packageName)
23+
}
24+
}

‎app/src/main/AndroidManifest.xml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3+
package="com.example.composeappusingprereleasecomposecompiler">
4+
5+
<application
6+
android:allowBackup="true"
7+
android:icon="@mipmap/ic_launcher"
8+
android:label="@string/app_name"
9+
android:roundIcon="@mipmap/ic_launcher_round"
10+
android:supportsRtl="true"
11+
android:theme="@style/Theme.ComposeAppUsingPrereleaseComposeCompiler">
12+
<activity
13+
android:name=".MainActivity"
14+
android:exported="true"
15+
android:label="@string/app_name"
16+
android:theme="@style/Theme.ComposeAppUsingPrereleaseComposeCompiler">
17+
<intent-filter>
18+
<action android:name="android.intent.action.MAIN" />
19+
20+
<category android:name="android.intent.category.LAUNCHER" />
21+
</intent-filter>
22+
</activity>
23+
</application>
24+
25+
</manifest>

‎app/src/main/java/com/example/composeappusingprereleasecomposecompiler/MainActivity.kt

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
package com.example.composeappusingprereleasecomposecompiler
2+
3+
import android.os.Bundle
4+
import androidx.activity.ComponentActivity
5+
import androidx.activity.compose.setContent
6+
import androidx.compose.foundation.layout.fillMaxSize
7+
import androidx.compose.material.MaterialTheme
8+
import androidx.compose.material.Surface
9+
import androidx.compose.material.Text
10+
import androidx.compose.runtime.Composable
11+
import androidx.compose.ui.Modifier
12+
import androidx.compose.ui.tooling.preview.Preview
13+
import com.example.composeappusingprereleasecomposecompiler.ui.theme.ComposeAppUsingPrereleaseComposeCompilerTheme
14+
15+
class MainActivity : ComponentActivity() {
16+
override fun onCreate(savedInstanceState: Bundle?) {
17+
super.onCreate(savedInstanceState)
18+
setContent {
19+
ComposeAppUsingPrereleaseComposeCompilerTheme {
20+
// A surface container using the 'background' color from the theme
21+
Surface(
22+
modifier = Modifier.fillMaxSize(),
23+
color = MaterialTheme.colors.background
24+
) {
25+
Greeting("Android")
26+
}
27+
}
28+
}
29+
}
30+
}
31+
32+
@Composable
33+
fun Greeting(name: String) {
34+
Text(text = "Hello $name!")
35+
}
36+
37+
@Preview(showBackground = true)
38+
@Composable
39+
fun DefaultPreview() {
40+
ComposeAppUsingPrereleaseComposeCompilerTheme {
41+
Greeting("Android")
42+
}
43+
}

‎app/src/main/java/com/example/composeappusingprereleasecomposecompiler/ui/theme/Color.kt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
package com.example.composeappusingprereleasecomposecompiler.ui.theme
2+
3+
import androidx.compose.ui.graphics.Color
4+
5+
val Purple200 = Color(0xFFBB86FC)
6+
val Purple500 = Color(0xFF6200EE)
7+
val Purple700 = Color(0xFF3700B3)
8+
val Teal200 = Color(0xFF03DAC5)

‎app/src/main/java/com/example/composeappusingprereleasecomposecompiler/ui/theme/Shape.kt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package com.example.composeappusingprereleasecomposecompiler.ui.theme
2+
3+
import androidx.compose.foundation.shape.RoundedCornerShape
4+
import androidx.compose.material.Shapes
5+
import androidx.compose.ui.unit.dp
6+
7+
val Shapes = Shapes(
8+
small = RoundedCornerShape(4.dp),
9+
medium = RoundedCornerShape(4.dp),
10+
large = RoundedCornerShape(0.dp)
11+
)

‎app/src/main/java/com/example/composeappusingprereleasecomposecompiler/ui/theme/Theme.kt

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
package com.example.composeappusingprereleasecomposecompiler.ui.theme
2+
3+
import androidx.compose.foundation.isSystemInDarkTheme
4+
import androidx.compose.material.MaterialTheme
5+
import androidx.compose.material.darkColors
6+
import androidx.compose.material.lightColors
7+
import androidx.compose.runtime.Composable
8+
9+
private val DarkColorPalette = darkColors(
10+
primary = Purple200,
11+
primaryVariant = Purple700,
12+
secondary = Teal200
13+
)
14+
15+
private val LightColorPalette = lightColors(
16+
primary = Purple500,
17+
primaryVariant = Purple700,
18+
secondary = Teal200
19+
20+
/* Other default colors to override
21+
background = Color.White,
22+
surface = Color.White,
23+
onPrimary = Color.White,
24+
onSecondary = Color.Black,
25+
onBackground = Color.Black,
26+
onSurface = Color.Black,
27+
*/
28+
)
29+
30+
@Composable
31+
fun ComposeAppUsingPrereleaseComposeCompilerTheme(
32+
darkTheme: Boolean = isSystemInDarkTheme(),
33+
content: @Composable () -> Unit
34+
) {
35+
val colors = if (darkTheme) {
36+
DarkColorPalette
37+
} else {
38+
LightColorPalette
39+
}
40+
41+
MaterialTheme(
42+
colors = colors,
43+
typography = Typography,
44+
shapes = Shapes,
45+
content = content
46+
)
47+
}

‎app/src/main/java/com/example/composeappusingprereleasecomposecompiler/ui/theme/Type.kt

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
package com.example.composeappusingprereleasecomposecompiler.ui.theme
2+
3+
import androidx.compose.material.Typography
4+
import androidx.compose.ui.text.TextStyle
5+
import androidx.compose.ui.text.font.FontFamily
6+
import androidx.compose.ui.text.font.FontWeight
7+
import androidx.compose.ui.unit.sp
8+
9+
// Set of Material typography styles to start with
10+
val Typography = Typography(
11+
body1 = TextStyle(
12+
fontFamily = FontFamily.Default,
13+
fontWeight = FontWeight.Normal,
14+
fontSize = 16.sp
15+
)
16+
/* Other default text styles to override
17+
button = TextStyle(
18+
fontFamily = FontFamily.Default,
19+
fontWeight = FontWeight.W500,
20+
fontSize = 14.sp
21+
),
22+
caption = TextStyle(
23+
fontFamily = FontFamily.Default,
24+
fontWeight = FontWeight.Normal,
25+
fontSize = 12.sp
26+
)
27+
*/
28+
)

‎app/src/main/res/drawable-v24/ic_launcher_foreground.xml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
xmlns:aapt="http://schemas.android.com/aapt"
3+
android:width="108dp"
4+
android:height="108dp"
5+
android:viewportWidth="108"
6+
android:viewportHeight="108">
7+
<path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
8+
<aapt:attr name="android:fillColor">
9+
<gradient
10+
android:endX="85.84757"
11+
android:endY="92.4963"
12+
android:startX="42.9492"
13+
android:startY="49.59793"
14+
android:type="linear">
15+
<item
16+
android:color="#44000000"
17+
android:offset="0.0" />
18+
<item
19+
android:color="#00000000"
20+
android:offset="1.0" />
21+
</gradient>
22+
</aapt:attr>
23+
</path>
24+
<path
25+
android:fillColor="#FFFFFF"
26+
android:fillType="nonZero"
27+
android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
28+
android:strokeWidth="1"
29+
android:strokeColor="#00000000" />
30+
</vector>

0 commit comments

Comments
 (0)