Merge pull request #45 from StringCare/develop

Develop

Author: efraespada

README.md

@@ -1,26 +1,29 @@
+[![version][badge]][link]
+
 <p align="center"><img width="10%" vspace="10" src="https://github.com/StringCare/AndroidLibrary/raw/develop/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png"></p>
 
 <h3 align="center" style="margin-bottom:30px" vspace="20">StringCare Android Library</h3>
 
 <p align="center"><img width="10%" vspace="20" src="https://github.com/StringCare/AndroidLibrary/raw/develop/white.png"></p>
 
-#### [Wiki Library](https://github.com/StringCare/AndroidLibrary/wiki)
+#### [What Is StringCare](https://github.com/StringCare/AndroidLibrary/wiki/What-is-StringCare)
 
-#### [What is StringCare](https://github.com/StringCare/AndroidLibrary/wiki/What-is-StringCare)
+#### [Implementation](https://github.com/StringCare/AndroidLibrary/wiki/Implementation)
 
-#### [Library Implementation](https://github.com/StringCare/AndroidLibrary/wiki/Library-Implementation)
+#### [Usage](https://github.com/StringCare/AndroidLibrary/wiki/Usage)
 
-#### [Library Usage](https://github.com/StringCare/AndroidLibrary/wiki/Library-Usage)
+#### [Configuration](https://github.com/StringCare/AndroidLibrary/wiki/Configuration)
 
 #### [Publish APK](https://github.com/StringCare/AndroidLibrary/wiki/Publish-APK)
 
 #### [Limitations](https://github.com/StringCare/AndroidLibrary/wiki/Limitations)
 
-#### [Migrate From 0.x To 1.x](https://github.com/StringCare/AndroidLibrary/wiki/Migrate-From-0.x-To-1.x)
+#### [Compatibility](https://github.com/StringCare/AndroidLibrary/wiki/Compatibility)
 
-#### [Compatibility](https://github.com/StringCare/GradlePlugin/wiki/Compatibility)
+#### [Migrate From 0.x To 1.x](https://github.com/StringCare/AndroidLibrary/wiki/Migrate-From-0.x-To-1.x)
 
-#### [Wiki Plugin](https://github.com/StringCare/GradlePlugin/wiki)
+[link]: https://github.com/StringCare/AndroidLibrary
+[badge]: https://img.shields.io/bintray/v/efff/maven/StringCareAndroidPlugin.svg
 
 License
 -------
@@ -39,3 +42,5 @@ License
     limitations under the License.
 
 
+[link]: https://github.com/StringCare/AndroidLibrary
+[badge]: https://img.shields.io/bintray/v/efff/maven/StringCareAndroidLibrary.svg

StringCareSchema.png

@@ -38,8 +38,8 @@ dependencies {
     })
     implementation 'com.android.support:appcompat-v7:28.0.0'
     testImplementation 'junit:junit:4.12'
-    // implementation project(path: ':library')
-    implementation "com.stringcare:library:$stringcare_version"
+    implementation project(path: ':library')
+    // implementation "com.stringcare:library:$stringcare_version"
 }
 
 

app/build.gradle

