Updating the text view to be an Android Library Module

elliott.chenger · elliott.chenger · commit fd0af613b11c · 2015-05-07T15:43:26.000-05:00
diff --git a/SizeAdjustingTextViewAndroidStudios/app/build.gradle b/SizeAdjustingTextViewAndroidStudios/app/build.gradle
@@ -1,24 +1,25 @@
-apply plugin: 'android'
+apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 19
-    buildToolsVersion "19.1.0"
+    compileSdkVersion 22
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
-        minSdkVersion 9
-        targetSdkVersion 19
+        minSdkVersion 14
+        targetSdkVersion 22
         versionCode 1
         versionName "1.0"
     }
     buildTypes {
         release {
-            runProguard false
+            minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
     }
 }
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:19.+'
+    compile 'com.android.support:appcompat-v7:21.+'
+    compile project(':sizeadjustingtextview')
 }
diff --git a/SizeAdjustingTextViewAndroidStudios/app/src/main/java/com/elliott/chenger/autosizingtextexampleproject/app/MainActivity.java b/SizeAdjustingTextViewAndroidStudios/app/src/main/java/com/elliott/chenger/autosizingtextexampleproject/app/MainActivity.java
@@ -11,7 +11,7 @@
 import android.widget.TextView.OnEditorActionListener;
 
 import com.elliott.chenger.autosizingtextexampleproject.utils.TextMover;
