Browse Source

配置项目

zk 1 year ago
parent
commit
55807c46e5
23 changed files with 133 additions and 266 deletions
  1. 1 1
      app/build.gradle
  2. 5 2
      app/src/main/AndroidManifest.xml
  3. 2 2
      app/src/main/java/com/datarecovery/my/master/App.java
  4. 7 0
      app/src/main/java/com/datarecovery/master/data/api/AtmobApi.java
  5. 2 2
      app/src/main/java/com/datarecovery/my/master/data/consts/Constants.java
  6. 1 1
      app/src/main/java/com/datarecovery/my/master/di/GsonModule.java
  7. 4 4
      app/src/main/java/com/datarecovery/my/master/di/NetworkModule.java
  8. 1 1
      app/src/main/java/com/datarecovery/my/master/utils/bindingadapters/ImageViewBindingAdapter.java
  9. 1 1
      app/src/main/java/com/datarecovery/my/master/utils/bindingadapters/TextViewBindingAdapter.java
  10. 1 1
      app/src/main/java/com/datarecovery/my/master/utils/bindingadapters/ViewBindingAdapter.java
  11. 1 1
      app/src/main/java/com/datarecovery/my/master/utils/livedata/SingleLiveEvent.java
  12. 0 7
      app/src/main/java/com/datarecovery/my/master/data/api/AtmobApi.java
  13. 0 30
      app/src/main/res/drawable-v24/ic_launcher_foreground.xml
  14. BIN
      app/src/main/res/drawable-xxhdpi/icon_splash_logo.webp
  15. 20 0
      app/src/main/res/drawable/bg_theme_splash.xml
  16. 0 170
      app/src/main/res/drawable/ic_launcher_background.xml
  17. 0 6
      app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
  18. 0 6
      app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
  19. 0 16
      app/src/main/res/values-night/themes.xml
  20. 8 7
      app/src/main/res/values/colors.xml
  21. 23 0
      app/src/main/res/values/style.xml
  22. 16 8
      app/src/main/res/values/themes.xml
  23. 40 0
      app/src/main/res/xml/network_config.xml

+ 1 - 1
app/build.gradle

