diff --git a/.gitignore b/.gitignore
index 39fb081..a674bf8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,57 @@
+# Built application files
+*.apk
+*.ap_
+
+# Files for the ART/Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+out/
+
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+
+# Android Studio Navigation editor temp files
+.navigation/
+
+# Android Studio captures folder
+captures/
+
+# Intellij
*.iml
-.gradle
-/local.properties
-/.idea/workspace.xml
-/.idea/libraries
-.DS_Store
-/build
-/captures
+.idea
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/gradle.xml
+.idea/dictionaries
+.idea/libraries
+
+# Keystore files
+# Uncomment the following line if you do not want to check your keystore files in.
+#*.jks
+
+# External native build folder generated in Android Studio 2.2 and later
.externalNativeBuild
+
+# Google Services (e.g. APIs or Firebase)
+google-services.json
+
+# Freeline
+freeline.py
+freeline/
+freeline_project_description.json
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
deleted file mode 100644
index 73d3857..0000000
--- a/.idea/gradle.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index 3963879..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 004e45b..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 7f68460..0000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 94a25f7..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index c5a3c23..1e2e3a4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -24,5 +24,6 @@ dependencies {
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.1'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
- implementation project(':mobile-passcode')
+// implementation project(':mifos-passcode')
+ implementation 'com.mifos.mobile:mifos-passcode:0.3.0'
}
diff --git a/build.gradle b/build.gradle
index 020eae2..140d628 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,10 +6,11 @@ buildscript {
google()
jcenter()
}
- dependencies {
- classpath 'com.android.tools.build:gradle:3.0.0'
-
+ dependencies {
+ classpath 'com.android.tools.build:gradle:3.0.1'
+ classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
+ classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
@@ -19,6 +20,7 @@ allprojects {
repositories {
google()
jcenter()
+ maven { url 'https://dl.bintray.com/mifos/maven/' }
}
}
diff --git a/mobile-passcode/.gitignore b/mifos-passcode/.gitignore
similarity index 100%
rename from mobile-passcode/.gitignore
rename to mifos-passcode/.gitignore
diff --git a/mifos-passcode/build.gradle b/mifos-passcode/build.gradle
new file mode 100644
index 0000000..5e6cc1c
--- /dev/null
+++ b/mifos-passcode/build.gradle
@@ -0,0 +1,75 @@
+apply plugin: 'com.android.library'
+
+ext {
+ bintrayRepo = 'maven'
+ bintrayName = 'mifos-passcode'
+
+ publishedGroupId = 'com.mifos.mobile'
+ libraryName = 'mifos-passcode'
+ artifact = 'mifos-passcode' // artifact name and library name should be same.
+
+ libraryDescription = 'A Library as feature of passcode'
+
+ siteUrl = 'https://github.com/openMF/mobile-passcode'
+ gitUrl = 'https://github.com/openMF/mobile-passcode.git'
+
+ libraryVersion = '0.3.0'
+
+ developerId = 'mifos'
+ developerName = 'Mifos Initiative'
+ developerEmail = 'info@mifos.org'
+
+ licenseName = 'The Apache Software License, Version 2.0'
+ licenseUrl = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+ allLicenses = ["Apache-2.0"]
+}
+
+android {
+ compileSdkVersion 26
+
+ defaultConfig {
+ minSdkVersion 15
+ targetSdkVersion 26
+ versionCode 1
+ versionName "0.3.0"
+ vectorDrawables.useSupportLibrary = true
+ testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+ }
+
+ buildTypes {
+ release {
+ minifyEnabled false
+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+ }
+ }
+
+}
+
+dependencies {
+ implementation fileTree(dir: 'libs', include: ['*.jar'])
+
+ implementation "com.android.support:design:26.1.0"
+ implementation 'com.android.support:appcompat-v7:26.1.0'
+
+ testImplementation 'junit:junit:4.12'
+ androidTestImplementation 'com.android.support.test:runner:1.0.1'
+ androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
+}
+
+tasks.withType(Javadoc) {
+ options.addStringOption('Xdoclint:none', '-quiet')
+ options.addStringOption('encoding', 'UTF-8')
+ options.addStringOption('charSet', 'UTF-8')
+}
+
+// Place it at the end of the file
+apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle'
+apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/bintrayv1.gradle'
+
+// Used this article to release the library
+// https://inthecheesefactory.com/blog/how-to-upload-library-to-jcenter-maven-central-as-dependency/en
+
+// Add these line in local.properties to direct release on bintray
+//bintray.user=YOUR_BINTRAY_USERNAME
+//bintray.apikey=YOUR_BINTRAY_API_KEY
+//bintray.gpg.password=YOUR_GPG_PASSWORD
\ No newline at end of file
diff --git a/mobile-passcode/proguard-rules.pro b/mifos-passcode/proguard-rules.pro
similarity index 100%
rename from mobile-passcode/proguard-rules.pro
rename to mifos-passcode/proguard-rules.pro
diff --git a/mobile-passcode/src/main/AndroidManifest.xml b/mifos-passcode/src/main/AndroidManifest.xml
similarity index 100%
rename from mobile-passcode/src/main/AndroidManifest.xml
rename to mifos-passcode/src/main/AndroidManifest.xml
diff --git a/mobile-passcode/src/main/java/com/mifos/mobile/passcode/BasePassCodeActivity.java b/mifos-passcode/src/main/java/com/mifos/mobile/passcode/BasePassCodeActivity.java
similarity index 100%
rename from mobile-passcode/src/main/java/com/mifos/mobile/passcode/BasePassCodeActivity.java
rename to mifos-passcode/src/main/java/com/mifos/mobile/passcode/BasePassCodeActivity.java
diff --git a/mobile-passcode/src/main/java/com/mifos/mobile/passcode/MifosPassCodeActivity.java b/mifos-passcode/src/main/java/com/mifos/mobile/passcode/MifosPassCodeActivity.java
similarity index 97%
rename from mobile-passcode/src/main/java/com/mifos/mobile/passcode/MifosPassCodeActivity.java
rename to mifos-passcode/src/main/java/com/mifos/mobile/passcode/MifosPassCodeActivity.java
index 2d38089..b1842f3 100644
--- a/mobile-passcode/src/main/java/com/mifos/mobile/passcode/MifosPassCodeActivity.java
+++ b/mifos-passcode/src/main/java/com/mifos/mobile/passcode/MifosPassCodeActivity.java
@@ -111,9 +111,9 @@ public void skip(View v) {
/**
* Saves the passcode by encrypting it which we got from {@link MifosPassCodeView}
+ * @param view Passcode View
*/
-
- public void savePassCode(View v) {
+ public void savePassCode(View view) {
if (isPassCodeLengthCorrect()) {
if (isPassCodeVerified) {
if (strPassCodeEntered.compareTo(mifosPassCodeView.getPasscode()) == 0) {
@@ -138,7 +138,7 @@ public void savePassCode(View v) {
/**
* It is a callback for {@link MifosPassCodeView}, provides with the passcode entered by user
- * @param passcode
+ * @param passcode Passcode that is entered by user.
*/
@Override
public void passCodeEntered(String passcode) {
@@ -232,9 +232,9 @@ public void clickedBackSpace(View v) {
}
/**
- * Changes PasscodeView to text if it was hidden and vice a versa
+ * @param view PasscodeView that changes to text if it was hidden and vice a versa
*/
- public void visibilityChange(View v) {
+ public void visibilityChange(View view) {
mifosPassCodeView.revertPassCodeVisibility();
if (!mifosPassCodeView.passcodeVisible()) {
ivVisibility.setColorFilter(ContextCompat.getColor(MifosPassCodeActivity.this,
diff --git a/mobile-passcode/src/main/java/com/mifos/mobile/passcode/MifosPassCodeView.java b/mifos-passcode/src/main/java/com/mifos/mobile/passcode/MifosPassCodeView.java
similarity index 97%
rename from mobile-passcode/src/main/java/com/mifos/mobile/passcode/MifosPassCodeView.java
rename to mifos-passcode/src/main/java/com/mifos/mobile/passcode/MifosPassCodeView.java
index 7c4d52c..7094b06 100644
--- a/mobile-passcode/src/main/java/com/mifos/mobile/passcode/MifosPassCodeView.java
+++ b/mifos-passcode/src/main/java/com/mifos/mobile/passcode/MifosPassCodeView.java
@@ -73,11 +73,11 @@ protected void onDraw(Canvas canvas) {
if (!isPasscodeVisible) {
canvas.drawCircle(xPosition, getHeight() / 2, 8f, fillCirclePaint);
} else {
- canvas.drawText(passwordList.get(i - 1), xPosition , getHeight() / 2 +
+ canvas.drawText(passwordList.get(i - 1), xPosition, getHeight() / 2 +
getHeight() / 8, fillCirclePaint);
}
} else {
- canvas.drawCircle(xPosition , getHeight() / 2, 8f, emptyCirclePaint);
+ canvas.drawCircle(xPosition, getHeight() / 2, 8f, emptyCirclePaint);
}
xPosition += getWidth() / PASSWORD_LENGTH;
}
diff --git a/mobile-passcode/src/main/java/com/mifos/mobile/passcode/utils/EncryptionUtil.java b/mifos-passcode/src/main/java/com/mifos/mobile/passcode/utils/EncryptionUtil.java
similarity index 100%
rename from mobile-passcode/src/main/java/com/mifos/mobile/passcode/utils/EncryptionUtil.java
rename to mifos-passcode/src/main/java/com/mifos/mobile/passcode/utils/EncryptionUtil.java
diff --git a/mobile-passcode/src/main/java/com/mifos/mobile/passcode/utils/ForegroundChecker.java b/mifos-passcode/src/main/java/com/mifos/mobile/passcode/utils/ForegroundChecker.java
similarity index 100%
rename from mobile-passcode/src/main/java/com/mifos/mobile/passcode/utils/ForegroundChecker.java
rename to mifos-passcode/src/main/java/com/mifos/mobile/passcode/utils/ForegroundChecker.java
diff --git a/mobile-passcode/src/main/java/com/mifos/mobile/passcode/utils/PassCodeConstants.java b/mifos-passcode/src/main/java/com/mifos/mobile/passcode/utils/PassCodeConstants.java
similarity index 100%
rename from mobile-passcode/src/main/java/com/mifos/mobile/passcode/utils/PassCodeConstants.java
rename to mifos-passcode/src/main/java/com/mifos/mobile/passcode/utils/PassCodeConstants.java
diff --git a/mobile-passcode/src/main/java/com/mifos/mobile/passcode/utils/PassCodeNetworkChecker.java b/mifos-passcode/src/main/java/com/mifos/mobile/passcode/utils/PassCodeNetworkChecker.java
similarity index 90%
rename from mobile-passcode/src/main/java/com/mifos/mobile/passcode/utils/PassCodeNetworkChecker.java
rename to mifos-passcode/src/main/java/com/mifos/mobile/passcode/utils/PassCodeNetworkChecker.java
index 10bb2e2..5548828 100644
--- a/mobile-passcode/src/main/java/com/mifos/mobile/passcode/utils/PassCodeNetworkChecker.java
+++ b/mifos-passcode/src/main/java/com/mifos/mobile/passcode/utils/PassCodeNetworkChecker.java
@@ -14,8 +14,8 @@ public class PassCodeNetworkChecker {
/**
* Get the network info
*
- * @param context
- * @return
+ * @param context Context
+ * @return NetworkInfo
*/
public static NetworkInfo getNetworkInfo(Context context) {
ConnectivityManager cm = (ConnectivityManager)
@@ -26,8 +26,8 @@ public static NetworkInfo getNetworkInfo(Context context) {
/**
* Check if there is any connectivity
*
- * @param context
- * @return
+ * @param context Context
+ * @return state of network
*/
public static boolean isConnected(Context context) {
NetworkInfo info = PassCodeNetworkChecker.getNetworkInfo(context);
@@ -37,9 +37,8 @@ public static boolean isConnected(Context context) {
/**
* Check if there is any connectivity to a Wifi network
*
- * @param context
- * @param type
- * @return
+ * @param context Context
+ * @return state if wifi connection
*/
public static boolean isConnectedWifi(Context context) {
NetworkInfo info = PassCodeNetworkChecker.getNetworkInfo(context);
@@ -50,9 +49,8 @@ public static boolean isConnectedWifi(Context context) {
/**
* Check if there is any connectivity to a mobile network
*
- * @param context
- * @param type
- * @return
+ * @param context Context
+ * @return mobile connected to network or not
*/
public static boolean isConnectedMobile(Context context) {
NetworkInfo info = PassCodeNetworkChecker.getNetworkInfo(context);
@@ -63,8 +61,8 @@ public static boolean isConnectedMobile(Context context) {
/**
* Check if there is fast connectivity
*
- * @param context
- * @return
+ * @param context Context
+ * @return connection is fast or not
*/
public static boolean isConnectedFast(Context context) {
NetworkInfo info = PassCodeNetworkChecker.getNetworkInfo(context);
@@ -75,9 +73,9 @@ public static boolean isConnectedFast(Context context) {
/**
* Check if the connection is fast
*
- * @param type
- * @param subType
- * @return
+ * @param type Type of connection
+ * @param subType SubType of Connection
+ * @return connection is fast or not
*/
public static boolean isConnectionFast(int type, int subType) {
if (type == ConnectivityManager.TYPE_WIFI) {
diff --git a/mobile-passcode/src/main/java/com/mifos/mobile/passcode/utils/PasscodePreferencesHelper.java b/mifos-passcode/src/main/java/com/mifos/mobile/passcode/utils/PasscodePreferencesHelper.java
similarity index 100%
rename from mobile-passcode/src/main/java/com/mifos/mobile/passcode/utils/PasscodePreferencesHelper.java
rename to mifos-passcode/src/main/java/com/mifos/mobile/passcode/utils/PasscodePreferencesHelper.java
diff --git a/mobile-passcode/src/main/jniLibs/arm64-v8a/libencryption.so b/mifos-passcode/src/main/jniLibs/arm64-v8a/libencryption.so
similarity index 100%
rename from mobile-passcode/src/main/jniLibs/arm64-v8a/libencryption.so
rename to mifos-passcode/src/main/jniLibs/arm64-v8a/libencryption.so
diff --git a/mobile-passcode/src/main/jniLibs/armeabi-v7a/libencryption.so b/mifos-passcode/src/main/jniLibs/armeabi-v7a/libencryption.so
similarity index 100%
rename from mobile-passcode/src/main/jniLibs/armeabi-v7a/libencryption.so
rename to mifos-passcode/src/main/jniLibs/armeabi-v7a/libencryption.so
diff --git a/mobile-passcode/src/main/jniLibs/armeabi/libencryption.so b/mifos-passcode/src/main/jniLibs/armeabi/libencryption.so
similarity index 100%
rename from mobile-passcode/src/main/jniLibs/armeabi/libencryption.so
rename to mifos-passcode/src/main/jniLibs/armeabi/libencryption.so
diff --git a/mobile-passcode/src/main/jniLibs/mips/libencryption.so b/mifos-passcode/src/main/jniLibs/mips/libencryption.so
similarity index 100%
rename from mobile-passcode/src/main/jniLibs/mips/libencryption.so
rename to mifos-passcode/src/main/jniLibs/mips/libencryption.so
diff --git a/mobile-passcode/src/main/jniLibs/mips64/libencryption.so b/mifos-passcode/src/main/jniLibs/mips64/libencryption.so
similarity index 100%
rename from mobile-passcode/src/main/jniLibs/mips64/libencryption.so
rename to mifos-passcode/src/main/jniLibs/mips64/libencryption.so
diff --git a/mobile-passcode/src/main/jniLibs/x86/libencryption.so b/mifos-passcode/src/main/jniLibs/x86/libencryption.so
similarity index 100%
rename from mobile-passcode/src/main/jniLibs/x86/libencryption.so
rename to mifos-passcode/src/main/jniLibs/x86/libencryption.so
diff --git a/mobile-passcode/src/main/jniLibs/x86_64/libencryption.so b/mifos-passcode/src/main/jniLibs/x86_64/libencryption.so
similarity index 100%
rename from mobile-passcode/src/main/jniLibs/x86_64/libencryption.so
rename to mifos-passcode/src/main/jniLibs/x86_64/libencryption.so
diff --git a/mobile-passcode/src/main/res/drawable/ic_backspace_48px.xml b/mifos-passcode/src/main/res/drawable/ic_backspace_48px.xml
similarity index 100%
rename from mobile-passcode/src/main/res/drawable/ic_backspace_48px.xml
rename to mifos-passcode/src/main/res/drawable/ic_backspace_48px.xml
diff --git a/mobile-passcode/src/main/res/drawable/ic_visibility_48px.xml b/mifos-passcode/src/main/res/drawable/ic_visibility_48px.xml
similarity index 100%
rename from mobile-passcode/src/main/res/drawable/ic_visibility_48px.xml
rename to mifos-passcode/src/main/res/drawable/ic_visibility_48px.xml
diff --git a/mobile-passcode/src/main/res/layout/activity_pass_code.xml b/mifos-passcode/src/main/res/layout/activity_pass_code.xml
similarity index 100%
rename from mobile-passcode/src/main/res/layout/activity_pass_code.xml
rename to mifos-passcode/src/main/res/layout/activity_pass_code.xml
diff --git a/mobile-passcode/src/main/res/values/attr.xml b/mifos-passcode/src/main/res/values/attr.xml
similarity index 100%
rename from mobile-passcode/src/main/res/values/attr.xml
rename to mifos-passcode/src/main/res/values/attr.xml
diff --git a/mobile-passcode/src/main/res/values/colors.xml b/mifos-passcode/src/main/res/values/colors.xml
similarity index 100%
rename from mobile-passcode/src/main/res/values/colors.xml
rename to mifos-passcode/src/main/res/values/colors.xml
diff --git a/mobile-passcode/src/main/res/values/dimens.xml b/mifos-passcode/src/main/res/values/dimens.xml
similarity index 100%
rename from mobile-passcode/src/main/res/values/dimens.xml
rename to mifos-passcode/src/main/res/values/dimens.xml
diff --git a/mobile-passcode/src/main/res/values/strings.xml b/mifos-passcode/src/main/res/values/strings.xml
similarity index 100%
rename from mobile-passcode/src/main/res/values/strings.xml
rename to mifos-passcode/src/main/res/values/strings.xml
diff --git a/mobile-passcode/src/main/res/values/styles.xml b/mifos-passcode/src/main/res/values/styles.xml
similarity index 100%
rename from mobile-passcode/src/main/res/values/styles.xml
rename to mifos-passcode/src/main/res/values/styles.xml
diff --git a/mobile-passcode/src/test/java/com/mifos/passcode/ExampleUnitTest.java b/mifos-passcode/src/test/java/com/mifos/passcode/ExampleUnitTest.java
similarity index 100%
rename from mobile-passcode/src/test/java/com/mifos/passcode/ExampleUnitTest.java
rename to mifos-passcode/src/test/java/com/mifos/passcode/ExampleUnitTest.java
diff --git a/mobile-passcode/build.gradle b/mobile-passcode/build.gradle
deleted file mode 100644
index a40fb1a..0000000
--- a/mobile-passcode/build.gradle
+++ /dev/null
@@ -1,35 +0,0 @@
-apply plugin: 'com.android.library'
-
-android {
- compileSdkVersion 26
-
-
-
- defaultConfig {
- minSdkVersion 15
- targetSdkVersion 26
- versionCode 1
- versionName "1.0"
- vectorDrawables.useSupportLibrary = true
- testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-
- }
-
- buildTypes {
- release {
- minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
- }
- }
-
-}
-
-dependencies {
- implementation fileTree(dir: 'libs', include: ['*.jar'])
-
- implementation "com.android.support:design:26.1.0"
- implementation 'com.android.support:appcompat-v7:26.1.0'
- testImplementation 'junit:junit:4.12'
- androidTestImplementation 'com.android.support.test:runner:1.0.1'
- androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
-}
diff --git a/settings.gradle b/settings.gradle
index 14d0903..c58212b 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':app', ':mobile-passcode'
+include ':app', ':mifos-passcode'