From b59f73b7b6030a344913fc34aea7503aa5eb05d9 Mon Sep 17 00:00:00 2001 From: riggaroo Date: Tue, 24 Sep 2019 12:02:13 +0200 Subject: [PATCH 1/2] Upgrading dependencies --- .idea/codeStyles/Project.xml | 116 ++++++++++++++++++ app/build.gradle | 16 +-- .../ConstraintLayoutStatesExampleActivity.kt | 2 +- build.gradle | 4 +- gradle/wrapper/gradle-wrapper.properties | 4 +- 5 files changed, 129 insertions(+), 13 deletions(-) create mode 100644 .idea/codeStyles/Project.xml diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..681f41a --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,116 @@ + + + + + + + +
+ + + + xmlns:android + + ^$ + + + +
+
+ + + + xmlns:.* + + ^$ + + + BY_NAME + +
+
+ + + + .*:id + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + .*:name + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + name + + ^$ + + + +
+
+ + + + style + + ^$ + + + +
+
+ + + + .* + + ^$ + + + BY_NAME + +
+
+ + + + .* + + http://schemas.android.com/apk/res/android + + + ANDROID_ATTRIBUTE_ORDER + +
+
+ + + + .* + + .* + + + BY_NAME + +
+ + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index fd00f38..8437cc5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,11 +6,11 @@ apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-kapt' android { - compileSdkVersion 28 + compileSdkVersion 29 defaultConfig { applicationId "za.co.riggaroo.constraintlayoutdemo" minSdkVersion 21 - targetSdkVersion 28 + targetSdkVersion 29 versionCode 1 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -30,13 +30,13 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation 'androidx.appcompat:appcompat:1.0.2' - implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha2' - implementation 'com.github.bumptech.glide:glide:4.8.0' - kapt 'com.github.bumptech.glide:compiler:4.8.0' + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta2' + implementation 'com.github.bumptech.glide:glide:4.9.0' + kapt 'com.github.bumptech.glide:compiler:4.9.0' testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' + androidTestImplementation 'androidx.test:runner:1.2.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' implementation 'com.google.android.material:material:1.0.0' implementation 'androidx.cardview:cardview:1.0.0' diff --git a/app/src/main/java/za/co/riggaroo/constraintlayoutdemo/ConstraintLayoutStatesExampleActivity.kt b/app/src/main/java/za/co/riggaroo/constraintlayoutdemo/ConstraintLayoutStatesExampleActivity.kt index d4ae9c8..2ab88e0 100644 --- a/app/src/main/java/za/co/riggaroo/constraintlayoutdemo/ConstraintLayoutStatesExampleActivity.kt +++ b/app/src/main/java/za/co/riggaroo/constraintlayoutdemo/ConstraintLayoutStatesExampleActivity.kt @@ -8,7 +8,7 @@ import kotlinx.android.synthetic.main.activity_cl_states_end.* class ConstraintLayoutStatesExampleActivity : AppCompatActivity() { - val handler = Handler() + private val handler = Handler() override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/build.gradle b/build.gradle index 82ba06b..8d482e6 100644 --- a/build.gradle +++ b/build.gradle @@ -1,13 +1,13 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.3.0' + ext.kotlin_version = '1.3.50' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.0-rc02' + classpath 'com.android.tools.build:gradle:3.5.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 6502c42..d78c6fd 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Nov 08 08:27:13 PST 2018 +#Tue Sep 24 11:38:15 SAST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip From e27e860f174d06a66891ae5c481aff3492febbd4 Mon Sep 17 00:00:00 2001 From: Rebecca Franks Date: Sun, 26 Jan 2020 19:03:45 +0200 Subject: [PATCH 2/2] added flow example. --- .idea/encodings.xml | 6 ++ .idea/gradle.xml | 3 + app/build.gradle | 8 +- app/src/main/AndroidManifest.xml | 1 + .../constraintlayoutdemo/FlowActivity.kt | 12 +++ .../constraintlayoutdemo/OptionsActivity.kt | 4 + app/src/main/res/layout/activity_flow.xml | 86 +++++++++++++++++++ app/src/main/res/layout/activity_options.xml | 12 +++ gradle/wrapper/gradle-wrapper.properties | 4 +- 9 files changed, 130 insertions(+), 6 deletions(-) create mode 100644 .idea/encodings.xml create mode 100644 app/src/main/java/za/co/riggaroo/constraintlayoutdemo/FlowActivity.kt create mode 100644 app/src/main/res/layout/activity_flow.xml diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..97626ba --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 7ac24c7..e04498a 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -1,8 +1,11 @@ +