From 4408dfe1aabf614dd4396623dd372975d94936f7 Mon Sep 17 00:00:00 2001 From: Kevin Murphy Date: Mon, 15 Jan 2018 12:07:47 +0000 Subject: [PATCH 1/5] PR Updates : Fixed build script, and updated gitignore --- .gitignore | 2 ++ alerter/build.gradle | 4 ++-- dependencies.gradle | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c34a1cb..550ddfb 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,5 @@ captures/ #NDK obj/ libs/ + +keystore.properties diff --git a/alerter/build.gradle b/alerter/build.gradle index 4f82070..5a8cf7b 100644 --- a/alerter/build.gradle +++ b/alerter/build.gradle @@ -16,8 +16,8 @@ final String DESCRIPTION = "An Android Alerting Library" final String GITHUB_URL = "https://github.com/Tapadoo/Alerter" android { - compileSdkVersion 27 - buildToolsVersion '27.0.3' + compileSdkVersion rootProject.ext.compileSdkVersion + buildToolsVersion rootProject.ext.buildToolsVersion defaultConfig { minSdkVersion rootProject.ext.minSdkVersion diff --git a/dependencies.gradle b/dependencies.gradle index 3a1f12e..df9bb96 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -3,7 +3,7 @@ ext { minSdkVersion = 14 targetSdkVersion = 27 - buildToolsVersion = '27.0.2' + buildToolsVersion = '27.0.3' sourceCompatibilityVersion = JavaVersion.VERSION_1_8 targetCompatibilityVersion = JavaVersion.VERSION_1_8 From 929f02f9983c94a007bcc8ab1f66a5e0af9b281b Mon Sep 17 00:00:00 2001 From: Kevin Murphy Date: Thu, 25 Jan 2018 17:35:24 +0000 Subject: [PATCH 2/5] Added fix for content gravity issue --- .gitignore | 2 ++ .../main/java/com/tapadoo/alerter/Alert.java | 28 +++++++++++++------ 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index c34a1cb..8c33785 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,5 @@ captures/ #NDK obj/ libs/ + +keystore/ diff --git a/alerter/src/main/java/com/tapadoo/alerter/Alert.java b/alerter/src/main/java/com/tapadoo/alerter/Alert.java index f5c0ef0..6aa9470 100644 --- 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; @@ -56,6 +57,7 @@ public class Alert extends FrameLayout implements View.OnClickListener, Animatio //UI private FrameLayout flClickShield; private FrameLayout flBackground; + private ViewGroup llAlertTextContainer; private TextView tvTitle; private TextView tvText; private ImageView ivIcon; @@ -127,13 +129,14 @@ 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); + llAlertTextContainer = findViewById(R.id.llAlertTextContainer); + 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); @@ -379,8 +382,15 @@ public int getContentGravity() { * @param contentGravity Gravity of the Alert */ public void setContentGravity(final int contentGravity) { - ((LayoutParams) rlContainer.getLayoutParams()).gravity = contentGravity; - rlContainer.requestLayout(); + LinearLayout.LayoutParams paramsTitle + = (LinearLayout.LayoutParams) tvTitle.getLayoutParams(); + paramsTitle.gravity = contentGravity; + tvTitle.setLayoutParams(paramsTitle); + + LinearLayout.LayoutParams paramsText + = (LinearLayout.LayoutParams) tvText.getLayoutParams(); + paramsText.gravity = contentGravity; + tvText.setLayoutParams(paramsText); } /** From f2ec3920691ee1ea697761fa2abba7eadfbd8a89 Mon Sep 17 00:00:00 2001 From: Kevin Murphy Date: Fri, 26 Jan 2018 10:07:56 +0000 Subject: [PATCH 3/5] Bumped version number --- alerter/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alerter/build.gradle b/alerter/build.gradle index f8a657a..5ecfc0a 100644 --- a/alerter/build.gradle +++ b/alerter/build.gradle @@ -11,7 +11,7 @@ apply plugin: "maven-publish" apply from: rootProject.file('quality.gradle') final String PACKAGE_NAME = "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" From 8e57b1e76748743a7403460c5198eb4fdb0718db Mon Sep 17 00:00:00 2001 From: Kevin Murphy Date: Fri, 26 Jan 2018 10:09:49 +0000 Subject: [PATCH 4/5] Updated changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ba7284a..08b9675 100644 --- 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 From 736e86b485fb086b2dfbb6ecbc26fe49cb0fd0ef Mon Sep 17 00:00:00 2001 From: Kevin Murphy Date: Fri, 26 Jan 2018 10:16:29 +0000 Subject: [PATCH 5/5] Resolved PMD issues --- alerter/src/main/java/com/tapadoo/alerter/Alert.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/alerter/src/main/java/com/tapadoo/alerter/Alert.java b/alerter/src/main/java/com/tapadoo/alerter/Alert.java index 6aa9470..a6d6845 100644 --- a/alerter/src/main/java/com/tapadoo/alerter/Alert.java +++ b/alerter/src/main/java/com/tapadoo/alerter/Alert.java @@ -57,7 +57,6 @@ public class Alert extends FrameLayout implements View.OnClickListener, Animatio //UI private FrameLayout flClickShield; private FrameLayout flBackground; - private ViewGroup llAlertTextContainer; private TextView tvTitle; private TextView tvText; private ImageView ivIcon; @@ -131,7 +130,6 @@ private void initView() { flBackground = findViewById(R.id.flAlertBackground); flClickShield = findViewById(R.id.flClickShield); - llAlertTextContainer = findViewById(R.id.llAlertTextContainer); ivIcon = findViewById(R.id.ivIcon); tvTitle = findViewById(R.id.tvTitle); tvText = findViewById(R.id.tvText); @@ -382,12 +380,12 @@ public int getContentGravity() { * @param contentGravity Gravity of the Alert */ public void setContentGravity(final int contentGravity) { - LinearLayout.LayoutParams paramsTitle + final LinearLayout.LayoutParams paramsTitle = (LinearLayout.LayoutParams) tvTitle.getLayoutParams(); paramsTitle.gravity = contentGravity; tvTitle.setLayoutParams(paramsTitle); - LinearLayout.LayoutParams paramsText + final LinearLayout.LayoutParams paramsText = (LinearLayout.LayoutParams) tvText.getLayoutParams(); paramsText.gravity = contentGravity; tvText.setLayoutParams(paramsText);