upadte targetSdkVersion 29 和主题色

youlookwhat · Dec 21, 2021 · f434f04 · f434f04
1 parent 98f6340
commit f434f04
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/ByWebView/build.gradle b/ByWebView/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 28
-    buildToolsVersion "28.0.3"
+    compileSdkVersion 29
+    buildToolsVersion "29.0.3"
 
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 28
-    buildToolsVersion "28.0.3"
+    compileSdkVersion 29
+    buildToolsVersion "29.0.3"
     defaultConfig {
         applicationId "com.example.jingbin.webviewstudy"
         minSdkVersion 14
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode 13
         versionName "3.2.0"
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
@@ -50,5 +50,5 @@ dependencies {
     implementation files('libs/tbs_sdk_thirdapp_v3.1.0.1034_43100_sharewithdownload_obfs_20170301_182143.jar')
 
     implementation project(':ByWebView')
-//    implementation 'com.github.youlookwhat:ByWebView:1.0.0'
+//    implementation 'com.github.youlookwhat:ByWebView:1.2.0'
 }
diff --git a/app/src/main/java/com/example/jingbin/webviewstudy/tencentx5/X5WebViewActivity.java b/app/src/main/java/com/example/jingbin/webviewstudy/tencentx5/X5WebViewActivity.java
@@ -85,7 +85,7 @@ private void getIntentData() {
     private void initTitle() {
         StatusBarUtil.setColor(this, ContextCompat.getColor(this, R.color.colorPrimary), 0);
         mProgressBar = findViewById(R.id.pb_progress);
-        mProgressBar.setColor(ContextCompat.getColor(this, R.color.colorPink), ContextCompat.getColor(this, R.color.colorAccent));
+        mProgressBar.setColor(ContextCompat.getColor(this, R.color.colorPink), ContextCompat.getColor(this, R.color.color_FF4081));
         mProgressBar.show();
         webView = findViewById(R.id.webview_detail);
         mTitleToolBar = findViewById(R.id.title_tool_bar);

diff --git a/app/src/main/java/com/example/jingbin/webviewstudy/ui/WebViewActivity.java b/app/src/main/java/com/example/jingbin/webviewstudy/ui/WebViewActivity.java
@@ -108,7 +108,7 @@ private void initTitle() {
         mProgressBar.setVisibility(View.GONE);
         rl_web_container.addView(webView, new FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT));
         rl_web_container.addView(mProgressBar);
-        mProgressBar.setColor(ContextCompat.getColor(this, R.color.colorAccent));
+        mProgressBar.setColor(ContextCompat.getColor(this, R.color.coloRed));
         mProgressBar.show();
         initToolBar();
     }

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#3F51B5</color>
-    <color name="colorPrimaryDark">#303F9F</color>
-    <color name="colorAccent">#FF4081</color>
+    <color name="colorPrimary">#2483D9</color>
+    <color name="colorPrimaryDark">#2483D9</color>
+    <color name="colorAccent">#2483D9</color>
     <color name="coloRed">#ff0000</color>
     <color name="colorPink">#ffb6cf</color>
-
     <color name="colorWhite">#ffffffff</color>
+    <color name="color_FF4081">#FF4081</color>
 </resources>