From b11788e67cf7c1b0666ff022ba514968b2a0b7ba Mon Sep 17 00:00:00 2001
From: virtualprodigyllc <virtualprodigyllc@gmail.com>
Date: Tue, 28 Jun 2016 22:17:44 -0400
Subject: [PATCH 1/4] - Remove unwed junk in manifest Still trying to fix the
 xmlns issue

---
 BetterTextViewSample/.idea/misc.xml                          | 3 ---
 .../app/src/main/res/layout/activity_main.xml                | 5 +++--
 .../bettertextview/src/main/AndroidManifest.xml              | 5 +----
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/BetterTextViewSample/.idea/misc.xml b/BetterTextViewSample/.idea/misc.xml
index 4716600..13c2835 100644
--- a/BetterTextViewSample/.idea/misc.xml
+++ b/BetterTextViewSample/.idea/misc.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
   <component name="NullableNotNullManager">
     <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
diff --git a/BetterTextViewSample/app/src/main/res/layout/activity_main.xml b/BetterTextViewSample/app/src/main/res/layout/activity_main.xml
index a120dd9..4a8ff2d 100644
--- a/BetterTextViewSample/app/src/main/res/layout/activity_main.xml
+++ b/BetterTextViewSample/app/src/main/res/layout/activity_main.xml
@@ -2,6 +2,7 @@
 <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:bettertv="http://schemas.android.com/apk/res-auto"
     android:id="@+id/activity_main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -11,8 +12,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="Hello World!"
-        app:typefaceAsset="dancing _script.ttf"
-        app:scaleWithinBounds="false"
+        bettertv:typefaceAsset="dancing _script.ttf"
+        bettertv:scaleWithinBounds="false"
         app:layout_constraintBottom_toBottomOf="@+id/activity_main"
         app:layout_constraintLeft_toLeftOf="@+id/activity_main"
         app:layout_constraintRight_toRightOf="@+id/activity_main"
diff --git a/BetterTextViewSample/bettertextview/src/main/AndroidManifest.xml b/BetterTextViewSample/bettertextview/src/main/AndroidManifest.xml
index 4cb9152..816ff8c 100644
--- a/BetterTextViewSample/bettertextview/src/main/AndroidManifest.xml
+++ b/BetterTextViewSample/bettertextview/src/main/AndroidManifest.xml
@@ -1,9 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.virtualprodigy.bettertextview">
 
-    <application android:allowBackup="true" android:label="@string/app_name"
-        android:supportsRtl="true">
-
-    </application>
+    <application/>
 
 </manifest>

From 85a42bef380c874cbb440e38ab48373b4c69d740 Mon Sep 17 00:00:00 2001
From: virtualprodigyllc <virtualprodigyllc@gmail.com>
Date: Wed, 29 Jun 2016 02:23:04 -0400
Subject: [PATCH 2/4] - Fixed the bug with the xmlns. Android studio didn't
 automatically add the "compile project(':bettertextview') so the mapping to
 my library was never created - moved my font resources to the correct folder.
 -  Tested the library. It works like a charm

---
 BetterTextViewSample/.idea/misc.xml                 |   3 +++
 BetterTextViewSample/app/build.gradle               |   3 ++-
 .../src/main/assets/fonts/dancing_script.ttf}       | Bin
 .../main/assets/fonts/dancing_script_license.html   |   0
 .../src/main/assets/fonts/ofl.txt                   |   0
 .../bettertextviewsample/MainActivity.java          |   6 +++++-
 .../app/src/main/res/layout/activity_main.xml       |   3 ++-
 BetterTextViewSample/bettertextview/build.gradle    |   2 +-
 .../bettertextview/BetterTextView.java              |   5 +++--
 9 files changed, 16 insertions(+), 6 deletions(-)
 rename BetterTextViewSample/{bettertextview/src/main/assets/fonts/dancing _script.ttf => app/src/main/assets/fonts/dancing_script.ttf} (100%)
 rename BetterTextViewSample/{bettertextview => app}/src/main/assets/fonts/dancing_script_license.html (100%)
 rename BetterTextViewSample/{bettertextview => app}/src/main/assets/fonts/ofl.txt (100%)

diff --git a/BetterTextViewSample/.idea/misc.xml b/BetterTextViewSample/.idea/misc.xml
index 13c2835..4716600 100644
--- a/BetterTextViewSample/.idea/misc.xml
+++ b/BetterTextViewSample/.idea/misc.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="EntryPointsManager">
+    <entry_points version="2.0" />
+  </component>
   <component name="NullableNotNullManager">
     <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
