Merge pull request #8 from maxis7567/master

fix background color for api 16
onurkagan · Mar 7, 2019 · 6b5437d · 6b5437d
2 parents dd569e5 + 4e3081b
commit 6b5437d
Show file tree

Hide file tree

Showing 20 changed files with 62 additions and 50 deletions.
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,14 +1,14 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 26
+    compileSdkVersion 28
     defaultConfig {
         applicationId "com.onurkaganaldemir.ktoast"
         minSdkVersion 16
-        targetSdkVersion 26
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
@@ -20,9 +20,9 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:appcompat-v7:26.1.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
+    implementation 'androidx.appcompat:appcompat:1.1.0-alpha02'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.1'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
+    androidTestImplementation 'androidx.test:runner:1.1.2-alpha01'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.2-alpha01'
 }
diff --git a/app/src/androidTest/java/com/onurkaganaldemir/ktoast/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/onurkaganaldemir/ktoast/ExampleInstrumentedTest.java
@@ -1,8 +1,8 @@
 package com.onurkaganaldemir.ktoast;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/app/src/main/java/com/onurkaganaldemir/ktoast/MainActivity.java b/app/src/main/java/com/onurkaganaldemir/ktoast/MainActivity.java
@@ -1,6 +1,6 @@
 package com.onurkaganaldemir.ktoast;
 
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 
 public class MainActivity extends AppCompatActivity {

diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.0'
+        classpath 'com.android.tools.build:gradle:3.3.2'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
 
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/gradle.properties b/gradle.properties
@@ -9,6 +9,8 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
+android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
 
 # When configured, Gradle will run in incubating parallel mode.

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Oct 05 15:12:48 IST 2018
+#Wed Mar 06 16:42:49 IRST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
diff --git a/ktoast-lib/build.gradle b/ktoast-lib/build.gradle
@@ -3,17 +3,17 @@ apply plugin: 'com.github.dcendents.android-maven'
 group='com.github.onurkagan'
 
 android {
-    compileSdkVersion 26
+    compileSdkVersion 28
 
 
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 26
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }
 
@@ -29,8 +29,8 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation 'com.android.support:appcompat-v7:26.1.0'
+    implementation 'androidx.appcompat:appcompat:1.1.0-alpha02'
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.1'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
+    androidTestImplementation 'androidx.test:runner:1.1.2-alpha01'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.2-alpha01'
 }
diff --git a/ktoast-lib/src/androidTest/java/com/onurkaganaldemir/ktoastlib/ExampleInstrumentedTest.java b/ktoast-lib/src/androidTest/java/com/onurkaganaldemir/ktoastlib/ExampleInstrumentedTest.java
@@ -1,8 +1,8 @@
 package com.onurkaganaldemir.ktoastlib;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/ktoast-lib/src/main/java/com/onurkaganaldemir/ktoastlib/KToast.java b/ktoast-lib/src/main/java/com/onurkaganaldemir/ktoastlib/KToast.java
@@ -5,11 +5,11 @@
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
 import android.os.CountDownTimer;
-import android.support.annotation.ColorRes;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.Nullable;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.AppCompatImageView;
+import androidx.annotation.ColorRes;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.widget.AppCompatImageView;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;

diff --git a/ktoast-lib/src/main/res/drawable/background_error_toast.xml b/ktoast-lib/src/main/res/drawable/background_error_toast.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
-        <shape
-            android:tint="@color/red" >
+        <shape >
+            <solid android:color="@color/red"/>
             <corners android:radius="16dp"/>
         </shape>
     </item>

diff --git a/ktoast-lib/src/main/res/drawable/background_info_toast.xml b/ktoast-lib/src/main/res/drawable/background_info_toast.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
-        <shape
-            android:tint="@color/blue" >
+        <shape>
+            <solid android:color="@color/blue"/>
             <corners android:radius="16dp"/>
         </shape>
     </item>

diff --git a/ktoast-lib/src/main/res/drawable/background_normal_toast.xml b/ktoast-lib/src/main/res/drawable/background_normal_toast.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
-        <shape
-            android:tint="@color/gray" >
+        <shape>
+            <solid android:color="@color/gray"/>
             <corners android:radius="16dp"/>
         </shape>
     </item>

diff --git a/ktoast-lib/src/main/res/drawable/background_success_toast.xml b/ktoast-lib/src/main/res/drawable/background_success_toast.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
-        <shape
-            android:tint="@color/green" >
+        <shape>
+            <solid android:color="@color/green"/>
             <corners android:radius="16dp"/>
         </shape>
     </item>

diff --git a/ktoast-lib/src/main/res/drawable/background_warning_toast.xml b/ktoast-lib/src/main/res/drawable/background_warning_toast.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
-        <shape
-            android:tint="@color/orange" >
-            <corners android:radius="16dp"/>
+        <shape>
+            <solid android:color="@color/orange" />
+            <corners android:radius="16dp" />
         </shape>
     </item>
 </selector>
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -1,18 +1,18 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 26
+    compileSdkVersion 28
 
 
 
     defaultConfig {
         applicationId "com.onurkaganaldemir.sample"
         minSdkVersion 16
-        targetSdkVersion 26
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }
 
@@ -28,10 +28,10 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation 'com.android.support:appcompat-v7:26.1.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
-    compile project(':ktoast-lib')
+    implementation 'androidx.appcompat:appcompat:1.1.0-alpha02'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation project(':ktoast-lib')
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.1'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
+    androidTestImplementation 'androidx.test:runner:1.1.2-alpha01'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.2-alpha01'
 }
diff --git a/sample/src/androidTest/java/com/onurkaganaldemir/sample/ExampleInstrumentedTest.java b/sample/src/androidTest/java/com/onurkaganaldemir/sample/ExampleInstrumentedTest.java
@@ -1,8 +1,8 @@
 package com.onurkaganaldemir.sample;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/sample/src/main/java/com/onurkaganaldemir/sample/MainActivity.java b/sample/src/main/java/com/onurkaganaldemir/sample/MainActivity.java
@@ -1,6 +1,6 @@
 package com.onurkaganaldemir.sample;
 
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.Gravity;
 import android.view.View;