@@ -22,11 +22,11 @@ protected void onCreate(Bundle savedInstanceState) {
         String password = "lalilulelo";
 
         String message = "\n\nFor Metal Gear lovers:\n\n\"Snake, the password is " + SC.obfuscate(password)
-            + "\n\n.. or " + SC.deobfuscate(SC.obfuscate(password)) + "\"";
+            + "\n\n.. or " + SC.reveal(SC.obfuscate(password)) + "\"";
 
         ((TextView) findViewById(R.id.example_a)).setText(Html.fromHtml(message));
 
-        String numbers = getString(R.string.test_a, "hi", 3) + " is " + SC.deobfuscate(R.string.test_a, "hi", 3);
+        String numbers = getString(R.string.test_a, "hi", 3) + " is " + SC.reveal(R.string.test_a, "hi", 3);
         ((TextView) findViewById(R.id.example_b)).setText(numbers);
         final SCTextView tvAuto = findViewById(R.id.auto_tv);
         findViewById(R.id.btn_change).setOnClickListener(new View.OnClickListener() {

app/src/main/java/com/efraespada/stringobfuscator/MainActivity.java

@@ -15,10 +15,10 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.stringcare:plugin:$stringcare_version"
-        // classpath files('../GradlePlugin/build/libs/plugin-0.9.jar')
+        // classpath "com.stringcare:plugin:$stringcare_version"
+        classpath files('../GradlePlugin/build/libs/plugin-1.2.jar')
         // classpath files('..\\GradlePlugin\\build\\libs\\plugin-0.9.jar')
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.4.0'
         classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.1"
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
     }

build.gradle

@@ -1,6 +1,6 @@
-#Tue Jan 15 17:50:13 CET 2019
+#Tue May 07 22:19:17 CEST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip

gradle/wrapper/gradle-wrapper.properties

@@ -3,7 +3,7 @@
 
 # Sets the minimum version of CMake required to build the native library.
 
-cmake_minimum_required(VERSION 3.13.2)
+cmake_minimum_required(VERSION 3.10.2)
 
 # Creates and names a library, sets it as either STATIC
 # or SHARED, and provides the relative paths to its source code.

library/CMakeLists.txt

@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
 
-version = "1.2"
+version = "1.5"
 
 android {
     compileSdkVersion 28
@@ -32,7 +32,7 @@ android {
     }
     externalNativeBuild {
         cmake {
-            version "3.13.2"
+            version "3.14.3"
             path "CMakeLists.txt"
         }
     }

library/build.gradle

@@ -201,7 +201,7 @@ public static String obfuscate(String value) {
      * @param id
      * @return String
      */
-    public static String deobfuscate(@StringRes int id) {
+    public static String reveal(@StringRes int id) {
         if (context == null) {
             Log.e(TAG, "Library not initialized: SC.init(Context)");
             return null;
@@ -219,7 +219,7 @@ public static String deobfuscate(@StringRes int id) {
      * @param value
      * @return String
      */
-    public static String deobfuscate(String value) {
+    public static String reveal(String value) {
         if (context == null) {
             Log.e(TAG, "Library not initialized: SC.init(Context)");
             return null;
@@ -238,8 +238,8 @@ public static String deobfuscate(String value) {
      * @param formatArgs
      * @return
      */
-    public static String deobfuscate(@StringRes int id, Object... formatArgs) {
-        String value = deobfuscate(id);
+    public static String reveal(@StringRes int id, Object... formatArgs) {
+        String value = reveal(id);
         Locale locale;
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
             locale = Resources.getSystem().getConfiguration().getLocales().get(0);
@@ -275,7 +275,7 @@ public static String encryptString(String value) {
      * Decrypts the given value
      * @param value
      * @return String
-     * @deprecated use {@link #deobfuscate(String)}()} instead.
+     * @deprecated use {@link #reveal(String)}()} instead.
      */
     @Deprecated
     public static String decryptString(String value) {
@@ -319,7 +319,7 @@ public static String getString(@StringRes int id) {
      * @param id
      * @param formatArgs
      * @return String
-     * @deprecated use {@link #deobfuscate(int, Object...)}()} instead.
+     * @deprecated use {@link #reveal(int, Object...)}()} instead.
      */
     @Deprecated
     public static String getString(@StringRes int id, Object... formatArgs) {

library/src/main/java/com/stringcare/library/SC.java

@@ -66,9 +66,9 @@ private void reloadText() {
                     @Override
                     public void contextReady() {
                         if (isHTML) {
-                            setText(Html.fromHtml(SC.deobfuscate(val)));
+                            setText(Html.fromHtml(SC.reveal(val)));
                         } else {
-                            setText(SC.deobfuscate(val));
+                            setText(SC.reveal(val));
                         }
                     }
                 });