From 772837f157d703022a3aa3b7c8577bef549b76e7 Mon Sep 17 00:00:00 2001 From: Federico Navarrete Date: Mon, 10 Aug 2020 08:22:05 +0200 Subject: [PATCH 1/7] Upgrade - Upgraded to AndroidX. --- .idea/codeStyles/Project.xml | 137 ++++++++++++++---- .idea/inspectionProfiles/Project_Default.xml | 46 ------ .idea/jarRepositories.xml | 25 ++++ .idea/misc.xml | 28 +--- .idea/modules.xml | 9 +- build.gradle | 4 +- fivestarslibrary/build.gradle | 10 +- .../com/fivestarslibrary/FiveStarsDialog.java | 2 +- gradle.properties | 4 +- gradle/wrapper/gradle-wrapper.properties | 4 +- sampleapp/build.gradle | 8 +- .../angtrim/com/sampleapp/MainActivity.java | 2 +- 12 files changed, 162 insertions(+), 117 deletions(-) delete mode 100644 .idea/inspectionProfiles/Project_Default.xml create mode 100644 .idea/jarRepositories.xml diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 30aa626..681f41a 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -1,29 +1,116 @@ - - - - - - - - - - + + + + + +
+ + + + xmlns:android + + ^$ + + + +
+
+ + + + xmlns:.* + + ^$ + + + BY_NAME + +
+
+ + + + .*:id + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + .*:name + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + name + + ^$ + + + +
+
+ + + + style + + ^$ + + + +
+
+ + + + .* + + ^$ + + + BY_NAME + +
+
+ + + + .* + + http://schemas.android.com/apk/res/android + + + ANDROID_ATTRIBUTE_ORDER + +
+
+ + + + .* + + .* + + + BY_NAME + +
+ + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index 9f1bae2..0000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..19364dc --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 99202cc..af0bbdd 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,29 +1,9 @@ - - - + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml index c2b81ab..a19cef9 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,12 +2,9 @@ - - - - - - + + + \ No newline at end of file diff --git a/build.gradle b/build.gradle index e46958d..c4d42b6 100644 --- a/build.gradle +++ b/build.gradle @@ -10,8 +10,8 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' - classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' // Add this line + classpath 'com.android.tools.build:gradle:4.0.1' + //classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' // Add this line // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/fivestarslibrary/build.gradle b/fivestarslibrary/build.gradle index 5a81f61..0189226 100644 --- a/fivestarslibrary/build.gradle +++ b/fivestarslibrary/build.gradle @@ -1,15 +1,15 @@ apply plugin: 'com.android.library' -apply plugin: 'com.github.dcendents.android-maven' +//apply plugin: 'com.github.dcendents.android-maven' group='com.github.Angtrim' android { - compileSdkVersion 27 - buildToolsVersion '28.0.3' + compileSdkVersion 29 + buildToolsVersion '29.0.2' defaultConfig { minSdkVersion 14 - targetSdkVersion 27 + targetSdkVersion 29 versionCode 1 versionName "1.0" } @@ -23,6 +23,6 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'com.android.support:appcompat-v7:27.1.1' + implementation 'androidx.appcompat:appcompat:1.2.0' } diff --git a/fivestarslibrary/src/main/java/angtrim/com/fivestarslibrary/FiveStarsDialog.java b/fivestarslibrary/src/main/java/angtrim/com/fivestarslibrary/FiveStarsDialog.java index 01047b4..aa6f2b4 100644 --- a/fivestarslibrary/src/main/java/angtrim/com/fivestarslibrary/FiveStarsDialog.java +++ b/fivestarslibrary/src/main/java/angtrim/com/fivestarslibrary/FiveStarsDialog.java @@ -7,7 +7,7 @@ import android.graphics.PorterDuff; import android.graphics.drawable.LayerDrawable; import android.net.Uri; -import android.support.v7.app.AlertDialog; +import androidx.appcompat.app.AlertDialog; import android.util.Log; import android.view.LayoutInflater; import android.view.View; diff --git a/gradle.properties b/gradle.properties index 1d3591c..915f0e6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,4 +15,6 @@ # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true \ No newline at end of file +# org.gradle.parallel=true +android.enableJetifier=true +android.useAndroidX=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f13c268..d82b40b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Dec 14 15:24:32 EET 2018 +#Mon Aug 10 07:47:22 CEST 2020 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-6.1.1-all.zip diff --git a/sampleapp/build.gradle b/sampleapp/build.gradle index ff8176e..b8bd5c2 100644 --- a/sampleapp/build.gradle +++ b/sampleapp/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 28 - buildToolsVersion '28.0.3' + compileSdkVersion 29 + buildToolsVersion '29.0.2' defaultConfig { applicationId "angtrim.com.sampleapp" minSdkVersion 14 - targetSdkVersion 28 + targetSdkVersion 29 versionCode 1 versionName "1.0" } @@ -21,6 +21,6 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'com.android.support:appcompat-v7:27.1.1' + implementation 'androidx.appcompat:appcompat:1.2.0' implementation project(':fivestarslibrary') } diff --git a/sampleapp/src/main/java/angtrim/com/sampleapp/MainActivity.java b/sampleapp/src/main/java/angtrim/com/sampleapp/MainActivity.java index 4e67837..8886532 100644 --- a/sampleapp/src/main/java/angtrim/com/sampleapp/MainActivity.java +++ b/sampleapp/src/main/java/angtrim/com/sampleapp/MainActivity.java @@ -1,7 +1,7 @@ package angtrim.com.sampleapp; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.util.Log; import android.view.Menu; import android.view.MenuItem; From 9de7dd396043259586a177f968ad6ac9da2668a5 Mon Sep 17 00:00:00 2001 From: Federico Navarrete Date: Mon, 31 Aug 2020 10:36:56 +0200 Subject: [PATCH 2/7] Changes - Removed old logs. - Added a new mode to show the dialog after N days. - Added inApp Mode to show the dialog. - Moved default texts to resources. --- .idea/codeStyles/Project.xml | 18 ++ fivestarslibrary/build.gradle | 2 +- .../com/fivestarslibrary/FiveStarsDialog.java | 208 +++++++++++++++--- .../fivestarslibrary/InAppReviewListener.java | 5 + .../src/main/res/values/strings.xml | 7 +- .../angtrim/com/sampleapp/MainActivity.java | 1 - 6 files changed, 206 insertions(+), 35 deletions(-) create mode 100644 fivestarslibrary/src/main/java/angtrim/com/fivestarslibrary/InAppReviewListener.java diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 681f41a..0d15693 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -1,5 +1,23 @@ + + + +