Skip to content
This repository was archived by the owner on Nov 10, 2024. It is now read-only.

Commit 661a84e

Browse files
authored
Merge pull request #53 from mreram/dev
Dev
2 parents 912a168 + b5e2515 commit 661a84e

File tree

11 files changed

+189
-148
lines changed

11 files changed

+189
-148
lines changed

README.md

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# :flashlight:ShowCaseView:flashlight:
2-
[![](https://jitpack.io/v/TKshadow018/ShowCaseView.svg)](https://jitpack.io/#TKshadow018/ShowCaseView)
32
[![Release](https://jitpack.io/v/mreram/ShowCaseView.svg)](https://jitpack.io/#mreram/ShowCaseView)
43
[![APK](https://img.shields.io/badge/APK-Demo-brightgreen.svg)](https://github.com/mreram/ShowCaseView/raw/master/demo-flatShowCaseView.apk)
54
[![API](https://img.shields.io/badge/API-11%2B-brightgreen.svg?style=flat)](https://android-arsenal.com/api?level=11) [![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-FlatShowCaseView-brightgreen.svg?style=flat)](https://android-arsenal.com/details/1/6713)
@@ -46,7 +45,7 @@ maven:
4645
<dependency>
4746
<groupId>com.github.mreram</groupId>
4847
<artifactId>showcaseview</artifactId>
49-
<version>1.2.0</version>
48+
<version>1.3.0</version>
5049
</dependency>
5150
```
5251
gradle:
@@ -62,7 +61,7 @@ allprojects {
6261
```
6362
Step 2. Add the dependency
6463
```groovy
65-
implementation 'com.github.mreram:showcaseview:1.2.0'
64+
implementation 'com.github.mreram:showcaseview:1.3.0'
6665
```
6766
## Change type face
6867
```java
@@ -142,6 +141,14 @@ new GuideView.Builder(MainActivity.this)
142141

143142

144143

144+
### PointerType Attribute
145+
146+
| Type | Description |
147+
| ------ | ------ |
148+
| circle | Show circle pointer towards targetView |
149+
| arrow | Show arrow pointer towards targetView |
150+
| none | Show no pointer or line towards targetView |
151+
145152

146153
## Contribution :collision:
147154

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ android {
44
compileSdkVersion 26
55
defaultConfig {
66
applicationId "smartdevelop.ir.eram.showcaseview"
7-
minSdkVersion 14
7+
minSdkVersion 11
88
targetSdkVersion 25
99
versionCode 1
1010
versionName "1.0"

app/src/main/java/ir/smartdevelop/eram/showcaseview/MainActivity.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
import android.os.Bundle;
44
import android.support.v7.app.AppCompatActivity;
55
import android.view.View;
6-
import android.widget.EditText;
76

87
import smartdevelop.ir.eram.showcaseviewlib.GuideView;
98
import smartdevelop.ir.eram.showcaseviewlib.config.DismissType;
109
import smartdevelop.ir.eram.showcaseviewlib.config.Gravity;
10+
import smartdevelop.ir.eram.showcaseviewlib.config.PointerType;
1111
import smartdevelop.ir.eram.showcaseviewlib.listener.GuideListener;
1212

1313
public class MainActivity extends AppCompatActivity {
@@ -38,6 +38,7 @@ protected void onCreate(Bundle savedInstanceState) {
3838
.setContentText("Guide Description Text\n .....Guide Description Text\n .....Guide Description Text .....")
3939
.setGravity(Gravity.center)
4040
.setDismissType(DismissType.anywhere)
41+
.setPointerType(PointerType.arrow)
4142
.setTargetView(view1)
4243
.setGuideListener(new GuideListener() {
4344
@Override

build.gradle

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,20 @@ buildscript {
44

55
repositories {
66
google()
7-
jcenter()
87
mavenCentral()
98

109
}
1110
dependencies {
12-
classpath 'com.android.tools.build:gradle:3.1.3'
11+
classpath 'com.android.tools.build:gradle:4.2.2'
1312
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
14-
// NOTE: Do not place your application dependencies here; they belong
15-
// in the individual module build.gradle files
1613
}
1714
}
1815

1916
allprojects {
2017
repositories {
21-
maven {
22-
url 'http://clojars.org/repo'
23-
}
2418
mavenCentral()
2519
maven { url "https://jitpack.io" }
2620
google()
27-
jcenter()
2821
}
2922
}
3023

gradle/wrapper/gradle-wrapper.jar

781 Bytes
Binary file not shown.
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Thu Jun 14 22:30:27 IST 2018
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

gradlew

100644100755
Lines changed: 42 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,43 @@
1-
#!/usr/bin/env bash
1+
#!/usr/bin/env sh
22

33
##############################################################################
44
##
55
## Gradle start up script for UN*X
66
##
77
##############################################################################
88

9-
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
10-
DEFAULT_JVM_OPTS=""
9+
# Attempt to set APP_HOME
10+
# Resolve links: $0 may be a link
11+
PRG="$0"
12+
# Need this for relative symlinks.
13+
while [ -h "$PRG" ] ; do
14+
ls=`ls -ld "$PRG"`
15+
link=`expr "$ls" : '.*-> \(.*\)$'`
16+
if expr "$link" : '/.*' > /dev/null; then
17+
PRG="$link"
18+
else
19+
PRG=`dirname "$PRG"`"/$link"
20+
fi
21+
done
22+
SAVED="`pwd`"
23+
cd "`dirname \"$PRG\"`/" >/dev/null
24+
APP_HOME="`pwd -P`"
25+
cd "$SAVED" >/dev/null
1126

1227
APP_NAME="Gradle"
1328
APP_BASE_NAME=`basename "$0"`
1429

30+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
31+
DEFAULT_JVM_OPTS=""
32+
1533
# Use the maximum available, or set MAX_FD != -1 to use that value.
1634
MAX_FD="maximum"
1735

18-
warn ( ) {
36+
warn () {
1937
echo "$*"
2038
}
2139

22-
die ( ) {
40+
die () {
2341
echo
2442
echo "$*"
2543
echo
@@ -30,6 +48,7 @@ die ( ) {
3048
cygwin=false
3149
msys=false
3250
darwin=false
51+
nonstop=false
3352
case "`uname`" in
3453
CYGWIN* )
3554
cygwin=true
@@ -40,26 +59,11 @@ case "`uname`" in
4059
MINGW* )
4160
msys=true
4261
;;
62+
NONSTOP* )
63+
nonstop=true
64+
;;
4365
esac
4466

45-
# Attempt to set APP_HOME
46-
# Resolve links: $0 may be a link
47-
PRG="$0"
48-
# Need this for relative symlinks.
49-
while [ -h "$PRG" ] ; do
50-
ls=`ls -ld "$PRG"`
51-
link=`expr "$ls" : '.*-> \(.*\)$'`
52-
if expr "$link" : '/.*' > /dev/null; then
53-
PRG="$link"
54-
else
55-
PRG=`dirname "$PRG"`"/$link"
56-
fi
57-
done
58-
SAVED="`pwd`"
59-
cd "`dirname \"$PRG\"`/" >/dev/null
60-
APP_HOME="`pwd -P`"
61-
cd "$SAVED" >/dev/null
62-
6367
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
6468

6569
# Determine the Java command to use to start the JVM.
@@ -85,7 +89,7 @@ location of your Java installation."
8589
fi
8690

8791
# Increase the maximum file descriptors if we can.
88-
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
92+
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
8993
MAX_FD_LIMIT=`ulimit -H -n`
9094
if [ $? -eq 0 ] ; then
9195
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -150,11 +154,19 @@ if $cygwin ; then
150154
esac
151155
fi
152156

153-
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
154-
function splitJvmOpts() {
155-
JVM_OPTS=("$@")
157+
# Escape application args
158+
save () {
159+
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
160+
echo " "
156161
}
157-
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
158-
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
162+
APP_ARGS=$(save "$@")
163+
164+
# Collect all arguments for the java command, following the shell quoting and substitution rules
165+
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
166+
167+
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
168+
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
169+
cd "$(dirname "$0")"
170+
fi
159171

160-
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
172+
exec "$JAVACMD" "$@"

0 commit comments

Comments
 (0)