fixed size controlling updated to v0.6.45

jjhesk · Mar 3, 2016 · f49eb9e · f49eb9e
1 parent 43f826a
commit f49eb9e
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@
 ```gradle
 
 dependencies {
-    compile 'com.hkm.advancedtoolbar:advancedtoolbar:0.6.2'
+    compile 'com.hkm.advancedtoolbar:advancedtoolbar:0.6.45'
 }
 
 ```

diff --git a/advancedtoolbar/src/main/java/com/hkm/advancedtoolbar/V5/BeastBar.java b/advancedtoolbar/src/main/java/com/hkm/advancedtoolbar/V5/BeastBar.java
@@ -16,6 +16,7 @@
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.AppCompatButton;
 import android.support.v7.widget.Toolbar;
+import android.util.TypedValue;
 import android.view.Display;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -173,7 +174,7 @@ public static BeastBar withToolbar(AppCompatActivity res, Toolbar original, fina
         bb.setup = beastbuilder;
         display.getSize(bb.size);
         bb.init();
-        bb.adjustmentTV();
+
         return bb;
     }
 
@@ -186,12 +187,6 @@ private BeastBar setToolBar(Toolbar tb) {
         return this;
     }
 
-    private void adjustmentTV() {
-        mtv.requestLayout();
-        if (setup.tb_textsize > 0) {
-            mtv.setTextSize(mContext.getResources().getDimensionPixelSize(setup.tb_textsize));
-        }
-    }
 
     private void animationTitle() {
         if (!isTitleShown) {
@@ -274,6 +269,12 @@ private void init() {
             mtv.setSingleLine(false);
             mtv.setMaxLines(setup.title_line_config);
         }
+
+        if (setup.tb_textsize > 0) {
+            mtv.setTextSize(TypedValue.COMPLEX_UNIT_PX, mContext.getResources().getDimensionPixelSize(setup.tb_textsize));
+        }
+        mtv.requestLayout();
+
         if (setup.ic_search != 0) {
             mSearchButton.setImageResource(setup.ic_search);
             isSearchButtonShown = true;

diff --git a/app/app.iml b/app/app.iml
@@ -71,10 +71,13 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.1/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.1/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
       <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/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
-VERSION_NAME=0.6.44
-VERSION_CODE=69
+VERSION_NAME=0.6.45
+VERSION_CODE=70
 
 ANDROID_BUILD_MIN_SDK_VERSION=17
 ANDROID_BUILD_TARGET_SDK_VERSION=22