commit 39ff9b08b3944ea9fa45aabfac73844dc69ff9be
Author: cirno-poi <874465028@qq.com>
Date: Mon Sep 10 15:31:37 2018 +0800
Initial commit
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..10c8840
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,46 @@
+# built application files
+*.apk
+*.ap_
+
+# files for the dex VM
+*.dex
+
+# Java class files
+*.class
+
+# generated files
+bin/
+gen/
+AndResGuardOutput/
+.DS_Store
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Eclipse project files
+.classpath
+.project
+
+# Android Studio
+.gradle
+/*/local.properties
+/*/out
+/build
+.externalNativeBuild
+/*/*/production
+*.iml
+*.iws
+*.ipr
+*~
+*.swp
+/captures
+.bugtags.log
+hs*.log
+/output
+apkinfo.pyc
+redex-src-strings-map.txt
+/.idea
+/tools/*.apk
+/tools/output
+/lint.xml
+
diff --git a/app/.gitignore b/app/.gitignore
new file mode 100644
index 0000000..f099d06
--- /dev/null
+++ b/app/.gitignore
@@ -0,0 +1,47 @@
+# built application files
+*.apk
+*.ap_
+
+# files for the dex VM
+*.dex
+
+# Java class files
+*.class
+
+# generated files
+bin/
+gen/
+AndResGuardOutput/
+.DS_Store
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Eclipse project files
+.classpath
+.project
+
+# Android Studio
+.gradle
+/*/local.properties
+/*/out
+/build
+.externalNativeBuild
+/*/*/production
+*.iml
+*.iws
+*.ipr
+*~
+*.swp
+/captures
+.bugtags.log
+hs*.log
+/output
+apkinfo.pyc
+redex-src-strings-map.txt
+/.idea
+/app/oneapm.properties
+/tools/*.apk
+/tools/output
+/lint.xml
+/.settings/org.eclipse.buildship.core.prefs
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
new file mode 100644
index 0000000..9618ed9
--- /dev/null
+++ b/app/build.gradle
@@ -0,0 +1,39 @@
+apply plugin: 'com.android.application'
+
+android {
+ compileSdkVersion 27
+ defaultConfig {
+ applicationId "com.example.cirno_poi.verifyedittext"
+ minSdkVersion 19
+ targetSdkVersion 27
+ versionCode 1
+ versionName "1.0"
+ testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+ }
+ buildTypes {
+ release {
+ minifyEnabled false
+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+ }
+ }
+ compileOptions {
+ sourceCompatibility JavaVersion.VERSION_1_8
+ targetCompatibility JavaVersion.VERSION_1_8
+ }
+ repositories {
+ flatDir {
+ dirs 'libs'
+ }
+ }
+}
+
+
+dependencies {
+ implementation fileTree(include: ['*.jar'], dir: 'libs')
+ implementation(name:'verifyedittextlibrary-release',ext:'aar')
+ implementation 'com.android.support:appcompat-v7:27.1.1'
+ implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+ testImplementation 'junit:junit:4.12'
+ androidTestImplementation 'com.android.support.test:runner:1.0.2'
+ androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+}
diff --git a/app/libs/verifyedittextlibrary-release.aar b/app/libs/verifyedittextlibrary-release.aar
new file mode 100644
index 0000000..53f278a
Binary files /dev/null and b/app/libs/verifyedittextlibrary-release.aar differ
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
new file mode 100644
index 0000000..f1b4245
--- /dev/null
+++ b/app/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/app/src/androidTest/java/com/example/cirno_poi/verifyedittext/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/example/cirno_poi/verifyedittext/ExampleInstrumentedTest.java
new file mode 100644
index 0000000..8d04c55
--- /dev/null
+++ b/app/src/androidTest/java/com/example/cirno_poi/verifyedittext/ExampleInstrumentedTest.java
@@ -0,0 +1,26 @@
+package com.example.cirno_poi.verifyedittext;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see Testing documentation
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+ @Test
+ public void useAppContext() {
+ // Context of the app under test.
+ Context appContext = InstrumentationRegistry.getTargetContext();
+
+ assertEquals("com.example.cirno_poi.verifyedittext", appContext.getPackageName());
+ }
+}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..adfa938
--- /dev/null
+++ b/app/src/main/AndroidManifest.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/java/com/example/cirno_poi/verifyedittext/MainActivity.java b/app/src/main/java/com/example/cirno_poi/verifyedittext/MainActivity.java
new file mode 100644
index 0000000..82dce09
--- /dev/null
+++ b/app/src/main/java/com/example/cirno_poi/verifyedittext/MainActivity.java
@@ -0,0 +1,13 @@
+package com.example.cirno_poi.verifyedittext;
+
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+
+public class MainActivity extends AppCompatActivity {
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_main);
+ }
+}
diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
new file mode 100644
index 0000000..c7bd21d
--- /dev/null
+++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/edit_cursor_shape.xml b/app/src/main/res/drawable/edit_cursor_shape.xml
new file mode 100644
index 0000000..f0b343c
--- /dev/null
+++ b/app/src/main/res/drawable/edit_cursor_shape.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
new file mode 100644
index 0000000..d5fccc5
--- /dev/null
+++ b/app/src/main/res/drawable/ic_launcher_background.xml
@@ -0,0 +1,170 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
new file mode 100644
index 0000000..626465f
--- /dev/null
+++ b/app/src/main/res/layout/activity_main.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100644
index 0000000..eca70cf
--- /dev/null
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
new file mode 100644
index 0000000..eca70cf
--- /dev/null
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..a2f5908
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000..1b52399
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..ff10afd
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 0000000..115a4c7
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..dcd3cd8
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..459ca60
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..8ca12fe
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..8e19b41
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000..b824ebd
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..4c19a13
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
new file mode 100644
index 0000000..0d2c4cc
--- /dev/null
+++ b/app/src/main/res/values/attrs.xml
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
new file mode 100644
index 0000000..11484f8
--- /dev/null
+++ b/app/src/main/res/values/colors.xml
@@ -0,0 +1,9 @@
+
+
+ #3F51B5
+ #303F9F
+ #FF4081
+
+ #FF4081
+ #eeeeee
+
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
new file mode 100644
index 0000000..ef15f5f
--- /dev/null
+++ b/app/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+
+ VerifyEditText
+
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
new file mode 100644
index 0000000..5885930
--- /dev/null
+++ b/app/src/main/res/values/styles.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
diff --git a/app/src/test/java/com/example/cirno_poi/verifyedittext/ExampleUnitTest.java b/app/src/test/java/com/example/cirno_poi/verifyedittext/ExampleUnitTest.java
new file mode 100644
index 0000000..11e4cd9
--- /dev/null
+++ b/app/src/test/java/com/example/cirno_poi/verifyedittext/ExampleUnitTest.java
@@ -0,0 +1,17 @@
+package com.example.cirno_poi.verifyedittext;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see Testing documentation
+ */
+public class ExampleUnitTest {
+ @Test
+ public void addition_isCorrect() {
+ assertEquals(4, 2 + 2);
+ }
+}
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..077cb2f
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,27 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+
+ repositories {
+ google()
+ jcenter()
+ }
+ dependencies {
+ classpath 'com.android.tools.build:gradle:3.1.4'
+
+
+ // NOTE: Do not place your application dependencies here; they belong
+ // in the individual module build.gradle files
+ }
+}
+
+allprojects {
+ repositories {
+ google()
+ jcenter()
+ }
+}
+
+task clean(type: Delete) {
+ delete rootProject.buildDir
+}
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 0000000..743d692
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,13 @@
+# Project-wide Gradle settings.
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx1536m
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..7a3265e
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..a3cfb8b
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Sat Aug 25 14:05:18 CST 2018
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
diff --git a/gradlew b/gradlew
new file mode 100755
index 0000000..cccdd3d
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+## Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`"/$link"
+ fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+ echo "$*"
+}
+
+die () {
+ echo
+ echo "$*"
+ echo
+ exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+ CYGWIN* )
+ cygwin=true
+ ;;
+ Darwin* )
+ darwin=true
+ ;;
+ MINGW* )
+ msys=true
+ ;;
+ NONSTOP* )
+ nonstop=true
+ ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ if [ ! -x "$JAVACMD" ] ; then
+ die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+else
+ JAVACMD="java"
+ which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+ MAX_FD_LIMIT=`ulimit -H -n`
+ if [ $? -eq 0 ] ; then
+ if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+ MAX_FD="$MAX_FD_LIMIT"
+ fi
+ ulimit -n $MAX_FD
+ if [ $? -ne 0 ] ; then
+ warn "Could not set maximum file descriptor limit: $MAX_FD"
+ fi
+ else
+ warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+ fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+ GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+ APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+ CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+ JAVACMD=`cygpath --unix "$JAVACMD"`
+
+ # We build the pattern for arguments to be converted via cygpath
+ ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+ SEP=""
+ for dir in $ROOTDIRSRAW ; do
+ ROOTDIRS="$ROOTDIRS$SEP$dir"
+ SEP="|"
+ done
+ OURCYGPATTERN="(^($ROOTDIRS))"
+ # Add a user-defined pattern to the cygpath arguments
+ if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+ OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+ fi
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ i=0
+ for arg in "$@" ; do
+ CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+ CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
+
+ if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
+ eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+ else
+ eval `echo args$i`="\"$arg\""
+ fi
+ i=$((i+1))
+ done
+ case $i in
+ (0) set -- ;;
+ (1) set -- "$args0" ;;
+ (2) set -- "$args0" "$args1" ;;
+ (3) set -- "$args0" "$args1" "$args2" ;;
+ (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+ (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+ (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+ (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+ (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+ (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+ esac
+fi
+
+# Escape application args
+save () {
+ for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+ echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+ cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..e95643d
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000..eea515e
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1 @@
+include ':app', ':verifyedittextlibrary'
diff --git a/verifyedittextlibrary/.gitignore b/verifyedittextlibrary/.gitignore
new file mode 100644
index 0000000..796b96d
--- /dev/null
+++ b/verifyedittextlibrary/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/verifyedittextlibrary/build.gradle b/verifyedittextlibrary/build.gradle
new file mode 100644
index 0000000..5b9d820
--- /dev/null
+++ b/verifyedittextlibrary/build.gradle
@@ -0,0 +1,39 @@
+apply plugin: 'com.android.library'
+
+android {
+ compileSdkVersion 27
+
+
+
+ defaultConfig {
+ minSdkVersion 19
+ targetSdkVersion 27
+ versionCode 1
+ versionName "1.0"
+
+ testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+
+ }
+
+ buildTypes {
+ release {
+ minifyEnabled false
+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+ }
+ }
+
+ compileOptions {
+ sourceCompatibility JavaVersion.VERSION_1_8
+ targetCompatibility JavaVersion.VERSION_1_8
+ }
+
+}
+
+dependencies {
+ implementation fileTree(dir: 'libs', include: ['*.jar'])
+
+ implementation 'com.android.support:appcompat-v7:27.1.1'
+ testImplementation 'junit:junit:4.12'
+ androidTestImplementation 'com.android.support.test:runner:1.0.2'
+ androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+}
diff --git a/verifyedittextlibrary/proguard-rules.pro b/verifyedittextlibrary/proguard-rules.pro
new file mode 100644
index 0000000..f1b4245
--- /dev/null
+++ b/verifyedittextlibrary/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/verifyedittextlibrary/src/androidTest/java/com/github/cirno_poi/verificationedittextlibrary/ExampleInstrumentedTest.java b/verifyedittextlibrary/src/androidTest/java/com/github/cirno_poi/verificationedittextlibrary/ExampleInstrumentedTest.java
new file mode 100644
index 0000000..6b834cb
--- /dev/null
+++ b/verifyedittextlibrary/src/androidTest/java/com/github/cirno_poi/verificationedittextlibrary/ExampleInstrumentedTest.java
@@ -0,0 +1,26 @@
+package com.github.cirno_poi.verificationedittextlibrary;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see Testing documentation
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+ @Test
+ public void useAppContext() {
+ // Context of the app under test.
+ Context appContext = InstrumentationRegistry.getTargetContext();
+
+ assertEquals("com.github.cirno_poi.verificationedittextlibrary.test", appContext.getPackageName());
+ }
+}
diff --git a/verifyedittextlibrary/src/main/AndroidManifest.xml b/verifyedittextlibrary/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..069f0d7
--- /dev/null
+++ b/verifyedittextlibrary/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+
diff --git a/verifyedittextlibrary/src/main/java/com/github/cirno_poi/verifyedittextlibrary/HelperEditText.java b/verifyedittextlibrary/src/main/java/com/github/cirno_poi/verifyedittextlibrary/HelperEditText.java
new file mode 100644
index 0000000..883b134
--- /dev/null
+++ b/verifyedittextlibrary/src/main/java/com/github/cirno_poi/verifyedittextlibrary/HelperEditText.java
@@ -0,0 +1,72 @@
+package com.github.cirno_poi.verifyedittextlibrary;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.KeyEvent;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputConnection;
+import android.view.inputmethod.InputConnectionWrapper;
+
+/**
+ * 解决AOSP键盘无法监听无内容状态下删除键的问题
+ *
+ * @author cirno-poi
+ */
+public class HelperEditText extends android.support.v7.widget.AppCompatEditText {
+
+ private OnKeyListener keyListener;
+
+ public HelperEditText(Context context) {
+ super(context);
+ }
+
+ public HelperEditText(Context context, AttributeSet attrs) {
+ super(context, attrs);
+ }
+
+ public HelperEditText(Context context, AttributeSet attrs, int defStyleAttr) {
+ super(context, attrs, defStyleAttr);
+ }
+
+ //覆盖输入框和键盘的关联接口
+ @Override
+ public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
+ return new MyInputConnection(super.onCreateInputConnection(outAttrs),
+ true);
+ }
+
+
+ private class MyInputConnection extends InputConnectionWrapper {
+
+ public MyInputConnection(InputConnection target, boolean mutable) {
+ super(target, mutable);
+ }
+
+ //覆盖事件传递
+ @Override
+ public boolean sendKeyEvent(KeyEvent event) {
+ if (keyListener != null) {
+ keyListener.onKey(HelperEditText.this, event.getKeyCode(), event);
+ }
+ return super.sendKeyEvent(event);
+ }
+
+ @Override
+ public boolean deleteSurroundingText(int beforeLength, int afterLength) {
+ //在删除时,输入框无内容,或者删除以后输入框无内容
+ if (beforeLength == 1 || afterLength == 0 || beforeLength == 0) {
+ // backspace
+ return sendKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DEL))
+ && sendKeyEvent(new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_DEL));
+ }
+ return super.deleteSurroundingText(beforeLength, afterLength);
+ }
+
+ }
+
+ //设置监听回调
+ public void setDeleteEventListener(OnKeyListener listener) {
+ keyListener = listener;
+ }
+
+}
diff --git a/verifyedittextlibrary/src/main/java/com/github/cirno_poi/verifyedittextlibrary/VerifyEditText.java b/verifyedittextlibrary/src/main/java/com/github/cirno_poi/verifyedittextlibrary/VerifyEditText.java
new file mode 100644
index 0000000..f5fc04b
--- /dev/null
+++ b/verifyedittextlibrary/src/main/java/com/github/cirno_poi/verifyedittextlibrary/VerifyEditText.java
@@ -0,0 +1,359 @@
+package com.github.cirno_poi.verifyedittextlibrary;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.support.annotation.ColorInt;
+import android.support.annotation.DrawableRes;
+import android.support.annotation.Nullable;
+import android.support.v4.content.ContextCompat;
+import android.text.Editable;
+import android.text.InputFilter;
+import android.text.InputType;
+import android.text.TextWatcher;
+import android.util.AttributeSet;
+import android.view.Gravity;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.EditText;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.github.cirno_poi.verificationedittextlibrary.R;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 验证码输入框,可自定义输入框数量,间距,颜色等
+ *
+ * @author cirno_poi
+ */
+public class VerifyEditText extends LinearLayout {
+
+ private final int DEFAULT_INPUT_COUNT = 4;
+ private final int DEFAULT_LINE_HEIGHT = 1;
+ private final int DEFAULT_INPUT_SPACE = 15;
+ private final int DEFAULT_LINE_SPACE = 8;
+ private final int DEFAULT_TEXT_SIZE = 20;
+
+ private Context context;
+ private List editTextList;
+ private List underlineList;
+ private int currentPosition = 0;
+ private inputCompleteListener inputCompleteListener;
+ private @ColorInt
+ int lineFocusColor = ContextCompat.getColor(getContext(), android.R.color.holo_blue_light);
+ private @ColorInt
+ int lineDefaultColor = ContextCompat.getColor(getContext(), R.color.colorDefault);
+ /**
+ * 是否让所有的线都高亮
+ */
+ private boolean isAllLineLight = false;
+ /**
+ * 输入框数量
+ */
+ private int inputCount = DEFAULT_INPUT_COUNT;
+ /**
+ * 下划线高度
+ */
+ private int lineHeight;
+ /**
+ * 输入框间距
+ */
+ private int inputSpace;
+ /**
+ * 和下划线的间距
+ */
+ private int lineSpace;
+ /**
+ * 输入文字大小
+ */
+ private float textSize = DEFAULT_TEXT_SIZE;
+ /**
+ * 光标资源
+ */
+ private @DrawableRes
+ int mCursorDrawable = R.drawable.edit_cursor_shape;
+
+ public VerifyEditText(Context context) {
+ this(context, null);
+ }
+
+ public VerifyEditText(Context context, @Nullable AttributeSet attrs) {
+ this(context, attrs, 0);
+ }
+
+ public VerifyEditText(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+ super(context, attrs, defStyleAttr);
+ this.context = context;
+ TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.VerifyEditText);
+ if (typedArray != null) {
+ inputCount = typedArray.getInteger(R.styleable.VerifyEditText_inputCount, DEFAULT_INPUT_COUNT);
+ lineHeight = (int) typedArray.getDimension(R.styleable.VerifyEditText_underlineHeight, dp2px(DEFAULT_LINE_HEIGHT));
+ inputSpace = (int) typedArray.getDimension(R.styleable.VerifyEditText_inputSpace, dp2px(DEFAULT_INPUT_SPACE));
+ lineSpace = (int) typedArray.getDimension(R.styleable.VerifyEditText_underlineSpace, dp2px(DEFAULT_LINE_SPACE));
+ textSize = typedArray.getDimension(R.styleable.VerifyEditText_mTextSize, DEFAULT_TEXT_SIZE);
+ lineFocusColor = typedArray.getColor(R.styleable.VerifyEditText_focusColor, ContextCompat.getColor(getContext(), android.R.color.holo_blue_light));
+ lineDefaultColor = typedArray.getColor(R.styleable.VerifyEditText_defaultColor, ContextCompat.getColor(getContext(), R.color.colorDefault));
+ mCursorDrawable = typedArray.getResourceId(R.styleable.VerifyEditText_cursorDrawable, R.drawable.edit_cursor_shape);
+ typedArray.recycle();
+ }
+ initView();
+ }
+
+ private void initView() {
+ if (inputCount <= 0) {
+ return;
+ }
+
+ editTextList = new ArrayList<>();
+ underlineList = new ArrayList<>();
+
+ setOrientation(HORIZONTAL);
+ setGravity(Gravity.CENTER);
+
+ for (int i = 0; i < inputCount; i++) {
+
+ LayoutParams flParams = new LayoutParams(0, ViewGroup.LayoutParams.WRAP_CONTENT, 1);
+ flParams.setMargins(i == 0 ? 0 : inputSpace, 0, 0, 0);
+ FrameLayout frameLayout = new FrameLayout(context);
+ frameLayout.setLayoutParams(flParams);
+
+ FrameLayout.LayoutParams etParams = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+ HelperEditText editText = new HelperEditText(context);
+ editText.setBackground(null);
+ editText.setPadding(0, 0, 0, lineSpace);
+ editText.setMaxLines(1);
+ editText.setTextSize(textSize);
+ InputFilter[] filters = {new InputFilter.LengthFilter(1)};
+ editText.setFilters(filters);
+ editText.setInputType(InputType.TYPE_CLASS_NUMBER);
+ editText.setGravity(Gravity.CENTER);
+ //修改光标的颜色(反射)
+ try {
+ Field f = TextView.class.getDeclaredField("mCursorDrawableRes");
+ f.setAccessible(true);
+ f.set(editText, mCursorDrawable);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ editText.setLayoutParams(etParams);
+ frameLayout.addView(editText);
+
+ FrameLayout.LayoutParams lineParams = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, lineHeight);
+ lineParams.gravity = Gravity.BOTTOM;
+ View underline = new View(context);
+ underline.setBackgroundColor(ContextCompat.getColor(context, R.color.colorDefault));
+ underline.setLayoutParams(lineParams);
+ frameLayout.addView(underline);
+
+ addView(frameLayout);
+ editTextList.add(editText);
+ underlineList.add(underline);
+ }
+
+ TextWatcher textWatcher = new TextWatcher() {
+ @Override
+ public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+ }
+
+ @Override
+ public void onTextChanged(CharSequence s, int start, int before, int count) {
+
+ }
+
+ @Override
+ public void afterTextChanged(Editable s) {
+ if (!s.toString().isEmpty() && currentPosition < editTextList.size() - 1) {
+ currentPosition++;
+ editTextList.get(currentPosition).requestFocus();
+ }
+ if (isInputComplete() && inputCompleteListener != null) {
+ inputCompleteListener.inputComplete(VerifyEditText.this, getContent());
+ }
+ }
+ };
+
+ OnFocusChangeListener onFocusChangeListener = (v, hasFocus) -> {
+ for (int i = 0; i < editTextList.size(); i++) {
+ if (editTextList.get(i).isFocused()) {
+ currentPosition = i;
+ }
+ if (!isAllLineLight) {
+ underlineList.get(i).setBackgroundColor(lineDefaultColor);
+ }
+ }
+ if (!isAllLineLight) {
+ underlineList.get(currentPosition).setBackgroundColor(lineFocusColor);
+ }
+ };
+
+ OnKeyListener keyListener = (v, keyCode, event) -> {
+ //监听键盘删除键
+ if (keyCode == KeyEvent.KEYCODE_DEL) {
+ //只对ACTION_DOWN进行处理
+ if (event.getAction() != KeyEvent.ACTION_DOWN) {
+ return true;
+ }
+ if (editTextList.get(currentPosition).getText().toString().isEmpty()) {
+ if (currentPosition <= 0) {
+ return true;
+ }
+ //跳到前一个不为空的EditText
+ for (int position = currentPosition; position >= 0; position--) {
+ currentPosition = position;
+ if (!editTextList.get(position).getText().toString().isEmpty()) {
+ break;
+ }
+ }
+ }
+ editTextList.get(currentPosition).requestFocus();
+ editTextList.get(currentPosition).getText().clear();
+ return true;
+ }
+ return false;
+ };
+
+ for (HelperEditText et : editTextList) {
+ et.addTextChangedListener(textWatcher);
+ et.setOnFocusChangeListener(onFocusChangeListener);
+ et.setOnKeyListener(keyListener);
+ }
+
+ editTextList.get(0).requestFocus();
+ }
+
+ /**
+ * 获取输入的内容,可能为空
+ *
+ * @return 输入的内容
+ */
+ public String getContent() {
+ if (editTextList == null) {
+ return "";
+ }
+ StringBuilder builder = new StringBuilder();
+ for (HelperEditText et : editTextList) {
+ builder.append(et.getText().toString());
+ }
+ return builder.toString();
+ }
+
+ /**
+ * 是否输入完成
+ *
+ * @return 输入完成boolean
+ */
+ public boolean isInputComplete() {
+ if (editTextList == null) {
+ return false;
+ }
+ for (EditText et : editTextList) {
+ if (et.getText().toString().isEmpty()) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ /**
+ * 是否设置所有下划线高亮
+ *
+ * @param flag 标志位
+ */
+ public void setAllLineLight(boolean flag) {
+ isAllLineLight = flag;
+ if (isAllLineLight) {
+ for (View v : underlineList) {
+ v.setBackgroundColor(lineFocusColor);
+ }
+ }
+ }
+
+ /**
+ * 输入完成监听,在afterTextChanged里调
+ */
+ public interface inputCompleteListener {
+ void inputComplete(VerifyEditText et, String content);
+ }
+
+ public void setInputCompleteListener(VerifyEditText.inputCompleteListener inputCompleteListener) {
+ this.inputCompleteListener = inputCompleteListener;
+ }
+
+ public int dp2px(int dp) {
+ return (int) (dp * context.getResources().getDisplayMetrics().density + 0.5f);
+ }
+
+ public int getLineFocusColor() {
+ return lineFocusColor;
+ }
+
+ public void setLineFocusColor(int lineFocusColor) {
+ this.lineFocusColor = lineFocusColor;
+ }
+
+ public int getLineDefaultColor() {
+ return lineDefaultColor;
+ }
+
+ public void setLineDefaultColor(int lineDefaultColor) {
+ this.lineDefaultColor = lineDefaultColor;
+ }
+
+ public int getInputCount() {
+ return inputCount;
+ }
+
+ public void setInputCount(int inputCount) {
+ this.inputCount = inputCount;
+ }
+
+ public int getLineHeight() {
+ return lineHeight;
+ }
+
+ public void setLineHeight(int lineHeight) {
+ this.lineHeight = lineHeight;
+ }
+
+ public int getInputSpace() {
+ return inputSpace;
+ }
+
+ public void setInputSpace(int inputSpace) {
+ this.inputSpace = inputSpace;
+ }
+
+ public int getLineSpace() {
+ return lineSpace;
+ }
+
+ public void setLineSpace(int lineSpace) {
+ this.lineSpace = lineSpace;
+ }
+
+ public float getTextSize() {
+ return textSize;
+ }
+
+ public void setTextSize(float textSize) {
+ this.textSize = textSize;
+ }
+
+ public int getmCursorDrawable() {
+ return mCursorDrawable;
+ }
+
+ public void setmCursorDrawable(int mCursorDrawable) {
+ this.mCursorDrawable = mCursorDrawable;
+ }
+
+ public boolean isAllLineLight() {
+ return isAllLineLight;
+ }
+}
diff --git a/verifyedittextlibrary/src/main/res/drawable/edit_cursor_shape.xml b/verifyedittextlibrary/src/main/res/drawable/edit_cursor_shape.xml
new file mode 100644
index 0000000..f0b343c
--- /dev/null
+++ b/verifyedittextlibrary/src/main/res/drawable/edit_cursor_shape.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/verifyedittextlibrary/src/main/res/values/attrs.xml b/verifyedittextlibrary/src/main/res/values/attrs.xml
new file mode 100644
index 0000000..f36a6e2
--- /dev/null
+++ b/verifyedittextlibrary/src/main/res/values/attrs.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/verifyedittextlibrary/src/main/res/values/colors.xml b/verifyedittextlibrary/src/main/res/values/colors.xml
new file mode 100644
index 0000000..11484f8
--- /dev/null
+++ b/verifyedittextlibrary/src/main/res/values/colors.xml
@@ -0,0 +1,9 @@
+
+
+ #3F51B5
+ #303F9F
+ #FF4081
+
+ #FF4081
+ #eeeeee
+
diff --git a/verifyedittextlibrary/src/main/res/values/strings.xml b/verifyedittextlibrary/src/main/res/values/strings.xml
new file mode 100644
index 0000000..f89087f
--- /dev/null
+++ b/verifyedittextlibrary/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+
+ VerificationEditTextLibrary
+
diff --git a/verifyedittextlibrary/src/test/java/com/github/cirno_poi/verificationedittextlibrary/ExampleUnitTest.java b/verifyedittextlibrary/src/test/java/com/github/cirno_poi/verificationedittextlibrary/ExampleUnitTest.java
new file mode 100644
index 0000000..68a7f47
--- /dev/null
+++ b/verifyedittextlibrary/src/test/java/com/github/cirno_poi/verificationedittextlibrary/ExampleUnitTest.java
@@ -0,0 +1,17 @@
+package com.github.cirno_poi.verificationedittextlibrary;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see Testing documentation
+ */
+public class ExampleUnitTest {
+ @Test
+ public void addition_isCorrect() {
+ assertEquals(4, 2 + 2);
+ }
+}
\ No newline at end of file