diff --git a/BetterTextViewSample/app/build.gradle b/BetterTextViewSample/app/build.gradle
index 3b0d24a..749bd33 100644
--- a/BetterTextViewSample/app/build.gradle
+++ b/BetterTextViewSample/app/build.gradle
@@ -20,11 +20,12 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile fileTree(include: ['*.jar'], dir: 'libs')
     compile 'com.android.support:appcompat-v7:23.4.0'
     compile 'com.android.support.constraint:constraint-layout:1.0.0-alpha2'
     testCompile 'junit:junit:4.12'
     androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
     androidTestCompile 'com.android.support.test:runner:0.5'
     androidTestCompile 'com.android.support:support-annotations:23.4.0'
+    compile project(':bettertextview')
 }
diff --git a/BetterTextViewSample/bettertextview/src/main/assets/fonts/dancing _script.ttf b/BetterTextViewSample/app/src/main/assets/fonts/dancing_script.ttf
similarity index 100%
rename from BetterTextViewSample/bettertextview/src/main/assets/fonts/dancing _script.ttf
rename to BetterTextViewSample/app/src/main/assets/fonts/dancing_script.ttf
diff --git a/BetterTextViewSample/bettertextview/src/main/assets/fonts/dancing_script_license.html b/BetterTextViewSample/app/src/main/assets/fonts/dancing_script_license.html
similarity index 100%
rename from BetterTextViewSample/bettertextview/src/main/assets/fonts/dancing_script_license.html
rename to BetterTextViewSample/app/src/main/assets/fonts/dancing_script_license.html
diff --git a/BetterTextViewSample/bettertextview/src/main/assets/fonts/ofl.txt b/BetterTextViewSample/app/src/main/assets/fonts/ofl.txt
similarity index 100%
rename from BetterTextViewSample/bettertextview/src/main/assets/fonts/ofl.txt
rename to BetterTextViewSample/app/src/main/assets/fonts/ofl.txt
diff --git a/BetterTextViewSample/app/src/main/java/com/virtualprodigy/bettertextviewsample/MainActivity.java b/BetterTextViewSample/app/src/main/java/com/virtualprodigy/bettertextviewsample/MainActivity.java
index 07fc35e..f88cf2c 100644
--- a/BetterTextViewSample/app/src/main/java/com/virtualprodigy/bettertextviewsample/MainActivity.java
+++ b/BetterTextViewSample/app/src/main/java/com/virtualprodigy/bettertextviewsample/MainActivity.java
@@ -1,13 +1,17 @@
 package com.virtualprodigy.bettertextviewsample;
 
+import android.content.Context;
+import android.graphics.Typeface;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.widget.TextView;
 
 public class MainActivity extends AppCompatActivity {
-
+    TextView helloWorld;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
+
     }
 }
diff --git a/BetterTextViewSample/app/src/main/res/layout/activity_main.xml b/BetterTextViewSample/app/src/main/res/layout/activity_main.xml
index 4a8ff2d..4a81459 100644
--- a/BetterTextViewSample/app/src/main/res/layout/activity_main.xml
+++ b/BetterTextViewSample/app/src/main/res/layout/activity_main.xml
@@ -9,10 +9,11 @@
     tools:context="com.virtualprodigy.bettertextviewsample.MainActivity">
 
     <com.virtualprodigy.bettertextview.BetterTextView
+        android:id="@+id/helloWorld"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="Hello World!"
-        bettertv:typefaceAsset="dancing _script.ttf"
+        bettertv:typefaceAsset="dancing_script.ttf"
         bettertv:scaleWithinBounds="false"
         app:layout_constraintBottom_toBottomOf="@+id/activity_main"
         app:layout_constraintLeft_toLeftOf="@+id/activity_main"
diff --git a/BetterTextViewSample/bettertextview/build.gradle b/BetterTextViewSample/bettertextview/build.gradle
index de1cede..5796085 100644
--- a/BetterTextViewSample/bettertextview/build.gradle
+++ b/BetterTextViewSample/bettertextview/build.gradle
@@ -21,7 +21,7 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile fileTree(include: ['*.jar'], dir: 'libs')
     compile 'com.android.support:appcompat-v7:23.4.0'
     testCompile 'junit:junit:4.12'
     androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
