Merge pull request #36 from Tapadoo/minor_fixes

Removed RtL support in the manifest file. Updated resource names
Tapadoo · Mar 7, 2017 · e2205e1 · e2205e1
2 parents c2b238a + 2c85622
commit e2205e1
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## 1.0.6 - 2017-03-07
+* Removed RtL support in Manifest
+* Updated icon resource names to resolve conflicts
+
 ## 1.0.5 - 2017-03-06
 * Add ability to hide the icon.
 

diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ all content.
 
 ```groovy
 dependencies {
-    compile 'com.tapadoo.android:alerter:1.0.5'
+    compile 'com.tapadoo.android:alerter:1.0.6'
 }
 ```
 
@@ -64,7 +64,7 @@ Alerter.create(this)
 ```java
 Alerter.create(this)
        .setText("Alert text...")
-       .setIcon(R.drawable.ic_face)
+       .setIcon(R.drawable.alerter_ic_face)
        .show();
 ```
 

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

diff --git a/alerter/src/main/AndroidManifest.xml b/alerter/src/main/AndroidManifest.xml
@@ -6,9 +6,7 @@
     <!-- Our Min SDK is 16, UI Automator requires Min 18, so this will force its use -->
     <uses-sdk tools:overrideLibrary="android.support.test.uiautomator.v18"/>
 
-    <application
-        android:supportsRtl="true">
-
+    <application>
         <!--This is just an Activity for Testing from within src/androidTest-->
         <activity
             android:name=".MockActivity"

diff --git a/alerter/src/main/res/drawable/ic_face.xml → ...src/main/res/drawable/alerter_ic_face.xml b/alerter/src/main/res/drawable/ic_face.xml → ...src/main/res/drawable/alerter_ic_face.xml
diff --git a/...rc/main/res/drawable/ic_notifications.xml → ...res/drawable/alerter_ic_notifications.xml b/...rc/main/res/drawable/ic_notifications.xml → ...res/drawable/alerter_ic_notifications.xml
diff --git a/alerter/src/main/res/layout/alerter_alert_view.xml b/alerter/src/main/res/layout/alerter_alert_view.xml
@@ -28,7 +28,7 @@
             android:layout_centerVertical="true"
             android:maxHeight="@dimen/alerter_alert_icn_size"
             android:maxWidth="@dimen/alerter_alert_icn_size"
-            android:src="@drawable/ic_notifications"
+            android:src="@drawable/alerter_ic_notifications"
             android:tint="@android:color/white"/>
 
         <LinearLayout

diff --git a/app/src/main/java/com/tapadoo/example/ExampleActivity.java b/app/src/main/java/com/tapadoo/example/ExampleActivity.java
@@ -85,7 +85,7 @@ private void showAlertColoured() {
     private void showAlertWithIcon() {
         Alerter.create(ExampleActivity.this)
                 .setText("Alert text...")
-                .setIcon(R.drawable.ic_face)
+                .setIcon(R.drawable.alerter_ic_face)
                 .show();
     }
 

diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:2.3.0'
     }
 }
 

diff --git a/documentation/full_demo.mp4 b/documentation/full_demo.mp4
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Dec 28 10:00:20 PST 2015
+#Mon Mar 06 09:39:22 GMT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,7 @@ buildscript { @@
         }
         dependencies {
-            classpath 'com.android.tools.build:gradle:2.2.3'
+            classpath 'com.android.tools.build:gradle:2.3.0'
         }
     }
@@ Expand Down @@