Cleanup

cp-radhika-s · cp-radhika-s · commit 04bf6d58c562 · 2022-02-03T14:51:29.000+05:30
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -26,11 +26,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '11'
     }
     buildFeatures {
         compose true
@@ -46,6 +46,7 @@ android {
 }
 
 dependencies {
+    implementation project(path: ':showcase')
 
     implementation 'androidx.core:core-ktx:1.7.0'
     implementation "androidx.compose.ui:ui:$compose_version"
diff --git a/app/src/main/java/com/canopas/campose/jettaptarget/MainActivity.kt b/app/src/main/java/com/canopas/campose/jettaptarget/MainActivity.kt
@@ -49,6 +49,8 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.canopas.campose.jettaptarget.ui.theme.JetTapTargetTheme
 import com.canopas.campose.jettaptarget.ui.theme.ThemeColor
+import com.canopas.campose.showcase.IntroShowCase
+import com.canopas.campose.showcase.ShowcaseProperty
 
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
diff --git a/build.gradle b/build.gradle
@@ -1,12 +1,12 @@
 buildscript {
     ext {
-        compose_version = '1.0.1'
+        compose_version = '1.1.0-beta04'
     }
 }// Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
     id 'com.android.application' version '7.1.0' apply false
     id 'com.android.library' version '7.1.0' apply false
-    id 'org.jetbrains.kotlin.android' version '1.5.21' apply false
+    id 'org.jetbrains.kotlin.android' version '1.6.0' apply false
 }
 
 task clean(type: Delete) {
diff --git a/settings.gradle b/settings.gradle
@@ -14,3 +14,4 @@ dependencyResolutionManagement {
 }
 rootProject.name = "JetTapTarget"
 include ':app'
+include ':showcase'
diff --git a/showcase/.gitignore b/showcase/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/showcase/build.gradle b/showcase/build.gradle
@@ -0,0 +1,53 @@
+plugins {
+    id 'com.android.library'
+    id 'org.jetbrains.kotlin.android'
+}
+
+android {
+    compileSdk 31
+
+    defaultConfig {
+        minSdk 21
+        targetSdk 31
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles "consumer-rules.pro"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = '11'
+    }
+    buildFeatures {
+        compose true
+    }
+    composeOptions {
+        kotlinCompilerExtensionVersion compose_version
+    }
+}
+
+dependencies {
+
+    implementation 'androidx.core:core-ktx:1.7.0'
+    implementation 'androidx.appcompat:appcompat:1.4.1'
+    implementation 'com.google.android.material:material:1.5.0'
+    implementation 'androidx.compose.ui:ui:1.0.5'
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+
+    implementation "androidx.compose.ui:ui:$compose_version"
+    implementation "androidx.compose.material:material:$compose_version"
+    implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
+    implementation "androidx.compose.material:material-icons-extended:$compose_version"
+}
diff --git a/showcase/consumer-rules.pro b/showcase/consumer-rules.pro
diff --git a/showcase/proguard-rules.pro b/showcase/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
diff --git a/showcase/src/androidTest/java/com/canopas/campose/showcase/ExampleInstrumentedTest.kt b/showcase/src/androidTest/java/com/canopas/campose/showcase/ExampleInstrumentedTest.kt
@@ -0,0 +1,22 @@
+package com.canopas.campose.showcase
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+
+/**
+ * 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.canopas.campose.showcase.test", appContext.packageName)
+    }
+}
diff --git a/showcase/src/main/AndroidManifest.xml b/showcase/src/main/AndroidManifest.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="com.canopas.campose.showcase">
+
+</manifest>
diff --git a/showcase/src/main/java/com/canopas/campose/showcase/IntroShowCase.kt b/showcase/src/main/java/com/canopas/campose/showcase/IntroShowCase.kt
@@ -1,4 +1,4 @@
-package com.canopas.campose.jettaptarget
+package com.canopas.campose.showcase
 
 import androidx.compose.animation.core.Animatable
 import androidx.compose.animation.core.FastOutLinearInEasing
diff --git a/showcase/src/test/java/com/canopas/campose/showcase/ExampleUnitTest.kt b/showcase/src/test/java/com/canopas/campose/showcase/ExampleUnitTest.kt
@@ -0,0 +1,16 @@
+package com.canopas.campose.showcase
+
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+/**
+ * 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)
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -26,11 +26,11 @@ android {`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`	`compileOptions {`
`29`		`- sourceCompatibility JavaVersion.VERSION_1_8`
`30`		`- targetCompatibility JavaVersion.VERSION_1_8`
	`29`	`+ sourceCompatibility JavaVersion.VERSION_11`
	`30`	`+ targetCompatibility JavaVersion.VERSION_11`
`31`	`31`	`}`
`32`	`32`	`kotlinOptions {`
`33`		`- jvmTarget = '1.8'`
	`33`	`+ jvmTarget = '11'`
`34`	`34`	`}`
`35`	`35`	`buildFeatures {`
`36`	`36`	`compose true`
`@@ -46,6 +46,7 @@ android {`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`dependencies {`
	`49`	`+ implementation project(path: ':showcase')`
`49`	`50`
`50`	`51`	`implementation 'androidx.core:core-ktx:1.7.0'`
`51`	`52`	`implementation "androidx.compose.ui:ui:$compose_version"`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,12 @@`
`1`	`1`	`buildscript {`
`2`	`2`	`ext {`
`3`		`- compose_version = '1.0.1'`
	`3`	`+ compose_version = '1.1.0-beta04'`
`4`	`4`	`}`
`5`	`5`	`}// Top-level build file where you can add configuration options common to all sub-projects/modules.`
`6`	`6`	`plugins {`
`7`	`7`	`id 'com.android.application' version '7.1.0' apply false`
`8`	`8`	`id 'com.android.library' version '7.1.0' apply false`
`9`		`- id 'org.jetbrains.kotlin.android' version '1.5.21' apply false`
	`9`	`+ id 'org.jetbrains.kotlin.android' version '1.6.0' apply false`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`task clean(type: Delete) {`
Original file line number	Diff line number	Diff line change
`@@ -14,3 +14,4 @@ dependencyResolutionManagement {`
`14`	`14`	`}`
`15`	`15`	`rootProject.name = "JetTapTarget"`
`16`	`16`	`include ':app'`
	`17`	`+include ':showcase'`