Added PlusProgressDialog - Better Performance - Fixed Bugs

PHELAT · PHELAT · commit 2dcf871482f5 · 2017-04-05T23:08:28.000+04:30
diff --git a/README.md b/README.md
@@ -9,15 +9,15 @@ Just a simple library for Android that provides setting custom font on Textview
 ```groovy
 dependencies {
     ...
-    compile 'phelat.textview:textviewplus:1.2.2'
+    compile 'phelat.textview:textviewplus:1.4.0'
 }
 ```
 ### Maven
 ```xml
 <dependency>
   <groupId>phelat.textview</groupId>
   <artifactId>textviewplus</artifactId>
-  <version>1.2.2</version>
+  <version>1.4.0</version>
   <type>pom</type>
 </dependency>
 ```
diff --git a/app/src/main/java/phelat/TextView/Sample/MainActivity.java b/app/src/main/java/phelat/TextView/Sample/MainActivity.java
@@ -2,8 +2,11 @@
 
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
+import android.view.View;
 
-import phelat.TextView.Plus;
+import phelat.widget.PlusButton;
+import phelat.widget.PlusProgressDialog;
+import phelat.widget.PlusTextView;
 
 /**
  *
@@ -18,9 +21,21 @@ public class MainActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.main);
 
-        Plus myTextView = (Plus) findViewById(R.id.myTextView);
+        PlusTextView myTextView = (PlusTextView) findViewById(R.id.myTextView);
         myTextView.setFont("Roboto-LightItalic.ttf");
 
+        PlusButton progressButton = (PlusButton) findViewById(R.id.progressButton);
+        progressButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                PlusProgressDialog plusProgressDialog = new PlusProgressDialog(MainActivity.this);
+                plusProgressDialog.setProgressMessage("Please Wait...");
+                plusProgressDialog.setFont("Roboto-LightItalic.ttf");
+                plusProgressDialog.setCancelable(true);
+                plusProgressDialog.show();
+            }
+        });
+
     }
 
 }
diff --git a/app/src/main/java/phelat/TextView/Sample/MyApplication.java b/app/src/main/java/phelat/TextView/Sample/MyApplication.java
@@ -0,0 +1,27 @@
+package phelat.TextView.Sample;
+
+import android.app.Application;
+
+import phelat.utils.Plus;
+
+/**
+ * Created by phelat on 4/5/17.
+ * Project : TextViewPlus.
+ */
+
+public class MyApplication extends Application {
+
+    @Override
+    public void onCreate(){
+        super.onCreate();
+    }
+
+    @Override
+    public void onTerminate(){
+        super.onTerminate();
+
+        Plus.unleash();
+
+    }
+
+}
diff --git a/app/src/main/res/layout/main.xml b/app/src/main/res/layout/main.xml
@@ -10,15 +10,15 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <phelat.TextView.Plus
+        <phelat.widget.PlusTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="Hello World!"
             android:gravity="center"
             android:textSize="50sp"
             app:font="Roboto-LightItalic.ttf"/>
 
-        <phelat.TextView.Plus
+        <phelat.widget.PlusTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="Hello World!"
@@ -27,7 +27,7 @@
             app:font="Roboto-Black.ttf"
             android:layout_marginTop="10dp" />
 
-        <phelat.TextView.Plus
+        <phelat.widget.PlusTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="Hello World!"
@@ -42,48 +42,49 @@
             android:orientation="horizontal"
             android:layout_marginTop="10dp">
 
-            <phelat.Button.Plus
+            <phelat.widget.PlusButton
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 app:font="Roboto-Black.ttf"
-                android:text="BOLD"/>
+                android:text="Progress"
+                android:id="@+id/progressButton"/>
 
-            <phelat.Button.Plus
+            <phelat.widget.PlusButton
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 app:font="Roboto-LightItalic.ttf"
                 android:text="Light Italic"/>
 
-            <phelat.Button.Plus
+            <phelat.widget.PlusButton
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:text="Normal"/>
 
         </LinearLayout>
 
-        <phelat.EditText.Plus
+        <phelat.widget.PlusEditText
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:font="Roboto-LightItalic.ttf"
             android:hint="Light Italic" />
 
-        <phelat.EditText.Plus
+        <phelat.widget.PlusEditText
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:font="Roboto-Black.ttf"
             android:hint="Bold" />
 
-        <phelat.CheckBox.Plus
+        <phelat.widget.PlusCheckBox
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:text="Coffee"
             app:font="Roboto-Black.ttf"
             android:textSize="19sp"/>
 
-        <phelat.CheckBox.Plus
+        <phelat.widget.PlusCheckBox
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:text="Tea"
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0'
+        classpath 'com.android.tools.build:gradle:2.3.1'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
 
diff --git a/textviewplus/bintray.gradle b/textviewplus/bintray.gradle
@@ -1,6 +1,6 @@
 apply plugin: 'com.jfrog.bintray'
 
