Merging

csc1995 · Jan 26, 2018 · c7f38ed · c7f38ed
2 parents 1049fe7 + 7b6cf9f
commit c7f38ed
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 13 deletions.
diff --git a/.gitignore b/.gitignore
@@ -46,4 +46,4 @@ obj/
 libs/
 
 #Signing Keys
-/keystore
+keystore
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## 2.0.4 - 26/1/2018
+* Fixed content gravity issue
+
 ## 2.0.3 - 08/1/2018
 * Updated build tools & support libs
 * Added methods to set icon tint

diff --git a/alerter/build.gradle b/alerter/build.gradle
@@ -11,7 +11,7 @@ apply plugin: "maven-publish"
 apply from: rootProject.file('quality.gradle')
 
 final String GROUP_ID = "com.tapadoo.android"
-final String VERSION      = "2.0.3"
+final String VERSION      = "2.0.4"
 final String DESCRIPTION  = "An Android Alerting Library"
 final String GITHUB_URL   = "https://github.com/Tapadoo/Alerter"
 

diff --git a/alerter/src/main/java/com/tapadoo/alerter/Alert.java b/alerter/src/main/java/com/tapadoo/alerter/Alert.java
@@ -32,6 +32,7 @@
 import android.view.animation.LinearInterpolator;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
@@ -125,13 +126,13 @@ private void initView() {
 
         ViewCompat.setTranslationZ(this, Integer.MAX_VALUE);
 
-        flBackground = (FrameLayout) findViewById(R.id.flAlertBackground);
-        flClickShield = (FrameLayout) findViewById(R.id.flClickShield);
-        ivIcon = (ImageView) findViewById(R.id.ivIcon);
-        tvTitle = (TextView) findViewById(R.id.tvTitle);
-        tvText = (TextView) findViewById(R.id.tvText);
-        rlContainer = (ViewGroup) findViewById(R.id.rlContainer);
-        pbProgress = (ProgressBar) findViewById(R.id.pbProgress);
+        flBackground = findViewById(R.id.flAlertBackground);
+        flClickShield = findViewById(R.id.flClickShield);
+        ivIcon = findViewById(R.id.ivIcon);
+        tvTitle = findViewById(R.id.tvTitle);
+        tvText = findViewById(R.id.tvText);
+        rlContainer = findViewById(R.id.rlContainer);
+        pbProgress = findViewById(R.id.pbProgress);
 
         flBackground.setOnClickListener(this);
 
@@ -377,8 +378,15 @@ public int getContentGravity() {
      * @param contentGravity Gravity of the Alert
      */
     public void setContentGravity(final int contentGravity) {
-        ((LayoutParams) rlContainer.getLayoutParams()).gravity = contentGravity;
-        rlContainer.requestLayout();
+        final LinearLayout.LayoutParams paramsTitle
+                = (LinearLayout.LayoutParams) tvTitle.getLayoutParams();
+        paramsTitle.gravity = contentGravity;
+        tvTitle.setLayoutParams(paramsTitle);
+
+        final LinearLayout.LayoutParams paramsText
+                = (LinearLayout.LayoutParams) tvText.getLayoutParams();
+        paramsText.gravity = contentGravity;
+        tvText.setLayoutParams(paramsText);
     }
 
     /**

diff --git a/dependencies.gradle b/dependencies.gradle
@@ -3,15 +3,15 @@ ext {
     minSdkVersion     = 14
     targetSdkVersion  = 27
 
-    keystoreProperties = '../keystore/release.properties'
-
     buildToolsVersion = '27.0.2'
 
     sourceCompatibilityVersion = JavaVersion.VERSION_1_8
     targetCompatibilityVersion = JavaVersion.VERSION_1_8
 
     supportLibVersion = '27.0.2'
 
+    keystoreProperties = '../keystore/release.properties'
+
     libs = [
             android_gradle      : 'com.android.tools.build:gradle:2.2.3',