Fix showcase position (#18)

cp-radhika-s · web-flow · commit d05be33adf2c · 2023-12-15T16:48:28.000+05:30
* Fix showcase popup position

* Fix publish script

* Fix build job
diff --git a/.github/workflows/app-build.yml b/.github/workflows/app-build.yml
@@ -7,10 +7,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: set up JDK 11
+      - name: set up JDK 17
         uses: actions/setup-java@v2
         with:
           distribution: adopt
-          java-version: 11
+          java-version: 17
       - name: Build with Gradle
         run: ./gradlew build
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -11,11 +11,11 @@ jobs:
     steps:
       - name: Check out code
         uses: actions/checkout@v2
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v2
         with:
           distribution: adopt
-          java-version: 11
+          java-version: 17
 
       - name: Publish to MavenCentral
         run: ./gradlew showcase:publishReleasePublicationToSonatypeRepository --max-workers 1 closeAndReleaseSonatypeStagingRepository
diff --git a/app/build.gradle b/app/build.gradle
@@ -4,12 +4,13 @@ plugins {
 }
 
 android {
-    compileSdk 31
+    namespace = "com.canopas.campose.showcase"
+    compileSdk 34
 
     defaultConfig {
         applicationId "com.canopas.campose.jettaptarget"
         minSdk 21
-        targetSdk 31
+        targetSdk 34
         versionCode 1
         versionName "1.0"
 
@@ -26,17 +27,17 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '11'
+        jvmTarget = '17'
     }
     buildFeatures {
         compose true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion compose_version
+        kotlinCompilerExtensionVersion compose_compiler_version
     }
     packagingOptions {
         resources {
@@ -48,15 +49,17 @@ android {
 dependencies {
     implementation project(path: ':showcase')
 
-    implementation 'androidx.core:core-ktx:1.7.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.lifecycle:lifecycle-runtime-ktx:2.3.1'
-    implementation 'androidx.activity:activity-compose:1.3.1'
+    implementation platform("androidx.compose:compose-bom:$compose_bom_version")
+
+    implementation 'androidx.core:core-ktx:1.12.0'
+    implementation "androidx.compose.ui:ui"
+    implementation "androidx.compose.material:material"
+    implementation "androidx.compose.ui:ui-tooling-preview"
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.2'
+    implementation 'androidx.activity:activity-compose:1.8.2'
     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"
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.5.4"
+    debugImplementation "androidx.compose.ui:ui-tooling"
 }
diff --git a/app/src/main/java/com/canopas/campose/showcase/MainActivity.kt b/app/src/main/java/com/canopas/campose/showcase/MainActivity.kt
@@ -46,9 +46,9 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.canopas.campose.showcase.ui.theme.JetTapTargetTheme
 import com.canopas.campose.showcase.ui.theme.ThemeColor
-import com.canopas.lib.showcase.IntroShowCase
-import com.canopas.lib.showcase.IntroShowCaseScope
-import com.canopas.lib.showcase.ShowcaseStyle
+import com.canopas.lib.showcase.IntroShowcase
+import com.canopas.lib.showcase.IntroShowcaseScope
+import com.canopas.lib.showcase.component.ShowcaseStyle
 
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -75,7 +75,7 @@ fun ShowcaseSample() {
         mutableStateOf(true)
     }
 
-    IntroShowCase(
+    IntroShowcase(
         showIntroShowCase = showAppIntro,
         dismissOnClickOutside = false,
         onShowCaseCompleted = {
@@ -142,7 +142,7 @@ fun ShowcaseSample() {
 
 
 @Composable
-fun IntroShowCaseScope.FloatingMailButton() {
+fun IntroShowcaseScope.FloatingMailButton() {
     FloatingActionButton(
         onClick = {},
         modifier = Modifier.introShowCaseTarget(
@@ -191,7 +191,7 @@ fun IntroShowCaseScope.FloatingMailButton() {
 }
 
 @Composable
-fun IntroShowCaseScope.BackButton() {
+fun IntroShowcaseScope.BackButton() {
     IconButton(
         onClick = {},
         modifier = Modifier.introShowCaseTarget(
@@ -232,7 +232,7 @@ fun IntroShowCaseScope.BackButton() {
 }
 
 @Composable
-fun IntroShowCaseScope.Content(modifier: Modifier) {
+fun IntroShowcaseScope.Content(modifier: Modifier) {
     Box(modifier = modifier.fillMaxSize()) {
         Box(modifier = Modifier.fillMaxHeight(0.3f)) {
 
diff --git a/build.gradle b/build.gradle
@@ -1,14 +1,16 @@
 buildscript {
     ext {
         compose_version = '1.1.0-beta04'
+        compose_bom_version = "2023.10.01"
+        compose_compiler_version = "1.5.3"
     }
 
 }// 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.6.0' apply false
-    id 'io.github.gradle-nexus.publish-plugin' version "1.1.0"
+    id 'com.android.application' version '8.1.1' apply false
+    id 'com.android.library' version '8.1.1' apply false
+    id 'org.jetbrains.kotlin.android' version '1.9.10' apply false
+    id 'io.github.gradle-nexus.publish-plugin' version "1.3.0"
 }
 
 apply from: "${rootDir}/scripts/publish-root.gradle"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Jan 31 09:43:16 IST 2022
+#Thu Dec 14 16:33:00 IST 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/scripts/publish-module.gradle b/scripts/publish-module.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'maven-publish'
 apply plugin: 'signing'
 
-task androidSourcesJar(type: Jar) {
+tasks.register('androidSourcesJar', Jar) {
     archiveClassifier.set('sources')
     if (project.plugins.findPlugin("com.android.library")) {
         from android.sourceSets.main.java.srcDirs
@@ -10,6 +10,7 @@ task androidSourcesJar(type: Jar) {
     }
 }
 
+
 artifacts {
     archives androidSourcesJar
 }
@@ -20,6 +21,8 @@ afterEvaluate {
     publishing {
         publications {
             release(MavenPublication) {
+                tasks.named("generateMetadataFileForReleasePublication").configure { dependsOn("androidSourcesJar") }
+
                 // The coordinates of the library, being set from variables that
                 // we'll set up later
                 groupId PUBLISH_GROUP_ID
diff --git a/showcase/build.gradle b/showcase/build.gradle
@@ -11,11 +11,13 @@ ext {
 apply from: "${rootDir}/scripts/publish-module.gradle"
 
 android {
-    compileSdk 31
+    namespace = "com.canopas.lib.showcase"
+
+    compileSdk 34
 
     defaultConfig {
         minSdk 21
-        targetSdk 31
+        targetSdk 34
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -29,32 +31,39 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '11'
+        jvmTarget = '17'
     }
     buildFeatures {
         compose true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion compose_version
+        kotlinCompilerExtensionVersion compose_compiler_version
+    }
+    publishing {
+        singleVariant("release") {
+            withSourcesJar()
+        }
     }
 }
 
 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'
+    implementation platform("androidx.compose:compose-bom:$compose_bom_version")
+
+    implementation 'androidx.core:core-ktx:1.12.0'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'com.google.android.material:material:1.11.0'
+    implementation 'androidx.compose.ui:ui:'
     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.test.ext:junit:1.1.5'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 
-    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"
+    implementation "androidx.compose.ui:ui"
+    implementation "androidx.compose.material:material"
+    implementation "androidx.compose.ui:ui-tooling-preview"
+    implementation "androidx.compose.material:material-icons-extended"
 }
diff --git a/showcase/src/main/java/com/canopas/lib/showcase/IntroShowCase.kt b/showcase/src/main/java/com/canopas/lib/showcase/IntroShowCase.kt
diff --git a/showcase/src/main/java/com/canopas/lib/showcase/IntroShowcase.kt b/showcase/src/main/java/com/canopas/lib/showcase/IntroShowcase.kt
@@ -0,0 +1,54 @@
+package com.canopas.lib.showcase
+
+import androidx.compose.foundation.layout.BoxScope
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import com.canopas.lib.showcase.component.IntroShowcaseState
+import com.canopas.lib.showcase.component.ShowcasePopup
+import com.canopas.lib.showcase.component.ShowcaseStyle
+import com.canopas.lib.showcase.component.introShowcaseTarget
+import com.canopas.lib.showcase.component.rememberIntroShowcaseState
+
+@Composable
+fun IntroShowcase(
+    showIntroShowCase: Boolean,
+    onShowCaseCompleted: () -> Unit,
+    state: IntroShowcaseState = rememberIntroShowcaseState(),
+    dismissOnClickOutside: Boolean = false,
+    content: @Composable IntroShowcaseScope.() -> Unit,
+) {
+    val scope = remember(state) {
+        IntroShowcaseScope(state)
+    }
+
+    scope.content()
+
+    if (showIntroShowCase) {
+        ShowcasePopup(
+            state = state,
+            dismissOnClickOutside = dismissOnClickOutside,
+            onShowCaseCompleted = onShowCaseCompleted,
+        )
+    }
+}
+
+
+class IntroShowcaseScope(
+    private val state: IntroShowcaseState,
+) {
+
+    /**
+     * Modifier that marks Compose UI element as a target for [IntroShowcase]
+     */
+    fun Modifier.introShowCaseTarget(
+        index: Int,
+        style: ShowcaseStyle = ShowcaseStyle.Default,
+        content: @Composable BoxScope.() -> Unit,
+    ): Modifier = introShowcaseTarget(
+        state = state,
+        index = index,
+        style = style,
+        content = content,
+    )
+}
diff --git a/showcase/src/main/java/com/canopas/lib/showcase/component/ShowCasestate.kt b/showcase/src/main/java/com/canopas/lib/showcase/component/ShowCasestate.kt
diff --git a/showcase/src/main/java/com/canopas/lib/showcase/component/ShowcaseComposeView.kt b/showcase/src/main/java/com/canopas/lib/showcase/component/ShowcaseComposeView.kt
diff --git a/showcase/src/main/java/com/canopas/lib/showcase/component/ShowcaseContent.kt b/showcase/src/main/java/com/canopas/lib/showcase/component/ShowcaseContent.kt
