From c6d3c76395f968f94fecf2d4b89d06413de01683 Mon Sep 17 00:00:00 2001 From: gargVader Date: Mon, 30 Aug 2021 10:15:05 +0530 Subject: [PATCH 1/4] added outsideTargetAndMessage dismissType --- .../java/smartdevelop/ir/eram/showcaseviewlib/GuideView.java | 5 +++++ .../ir/eram/showcaseviewlib/config/DismissType.java | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/showcaseviewlib/src/main/java/smartdevelop/ir/eram/showcaseviewlib/GuideView.java b/showcaseviewlib/src/main/java/smartdevelop/ir/eram/showcaseviewlib/GuideView.java index 33444b2e..4945d6c5 100644 --- a/showcaseviewlib/src/main/java/smartdevelop/ir/eram/showcaseviewlib/GuideView.java +++ b/showcaseviewlib/src/main/java/smartdevelop/ir/eram/showcaseviewlib/GuideView.java @@ -360,6 +360,11 @@ public boolean onTouchEvent(MotionEvent event) { dismiss(); } break; + + case outsideTargetAndMessage: + if(!(targetRect.contains(x, y) || isViewContains(mMessageView, x, y))){ + dismiss(); + } } return true; } diff --git a/showcaseviewlib/src/main/java/smartdevelop/ir/eram/showcaseviewlib/config/DismissType.java b/showcaseviewlib/src/main/java/smartdevelop/ir/eram/showcaseviewlib/config/DismissType.java index 7366aabc..f97eb2ce 100644 --- a/showcaseviewlib/src/main/java/smartdevelop/ir/eram/showcaseviewlib/config/DismissType.java +++ b/showcaseviewlib/src/main/java/smartdevelop/ir/eram/showcaseviewlib/config/DismissType.java @@ -4,5 +4,5 @@ * Created by Mohammad Reza Eram (https://github.com/mreram) on 27,November,2018 */ public enum DismissType { - outside, anywhere, targetView, selfView + outside, anywhere, targetView, selfView, outsideTargetAndMessage } \ No newline at end of file From 7601aded8aef9277b4dcadb2330ab7f94c764cd9 Mon Sep 17 00:00:00 2001 From: Mohammad Reza Date: Tue, 31 Aug 2021 13:05:46 +0430 Subject: [PATCH 2/4] Update sdk versions --- app/build.gradle | 6 +++--- app/src/main/AndroidManifest.xml | 8 ++++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index e9bb38e2..d0a7ca73 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,11 +1,11 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 26 + compileSdkVersion 30 defaultConfig { applicationId "smartdevelop.ir.eram.showcaseview" - minSdkVersion 11 - targetSdkVersion 25 + minSdkVersion 14 + targetSdkVersion 30 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 00fa9802..a78346c7 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,5 +1,7 @@ - - + From e9afad75cfc7929ccc07cac4be172f1152cd01ae Mon Sep 17 00:00:00 2001 From: Mohammad Reza Date: Tue, 31 Aug 2021 13:07:09 +0430 Subject: [PATCH 3/4] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index dfe8b099..4c9dc58a 100644 --- a/README.md +++ b/README.md @@ -138,6 +138,7 @@ new GuideView.Builder(MainActivity.this) | outside | Dismissing with click on outside of MessageView | | anywhere | Dismissing with click on anywhere | | targetView | Dismissing with click on targetView(targetView is assigned with setTargetView method) | +| outsideTargetAndMessage | Dismissing with click on outside of MessageView and target View | From bb3b9205f2403b5ee7cc326e66136256ed665f91 Mon Sep 17 00:00:00 2001 From: Mohammad Reza Date: Tue, 31 Aug 2021 13:08:21 +0430 Subject: [PATCH 4/4] Increase library version --- README.md | 4 ++-- showcaseviewlib/build.gradle | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 4c9dc58a..ba6e3763 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ maven: com.github.mreram showcaseview - 1.3.0 + 1.4.0 ``` gradle: @@ -61,7 +61,7 @@ allprojects { ``` Step 2. Add the dependency ```groovy -implementation 'com.github.mreram:showcaseview:1.3.0' +implementation 'com.github.mreram:showcaseview:1.4.0' ``` ## Change type face ```java diff --git a/showcaseviewlib/build.gradle b/showcaseviewlib/build.gradle index 2fd9382d..90d5b75c 100644 --- a/showcaseviewlib/build.gradle +++ b/showcaseviewlib/build.gradle @@ -9,8 +9,8 @@ android { defaultConfig { minSdkVersion 11 targetSdkVersion 30 - versionCode 2 - versionName "1.3.0" + versionCode 3 + versionName "1.4.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"