Rename packages

README.md

@@ -191,7 +191,7 @@ The Pin Dots:
 By supplying alternate drawable resources for app:lp_empty_pin_dot and app:lp_full_pin_dot you can custimize how it looks.
 
 ```
-<com.github.orangegangsters.lollipin.lib.views.PinCodeRoundView
+<com.dewarder.materialpin.views.PinCodeRoundView
                 android:id="@+id/pin_code_round_view"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"

build.gradle

@@ -1,7 +1,17 @@
 buildscript {
+
+    //project config
+    ext {
+        min_sdk_version = 14
+        sdk_version = 26
+        build_tool_version = "26.0.2"
+    }
+
+    //libraries version
     ext {
         support_library_version = "26.0.2"
     }
+
     repositories {
         jcenter()
     }

app/build.gradle → material-pin-example/build.gradle

@@ -1,16 +1,17 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion "25.0.3"
+    compileSdkVersion sdk_version
+    buildToolsVersion build_tool_version
 
     defaultConfig {
-        applicationId "com.github.orangegangsters.lollipin"
-        minSdkVersion 14
-        targetSdkVersion 26
+        applicationId "com.github.lollipin"
+        minSdkVersion min_sdk_version
+        targetSdkVersion sdk_version
         versionCode 1
         versionName "1.0"
     }
+
     buildTypes {
         release {
             minifyEnabled false
@@ -22,7 +23,7 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
 
-    compile project(':lib')
+    compile project(':material-pin')
     compile "com.android.support:appcompat-v7:$support_library_version"
 
     //Lollipop dialogs https://github.com/lewisjdeane/L-Dialogs and buttons, animations etc...

app/src/androidTest/java/lollipin/orangegangsters/github/com/lollipin/functional/AbstractTest.java → material-pin-example/src/androidTest/java/lollipin/orangegangsters/github/com/lollipin/functional/AbstractTest.java

@@ -5,8 +5,8 @@
 import android.test.ActivityInstrumentationTestCase2;
 import android.view.View;
 
-import com.github.orangegangsters.lollipin.MainActivity;
-import com.github.orangegangsters.lollipin.lib.managers.LockManager;
+import com.dewarder.materialpin.MainActivity;
+import com.dewarder.materialpin.managers.LockManager;
 import com.robotium.solo.Solo;
 
 /**

app/src/androidTest/java/lollipin/orangegangsters/github/com/lollipin/functional/PinLockTest.java → material-pin-example/src/androidTest/java/lollipin/orangegangsters/github/com/lollipin/functional/PinLockTest.java

@@ -9,16 +9,15 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.github.orangegangsters.lollipin.CustomPinActivity;
-import com.github.orangegangsters.lollipin.MainActivity;
-import com.github.orangegangsters.lollipin.NotLockedActivity;
-import com.github.orangegangsters.lollipin.lib.encryption.Encryptor;
-import com.github.orangegangsters.lollipin.lib.enums.Algorithm;
-import com.github.orangegangsters.lollipin.lib.managers.AppLock;
-import com.github.orangegangsters.lollipin.lib.managers.AppLockImpl;
-import com.github.orangegangsters.lollipin.lib.managers.FingerprintUiHelper;
-import com.github.orangegangsters.lollipin.lib.managers.LockManager;
-import com.github.orangegangsters.lollipin.lib.views.PinCodeRoundView;
+import com.dewarder.materialpin.CustomPinActivity;
+import com.dewarder.materialpin.MainActivity;
+import com.dewarder.materialpin.NotLockedActivity;
+import com.dewarder.materialpin.encryption.Encryptor;
+import com.dewarder.materialpin.enums.Algorithm;
+import com.dewarder.materialpin.managers.AppLockImpl;
+import com.dewarder.materialpin.managers.FingerprintUiHelper;
+import com.dewarder.materialpin.managers.LockManager;
+import com.dewarder.materialpin.views.PinCodeRoundView;
 
 import lollipin.orangegangsters.github.com.lollipin.R;
 
@@ -59,7 +58,7 @@ public void testPinClearButton() {
 
         //Check length 3
         solo.sleep(1000);
-        PinCodeRoundView pinCodeRoundView = (PinCodeRoundView) solo.getCurrentActivity().findViewById(com.github.orangegangsters.lollipin.lib.R.id.pin_code_round_view);
+        PinCodeRoundView pinCodeRoundView = (PinCodeRoundView) solo.getCurrentActivity().findViewById(com.github.lollipin.lib.R.id.pin_code_round_view);
         assertEquals(3, pinCodeRoundView.getCurrentLength());
 
         //Click clear button
@@ -106,8 +105,8 @@ public void testPinEnablingChecking() throws SecurityException {
 
         //Test fingerprint if available
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            ImageView fingerprintImageView = (ImageView) solo.getView(com.github.orangegangsters.lollipin.lib.R.id.pin_code_fingerprint_imageview);
-            TextView fingerprintTextView = (TextView) solo.getView(com.github.orangegangsters.lollipin.lib.R.id.pin_code_fingerprint_textview);
+            ImageView fingerprintImageView = (ImageView) solo.getView(com.github.lollipin.lib.R.id.pin_code_fingerprint_imageview);
+            TextView fingerprintTextView = (TextView) solo.getView(com.github.lollipin.lib.R.id.pin_code_fingerprint_textview);
             FingerprintManager fingerprintManager = (FingerprintManager) getActivity().getSystemService(Context.FINGERPRINT_SERVICE);
             FingerprintUiHelper fingerprintUiHelper = new FingerprintUiHelper.FingerprintUiHelperBuilder(fingerprintManager).build(fingerprintImageView, fingerprintTextView, (CustomPinActivity) solo.getCurrentActivity());
             if (fingerprintManager.isHardwareDetected() && fingerprintUiHelper.isFingerprintAuthAvailable()) {

app/src/main/AndroidManifest.xml → material-pin-example/src/main/AndroidManifest.xml

@@ -3,13 +3,13 @@
     package="lollipin.orangegangsters.github.com.lollipin" >
 
     <application
-        android:name="com.github.orangegangsters.lollipin.CustomApplication"
+        android:name="com.github.lollipin.CustomApplication"
         android:allowBackup="true"
         android:icon="@drawable/icon"
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
         <activity
-            android:name="com.github.orangegangsters.lollipin.MainActivity"
+            android:name="com.github.lollipin.MainActivity"
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -18,14 +18,14 @@
             </intent-filter>
         </activity>
         <activity
-            android:name="com.github.orangegangsters.lollipin.NotLockedActivity"
+            android:name="com.github.lollipin.NotLockedActivity"
             android:label="@string/app_name" >
         </activity>
         <activity
-            android:name="com.github.orangegangsters.lollipin.CustomPinActivity"
+            android:name="com.github.lollipin.CustomPinActivity"
             android:label="@string/app_name" >
         </activity>
-        <activity android:name="com.github.orangegangsters.lollipin.LockedCompatActivity"
+        <activity android:name="com.github.lollipin.LockedCompatActivity"
             android:label="@string/app_name"
             android:theme="@style/AppThemeNoActionbar">
         </activity>

app/src/main/java/com/github/orangegangsters/lollipin/CustomApplication.java → material-pin-example/src/main/java/com/dewarder/materialpin/CustomApplication.java

@@ -1,8 +1,8 @@
-package com.github.orangegangsters.lollipin;
+package com.dewarder.materialpin;
 
 import android.app.Application;
 
-import com.github.orangegangsters.lollipin.lib.managers.LockManager;
+import com.dewarder.materialpin.managers.LockManager;
 
 import lollipin.orangegangsters.github.com.lollipin.R;
 

app/src/main/java/com/github/orangegangsters/lollipin/CustomPinActivity.java → material-pin-example/src/main/java/com/dewarder/materialpin/CustomPinActivity.java

@@ -1,12 +1,12 @@
-package com.github.orangegangsters.lollipin;
+package com.dewarder.materialpin;
 
 import android.content.res.Resources;
 import android.graphics.Color;
 import android.graphics.Typeface;
 import android.graphics.drawable.ColorDrawable;
 import android.widget.Toast;
 
-import com.github.orangegangsters.lollipin.lib.managers.AppLockActivity;
+import com.dewarder.materialpin.managers.AppLockActivity;
 
 import lollipin.orangegangsters.github.com.lollipin.R;
 import uk.me.lewisdeane.ldialogs.BaseDialog;

app/src/main/java/com/github/orangegangsters/lollipin/LockedCompatActivity.java → material-pin-example/src/main/java/com/dewarder/materialpin/LockedCompatActivity.java

@@ -1,8 +1,8 @@
-package com.github.orangegangsters.lollipin;
+package com.dewarder.materialpin;
 
 import android.os.Bundle;
 import android.support.v7.widget.Toolbar;
-import com.github.orangegangsters.lollipin.lib.PinCompatActivity;
+import com.dewarder.materialpin.PinCompatActivity;
 import lollipin.orangegangsters.github.com.lollipin.R;
 
 /**

app/src/main/java/com/github/orangegangsters/lollipin/MainActivity.java → material-pin-example/src/main/java/com/dewarder/materialpin/MainActivity.java

@@ -1,13 +1,12 @@
-package com.github.orangegangsters.lollipin;
+package com.dewarder.materialpin;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.*;
 import android.view.View;
 import android.widget.Toast;
 
-import com.github.orangegangsters.lollipin.lib.PinActivity;
-import com.github.orangegangsters.lollipin.lib.managers.AppLock;
+import com.dewarder.materialpin.PinActivity;
+import com.dewarder.materialpin.managers.AppLock;
 
 import lollipin.orangegangsters.github.com.lollipin.R;
 

app/src/main/java/com/github/orangegangsters/lollipin/NotLockedActivity.java → material-pin-example/src/main/java/com/dewarder/materialpin/NotLockedActivity.java

@@ -1,4 +1,4 @@
-package com.github.orangegangsters.lollipin;
+package com.dewarder.materialpin;
 
 import android.app.Activity;
 import android.os.Bundle;

realm-storage/build.gradle → material-pin-realm/build.gradle

@@ -2,12 +2,12 @@ apply plugin: 'com.android.library'
 apply plugin: 'realm-android'
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion "26.0.1"
+    compileSdkVersion sdk_version
+    buildToolsVersion build_tool_version
 
     defaultConfig {
-        minSdkVersion 14
-        targetSdkVersion 26
+        minSdkVersion min_sdk_version
+        targetSdkVersion sdk_version
         versionCode 1
         versionName "1.0"
     }
@@ -22,5 +22,5 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile project(":lib")
+    compile project(':material-pin')
 }

realm-storage/src/main/java/com/dewarder/realmstorage/PasscodeData.java → material-pin-realm/src/main/java/com/dewarder/materialpin/realm/PasscodeData.java

@@ -1,4 +1,4 @@
-package com.dewarder.realmstorage;
+package com.dewarder.materialpin.realm;
 
 import io.realm.RealmObject;
 import io.realm.annotations.PrimaryKey;

realm-storage/src/main/java/com/dewarder/realmstorage/PasscodeDataModule.java → material-pin-realm/src/main/java/com/dewarder/materialpin/realm/PasscodeDataModule.java

@@ -1,4 +1,4 @@
-package com.dewarder.realmstorage;
+package com.dewarder.materialpin.realm;
 
 import io.realm.annotations.RealmModule;
 

realm-storage/src/main/java/com/dewarder/realmstorage/RealmEncryptionKeyManager.java → material-pin-realm/src/main/java/com/dewarder/materialpin/realm/RealmEncryptionKeyManager.java

@@ -1,4 +1,4 @@
-package com.dewarder.realmstorage;
+package com.dewarder.materialpin.realm;
 
 import android.content.Context;
 import android.content.SharedPreferences;

realm-storage/src/main/java/com/dewarder/realmstorage/RealmEncryptionKeyProvider.java → material-pin-realm/src/main/java/com/dewarder/materialpin/realm/RealmEncryptionKeyProvider.java

@@ -1,4 +1,4 @@
-package com.dewarder.realmstorage;
+package com.dewarder.materialpin.realm;
 
 public interface RealmEncryptionKeyProvider {
 

realm-storage/src/main/java/com/dewarder/realmstorage/RealmPasscodeDataStorage.java → material-pin-realm/src/main/java/com/dewarder/materialpin/realm/RealmPasscodeDataStorage.java

@@ -1,11 +1,11 @@
-package com.dewarder.realmstorage;
+package com.dewarder.materialpin.realm;
 
 import android.content.Context;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
-import com.github.orangegangsters.lollipin.lib.enums.Algorithm;
-import com.github.orangegangsters.lollipin.lib.interfaces.PasscodeDataStorage;
+import com.dewarder.materialpin.enums.Algorithm;
+import com.dewarder.materialpin.interfaces.PasscodeDataStorage;
 
 import io.realm.Realm;
 import io.realm.RealmConfiguration;

lib/build.gradle → material-pin/build.gradle

@@ -1,14 +1,14 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion "25.0.3"
+    compileSdkVersion sdk_version
+    buildToolsVersion build_tool_version
 
     defaultConfig {
-        minSdkVersion 14
-        targetSdkVersion 26
+        minSdkVersion min_sdk_version
+        targetSdkVersion sdk_version
         versionCode 2
-        versionName VERSION_NAME
+        versionName "1.0"
     }
     buildTypes {
         release {
@@ -20,16 +20,11 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    //RippleView
-    compile 'com.github.traex.rippleeffect:ripple:1.3.1-OG'
-    //TypefaceView
-    compile 'com.github.omadahealth.typefaceview:typefaceview:1.5.0@aar' //TypefaceTextView
-
     //Compat
     compile "com.android.support:support-v4:$support_library_version"
     compile "com.android.support:appcompat-v7:$support_library_version"
     compile "com.android.support:support-v13:$support_library_version"
-}
 
-//gradle clean build uploadArchives
-apply from: 'https://raw.github.com/omadahealth/omada-nexus/master/gradle-mvn-push/gradle-mvn-push.gradle'
+    //RippleView
+    compile 'com.github.traex.rippleeffect:ripple:1.3.1-OG'
+}

lib/src/androidTest/java/com/github/orangegangsters/lollipin/lib/ApplicationTest.java → material-pin/src/androidTest/java/com/github/lollipin/lib/ApplicationTest.java

@@ -1,4 +1,4 @@
-package com.github.orangegangsters.lollipin.lib;
+package com.github.lollipin.lib;
 
 import android.app.Application;
 import android.test.ApplicationTestCase;

lib/src/main/AndroidManifest.xml → material-pin/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.github.orangegangsters.lollipin.lib">
+    package="com.github.lollipin.lib">
 
     <uses-permission android:name="android.permission.USE_FINGERPRINT" />
 

lib/src/main/java/com/github/orangegangsters/lollipin/lib/PinActivity.java → material-pin/src/main/java/com/dewarder/materialpin/PinActivity.java

@@ -1,4 +1,4 @@
-package com.github.orangegangsters.lollipin.lib;
+package com.dewarder.materialpin;
 
 
 import android.app.Activity;
@@ -9,14 +9,14 @@
 import android.os.Bundle;
 import android.support.v4.content.LocalBroadcastManager;
 
-import com.github.orangegangsters.lollipin.lib.interfaces.LifeCycleInterface;
-import com.github.orangegangsters.lollipin.lib.managers.AppLockActivity;
+import com.dewarder.materialpin.interfaces.LifeCycleInterface;
+import com.dewarder.materialpin.managers.AppLockActivity;
 
 /**
  * Created by stoyan and olivier on 1/12/15.
  * You must extend this Activity in order to support this library.
  * Then to enable PinCode blocking, you must call
- * {@link com.github.orangegangsters.lollipin.lib.managers.LockManager#enableAppLock(android.content.Context, Class)}
+ * {@link com.dewarder.materialpin.managers.LockManager#enableAppLock(android.content.Context, Class)}
  */
 public class PinActivity extends Activity {
     private static LifeCycleInterface mLifeCycleListener;

lib/src/main/java/com/github/orangegangsters/lollipin/lib/PinCompatActivity.java → material-pin/src/main/java/com/dewarder/materialpin/PinCompatActivity.java

@@ -1,4 +1,4 @@
-package com.github.orangegangsters.lollipin.lib;
+package com.dewarder.materialpin;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -8,14 +8,14 @@
 import android.support.v4.content.LocalBroadcastManager;
 import android.support.v7.app.AppCompatActivity;
 
-import com.github.orangegangsters.lollipin.lib.interfaces.LifeCycleInterface;
-import com.github.orangegangsters.lollipin.lib.managers.AppLockActivity;
+import com.dewarder.materialpin.interfaces.LifeCycleInterface;
+import com.dewarder.materialpin.managers.AppLockActivity;
 
 /**
  * Created by callmepeanut on 16-1-14.
  * You must extend this Activity in order to support this library.
  * Then to enable PinCode blocking, you must call
- * {@link com.github.orangegangsters.lollipin.lib.managers.LockManager#enableAppLock(android.content.Context, Class)}
+ * {@link com.dewarder.materialpin.managers.LockManager#enableAppLock(android.content.Context, Class)}
  */
 public class PinCompatActivity extends AppCompatActivity {
     private static LifeCycleInterface mLifeCycleListener;