-import com.elliott.chenger.autosizingtextexampleproject.view.SizeAdjustingTextView;
+import com.omitneedlesscode.sizeadjustingtextview.SizeAdjustingTextView;
 
 public class MainActivity extends Activity {
 
diff --git a/SizeAdjustingTextViewAndroidStudios/app/src/main/java/com/elliott/chenger/autosizingtextexampleproject/utils/TextMover.java b/SizeAdjustingTextViewAndroidStudios/app/src/main/java/com/elliott/chenger/autosizingtextexampleproject/utils/TextMover.java
@@ -1,6 +1,6 @@
 package com.elliott.chenger.autosizingtextexampleproject.utils;
 
-import com.elliott.chenger.autosizingtextexampleproject.view.SizeAdjustingTextView;
+import com.omitneedlesscode.sizeadjustingtextview.SizeAdjustingTextView;
 
 /**
  * Created by chenger on 5/26/14.
diff --git a/SizeAdjustingTextViewAndroidStudios/app/src/main/res/layout/activity_main.xml b/SizeAdjustingTextViewAndroidStudios/app/src/main/res/layout/activity_main.xml
@@ -17,7 +17,7 @@
         android:inputType="textCapSentences" />
 
     <!-- Top Row -->
-    <com.elliott.chenger.autosizingtextexampleproject.view.SizeAdjustingTextView
+    <com.omitneedlesscode.sizeadjustingtextview.SizeAdjustingTextView
         android:id="@+id/topBox"
         android:layout_width="fill_parent"
         android:layout_height="100dp"
@@ -35,7 +35,7 @@
         android:orientation="horizontal"
         android:layout_below="@id/topBox" >
 
-        <com.elliott.chenger.autosizingtextexampleproject.view.SizeAdjustingTextView
+        <com.omitneedlesscode.sizeadjustingtextview.SizeAdjustingTextView
             android:id="@+id/middleLeftBox"
             android:layout_width="0dp"
             android:layout_height="fill_parent"
@@ -44,7 +44,7 @@
             android:padding="0dp"
             android:textSize="60sp" />
 
-        <com.elliott.chenger.autosizingtextexampleproject.view.SizeAdjustingTextView
+        <com.omitneedlesscode.sizeadjustingtextview.SizeAdjustingTextView
             android:id="@+id/middleRightBox"
             android:layout_width="0dp"
             android:layout_height="fill_parent"
@@ -61,7 +61,7 @@
         android:layout_height="100dp"
         android:layout_below="@id/middleRow" >
 
-        <com.elliott.chenger.autosizingtextexampleproject.view.SizeAdjustingTextView
+        <com.omitneedlesscode.sizeadjustingtextview.SizeAdjustingTextView
             android:id="@+id/bottomLeftBox"
             android:layout_width="0dp"
             android:layout_height="fill_parent"
@@ -70,7 +70,7 @@
             android:padding="0dp"
             android:textSize="60sp" />
 
-        <com.elliott.chenger.autosizingtextexampleproject.view.SizeAdjustingTextView
+        <com.omitneedlesscode.sizeadjustingtextview.SizeAdjustingTextView
             android:id="@+id/bottomMiddleBox"
             android:layout_width="0dp"
             android:layout_height="fill_parent"
@@ -79,7 +79,7 @@
             android:padding="0dp"
             android:textSize="60sp" />
 
-        <com.elliott.chenger.autosizingtextexampleproject.view.SizeAdjustingTextView
+        <com.omitneedlesscode.sizeadjustingtextview.SizeAdjustingTextView
             android:id="@+id/bottomRightBox"
             android:layout_width="0dp"
             android:layout_height="fill_parent"
diff --git a/SizeAdjustingTextViewAndroidStudios/build.gradle b/SizeAdjustingTextViewAndroidStudios/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.9.+'
+        classpath 'com.android.tools.build:gradle:1.1.0'
     }
 }
 
diff --git a/SizeAdjustingTextViewAndroidStudios/gradle/wrapper/gradle-wrapper.properties b/SizeAdjustingTextViewAndroidStudios/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-all.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-2.2.1-all.zip
diff --git a/SizeAdjustingTextViewAndroidStudios/settings.gradle b/SizeAdjustingTextViewAndroidStudios/settings.gradle
@@ -1 +1 @@
-include ':app'
+include ':app', ':sizeadjustingtextview'
diff --git a/SizeAdjustingTextViewAndroidStudios/sizeadjustingtextview/.gitignore b/SizeAdjustingTextViewAndroidStudios/sizeadjustingtextview/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/SizeAdjustingTextViewAndroidStudios/sizeadjustingtextview/build.gradle b/SizeAdjustingTextViewAndroidStudios/sizeadjustingtextview/build.gradle
@@ -0,0 +1,24 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion 22
+    buildToolsVersion "21.1.2"
+
+    defaultConfig {
+        minSdkVersion 14
+        targetSdkVersion 22
+        versionCode 2
+        versionName "1.1"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile 'com.android.support:appcompat-v7:22.1.1'
+}
diff --git a/SizeAdjustingTextViewAndroidStudios/sizeadjustingtextview/proguard-rules.pro b/SizeAdjustingTextViewAndroidStudios/sizeadjustingtextview/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/elliot.chenger/Development/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/SizeAdjustingTextViewAndroidStudios/sizeadjustingtextview/src/androidTest/java/com/omitneedlesscode/sizeadjustingtextview/ApplicationTest.java b/SizeAdjustingTextViewAndroidStudios/sizeadjustingtextview/src/androidTest/java/com/omitneedlesscode/sizeadjustingtextview/ApplicationTest.java
@@ -0,0 +1,13 @@
+package com.omitneedlesscode.sizeadjustingtextview;
+
+import android.app.Application;
+import android.test.ApplicationTestCase;
+
+/**
+ * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
+ */
+public class ApplicationTest extends ApplicationTestCase<Application> {
+    public ApplicationTest() {
+        super(Application.class);
+    }
+}
diff --git a/SizeAdjustingTextViewAndroidStudios/sizeadjustingtextview/src/main/AndroidManifest.xml b/SizeAdjustingTextViewAndroidStudios/sizeadjustingtextview/src/main/AndroidManifest.xml
@@ -0,0 +1,8 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.omitneedlesscode.sizeadjustingtextview">
+
+    <application android:allowBackup="true" android:label="@string/app_name">
+
+    </application>
+
+</manifest>
diff --git a/SizeAdjustingTextViewAndroidStudios/sizeadjustingtextview/src/main/java/com/omitneedlesscode/sizeadjustingtextview/SizeAdjustingTextView.java b/SizeAdjustingTextViewAndroidStudios/sizeadjustingtextview/src/main/java/com/omitneedlesscode/sizeadjustingtextview/SizeAdjustingTextView.java
@@ -1,4 +1,4 @@
-package com.elliott.chenger.autosizingtextexampleproject.view;
+package com.omitneedlesscode.sizeadjustingtextview;
 import android.content.Context;
 import android.text.Layout.Alignment;
 import android.text.StaticLayout;
diff --git a/SizeAdjustingTextViewAndroidStudios/sizeadjustingtextview/src/main/res/values/strings.xml b/SizeAdjustingTextViewAndroidStudios/sizeadjustingtextview/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">Size Adjusting Text View</string>
+</resources>

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ buildscript {`
`5`	`5`	`mavenCentral()`
`6`	`6`	`}`
`7`	`7`	`dependencies {`
`8`		`- classpath 'com.android.tools.build:gradle:0.9.+'`
	`8`	`+ classpath 'com.android.tools.build:gradle:1.1.0'`
`9`	`9`	`}`
`10`	`10`	`}`
`11`	`11`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-include ':app'`
	`1`	`+include ':app', ':sizeadjustingtextview'`