Upgrade to AndroidX Framework

Update To Android Q SDK

.idea/codeStyles/Project.xml

+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <codeStyleSettings language="XML">
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      </indentOptions>
+      <arrangement>
+        <rules>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:android</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:id</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>style</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>ANDROID_ATTRIBUTE_ORDER</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>.*</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+        </rules>
+      </arrangement>
+    </codeStyleSettings>
+  </code_scheme>
+</component>
\ No newline at end of file

README.md

@@ -12,12 +12,12 @@ Volume Control Features<br/>
 Yuki Push Service<br/>
 
 ## Current Version
-2.0.2-git-20180124<br/>
+2.1.1-git-20190823<br/>
 All-in-One Package(Depreciated): [ ![Download](https://api.bintray.com/packages/takeya-yuki-studio/maven/rubylib/images/download.svg) ](https://bintray.com/takeya-yuki-studio/maven/rubylib/_latestVersion)
 
-AjaxLib Package: [ ![Download](https://api.bintray.com/packages/takeya-yuki-studio/maven/ajaxlib/images/download.svg) ](https://bintray.com/takeya-yuki-studio/maven/ajaxlib/_latestVersion) Add Gson for JSON Ajax
+AjaxLib Package: [ ![Download](https://api.bintray.com/packages/takeya-yuki-studio/maven/ajaxlib/images/download.svg) ](https://bintray.com/takeya-yuki-studio/maven/ajaxlib/_latestVersion)
 
-IO Package:  [ ![Download](https://api.bintray.com/packages/takeya-yuki-studio/maven/io/images/download.svg) ](https://bintray.com/takeya-yuki-studio/maven/io/_latestVersion)
+IO Package:  [ ![Download](https://api.bintray.com/packages/takeya-yuki-studio/maven/io/images/download.svg) ](https://bintray.com/takeya-yuki-studio/maven/io/_latestVersion) Add Gson for JSON Ajax
 
 Package Manager: [ ![Download](https://api.bintray.com/packages/takeya-yuki-studio/maven/packagemanager/images/download.svg) ](https://bintray.com/takeya-yuki-studio/maven/packagemanager/_latestVersion) dependency: IO Package, AjaxLib Package
 

ajaxlib/build.gradle

@@ -5,22 +5,22 @@ publish {
     userOrg = 'takeya-yuki-studio'      //bintray注册的用户名
     groupId = 'jp.ruby.rubylib'         //compile引用时的第1部分groupId
     artifactId = 'ajaxlib'     //compile引用时的第2部分项目名
-    publishVersion = '2.0.2'    //compile引用时的第3部分版本号
+    publishVersion = '2.1.1'    //compile引用时的第3部分版本号
     desc = 'Ruby Extended Controls - AjaxLib'
     website = 'https://github.com/Takeya-Yuki/RubyLib.git'
 }
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion "26.0.2"
+    compileSdkVersion 29
+    buildToolsVersion "29.0.2"
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 26
+        targetSdkVersion 29
         versionCode 2
-        versionName "2.0"
+        versionName "2.1"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }
     buildTypes {
@@ -33,9 +33,9 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    implementation 'com.android.support:appcompat-v7:26.+'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
     testImplementation 'junit:junit:4.12'
 }

ajaxlib/src/androidTest/java/yuki/yuki/control/extended/ExampleInstrumentedTest.java

 package yuki.control.extended;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

app/build.gradle

 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion "26.0.2"
+    compileSdkVersion 29
+    buildToolsVersion "29.0.2"
     defaultConfig {
         applicationId "jp.ruby.rubylibrary"
-        minSdkVersion 21
-        targetSdkVersion 26
+        minSdkVersion 26
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
@@ -21,12 +21,12 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     implementation project(':io')
-    implementation 'com.android.support:appcompat-v7:26.+'
-    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     testImplementation 'junit:junit:4.12'
     implementation project(':webviewex')
     implementation project(':ajaxlib')

app/src/androidTest/java/jp/ruby/rubylibrary/ExampleInstrumentedTest.java

 package jp.ruby.rubylibrary;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

app/src/main/AndroidManifest.xml

@@ -31,7 +31,8 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        android:usesCleartextTraffic="true">
         <activity
             android:name=".MainActivity"
             android:windowSoftInputMode="adjustResize">

app/src/main/java/jp/ruby/rubylibrary/MainActivity.java

@@ -27,17 +27,18 @@ import static yuki.pm.extended.NetworkManager.NO_NETWORK;
 
 public class MainActivity extends Activity {
 
+    WebViewEx wv;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-        WebViewEx wv = (WebViewEx) findViewById(R.id.wv);
+        wv = (WebViewEx) findViewById(R.id.wv);
         wv.getSettings().setJavaScriptCanOpenWindowsAutomatically(true);
         wv.getSettings().setJavaScriptEnabled(true);
-        wv.loadUrl("http://10.1.1.134:8282/Client.html");
+        wv.loadUrl("https://image.so.com/");
         wv.addJavascriptInterface(new TTSComplexController(getApplicationContext(), Locale.SIMPLIFIED_CHINESE), "tts");
         //wv.addJavascriptInterface(new JS(getApplicationContext()), "tts");
-        Intent i=new Intent(Intent.ACTION_VIEW,Uri.parse("http://www.baidu.com/"));
+        Intent i=new Intent(Intent.ACTION_VIEW,Uri.parse("https://www.baidu.com/"));
         PendingIntent pi=PendingIntent.getActivity(getApplicationContext(),0,i,PendingIntent.FLAG_UPDATE_CURRENT);
         int y=NetworkManager.GetNetworkType(MainActivity.this);
         Intent srv=new Intent("AAA");
@@ -52,7 +53,7 @@ public class MainActivity extends Activity {
             PackageManager packageManager = getPackageManager();
             data+=Pi.name+":"+Pi.loadDescription(packageManager)+"<br/>";
         }
-        wv.loadData(data,"text/html","utf-8");
+        //wv.loadData(data,"text/html","utf-8");
 
         ConnectivityManager mConnectivityManager = (ConnectivityManager) this.getSystemService(Context.CONNECTIVITY_SERVICE);
         NetworkInfo mNetworkInfo = mConnectivityManager.getActiveNetworkInfo();
@@ -62,6 +63,12 @@ public class MainActivity extends Activity {
             int x= NO_NETWORK;
         }
     }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        wv.onActivityResult(requestCode,resultCode,data);
+    }
 }
 
 

build.gradle

@@ -7,10 +7,11 @@ buildscript {
             url 'https://maven.google.com/'
             name 'Google'
         }
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
-        classpath 'com.novoda:bintray-release:0.5.0'
+        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.novoda:bintray-release:0.9.1'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

gradle.properties

@@ -20,4 +20,6 @@ systemProp.https.proxyHost=127.0.0.1
 systemProp.https.proxyPort=1080
 #systemProp.http.nonProxyHost=*.google.com
 #systemProp.https.nonProxyHost=*.google.com
-org.gradle.java.home=A:\\JDK\\1.8.0\\152
+org.gradle.java.home=C:\\JDK\\1.8.0\\221
+android.useAndroidX=true
+android.enableJetifier=true

gradle/wrapper/gradle-wrapper.properties

-#Mon Oct 30 17:47:55 JST 2017
+#Fri Aug 23 11:20:52 CST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

io/build.gradle

@@ -5,20 +5,20 @@ publish {
     userOrg = 'takeya-yuki-studio'      //bintray注册的用户名
     groupId = 'jp.ruby.rubylib'         //compile引用时的第1部分groupId
     artifactId = 'io'     //compile引用时的第2部分项目名
-    publishVersion = '2.0.1'    //compile引用时的第3部分版本号
+    publishVersion = '2.1.0'    //compile引用时的第3部分版本号
     desc = 'Ruby Extended Controls - IOLib'
     website = 'https://github.com/Takeya-Yuki/RubyLib.git'
 }
 
 
 android {
-    compileSdkVersion 26
+    compileSdkVersion 29
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 26
+        targetSdkVersion 29
         versionCode 1
-        versionName "2.0"
+        versionName "2.1"
 
         //testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
@@ -35,8 +35,8 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.google.code.gson:gson:2.8.1'
-    implementation 'com.android.support:appcompat-v7:26+'
+    implementation 'com.google.code.gson:gson:2.8.5'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
     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'

io/src/androidTest/java/com/example/iocontrol/ExampleInstrumentedTest.java

 package com.example.iocontrol;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

io/src/main/java/yuki/msg/extended/YukiPushService.java

@@ -6,7 +6,7 @@ import android.app.Service;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.IBinder;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Log;
 
 import java.io.BufferedReader;

io/src/main/java/yuki/resource/extended/UIController.java

@@ -3,7 +3,7 @@ package yuki.resource.extended;
 import android.app.Activity;
 import android.graphics.Color;
 import android.os.Build;
-import android.support.annotation.ColorInt;
+import androidx.annotation.ColorInt;
 import android.util.DisplayMetrics;
 import android.view.View;
 import android.view.WindowManager;

pm/build.gradle

@@ -5,22 +5,22 @@ publish {
     userOrg = 'takeya-yuki-studio'      //bintray注册的用户名
     groupId = 'jp.ruby.rubylib'         //compile引用时的第1部分groupId
     artifactId = 'packagemanager'     //compile引用时的第2部分项目名
-    publishVersion = '2.0.2'    //compile引用时的第3部分版本号
+    publishVersion = '2.1.0'    //compile引用时的第3部分版本号
     desc = 'Ruby Extended Controls - PackageManager'
     website = 'https://github.com/Takeya-Yuki/RubyLib.git'
 }
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion "26.0.2"
+    compileSdkVersion 29
+    buildToolsVersion "29.0.2"
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 26
+        targetSdkVersion 29
         versionCode 2
         versionName "2.0"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }
     buildTypes {
@@ -33,10 +33,10 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    implementation 'com.android.support:appcompat-v7:26.+'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
     testImplementation 'junit:junit:4.12'
     implementation project(':ajaxlib')
 }

pm/src/androidTest/java/yuki/yuki/pm/extended/ExampleInstrumentedTest.java

 package yuki.pm.extended;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

pm/src/main/java/yuki/pm/extended/AutoUpdateManager.java

@@ -11,6 +11,7 @@ import android.os.Handler;
 
 import org.json.JSONObject;
 import yuki.control.extended.HttpAsyncClient;
+import yuki.control.extended.OnException;
 import yuki.control.extended.OnGetString;
 
 
@@ -154,6 +155,11 @@ public final class AutoUpdateManager {
                     });
                 }
             }
+        }, new OnException() {
+            @Override
+            public void OnError(Exception error) {
+
+            }
         });
     }
 }

webviewex/build.gradle

@@ -5,22 +5,22 @@ publish {
     userOrg = 'takeya-yuki-studio'      //bintray注册的用户名
     groupId = 'jp.ruby.rubylib'         //compile引用时的第1部分groupId
     artifactId = 'webviewex'     //compile引用时的第2部分项目名
-    publishVersion = '2.0.2'    //compile引用时的第3部分版本号
+    publishVersion = '2.1.0'    //compile引用时的第3部分版本号
     desc = 'Ruby Extended Controls - WebViewEx'
     website = 'https://github.com/Takeya-Yuki/RubyLib.git'
 }
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion "26.0.2"
+    compileSdkVersion 29
+    buildToolsVersion "29.0.2"
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 26
+        targetSdkVersion 29
         versionCode 2
         versionName "2.0"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }
     buildTypes {
@@ -33,9 +33,9 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    implementation 'com.android.support:appcompat-v7:26.+'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
     testImplementation 'junit:junit:4.12'
 }

webviewex/src/androidTest/java/yuki/yuki/control/extended/ExampleInstrumentedTest.java

 package yuki.control.extended;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;