From b24b6ac8f1d9b47e2aca24d4c5580aff00f4b392 Mon Sep 17 00:00:00 2001 From: jhuan Reategui Date: Sat, 14 Apr 2018 17:34:14 -0500 Subject: [PATCH 1/6] Use the new dependency configurations Signed-off-by: Jhuan Reategui --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index b0e1e88..aaa1a9b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -18,6 +18,6 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - compile project(':floatingActionButton') + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation project(':floatingActionButton') } From 37e7d664b7f4e6378ff1afe30e71467a1b174bf0 Mon Sep 17 00:00:00 2001 From: jhuan Reategui Date: Sat, 14 Apr 2018 17:39:51 -0500 Subject: [PATCH 2/6] Update for Gradle 3.0.0 Signed-off-by: Jhuan Reategui Solis --- app/build.gradle | 9 ++++----- build.gradle | 7 +++---- floatingActionButton/build.gradle | 5 ++--- gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index aaa1a9b..417b409 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,17 +1,16 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 20 - buildToolsVersion '20.0.0' + compileSdkVersion 19 + buildToolsVersion '27.0.3' defaultConfig { - applicationId "com.shubhangrathore.multisimtoggle" minSdkVersion 15 - targetSdkVersion 20 + targetSdkVersion 19 } buildTypes { release { - runProguard false + minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } diff --git a/build.gradle b/build.gradle index a75fc81..cd074c2 100644 --- a/build.gradle +++ b/build.gradle @@ -3,17 +3,16 @@ buildscript { repositories { jcenter() + google() } dependencies { - classpath 'com.android.tools.build:gradle:0.12.+' - - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files + classpath 'com.android.tools.build:gradle:3.1.1' } } allprojects { repositories { jcenter() + google() } } diff --git a/floatingActionButton/build.gradle b/floatingActionButton/build.gradle index 8625901..eefc3e1 100644 --- a/floatingActionButton/build.gradle +++ b/floatingActionButton/build.gradle @@ -2,17 +2,16 @@ apply plugin: 'android-library' android { compileSdkVersion 19 - buildToolsVersion "19.1.0" + buildToolsVersion '27.0.3' defaultConfig { - applicationId "com.faizmalkani.floatingactionbutton" minSdkVersion 15 targetSdkVersion 19 } buildTypes { release { - runProguard false + minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1e61d1f..ba9b119 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip From d3ab8392fd75ef4ae7101cfae9d4254451755003 Mon Sep 17 00:00:00 2001 From: jhuan Reategui Date: Sat, 14 Apr 2018 21:42:01 -0500 Subject: [PATCH 3/6] Add Responsive Design Signed-off-by: Jhuan Reategui Solis --- app/src/main/res/layout/activity_main.xml | 239 ++++++++++------------ app/src/main/res/values-w240dp/dimens.xml | 6 + app/src/main/res/values-w820dp/dimens.xml | 8 +- app/src/main/res/values/dimens.xml | 6 + 4 files changed, 130 insertions(+), 129 deletions(-) create mode 100644 app/src/main/res/values-w240dp/dimens.xml diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index faf11d6..da249bb 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -19,150 +19,133 @@ ~ along with this program. If not, see . --> - + + + + + + + + + android:gravity="center" + android:orientation="horizontal"> + + + + + + - + - + - - - - - - - + + + android:layout_height="wrap_content" + android:gravity="center|left" + android:padding="8dp" + android:text="@string/app_name" + android:textColor="@android:color/white" + android:textSize="@dimen/subtitle_size" + android:textStyle="bold" /> + + + + - - - - - - - - - - - - - - - - - - - - - - + android:layout_height="wrap_content" + android:clickable="true" + android:gravity="center|left" + android:onClick="openDeveloperWebsite" + android:text="@string/app_copyright" + android:textColor="@android:color/white" + android:textSize="@dimen/information_size" /> - + + diff --git a/app/src/main/res/values-w240dp/dimens.xml b/app/src/main/res/values-w240dp/dimens.xml new file mode 100644 index 0000000..bc662c6 --- /dev/null +++ b/app/src/main/res/values-w240dp/dimens.xml @@ -0,0 +1,6 @@ + + + 20sp + 12sp + 10sp + \ No newline at end of file diff --git a/app/src/main/res/values-w820dp/dimens.xml b/app/src/main/res/values-w820dp/dimens.xml index 63fc816..0112451 100644 --- a/app/src/main/res/values-w820dp/dimens.xml +++ b/app/src/main/res/values-w820dp/dimens.xml @@ -2,5 +2,11 @@ - 64dp + 44sp + 30 + 102dp + 102dp + 30dp + 24sp + diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 47c8224..5cf04e7 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -2,4 +2,10 @@ 16dp 16dp + 34sp + 18sp + 14sp + 72dp + 72dp + 20dp From b4014c78f1d5fd0367901d9bf991a57631621075 Mon Sep 17 00:00:00 2001 From: jhuan Reategui Date: Sat, 14 Apr 2018 21:45:33 -0500 Subject: [PATCH 4/6] Fix warning 'android-library' Signed-off-by: Jhuan Reategui Solis --- floatingActionButton/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/floatingActionButton/build.gradle b/floatingActionButton/build.gradle index eefc3e1..1b6d7e7 100644 --- a/floatingActionButton/build.gradle +++ b/floatingActionButton/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'android-library' +apply plugin: 'com.android.library' android { compileSdkVersion 19 From 0f8f525aca4798e73a383321af137ffaaf4fd163 Mon Sep 17 00:00:00 2001 From: jhuan Reategui Date: Sat, 14 Apr 2018 21:47:43 -0500 Subject: [PATCH 5/6] Add spanish translation Signed-off-by: Jhuan Reategui Solis --- app/src/main/res/layout/activity_main.xml | 2 +- app/src/main/res/values-es/strings.xml | 63 +++++++++++++++++++++++ app/src/main/res/values/strings.xml | 12 ++--- 3 files changed, 69 insertions(+), 8 deletions(-) create mode 100644 app/src/main/res/values-es/strings.xml diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index da249bb..5543d4e 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -40,7 +40,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:gravity="left|bottom" - android:text="@string/multisim" + android:text="@string/app_name" android:textColor="@android:color/white" android:textSize="@dimen/title_size" /> diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml new file mode 100644 index 0000000..cda44d8 --- /dev/null +++ b/app/src/main/res/values-es/strings.xml @@ -0,0 +1,63 @@ + + + + + + + + + Salir + + + + + Desactivado + Activado + + Toque el botón flotante para habilitar multiSIM + Toque el botón flotante para deshabilitar multiSIM + ADVERTENCIA + Active la multisim solo si su ROM lo admite + + Codigo fuente en Github + Saber mas sobre la aplicación + + Disable MultiSIM + + \nEl teléfono se reiniciará automáticamente después de que MultiSIM se desactive correctamente. + \n\nSe requieren permisos Root.\n + Continuar + Cancelar + Cancelado + MultiSIM Desactivado + MultiSIM Activado + Error... + + Activar MultiSIM + + \nEl teléfono se reiniciará automáticamente después de que MultiSIM se habilite correctamente. + \n\nSe requieren permisos Root.\n + + Reiniciando... + Abrir el sitio web del desarrollador + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 98085b9..282b9de 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,4 @@ - - - MultiSIM Toggle - v + MultiSIM Toggle + v - + Copyright © 2014 Shubhang Rathore \nGoogle+: http://google.com/+ShubhangRathore \nGithub: https://github.com/xenon92 @@ -40,7 +39,6 @@ - MultiSIM DISABLED ENABLED @@ -64,7 +62,7 @@ Unsuccessful Enable MultiSIM - + \nPhone will reboot automatically after MultiSIM is successfully enabled. \n\nSuperUser permission required.\n From 7132718caa4b3a1020c1ec45c9ad9bc51a1b99fd Mon Sep 17 00:00:00 2001 From: jhuan Reategui Date: Sat, 14 Apr 2018 21:48:39 -0500 Subject: [PATCH 6/6] Bump to v1.3 Signed-off-by: Jhuan Reategui Solis --- app/src/main/AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0fe4145..a9104b8 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="4" + android:versionName="1.3">