diff --git a/projects/ComposeConstraintLayout/.gitignore b/projects/ComposeConstraintLayout/.gitignore new file mode 100644 index 000000000..aa724b770 --- /dev/null +++ b/projects/ComposeConstraintLayout/.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/projects/ComposeConstraintLayout/.idea/.gitignore b/projects/ComposeConstraintLayout/.idea/.gitignore new file mode 100644 index 000000000..26d33521a --- /dev/null +++ b/projects/ComposeConstraintLayout/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/projects/ComposeConstraintLayout/app/.gitignore b/projects/ComposeConstraintLayout/app/.gitignore new file mode 100644 index 000000000..42afabfd2 --- /dev/null +++ b/projects/ComposeConstraintLayout/app/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/projects/ComposeConstraintLayout/app/build.gradle b/projects/ComposeConstraintLayout/app/build.gradle new file mode 100644 index 000000000..ae42efc0a --- /dev/null +++ b/projects/ComposeConstraintLayout/app/build.gradle @@ -0,0 +1,79 @@ +plugins { + id 'com.android.application' + id 'kotlin-android' +} + +def compose_version = '1.0.0-beta02' + +android { + compileSdkVersion 30 + buildToolsVersion "30.0.3" + + defaultConfig { + applicationId "androidx.constaitnlayout.experiments.template" + minSdkVersion 21 + targetSdkVersion 30 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + buildFeatures { + compose true + buildConfig false + } + + packagingOptions { + exclude 'META-INF/AL2.0' + exclude 'META-INF/LGPL2.1' + } + + kotlinOptions { + jvmTarget = JavaVersion.VERSION_1_8.toString() + useIR = true + } + + composeOptions { + kotlinCompilerVersion "1.4.31" + kotlinCompilerExtensionVersion compose_version + } + +} + +dependencies { + + implementation project(':core') + implementation project(':compose') + + implementation "androidx.activity:activity-compose:1.3.0-alpha04" + + implementation "androidx.compose.material:material:$compose_version" + implementation "androidx.compose.ui:ui:$compose_version" + implementation "androidx.compose.ui:ui-unit:$compose_version" + implementation "androidx.compose.ui:ui-util:$compose_version" + implementation "androidx.compose.foundation:foundation-layout:$compose_version" + implementation "androidx.compose.foundation:foundation:$compose_version" + implementation "androidx.compose.ui:ui-test:$compose_version" + + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation 'androidx.core:core-ktx:1.3.1' + implementation 'androidx.appcompat:appcompat:1.2.0' + implementation 'com.google.android.material:material:1.2.1' + implementation project(path: ':constraintlayout') + implementation 'androidx.compose.ui:ui-tooling:1.0.0-beta02' + testImplementation 'junit:junit:4.13' + androidTestImplementation 'androidx.test.ext:junit:1.1.2' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' +} \ No newline at end of file diff --git a/projects/ComposeConstraintLayout/app/proguard-rules.pro b/projects/ComposeConstraintLayout/app/proguard-rules.pro new file mode 100644 index 000000000..481bb4348 --- /dev/null +++ b/projects/ComposeConstraintLayout/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/projects/ComposeConstraintLayout/app/src/androidTest/java/com/example/constraintlayout/ExampleInstrumentedTest.kt b/projects/ComposeConstraintLayout/app/src/androidTest/java/com/example/constraintlayout/ExampleInstrumentedTest.kt new file mode 100644 index 000000000..a3a0b6b2e --- /dev/null +++ b/projects/ComposeConstraintLayout/app/src/androidTest/java/com/example/constraintlayout/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package com.example.constraintlayout + +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.developertemplate", appContext.packageName) + } +} \ No newline at end of file diff --git a/projects/ComposeConstraintLayout/app/src/main/AndroidManifest.xml b/projects/ComposeConstraintLayout/app/src/main/AndroidManifest.xml new file mode 100644 index 000000000..55a65db6e --- /dev/null +++ b/projects/ComposeConstraintLayout/app/src/main/AndroidManifest.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/projects/ComposeConstraintLayout/app/src/main/java/com/example/constraintlayout/MainActivity.kt b/projects/ComposeConstraintLayout/app/src/main/java/com/example/constraintlayout/MainActivity.kt new file mode 100644 index 000000000..b4feedb0c --- /dev/null +++ b/projects/ComposeConstraintLayout/app/src/main/java/com/example/constraintlayout/MainActivity.kt @@ -0,0 +1,15 @@ +package com.example.constraintlayout + +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import androidx.activity.compose.setContent +import androidx.constraintlayout.compose.Screen2 + +class MainActivity : AppCompatActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContent { + Screen2() + } + } +} \ No newline at end of file diff --git a/projects/ComposeConstraintLayout/app/src/main/java/com/example/constraintlayout/test.kt b/projects/ComposeConstraintLayout/app/src/main/java/com/example/constraintlayout/test.kt new file mode 100644 index 000000000..06b4b2d0b --- /dev/null +++ b/projects/ComposeConstraintLayout/app/src/main/java/com/example/constraintlayout/test.kt @@ -0,0 +1,352 @@ +package androidx.constraintlayout.compose + +import androidx.compose.foundation.Image +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.material.Button +import androidx.compose.material.MaterialTheme +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp +import androidx.compose.material.Text +import androidx.compose.ui.layout.layoutId +import androidx.compose.ui.tooling.preview.Preview +import com.example.constraintlayout.R + +@Preview +@Composable +public fun Screen() { + ConstraintLayout( + modifier = Modifier + .fillMaxSize() + ) { + val (image, header, tag1, tag2, tag3, bSignup, bLogin, disclaimer) = createRefs() + val g1 = createGuidelineFromStart(44.dp) + val g2 = createGuidelineFromEnd(44.dp) + Image( + modifier = Modifier.constrainAs(image) { + width = Dimension.value(201.dp) + height = Dimension.value(179.dp) + top.linkTo(parent.top, 32.dp) + start.linkTo(g1) + }, + painter = painterResource(id = R.drawable.intercom_snooze), + contentDescription = null + ) + Text( + modifier = Modifier.constrainAs(header) { + top.linkTo(image.bottom, 32.dp) + start.linkTo(g1) + end.linkTo(g2) + width = Dimension.fillToConstraints + }, + text = stringResource(id = R.string.welcome_header), + style = MaterialTheme.typography.h5, + ) + Text( + modifier = Modifier.constrainAs(tag1) { + top.linkTo(header.bottom, 16.dp) + start.linkTo(g1) + end.linkTo(g2) + width = Dimension.fillToConstraints + }, + text = stringResource(id = R.string.welcome_tagline1) + ) + Text( + modifier = Modifier.constrainAs(tag2) { + top.linkTo(tag1.bottom, 8.dp) + start.linkTo(g1) + end.linkTo(g2) + width = Dimension.fillToConstraints + }, + text = stringResource(id = R.string.welcome_tagline2) + ) + Text( + modifier = Modifier.constrainAs(tag3) { + top.linkTo(tag2.bottom, 8.dp) + start.linkTo(g1) + end.linkTo(g2) + width = Dimension.fillToConstraints + }, + text = stringResource(id = R.string.welcome_tagline3) + ) + Button( + modifier = Modifier.constrainAs(bSignup) { + bottom.linkTo(bLogin.top, 16.dp) + start.linkTo(g1) + end.linkTo(g2) + width = Dimension.fillToConstraints + }, + onClick = {} + ) { + Text(text = stringResource(id = R.string.sign_up)) + } + Button( + modifier = Modifier.constrainAs(bLogin) { + bottom.linkTo(disclaimer.top, 16.dp) + start.linkTo(g1) + end.linkTo(g2) + width = Dimension.fillToConstraints + }, + onClick = {}, + ) { + Text(text = stringResource(id = R.string.log_in)) + } + Text( + modifier = Modifier.constrainAs(disclaimer) { + bottom.linkTo(parent.bottom, 8.dp) + start.linkTo(g1) + end.linkTo(g2) + width = Dimension.fillToConstraints + }, + text = stringResource(id = R.string.trial_disclaimer), + style = MaterialTheme.typography.caption, + ) + } +} + +@Preview +@Composable +public fun Screen2() { + ConstraintLayout( + modifier = Modifier + .fillMaxSize() + ) { + val bLogin = createRef() + val g1 = createGuidelineFromStart(44.dp) + val g2 = createGuidelineFromEnd(44.dp) + Button( + modifier = Modifier.constrainAs(bLogin) { + bottom.linkTo(parent.bottom, 16.dp) + start.linkTo(g1) + end.linkTo(g2) + width = Dimension.fillToConstraints + }, + onClick = {}, + ) { + Text(text = stringResource(id = R.string.log_in)) + } + } +} + +@Preview +@Composable +public fun Screen3() { + ConstraintLayout( + modifier = Modifier + .fillMaxSize() + ) { + val bLogin = createRef() + val g1 = createGuidelineFromTop(44.dp) + val g2 = createGuidelineFromBottom(44.dp) + Button( + modifier = Modifier.constrainAs(bLogin) { + top.linkTo(g1) + bottom.linkTo(g2) + height = Dimension.fillToConstraints + }, + onClick = {}, + ) { + Text(text = stringResource(id = R.string.log_in)) + } + } +} + +@Preview +@Composable +public fun Screen4() { + ConstraintLayout( + ConstraintSet { + val image = createRefFor("image") + val header = createRefFor("header") + val tag1 = createRefFor("tag1") + val tag2 = createRefFor("tag2") + val tag3 = createRefFor("tag3") + val bSignup = createRefFor("bSignup") + val bLogin = createRefFor("bLogin") + val disclaimer = createRefFor("disclaimer") + + val g1 = createGuidelineFromStart(44.dp) + val g2 = createGuidelineFromEnd(44.dp) + + constrain(image) { + width = Dimension.value(201.dp) + height = Dimension.value(179.dp) + top.linkTo(parent.top, 32.dp) + start.linkTo(g1) + } + + constrain(header) { + top.linkTo(image.bottom, 32.dp) + start.linkTo(g1) + end.linkTo(g2) + width = Dimension.fillToConstraints + } + + constrain(tag1) { + top.linkTo(header.bottom, 16.dp) + start.linkTo(g1) + end.linkTo(g2) + width = Dimension.fillToConstraints + } + + constrain(tag2) { + top.linkTo(tag1.bottom, 8.dp) + start.linkTo(g1) + end.linkTo(g2) + width = Dimension.fillToConstraints + } + + constrain(tag3) { + top.linkTo(tag2.bottom, 8.dp) + start.linkTo(g1) + end.linkTo(g2) + width = Dimension.fillToConstraints + } + + constrain(bSignup) { + bottom.linkTo(bLogin.top, 16.dp) + start.linkTo(g1) + end.linkTo(g2) + width = Dimension.fillToConstraints + } + + constrain(bLogin) { + bottom.linkTo(disclaimer.top, 16.dp) + start.linkTo(g1) + end.linkTo(g2) + width = Dimension.fillToConstraints + } + + constrain(disclaimer) { + bottom.linkTo(parent.bottom, 8.dp) + start.linkTo(g1) + end.linkTo(g2) + width = Dimension.fillToConstraints + } + }, + modifier = Modifier + .fillMaxSize() + ) { + Image(modifier = Modifier.layoutId("image"), + painter = painterResource(id = R.drawable.intercom_snooze), + contentDescription = null + ) + Text(modifier = Modifier.layoutId("header"), + text = stringResource(id = R.string.welcome_header), + style = MaterialTheme.typography.h5, + ) + Text(modifier = Modifier.layoutId("tag1"), + text = stringResource(id = R.string.welcome_tagline1) + ) + Text(modifier = Modifier.layoutId("tag2"), + text = stringResource(id = R.string.welcome_tagline2) + ) + Text(modifier = Modifier.layoutId("tag3"), + text = stringResource(id = R.string.welcome_tagline3) + ) + Button(modifier = Modifier.layoutId("bSignup"), + onClick = {} + ) { + Text(text = stringResource(id = R.string.sign_up)) + } + Button(modifier = Modifier.layoutId("bLogin"), + onClick = {}, + ) { + Text(text = stringResource(id = R.string.log_in)) + } + Text(modifier = Modifier.layoutId("disclaimer"), + text = stringResource(id = R.string.trial_disclaimer), + style = MaterialTheme.typography.caption, + ) + } +} + +@Preview +@Composable +public fun Screen5() { + val cs = """ + { + g1 : { type: 'guideline', at: ['start', 44] }, + g2 : { type: 'guideline', at: ['end', 44] }, + image: { + width: 201, height: 179, + top: ['parent','top', 32], + start: ['g1'] + }, + header: { + width: 'match_constraints', + start: ['g1'], end: ['g2'], + top: ['image','bottom', 32] + }, + tag1: { + width: 'match_constraints', + start: ['g1'], end: ['g2'], + top: ['header','bottom', 16] + }, + tag2: { + width: 'match_constraints', + start: ['g1'], end: ['g2'], + top: ['tag1','bottom', 8] + }, + tag3: { + width: 'match_constraints', + start: ['g1'], end: ['g2'], + top: ['tag2','bottom', 8] + }, + bSignup: { + width: 'match_constraints', + start: ['g1'], end: ['g2'], + bottom: ['bLogin','top', 16] + }, + bLogin: { + width: 'match_constraints', + start: ['g1'], end: ['g2'], + bottom: ['disclaimer','top', 16] + }, + disclaimer: { + width: 'match_constraints', + start: ['g1'], end: ['g2'], + bottom: ['parent','bottom', 8] + }, + } + """ + ConstraintLayout( + ConstraintSet {}, + modifier = Modifier + .fillMaxSize() + ) { + Image(modifier = Modifier.layoutId("image"), + painter = painterResource(id = R.drawable.intercom_snooze), + contentDescription = null + ) + Text(modifier = Modifier.layoutId("header"), + text = stringResource(id = R.string.welcome_header), + style = MaterialTheme.typography.h5, + ) + Text(modifier = Modifier.layoutId("tag1"), + text = stringResource(id = R.string.welcome_tagline1) + ) + Text(modifier = Modifier.layoutId("tag2"), + text = stringResource(id = R.string.welcome_tagline2) + ) + Text(modifier = Modifier.layoutId("tag3"), + text = stringResource(id = R.string.welcome_tagline3) + ) + Button(modifier = Modifier.layoutId("bSignup"), + onClick = {} + ) { + Text(text = stringResource(id = R.string.sign_up)) + } + Button(modifier = Modifier.layoutId("bLogin"), + onClick = {}, + ) { + Text(text = stringResource(id = R.string.log_in)) + } + Text(modifier = Modifier.layoutId("disclaimer"), + text = stringResource(id = R.string.trial_disclaimer), + style = MaterialTheme.typography.caption, + ) + } +} \ No newline at end of file diff --git a/projects/ComposeConstraintLayout/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/projects/ComposeConstraintLayout/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 000000000..2b068d114 --- /dev/null +++ b/projects/ComposeConstraintLayout/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/projects/ComposeConstraintLayout/app/src/main/res/drawable/ic_launcher_background.xml b/projects/ComposeConstraintLayout/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 000000000..07d5da9cb --- /dev/null +++ b/projects/ComposeConstraintLayout/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/projects/ComposeConstraintLayout/app/src/main/res/drawable/intercom_snooze.xml b/projects/ComposeConstraintLayout/app/src/main/res/drawable/intercom_snooze.xml new file mode 100644 index 000000000..0df8cff0d --- /dev/null +++ b/projects/ComposeConstraintLayout/app/src/main/res/drawable/intercom_snooze.xml @@ -0,0 +1,9 @@ + + + \ No newline at end of file diff --git a/projects/ComposeConstraintLayout/app/src/main/res/layout/activity_main.xml b/projects/ComposeConstraintLayout/app/src/main/res/layout/activity_main.xml new file mode 100644 index 000000000..4fc244418 --- /dev/null +++ b/projects/ComposeConstraintLayout/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,18 @@ + + + + + + \ No newline at end of file diff --git a/projects/ComposeConstraintLayout/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/projects/ComposeConstraintLayout/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 000000000..eca70cfe5 --- /dev/null +++ b/projects/ComposeConstraintLayout/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/projects/ComposeConstraintLayout/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/projects/ComposeConstraintLayout/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 000000000..eca70cfe5 --- /dev/null +++ b/projects/ComposeConstraintLayout/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/projects/ComposeConstraintLayout/app/src/main/res/mipmap-hdpi/ic_launcher.png b/projects/ComposeConstraintLayout/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..a571e6009 Binary files /dev/null and b/projects/ComposeConstraintLayout/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/projects/ComposeConstraintLayout/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/projects/ComposeConstraintLayout/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 000000000..61da551c5 Binary files /dev/null and b/projects/ComposeConstraintLayout/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/projects/ComposeConstraintLayout/app/src/main/res/mipmap-mdpi/ic_launcher.png b/projects/ComposeConstraintLayout/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..c41dd2853 Binary files /dev/null and b/projects/ComposeConstraintLayout/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/projects/ComposeConstraintLayout/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/projects/ComposeConstraintLayout/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 000000000..db5080a75 Binary files /dev/null and b/projects/ComposeConstraintLayout/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/projects/ComposeConstraintLayout/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/projects/ComposeConstraintLayout/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..6dba46dab Binary files /dev/null and b/projects/ComposeConstraintLayout/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/projects/ComposeConstraintLayout/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/projects/ComposeConstraintLayout/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 000000000..da31a871c Binary files /dev/null and b/projects/ComposeConstraintLayout/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/projects/ComposeConstraintLayout/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/projects/ComposeConstraintLayout/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..15ac68172 Binary files /dev/null and b/projects/ComposeConstraintLayout/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/projects/ComposeConstraintLayout/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/projects/ComposeConstraintLayout/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 000000000..b216f2d31 Binary files /dev/null and b/projects/ComposeConstraintLayout/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/projects/ComposeConstraintLayout/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/projects/ComposeConstraintLayout/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..f25a41974 Binary files /dev/null and b/projects/ComposeConstraintLayout/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/projects/ComposeConstraintLayout/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/projects/ComposeConstraintLayout/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 000000000..e96783ccc Binary files /dev/null and b/projects/ComposeConstraintLayout/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/projects/ComposeConstraintLayout/app/src/main/res/values-night/themes.xml b/projects/ComposeConstraintLayout/app/src/main/res/values-night/themes.xml new file mode 100644 index 000000000..e4ca853c1 --- /dev/null +++ b/projects/ComposeConstraintLayout/app/src/main/res/values-night/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/projects/ComposeConstraintLayout/app/src/main/res/values/colors.xml b/projects/ComposeConstraintLayout/app/src/main/res/values/colors.xml new file mode 100644 index 000000000..f8c6127d3 --- /dev/null +++ b/projects/ComposeConstraintLayout/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/projects/ComposeConstraintLayout/app/src/main/res/values/strings.xml b/projects/ComposeConstraintLayout/app/src/main/res/values/strings.xml new file mode 100644 index 000000000..17373fba0 --- /dev/null +++ b/projects/ComposeConstraintLayout/app/src/main/res/values/strings.xml @@ -0,0 +1,11 @@ + + DeveloperTemplate + welcome header + tag 1 + tag 2 + tag 3 + sign up + log in + disclaimer + + \ No newline at end of file diff --git a/projects/ComposeConstraintLayout/app/src/main/res/values/themes.xml b/projects/ComposeConstraintLayout/app/src/main/res/values/themes.xml new file mode 100644 index 000000000..22a433245 --- /dev/null +++ b/projects/ComposeConstraintLayout/app/src/main/res/values/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/projects/ComposeConstraintLayout/app/src/test/java/com/example/constraintlayout/ExampleUnitTest.kt b/projects/ComposeConstraintLayout/app/src/test/java/com/example/constraintlayout/ExampleUnitTest.kt new file mode 100644 index 000000000..44e6fc2a6 --- /dev/null +++ b/projects/ComposeConstraintLayout/app/src/test/java/com/example/constraintlayout/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package com.example.constraintlayout + +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/projects/ComposeConstraintLayout/build.gradle b/projects/ComposeConstraintLayout/build.gradle new file mode 100644 index 000000000..c53e41475 --- /dev/null +++ b/projects/ComposeConstraintLayout/build.gradle @@ -0,0 +1,26 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. +buildscript { + ext.kotlin_version = "1.4.31" + repositories { + google() + jcenter() + } + dependencies { + classpath 'com.android.tools.build:gradle:7.0.0-alpha08' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + + // NOTE: Do not place your application dependencies here; they belong + // in the individual module build.gradle files + } +} + +allprojects { + repositories { + google() + jcenter() + } +} + +task clean(type: Delete) { + delete rootProject.buildDir +} \ No newline at end of file diff --git a/projects/ComposeConstraintLayout/compose/build.gradle b/projects/ComposeConstraintLayout/compose/build.gradle new file mode 100644 index 000000000..ff366ac4c --- /dev/null +++ b/projects/ComposeConstraintLayout/compose/build.gradle @@ -0,0 +1,74 @@ +apply plugin: 'com.android.library' +apply plugin: 'maven' +apply plugin: 'kotlin-android' + +def compose_version = '1.0.0-beta02' + +android { + compileSdkVersion 30 + + defaultConfig { + minSdkVersion 21 + targetSdkVersion 30 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + + } + + sourceSets{ + main { + main.java.srcDirs = ['../../../constraintlayout/compose/src/main/java'] + test.java.srcDirs = ['../../../constraintlayout/compose/src/test'] + manifest.srcFile '../../../constraintlayout/compose/src/main/AndroidManifest.xml' + } + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + buildFeatures { + compose true + buildConfig false + } + + kotlinOptions { + jvmTarget = JavaVersion.VERSION_1_8.toString() + useIR = true + } + + composeOptions { + kotlinCompilerVersion "1.4.31" + kotlinCompilerExtensionVersion compose_version + } + + packagingOptions { + exclude 'META-INF/AL2.0' + exclude 'META-INF/LGPL2.1' + } +} + +dependencies { + implementation "androidx.compose.ui:ui:$compose_version" + implementation "androidx.compose.ui:ui-unit:$compose_version" + implementation "androidx.compose.ui:ui-util:$compose_version" + implementation "androidx.compose.foundation:foundation-layout:$compose_version" + implementation "androidx.compose.foundation:foundation:$compose_version" + implementation project(':core') + androidTestImplementation 'junit:junit:4.13.1' + androidTestImplementation "androidx.compose.ui:ui-test:$compose_version" + androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version" + androidTestImplementation 'androidx.test:runner:1.3.0' + androidTestImplementation 'androidx.test:rules:1.3.0' + androidTestImplementation "androidx.activity:activity:1.1.0" +} diff --git a/projects/ComposeConstraintLayout/constraintlayout/.gitignore b/projects/ComposeConstraintLayout/constraintlayout/.gitignore new file mode 100644 index 000000000..42afabfd2 --- /dev/null +++ b/projects/ComposeConstraintLayout/constraintlayout/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/projects/ComposeConstraintLayout/constraintlayout/build.gradle b/projects/ComposeConstraintLayout/constraintlayout/build.gradle new file mode 100644 index 000000000..b847802a7 --- /dev/null +++ b/projects/ComposeConstraintLayout/constraintlayout/build.gradle @@ -0,0 +1,47 @@ +apply plugin: 'com.android.library' + +android { + compileSdkVersion 30 + + + + defaultConfig { + minSdkVersion 15 + targetSdkVersion 30 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + + } + + sourceSets{ + main { + java.srcDirs = ['../../../constraintlayout/constraintlayout/src/main/java'] + res.srcDirs = ['../../../constraintlayout/constraintlayout/src/main/res'] + manifest.srcFile '../../../constraintlayout/constraintlayout/src/main/AndroidManifest.xml' + } + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +dependencies { + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation 'androidx.core:core-ktx:1.3.1' + implementation 'androidx.appcompat:appcompat:1.2.0' + implementation project(path: ':core') + testImplementation 'junit:junit:4.13' + androidTestImplementation 'androidx.test.ext:junit:1.1.2' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' +} diff --git a/projects/ComposeConstraintLayout/constraintlayout/consumer-rules.pro b/projects/ComposeConstraintLayout/constraintlayout/consumer-rules.pro new file mode 100644 index 000000000..e69de29bb diff --git a/projects/ComposeConstraintLayout/constraintlayout/proguard-rules.pro b/projects/ComposeConstraintLayout/constraintlayout/proguard-rules.pro new file mode 100644 index 000000000..481bb4348 --- /dev/null +++ b/projects/ComposeConstraintLayout/constraintlayout/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/projects/ComposeConstraintLayout/core/.gitignore b/projects/ComposeConstraintLayout/core/.gitignore new file mode 100644 index 000000000..42afabfd2 --- /dev/null +++ b/projects/ComposeConstraintLayout/core/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/projects/ComposeConstraintLayout/core/build.gradle b/projects/ComposeConstraintLayout/core/build.gradle new file mode 100644 index 000000000..35012e1a0 --- /dev/null +++ b/projects/ComposeConstraintLayout/core/build.gradle @@ -0,0 +1,15 @@ +apply plugin: 'java-library' + +java { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 +} + +sourceSets{ + main.java.srcDirs = ['../../../constraintlayout/core/src/main/java'] + test.java.srcDirs = ['../../../constraintlayout/core/src/test'] +} + +dependencies { + testImplementation 'org.testng:testng:7.3.0' +} diff --git a/projects/ComposeConstraintLayout/gradle.properties b/projects/ComposeConstraintLayout/gradle.properties new file mode 100644 index 000000000..98bed167d --- /dev/null +++ b/projects/ComposeConstraintLayout/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/projects/ComposeConstraintLayout/gradle/wrapper/gradle-wrapper.jar b/projects/ComposeConstraintLayout/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 000000000..f6b961fd5 Binary files /dev/null and b/projects/ComposeConstraintLayout/gradle/wrapper/gradle-wrapper.jar differ diff --git a/projects/ComposeConstraintLayout/gradle/wrapper/gradle-wrapper.properties b/projects/ComposeConstraintLayout/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..dbf12fedd --- /dev/null +++ b/projects/ComposeConstraintLayout/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Tue Sep 15 13:52:47 PDT 2020 +distributionBase=GRADLE_USER_HOME +distributionUrl=https://services.gradle.org/distributions/gradle-6.8.2-bin.zip +distributionPath=wrapper/dists +zipStorePath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME diff --git a/projects/ComposeConstraintLayout/gradlew b/projects/ComposeConstraintLayout/gradlew new file mode 100755 index 000000000..cccdd3d51 --- /dev/null +++ b/projects/ComposeConstraintLayout/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## 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="" + +# 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, switch paths to Windows format before running java +if $cygwin ; 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=$((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" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/projects/ComposeConstraintLayout/gradlew.bat b/projects/ComposeConstraintLayout/gradlew.bat new file mode 100644 index 000000000..e95643d6a --- /dev/null +++ b/projects/ComposeConstraintLayout/gradlew.bat @@ -0,0 +1,84 @@ +@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 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= + +@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 init + +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 init + +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 + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +: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 %CMD_LINE_ARGS% + +: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/projects/ComposeConstraintLayout/settings.gradle b/projects/ComposeConstraintLayout/settings.gradle new file mode 100644 index 000000000..a09092c90 --- /dev/null +++ b/projects/ComposeConstraintLayout/settings.gradle @@ -0,0 +1,5 @@ +rootProject.name = "ComposeConstraintLayout" +include ':app' +include ':constraintlayout' +include ':compose' +include ':core'