@@ -4,7 +4,7 @@ plugins {
 }
 
 android {
-    namespace 'com.datarecovery.my.master'
+    namespace 'com.datarecovery.master'
     compileSdk rootProject.compileSdkVersion
 
     defaultConfig {

+ 5 - 2
app/src/main/AndroidManifest.xml

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.datarecovery.my.master">
+    package="com.datarecovery.master">
 
+    <!-- 允许访问网络,必选权限 -->
     <uses-permission android:name="android.permission.INTERNET" />
 
 
@@ -12,10 +13,12 @@
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:networkSecurityConfig="@xml/network_config"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        tools:replace="android:allowBackup"
+        tools:ignore="LockedOrientationActivity"
         android:theme="@style/Theme.DataRecover"
+        tools:replace="android:allowBackup"
         tools:targetApi="31">
 
 

+ 2 - 2
app/src/main/java/com/datarecovery/my/master/App.java

@@ -1,8 +1,8 @@
-package com.datarecovery.my.master;
+package com.datarecovery.master;
 
 import com.atmob.app.lib.base.BaseApplication;
 import com.atmob.user.AtmobUser;
-import com.datarecovery.my.master.data.consts.Constants;
+import com.datarecovery.master.data.consts.Constants;
 
 public class App extends BaseApplication {
     @Override

+ 7 - 0
app/src/main/java/com/datarecovery/master/data/api/AtmobApi.java

@@ -0,0 +1,7 @@
+package com.datarecovery.master.data.api;
+
+
+public interface AtmobApi {
+
+
+}

+ 2 - 2
app/src/main/java/com/datarecovery/my/master/data/consts/Constants.java

@@ -1,6 +1,6 @@
-package com.datarecovery.my.master.data.consts;
+package com.datarecovery.master.data.consts;
 
-import com.datarecovery.my.master.BuildConfig;
+import com.datarecovery.master.BuildConfig;
 
 public class Constants {
 

+ 1 - 1
app/src/main/java/com/datarecovery/my/master/di/GsonModule.java

@@ -1,4 +1,4 @@
-package com.datarecovery.my.master.di;
+package com.datarecovery.master.di;
 
 import com.google.gson.Gson;
 

+ 4 - 4
app/src/main/java/com/datarecovery/my/master/di/NetworkModule.java

@@ -1,9 +1,9 @@
-package com.datarecovery.my.master.di;
+package com.datarecovery.master.di;
 
 import com.atmob.network.okhttp.AtmobOkHttpClient;
-import com.datarecovery.my.master.BuildConfig;
-import com.datarecovery.my.master.data.api.AtmobApi;
-import com.datarecovery.my.master.data.consts.Constants;
+import com.datarecovery.master.BuildConfig;
+import com.datarecovery.master.data.api.AtmobApi;
+import com.datarecovery.master.data.consts.Constants;
 import com.google.gson.Gson;
 
 import javax.inject.Singleton;

+ 1 - 1
app/src/main/java/com/datarecovery/my/master/utils/bindingadapters/ImageViewBindingAdapter.java

@@ -1,4 +1,4 @@
-package com.datarecovery.my.master.utils.bindingadapters;
+package com.datarecovery.master.utils.bindingadapters;
 
 import android.content.res.ColorStateList;
 import android.graphics.drawable.Drawable;

+ 1 - 1
app/src/main/java/com/datarecovery/my/master/utils/bindingadapters/TextViewBindingAdapter.java

@@ -1,4 +1,4 @@
-package com.datarecovery.my.master.utils.bindingadapters;
+package com.datarecovery.master.utils.bindingadapters;
 
 import android.content.Context;
 import android.content.res.AssetManager;

+ 1 - 1
app/src/main/java/com/datarecovery/my/master/utils/bindingadapters/ViewBindingAdapter.java

@@ -1,4 +1,4 @@
-package com.datarecovery.my.master.utils.bindingadapters;
+package com.datarecovery.master.utils.bindingadapters;
 
 import android.content.res.ColorStateList;
 import android.graphics.Rect;

+ 1 - 1
app/src/main/java/com/datarecovery/my/master/utils/livedata/SingleLiveEvent.java

@@ -1,4 +1,4 @@
-package com.datarecovery.my.master.utils.livedata;
+package com.datarecovery.master.utils.livedata;
 
 import android.util.Log;
 

+ 0 - 7
app/src/main/java/com/datarecovery/my/master/data/api/AtmobApi.java

@@ -1,7 +0,0 @@
-package com.datarecovery.my.master.data.api;
-
-
-public interface AtmobApi {
-
-
-}

File diff suppressed because it is too large
+ 0 - 30
app/src/main/res/drawable-v24/ic_launcher_foreground.xml


BIN
app/src/main/res/drawable-xxhdpi/icon_splash_logo.webp


+ 20 - 0
app/src/main/res/drawable/bg_theme_splash.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <size
+                android:width="1080px"
+                android:height="1920px" />
+            <gradient
+                android:angle="90"
+                android:endColor="#F8FAFF"
+                android:startColor="#DEE9FF" />
+        </shape>
+    </item>
+
+    <item android:top="510px">
+        <bitmap
+            android:gravity="center|top"
+            android:src="@drawable/icon_splash_logo" />
+    </item>
+</layer-list>

+ 0 - 170
app/src/main/res/drawable/ic_launcher_background.xml

@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>

+ 0 - 6
app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>

+ 0 - 6
app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>

+ 0 - 16
app/src/main/res/values-night/themes.xml

@@ -1,16 +0,0 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Base application theme. -->
-    <style name="Theme.DataRecover" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
-        <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_200</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
-        <item name="colorOnPrimary">@color/black</item>
-        <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_200</item>
-        <item name="colorOnSecondary">@color/black</item>
-        <!-- Status bar color. -->
-        <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
-        <!-- Customize your theme here. -->
-    </style>
-</resources>

+ 8 - 7
app/src/main/res/values/colors.xml

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="purple_200">#FFBB86FC</color>
-    <color name="purple_500">#FF6200EE</color>
-    <color name="purple_700">#FF3700B3</color>
-    <color name="teal_200">#FF03DAC5</color>
-    <color name="teal_700">#FF018786</color>
-    <color name="black">#FF000000</color>
-    <color name="white">#FFFFFFFF</color>
+
+
+    <color name="colorPrimary">#2B66FE</color>
+    <color name="colorClickPrimary">#2B66FE</color>
+    <color name="colorPrimaryVariant">#E0EBFF</color>
+
+    <color name="common_txt_color">#202020</color>
+
 </resources>

+ 23 - 0
app/src/main/res/values/style.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="tool_bar_style" parent="Base.Widget.AppCompat.Toolbar">
+        <item name="contentInsetLeft">0dp</item>
+        <item name="contentInsetStart">0dp</item>
+        <item name="contentInsetStartWithNavigation">0dp</item>
+        <item name="titleTextColor">@color/common_txt_color</item>
+        <item name="titleTextAppearance">@style/Toolbar.TitleText</item>
+    </style>
+
+    <style name="Toolbar.TitleText" parent="TextAppearance.Widget.AppCompat.Toolbar.Title">
+        <item name="android:textSize">18sp</item>
+        <item name="android:textStyle">bold</item>
+    </style>
+
+    <style name="myToolbarNavigationButtonStyle" parent="@style/Widget.AppCompat.Toolbar.Button.Navigation">
+        <item name="android:minWidth">0dp</item>
+        <item name="android:paddingLeft">12dp</item>
+    </style>
+
+
+</resources>

+ 16 - 8
app/src/main/res/values/themes.xml

@@ -1,16 +1,24 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.DataRecover" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <style name="Theme.DataRecover" parent="Theme.MaterialComponents.Light.NoActionBar">
         <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_500</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryVariant">@color/colorPrimaryVariant</item>
+        <item name="colorPrimaryDark">@color/colorPrimary</item>
+        <item name="colorAccent">@color/colorPrimary</item>
         <item name="colorOnPrimary">@color/white</item>
-        <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_700</item>
-        <item name="colorOnSecondary">@color/black</item>
         <!-- Status bar color. -->
-        <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
         <!-- Customize your theme here. -->
+
+        <item name="toolbarStyle">@style/tool_bar_style</item>
+
+        <item name="toolbarNavigationButtonStyle">@style/myToolbarNavigationButtonStyle</item>
+    </style>
+
+    <style name="Theme.Splash" parent="Theme.MaterialComponents.Light.NoActionBar">
+        <item name="android:windowBackground">@drawable/bg_theme_splash</item>
+        <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
     </style>
 </resources>

+ 40 - 0
app/src/main/res/xml/network_config.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="MissingDefaultResource">
+
+    <!-- For AdColony, this permits all cleartext traffic: -->
+    <base-config cleartextTrafficPermitted="true">
+        <trust-anchors>
+            <certificates src="system" />
+        </trust-anchors>
+    </base-config>
+    <!-- End AdColony section -->
+
+    <domain-config cleartextTrafficPermitted="true">
+
+        <!-- For Meta Audience Network, this permits cleartext traffic to localhost: -->
+        <domain includeSubdomains="true">127.0.0.1</domain>
+        <!-- End Meta Audience Network section -->
+
+    </domain-config>
+
+    <domain-config cleartextTrafficPermitted="true">
+        <domain includeSubdomains="true">192.168.10.244</domain>
+    </domain-config>
+
+    <domain-config cleartextTrafficPermitted="true">
+        <domain includeSubdomains="true">cdn.atmob.com</domain>
+    </domain-config>
+
+    <domain-config cleartextTrafficPermitted="true">
+        <domain includeSubdomains="true">test-micro.atmob.com</domain>
+    </domain-config>
+
+    <domain-config cleartextTrafficPermitted="true">
+        <domain includeSubdomains="true">api-img-sh.fengkongcloud.com</domain>
+    </domain-config>
+
+    <domain-config cleartextTrafficPermitted="true">
+        <domain includeSubdomains="true">api-text-gz.fengkongcloud.com</domain>
+    </domain-config>
+</network-security-config>