-version = '1.3.0'
+version = '1.4.0'
 
 task sourcesJar(type: Jar) {
     from android.sourceSets.main.java.srcDirs
diff --git a/textviewplus/build.gradle b/textviewplus/build.gradle
@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 25
-        versionCode 4
-        versionName "1.3.0"
+        versionCode 5
+        versionName "1.4.0"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
diff --git a/textviewplus/src/main/java/phelat/Button/Plus.java b/textviewplus/src/main/java/phelat/Button/Plus.java
@@ -8,8 +8,8 @@
 import android.util.Log;
 
 import phelat.TextView.R;
-import phelat.Utils.FontHelper;
 
+@Deprecated
 public class Plus extends AppCompatButton {
 
     private static final String TAG = "TextViewPlus";
@@ -44,7 +44,7 @@ public boolean setFont(String asset) {
 
         try {
 
-            typeface = FontHelper.get(getContext(), asset);
+            typeface = phelat.utils.Plus.get(getContext(), asset);
 
         } catch (Exception e) {
 
diff --git a/textviewplus/src/main/java/phelat/CheckBox/Plus.java b/textviewplus/src/main/java/phelat/CheckBox/Plus.java
@@ -8,8 +8,8 @@
 import android.util.Log;
 
 import phelat.TextView.R;
-import phelat.Utils.FontHelper;
 
+@Deprecated
 public class Plus extends AppCompatCheckBox {
 
     private static final String TAG = "TextViewPlus";
@@ -44,7 +44,7 @@ public boolean setFont(String asset) {
 
         try {
 
-            typeface = FontHelper.get(getContext(), asset);
+            typeface = phelat.utils.Plus.get(getContext(), asset);
 
         } catch (Exception e) {
 
diff --git a/textviewplus/src/main/java/phelat/EditText/Plus.java b/textviewplus/src/main/java/phelat/EditText/Plus.java
@@ -8,8 +8,8 @@
 import android.util.Log;
 
 import phelat.TextView.R;
-import phelat.Utils.FontHelper;
 
+@Deprecated
 public class Plus extends AppCompatEditText {
 
     private static final String TAG = "TextViewPlus";
@@ -44,7 +44,7 @@ public boolean setFont(String asset) {
 
         try {
 
-            typeface = FontHelper.get(getContext(), asset);
+            typeface = phelat.utils.Plus.get(getContext(), asset);
 
         } catch (Exception e) {
 
diff --git a/textviewplus/src/main/java/phelat/TextView/Plus.java b/textviewplus/src/main/java/phelat/TextView/Plus.java
@@ -7,8 +7,7 @@
 import android.util.AttributeSet;
 import android.util.Log;
 
-import phelat.Utils.FontHelper;
-
+@Deprecated
 public class Plus extends AppCompatTextView {
 
     private static final String TAG = "TextViewPlus";
@@ -43,7 +42,7 @@ public boolean setFont(String asset) {
 
         try {
 
-            typeface = FontHelper.get(getContext(), asset);
+            typeface = phelat.utils.Plus.get(getContext(), asset);
 
         } catch (Exception e) {
 
diff --git a/textviewplus/src/main/java/phelat/utils/Plus.java b/textviewplus/src/main/java/phelat/utils/Plus.java
@@ -1,16 +1,22 @@
-package phelat.Utils;
+package phelat.utils;
 
 import android.content.Context;
 import android.graphics.Typeface;
 
 import java.util.HashMap;
 import java.util.Map;
 
-public class FontHelper {
+public class Plus {
 
     private static final Map<String, Typeface> TYPEFACES = new HashMap<>();
 
-    public static Typeface get(Context context,String fontFileName){
+    /**
+     * Get saved typeface, if not saved create one and return it
+     * @param context
+     * @param fontFileName
+     * @return Typeface
+     */
+    public static Typeface get(Context context, String fontFileName){
 
         Typeface typeface = TYPEFACES.get(fontFileName);
 
@@ -22,4 +28,13 @@ public static Typeface get(Context context,String fontFileName){
         return typeface;
     }
 
+    /**
+     * Clear saved typefaces
+     */
+    public static void unleash(){
+        if (!TYPEFACES.isEmpty()){
+            TYPEFACES.clear();
+        }
+    }
+
 }
diff --git a/textviewplus/src/main/java/phelat/utils/PlusTypefaceSpan.java b/textviewplus/src/main/java/phelat/utils/PlusTypefaceSpan.java
@@ -0,0 +1,25 @@
+package phelat.utils;
+
+import android.graphics.Paint;
+import android.graphics.Typeface;
+import android.text.TextPaint;
+import android.text.style.TypefaceSpan;
+
+public class PlusTypefaceSpan extends TypefaceSpan {
+
+    private Typeface typeface;
+
+    public PlusTypefaceSpan(Typeface typeface) {
+        super("");
+        this.typeface = typeface;
+    }
+
+    @Override
+    public void updateDrawState(TextPaint ds) {applyTypeFace(ds, typeface);}
+
+    @Override
+    public void updateMeasureState(TextPaint paint) {applyTypeFace(paint, typeface);}
+
+    private static void applyTypeFace(Paint paint, Typeface tf) {paint.setTypeface(tf);}
+
+}
diff --git a/textviewplus/src/main/java/phelat/widget/PlusButton.java b/textviewplus/src/main/java/phelat/widget/PlusButton.java
diff --git a/textviewplus/src/main/java/phelat/widget/PlusCheckBox.java b/textviewplus/src/main/java/phelat/widget/PlusCheckBox.java
diff --git a/textviewplus/src/main/java/phelat/widget/PlusEditText.java b/textviewplus/src/main/java/phelat/widget/PlusEditText.java
diff --git a/textviewplus/src/main/java/phelat/widget/PlusProgressDialog.java b/textviewplus/src/main/java/phelat/widget/PlusProgressDialog.java
diff --git a/textviewplus/src/main/java/phelat/widget/PlusTextView.java b/textviewplus/src/main/java/phelat/widget/PlusTextView.java

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ buildscript {`
`5`	`5`	`jcenter()`
`6`	`6`	`}`
`7`	`7`	`dependencies {`
`8`		`- classpath 'com.android.tools.build:gradle:2.3.0'`
	`8`	`+ classpath 'com.android.tools.build:gradle:2.3.1'`
`9`	`9`	`classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2'`
`10`	`10`	`classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'`
`11`	`11`