Convert project to library including sample app

jombie · Mar 31, 2015 · f6f1099 · f6f1099
1 parent bd71473
commit f6f1099
Show file tree

Hide file tree

Showing 20 changed files with 162 additions and 53 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/app/app.iml b/app/app.iml
@@ -88,6 +88,7 @@
     <orderEntry type="library" exported="" name="support-v4-22.0.0" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-22.0.0" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-22.0.0" level="project" />
+    <orderEntry type="module" module-name="lib" exported="" />
   </component>
 </module>
 
diff --git a/app/build.gradle b/app/build.gradle
@@ -20,6 +20,6 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'com.android.support:appcompat-v7:22.0.0'
+    compile project(":lib")
 }
diff --git a/app/src/androidTest/java/com/fieldsoftware/floatinglabelvalidator/ApplicationTest.java b/app/src/androidTest/java/com/fieldsoftware/floatinglabelvalidator/ApplicationTest.java
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,13 +1,13 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.fieldsoftware.floatinglabelvalidator">
+    package="com.ivanwooll.floatinglabelvalidatorexample">
 
     <application
         android:allowBackup="true"
         android:label="@string/app_name"
         android:icon="@mipmap/ic_launcher"
         android:theme="@style/AppTheme">
         <activity
-            android:name="com.fieldsoftware.floatinglabelvalidator.MainActivity"
+            android:name="com.ivanwooll.floatinglabelvalidatorexample.MainActivity"
             android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

diff --git a/app/src/main/java/com/fieldsoftware/floatinglabelvalidator/DebugLog.java b/app/src/main/java/com/fieldsoftware/floatinglabelvalidator/DebugLog.java
diff --git a/.../floatinglabelvalidator/MainActivity.java → ...nglabelvalidatorexample/MainActivity.java b/.../floatinglabelvalidator/MainActivity.java → ...nglabelvalidatorexample/MainActivity.java
@@ -1,13 +1,11 @@
-package com.fieldsoftware.floatinglabelvalidator;
+package com.ivanwooll.floatinglabelvalidatorexample;
 
 import android.os.Bundle;
 import android.support.v4.app.FragmentActivity;
 
-
 public class MainActivity extends FragmentActivity {
 
 
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -6,35 +6,35 @@
     tools:context=".MainActivity"
     android:orientation="vertical">
 
-    <com.fieldsoftware.floatinglabelvalidator.FloatingLabelTextView
+    <com.ivanwooll.floatinglabelvalidator.lib.FloatingLabelTextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:hint="alpha"
         app:allowEmpty="false"
         app:validatorType="alpha" />
 
-    <com.fieldsoftware.floatinglabelvalidator.FloatingLabelTextView
+    <com.ivanwooll.floatinglabelvalidator.lib.FloatingLabelTextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:hint="numeric"
         app:allowEmpty="false"
         app:validatorType="numeric" />
 
-    <com.fieldsoftware.floatinglabelvalidator.FloatingLabelTextView
+    <com.ivanwooll.floatinglabelvalidator.lib.FloatingLabelTextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:hint="alpha numeric"
         app:allowEmpty="false"
         app:validatorType="alphaNumeric" />
 
-    <com.fieldsoftware.floatinglabelvalidator.FloatingLabelTextView
+    <com.ivanwooll.floatinglabelvalidator.lib.FloatingLabelTextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:hint="email"
         app:allowEmpty="false"
         app:validatorType="email" />
 
-    <com.fieldsoftware.floatinglabelvalidator.FloatingLabelTextView
+    <com.ivanwooll.floatinglabelvalidator.lib.FloatingLabelTextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:hint="phone number"

diff --git a/lib/.gitignore b/lib/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/lib/build.gradle b/lib/build.gradle
@@ -0,0 +1,23 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion 22
+    buildToolsVersion "21.1.2"
+
+    defaultConfig {
+        minSdkVersion 15
+        targetSdkVersion 22
+        versionCode 1
+        versionName "1.0"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    compile 'com.android.support:appcompat-v7:22.0.0'
+}
diff --git a/lib/lib.iml b/lib/lib.iml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="FloatingLabelValidator" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android-gradle" name="Android-Gradle">
+      <configuration>
+        <option name="GRADLE_PROJECT_PATH" value=":lib" />
+      </configuration>
+    </facet>
+    <facet type="android" name="Android">
+      <configuration>
+        <option name="SELECTED_BUILD_VARIANT" value="debug" />
+        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
+        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
+        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
+        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
+        <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
+        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
+        <option name="ALLOW_USER_CONFIGURATION" value="false" />
+        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
+        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
+        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
+        <option name="LIBRARY_PROJECT" value="true" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
+    </content>
+    <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" exported="" name="support-v4-22.0.0" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-22.0.0" level="project" />
+    <orderEntry type="library" exported="" name="appcompat-v7-22.0.0" level="project" />
+  </component>
+</module>
+
diff --git a/lib/proguard-rules.pro b/lib/proguard-rules.pro
@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /Users/ivanwooll/Library/Android/sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# 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 *;
+#}
diff --git a/lib/src/main/AndroidManifest.xml b/lib/src/main/AndroidManifest.xml
@@ -0,0 +1,8 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.ivanwooll.floatinglabelvalidator.lib">
+
+    <application android:allowBackup="true" android:label="@string/app_name">
+
+    </application>
+
+</manifest>
diff --git a/...labelvalidator/FloatingLabelTextView.java → ...lvalidator/lib/FloatingLabelTextView.java b/...labelvalidator/FloatingLabelTextView.java → ...lvalidator/lib/FloatingLabelTextView.java
@@ -1,4 +1,4 @@
-package com.fieldsoftware.floatinglabelvalidator;
+package com.ivanwooll.floatinglabelvalidator.lib;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -33,10 +33,7 @@ public FloatingLabelTextView(Context context) {
 
     public FloatingLabelTextView(Context context, AttributeSet attrs) {
         super(context, attrs);
-        TypedArray a = context.getTheme().obtainStyledAttributes(
-                attrs,
-                R.styleable.FloatingLabelTextView,
-                0, 0);
+        TypedArray a = context.getTheme().obtainStyledAttributes(attrs,R.styleable.FloatingLabelTextView, 0, 0);
         try {
             validationMessage = a.getString(R.styleable.FloatingLabelTextView_validationMessage);
             hintText = a.getString(R.styleable.FloatingLabelTextView_hint);

diff --git a/...are/floatinglabelvalidator/Validator.java → ...floatinglabelvalidator/lib/Validator.java b/...are/floatinglabelvalidator/Validator.java → ...floatinglabelvalidator/lib/Validator.java
@@ -1,4 +1,4 @@
-package com.fieldsoftware.floatinglabelvalidator;
+package com.ivanwooll.floatinglabelvalidator.lib;
 
 import android.text.TextUtils;
 

diff --git a/...n/res/layout/floating_label_text_view.xml → ...n/res/layout/floating_label_text_view.xml b/...n/res/layout/floating_label_text_view.xml → ...n/res/layout/floating_label_text_view.xml
diff --git a/app/src/main/res/values/attrs.xml → lib/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml → lib/src/main/res/values/attrs.xml
diff --git a/lib/src/main/res/values/strings.xml b/lib/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">Lib</string>
+</resources>
diff --git a/settings.gradle b/settings.gradle
@@ -1 +1 @@
-include ':app'
+include ':app', ':lib'