Merge pull request #33 from topminipie/dev

Delete boot animation, AboutActivity.java
topminipie · Apr 20, 2024 · 2857f8e · 2857f8e
2 parents 0514570 + 7de4fd4
commit 2857f8e
Show file tree

Hide file tree

Showing 10 changed files with 6 additions and 347 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -54,8 +54,8 @@ dependencies {
     implementation "com.github.topjohnwu.libsu:core:5.2.2"
 
     // AboutPage
-    implementation 'io.github.medyo:android-about-page:2.0.0'
-    implementation 'de.psdev.licensesdialog:licensesdialog:2.2.0'
+    //implementation 'io.github.medyo:android-about-page:2.0.0'
+    //implementation 'de.psdev.licensesdialog:licensesdialog:2.2.0'
     implementation 'com.afollestad.material-dialogs:core:0.9.6.0'
 
     implementation 'org.jdeferred:jdeferred-android-aar:1.2.6'
@@ -69,5 +69,5 @@ dependencies {
     implementation 'org.tukaani:xz:1.9'
 
     implementation 'com.github.hzy3774:AndroidP7zip:1.7.2'
-    implementation 'com.cleveroad:androidmanimation:0.9.1'
+    //implementation 'com.cleveroad:androidmanimation:0.9.1'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -36,11 +36,6 @@
         </activity>
 
 
-        <activity
-            android:name=".ui.AboutActivity"
-            android:label="@string/about_btn"
-            android:screenOrientation="portrait" />
-
         <activity
             android:name=".ui.SelectAppActivity"
             android:label="@string/create_app_activity"

diff --git a/app/src/main/java/io/twoyi/Render2Activity.java b/app/src/main/java/io/twoyi/Render2Activity.java
@@ -37,8 +37,6 @@
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 
-import com.cleveroad.androidmanimation.LoadingAnimationView;
-
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -57,7 +55,6 @@ public class Render2Activity extends AppCompatActivity implements View.OnTouchLi
     private SurfaceView mSurfaceView;
 
     private ViewGroup mRootView;
-    private LoadingAnimationView mLoadingView;
     private TextView mLoadingText;
     private View mLoadingLayout;
     private View mBootLogView;
@@ -121,12 +118,10 @@ protected void onCreate(Bundle savedInstanceState) {
         mSurfaceView.getHolder().addCallback(mSurfaceCallback);
 
         mLoadingLayout = findViewById(R.id.loadingLayout);
-        mLoadingView = findViewById(R.id.loading);
         mLoadingText = findViewById(R.id.loadingText);
         mBootLogView = findViewById(R.id.bootlog);
 
         mLoadingLayout.setVisibility(View.VISIBLE);
-        mLoadingView.startAnimation();
 
         UITips.checkForAndroid12(this, this::bootSystem);
 
@@ -222,7 +217,6 @@ private void showBootingProcedure() {
             }
 
             runOnUiThread(() -> {
-                mLoadingView.stopAnimation();
                 mLoadingLayout.setVisibility(View.GONE);
             });
         }, "waiting-boot").start();

diff --git a/app/src/main/java/io/twoyi/provider/TwoyiDocumentsProvider.java b/app/src/main/java/io/twoyi/provider/TwoyiDocumentsProvider.java
@@ -20,6 +20,7 @@
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.util.Objects;
 
 import io.twoyi.R;
 import io.twoyi.utils.RomManager;
@@ -60,7 +61,7 @@ public Cursor queryRoots(String[] projection) {
         File BASE_DIR = RomManager.getRomSdcardDir(getContext());
 
         final MatrixCursor result = new MatrixCursor(projection != null ? projection : DEFAULT_ROOT_PROJECTION);
-        final String applicationName = getContext().getString(R.string.app_name);
+        final String applicationName = Objects.requireNonNull(getContext()).getString(R.string.app_name);
 
         final MatrixCursor.RowBuilder row = result.newRow();
         row.add(Root.COLUMN_ROOT_ID, DEFAULT_ROOT_ID);
@@ -182,7 +183,7 @@ private File getRootDir() {
     }
 
     private String getRootSummary() {
-        return getContext().getResources().getString(R.string.sdcard_of_twoyi);
+        return Objects.requireNonNull(getContext()).getResources().getString(R.string.sdcard_of_twoyi);
     }
 
     private void includeFile(MatrixCursor result, String docId, File file)

diff --git a/app/src/main/java/io/twoyi/ui/AboutActivity.java b/app/src/main/java/io/twoyi/ui/AboutActivity.java
diff --git a/app/src/main/java/io/twoyi/ui/SettingsActivity.java b/app/src/main/java/io/twoyi/ui/SettingsActivity.java
@@ -98,8 +98,6 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
             Preference replaceRom = findPreference(R.string.settings_key_replace_rom);
             Preference factoryReset = findPreference(R.string.settings_key_factory_reset);
 
-            Preference about = findPreference(R.string.settings_key_about);
-
             importApp.setOnPreferenceClickListener(preference -> {
                 UIHelper.startActivity(getContext(), SelectAppActivity.class);
                 return true;
@@ -157,11 +155,6 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
                         .show();
                 return true;
             });
-
-            about.setOnPreferenceClickListener(preference -> {
-                UIHelper.startActivity(getContext(), AboutActivity.class);
-                return true;
-            });
         }
 
 

diff --git a/app/src/main/java/io/twoyi/utils/AppKV.java b/app/src/main/java/io/twoyi/utils/AppKV.java
@@ -20,7 +20,6 @@ public class AppKV {
     private static final String PREF_NAME = "app_kv";
 
     public static final String ADD_APP_NOT_SHOW_SYSTEM= "add_app_not_show_system";
-    public static final String ADD_APP_NOT_SHOW_ADDED = "add_app_not_show_added";
     public static final String SHOW_ANDROID12_TIPS = "show_android12_tips_v2";
     public static final String ADD_APP_NOT_SHOW_32BIT = "add_app_not_show_32bit";