Merge pull request Tapadoo#175 from Tapadoo/issue-fixes

Issue fixes
ViperJooy · Feb 28, 2019 · b2ef7f8 · b2ef7f8
2 parents 668357b + 00a09e7
commit b2ef7f8
Show file tree

Hide file tree

Showing 51 changed files with 147 additions and 273 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,10 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-## 4.0.0 - 2/12/218
+## 4.0.1 - 27/2/2019
+* Bug Fixes - Removed Unneeded LinearLayoutCompat
+
+## 4.0.0 - 2/12/2018
 * Migrate to AndroidX
 * Added support for Cutout/Notch
 

diff --git a/alerter/build.gradle b/alerter/build.gradle
@@ -13,16 +13,16 @@ apply plugin: 'org.jetbrains.dokka'
 apply from: rootProject.file('quality.gradle')
 
 final String GROUP_ID = "com.tapadoo.android"
-final String VERSION      = "4.0.0"
-final String DESCRIPTION  = "An Android Alerting Library"
-final String GITHUB_URL   = "https://github.com/Tapadoo/Alerter"
+final String VERSION = "4.0.1"
+final String DESCRIPTION = "An Android Alerting Library"
+final String GITHUB_URL = "https://github.com/Tapadoo/Alerter"
 
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
     buildToolsVersion rootProject.ext.buildToolsVersion
 
     defaultConfig {
-        minSdkVersion    rootProject.ext.minSdkVersion
+        minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
 
         versionCode 1
@@ -45,24 +45,24 @@ android {
 //BinTray configuration - credentials stored in user's gradle.properties
 bintray {
     user = getBinTrayUser()
-    key  = getBinTrayKey()
+    key = getBinTrayKey()
 
     publications = ['Alerter']
 
     pkg {
-        repo            = 'maven'
-        name            = project.getName()
-        desc            = DESCRIPTION
-        vcsUrl          = GITHUB_URL + '.git'
-        websiteUrl      = GITHUB_URL
+        repo = 'maven'
+        name = project.getName()
+        desc = DESCRIPTION
+        vcsUrl = GITHUB_URL + '.git'
+        websiteUrl = GITHUB_URL
         issueTrackerUrl = GITHUB_URL + '/issues'
-        licenses        = ['MIT']
-        publish         = true
+        licenses = ['MIT']
+        publish = true
 
         version {
-            name     = VERSION // Version name i.e. "1.0"
-            desc     = DESCRIPTION
-            vcsTag   = VERSION
+            name = VERSION // Version name i.e. "1.0"
+            desc = DESCRIPTION
+            vcsTag = VERSION
             released = new Date()
         }
     }
@@ -121,18 +121,18 @@ configurations {
 
 dependencies {
     implementation "androidx.appcompat:appcompat:1.0.2"
-    implementation "androidx.annotation:annotation:1.0.0"
+    implementation "androidx.annotation:annotation:1.0.2"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
     // Local Unit Tests - in src/test
     testImplementation 'junit:junit:4.12'
 
     // Instrumentation Tests - in src/androidTest
     androidTestImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test:rules:1.1.0'
+    androidTestImplementation 'androidx.test:rules:1.1.1'
     androidTestImplementation 'org.hamcrest:hamcrest-library:1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
-    androidTestImplementation 'androidx.test:runner:1.1.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
+    androidTestImplementation 'androidx.test:runner:1.1.1'
     androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0'
 }
 
@@ -152,11 +152,11 @@ bintrayUpload.dependsOn 'dokka'
 
 def final getBinTrayUser() {
     final String BINTRAY_USER = "BINTRAY_USER"
-    return project.hasProperty(BINTRAY_USER)? project.getProperty(BINTRAY_USER) : null
+    return project.hasProperty(BINTRAY_USER) ? project.getProperty(BINTRAY_USER) : null
 }
 
 def final getBinTrayKey() {
-    final String BINTRAY_KEY  = "BINTRAY_KEY"
-    return project.hasProperty(BINTRAY_KEY)? project.getProperty(BINTRAY_KEY) : null
+    final String BINTRAY_KEY = "BINTRAY_KEY"
+    return project.hasProperty(BINTRAY_KEY) ? project.getProperty(BINTRAY_KEY) : null
 }
 
diff --git a/alerter/src/main/java/com/tapadoo/alerter/Alert.kt b/alerter/src/main/java/com/tapadoo/alerter/Alert.kt
@@ -21,9 +21,6 @@ import android.widget.Button
 import android.widget.FrameLayout
 import android.widget.LinearLayout
 import kotlinx.android.synthetic.main.alerter_alert_view.view.*
-import android.view.DisplayCutout
-import androidx.core.view.DisplayCutoutCompat
-
 
 /**
  * Custom Alert View
@@ -71,12 +68,12 @@ class Alert @JvmOverloads constructor(context: Context, attrs: AttributeSet? = n
     var contentGravity: Int
         get() = (llAlertBackground?.layoutParams as FrameLayout.LayoutParams).gravity
         set(contentGravity) {
-            val paramsTitle = tvTitle?.layoutParams as LinearLayout.LayoutParams
-            paramsTitle.gravity = contentGravity
+            val paramsTitle = tvTitle?.layoutParams as? LinearLayout.LayoutParams
+            paramsTitle?.gravity = contentGravity
             tvTitle?.layoutParams = paramsTitle
 
-            val paramsText = tvText?.layoutParams as LinearLayout.LayoutParams
-            paramsText.gravity = contentGravity
+            val paramsText = tvText?.layoutParams as? LinearLayout.LayoutParams
+            paramsText?.gravity = contentGravity
             tvText?.layoutParams = paramsText
         }
 
@@ -239,22 +236,18 @@ class Alert @JvmOverloads constructor(context: Context, attrs: AttributeSet? = n
         postDelayed(object : Runnable {
             override fun run() {
                 try {
-                    if (parent == null) {
-                        Log.e(javaClass.simpleName, "getParent() returning Null")
-                    } else {
+                    if (parent != null) {
                         try {
                             (parent as ViewGroup).removeView(this@Alert)
 
                             onHideListener?.onHide()
                         } catch (ex: Exception) {
                             Log.e(javaClass.simpleName, "Cannot remove from parent layout")
                         }
-
                     }
                 } catch (ex: Exception) {
                     Log.e(javaClass.simpleName, Log.getStackTraceString(ex))
                 }
-
             }
         }, CLEAN_UP_DELAY_MILLIS.toLong())
     }

diff --git a/alerter/src/main/res/layout/alerter_alert_view.xml b/alerter/src/main/res/layout/alerter_alert_view.xml
@@ -8,7 +8,7 @@
     android:background="@android:color/transparent"
     android:clickable="false">
 
-    <androidx.appcompat.widget.LinearLayoutCompat
+    <LinearLayout
         android:id="@+id/llAlertBackground"
         style="@style/AlertStyle"
         android:background="@android:color/darker_gray"
@@ -23,8 +23,8 @@
         android:paddingBottom="@dimen/alerter_padding_default"
         tools:visibility="visible">
 
-        <androidx.appcompat.widget.LinearLayoutCompat
-            android:layout_width="wrap_content"
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:clipToPadding="false">
 
@@ -54,11 +54,10 @@
                     android:visibility="invisible"
                     tools:visibility="visible" />
 
-
             </FrameLayout>
 
             <LinearLayout
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:orientation="vertical">
@@ -71,6 +70,7 @@
                     android:layout_marginEnd="@dimen/alerter_padding_half"
                     android:paddingStart="@dimen/alerter_padding_small"
                     android:paddingLeft="@dimen/alerter_padding_small"
+                    android:paddingEnd="@dimen/alerter_padding_small"
                     android:textAppearance="@style/AlertTextAppearance.Title"
                     android:visibility="gone"
                     tools:text="Title"
@@ -85,6 +85,7 @@
                     android:paddingStart="@dimen/alerter_padding_small"
                     android:paddingLeft="@dimen/alerter_padding_small"
                     android:paddingTop="@dimen/alerter_padding_small"
+                    android:paddingEnd="@dimen/alerter_padding_small"
                     android:paddingBottom="@dimen/alerter_padding_small"
                     android:textAppearance="@style/AlertTextAppearance.Text"
                     android:visibility="gone"
@@ -93,15 +94,15 @@
 
             </LinearLayout>
 
-        </androidx.appcompat.widget.LinearLayoutCompat>
-
+        </LinearLayout>
 
-        <androidx.appcompat.widget.LinearLayoutCompat
+        <LinearLayout
             android:id="@+id/llButtonContainer"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:gravity="end" />
+            android:gravity="end"
+            android:orientation="horizontal" />
 
-    </androidx.appcompat.widget.LinearLayoutCompat>
+    </LinearLayout>
 
 </FrameLayout>
diff --git a/app-base/.gitignore b/app-base/.gitignore
diff --git a/app-base/build.gradle b/app-base/build.gradle
diff --git a/app-base/proguard-rules.pro b/app-base/proguard-rules.pro
diff --git a/app-base/src/main/AndroidManifest.xml b/app-base/src/main/AndroidManifest.xml
diff --git a/app-instant/.gitignore b/app-instant/.gitignore
diff --git a/app-instant/build.gradle b/app-instant/build.gradle