diff --git a/BetterTextViewSample/bettertextview/src/main/java/com/virtualprodigy/bettertextview/BetterTextView.java b/BetterTextViewSample/bettertextview/src/main/java/com/virtualprodigy/bettertextview/BetterTextView.java
index 6939edd..d96cf32 100644
--- a/BetterTextViewSample/bettertextview/src/main/java/com/virtualprodigy/bettertextview/BetterTextView.java
+++ b/BetterTextViewSample/bettertextview/src/main/java/com/virtualprodigy/bettertextview/BetterTextView.java
@@ -14,6 +14,7 @@ public class BetterTextView extends TextView {
     private boolean scaleWithinBounds;
     private String typefaceAsset;
     private Context context;
+    private final String FONT_DIRECTORY = "fonts/";
 
     public BetterTextView(Context context) {
         super(context);
@@ -45,7 +46,7 @@ private void init(Context context, AttributeSet attrs) {
 
         try {
             scaleWithinBounds = typedArray.getBoolean(R.styleable.betterTextViewAttrs_typefaceAsset, false);
-            typefaceAsset = typedArray.getString(R.styleable.betterTextViewAttrs_typefaceAsset);
+            typefaceAsset = FONT_DIRECTORY + typedArray.getString(R.styleable.betterTextViewAttrs_typefaceAsset);
         } finally {
             typedArray.recycle();
         }
@@ -69,7 +70,7 @@ public void setScaleWithinBounds(boolean scaleWithinBounds) {
      * @param typefaceAsset - Name of the TTF file
      */
     public void setTypefaceAsset(String typefaceAsset) {
-        this.typefaceAsset = typefaceAsset;
+        this.typefaceAsset = FONT_DIRECTORY + typefaceAsset;
         setTypeface();
     }
 

From 6daac349cd163be33e9f77b831c8a84e90ec06ea Mon Sep 17 00:00:00 2001
From: virtualprodigyllc <virtualprodigyllc@gmail.com>
Date: Wed, 29 Jun 2016 02:38:46 -0400
Subject: [PATCH 3/4] - Added a web view to display the license for the dancing
 font used in the tutorial

---
 .../bettertextviewsample/MainActivity.java    | 48 ++++++++++++++++++-
 .../app/src/main/res/menu/menu.xml            | 11 +++++
 2 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 BetterTextViewSample/app/src/main/res/menu/menu.xml

diff --git a/BetterTextViewSample/app/src/main/java/com/virtualprodigy/bettertextviewsample/MainActivity.java b/BetterTextViewSample/app/src/main/java/com/virtualprodigy/bettertextviewsample/MainActivity.java
index f88cf2c..22dc57c 100644
--- a/BetterTextViewSample/app/src/main/java/com/virtualprodigy/bettertextviewsample/MainActivity.java
+++ b/BetterTextViewSample/app/src/main/java/com/virtualprodigy/bettertextviewsample/MainActivity.java
@@ -2,16 +2,62 @@
 
 import android.content.Context;
 import android.graphics.Typeface;
+import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.webkit.WebView;
 import android.widget.TextView;
 
 public class MainActivity extends AppCompatActivity {
-    TextView helloWorld;
+    Context context;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
+        context = this;
+
+    }
+
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        MenuInflater inflater = getMenuInflater();
+        inflater.inflate(R.menu.menu, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        // Handle item selection
+        switch (item.getItemId()) {
+            case R.id.font_license:
+                displayChangeLog();
+                return true;
+
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
+
+    /**
+     * Display the webview with the license for the Dancing font
+     */
+    private void displayChangeLog() {
+
+        WebView webview = new WebView(context);
+        webview.loadUrl("file:///android_asset/fonts/dancing_script_license.html");
+
+        AlertDialog dialog = new AlertDialog.Builder(context)
+                .setTitle("Dancing Script License")
+                .setView(webview)
+                .setPositiveButton("ok",null)
+                .create();
+        dialog.show();
 
     }
 }
diff --git a/BetterTextViewSample/app/src/main/res/menu/menu.xml b/BetterTextViewSample/app/src/main/res/menu/menu.xml
new file mode 100644
index 0000000..24d4e16
--- /dev/null
+++ b/BetterTextViewSample/app/src/main/res/menu/menu.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/font_license"
+        app:showAsAction="never"
+        android:title="font license" />
+
+
+</menu>
\ No newline at end of file

From a23ffa8fc2f4f0db0bab12a75cef5a08cccfd0d9 Mon Sep 17 00:00:00 2001
From: virtualprodigyllc <virtualprodigyllc@gmail.com>
Date: Wed, 29 Jun 2016 02:50:00 -0400
Subject: [PATCH 4/4] Updated the project Readmd.md

---
 README.md | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 63d2485..0e37d44 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,33 @@
 # BetterTextView
-A Custom Android TextView With some upgrades
+A custom Android TextView with some upgrades. 
+
+#Description
+This small library is a slightly upgraded version of Android's standard TextView. It currently features the ability
+to set the Type Face via XML. 
+
+
+
+#Feature Features
+### 1. Automatically sizing the font to fit within a TextView's bound.
+### 2. Maven distribution
+
+
+#Change Log
+###Version 1.0
+  1. Users can add their typeface view xml
+  
+  
+#License
+ Copyright 2016 Matthew Butler
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+limitations under the License.
\ No newline at end of file