update dump view UI

cinit · Dec 17, 2021 · 2cad012 · 2cad012
1 parent 9782261
commit 2cad012
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 11 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -73,7 +73,7 @@ dependencies {
     implementation 'com.tencent:mmkv-static:1.2.8'
     implementation 'de.psdev.licensesdialog:licensesdialog:2.2.0'
     implementation 'io.noties.markwon:core:4.6.2'
-    implementation 'org.lsposed.hiddenapibypass:hiddenapibypass:2.0'
+    implementation 'org.lsposed.hiddenapibypass:hiddenapibypass:3.0'
     implementation "com.github.topjohnwu.libsu:core:3.1.2"
     implementation 'androidx.appcompat:appcompat:1.4.0'
     implementation 'com.google.android.material:material:1.4.0'

diff --git a/app/src/main/java/cc/ioctl/nfcdevicehost/activity/MainUiFragmentActivity.java b/app/src/main/java/cc/ioctl/nfcdevicehost/activity/MainUiFragmentActivity.java
@@ -48,7 +48,7 @@ protected boolean doOnCreate(Bundle savedInstanceState) {
         // Passing each menu ID as a set of Ids because each
         // menu should be considered as top level destinations.
         mAppBarConfiguration = new AppBarConfiguration.Builder(
-                R.id.nav_main_home, R.id.nav_main_dump, R.id.nav_main_cards)
+                R.id.nav_main_home, R.id.nav_main_dump_live, R.id.nav_main_cards)
                 .setDrawerLayout(drawer)
                 .build();
         mNavController = Navigation.findNavController(this, R.id.nav_host_fragment);

diff --git a/app/src/main/java/cc/ioctl/nfcdevicehost/activity/ui/dump/HalDumpFileViewFragment.java b/app/src/main/java/cc/ioctl/nfcdevicehost/activity/ui/dump/HalDumpFileViewFragment.java
@@ -74,7 +74,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
         Bundle args = getArguments();
         final String uriPath = args == null ? null : args.getString(EXTRA_CONTENT);
         if (uriPath == null) {
-            requireActivity().finish();
+            popSelf();
             return null;
         }
         Uri uri = Uri.parse(uriPath);
@@ -101,7 +101,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
                             .setTitle(R.string.ui_dialog_error_title)
                             .setMessage(e.toString())
                             .setCancelable(false)
-                            .setPositiveButton(android.R.string.ok, (dialog1, which) -> requireActivity().finish())
+                            .setPositiveButton(android.R.string.ok, (dialog1, which) -> popSelf())
                             .show());
                 }
             } catch (IOException e) {
@@ -110,7 +110,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
                         .setMessage(context.getString(R.string.ui_dialog_unable_to_open_file_v0s, uri.toString())
                                 + "\n" + e)
                         .setCancelable(false)
-                        .setPositiveButton(android.R.string.ok, (dialog1, which) -> requireActivity().finish())
+                        .setPositiveButton(android.R.string.ok, (dialog1, which) -> popSelf())
                         .show());
             }
         });
@@ -127,4 +127,9 @@ public void onResume() {
         }
 
     }
+
+    private void popSelf() {
+        requireActivity().onBackPressed();
+    }
+
 }
diff --git a/app/src/main/java/cc/ioctl/nfcdevicehost/activity/ui/dump/NciLiveDumpFragment.java b/app/src/main/java/cc/ioctl/nfcdevicehost/activity/ui/dump/NciLiveDumpFragment.java
@@ -162,11 +162,11 @@ public boolean onOptionsItemSelected(@NonNull MenuItem item) {
             }
             case R.id.action_view_dump_file: {
                 SafUtils.requestOpenFile(requireActivity()).setMimeType("application/*").onResult(uri -> {
-                    Intent intent = new Intent(Intent.ACTION_VIEW);
-                    intent.setComponent(new ComponentName(requireContext(), SidebandHostActivity.class));
-                    intent.setData(uri);
-                    startActivity(intent);
+                    Bundle args = new Bundle();
+                    args.putString(HalDumpFileViewFragment.EXTRA_CONTENT, uri.toString());
+                    ((MainUiFragmentActivity) requireActivity()).getNavController().navigate(R.id.nav_main_dump_file, args);
                 }).commit();
+                return true;
             }
             default:
                 return super.onContextItemSelected(item);

diff --git a/app/src/main/res/menu/activity_main_drawer.xml b/app/src/main/res/menu/activity_main_drawer.xml
@@ -9,7 +9,7 @@
             android:icon="@drawable/ic_baseline_home_24"
             android:title="@string/menu_fragment_home" />
         <item
-            android:id="@+id/nav_main_dump"
+            android:id="@+id/nav_main_dump_live"
             android:icon="@drawable/ic_baseline_swap_vert_24"
             android:title="@string/menu_fragment_dump" />
         <item

diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml
@@ -12,7 +12,7 @@
         tools:layout="@layout/fragment_main_home" />
 
     <fragment
-        android:id="@+id/nav_main_dump"
+        android:id="@+id/nav_main_dump_live"
         android:name="cc.ioctl.nfcdevicehost.activity.ui.dump.NciLiveDumpFragment"
         android:label="@string/menu_fragment_dump"
         tools:layout="@layout/fragment_main_dump" />
@@ -22,4 +22,10 @@
         android:name="cc.ioctl.nfcdevicehost.activity.ui.cards.CardListFragment"
         android:label="@string/menu_fragment_cards"
         tools:layout="@layout/fragment_main_card_list" />
+
+    <fragment
+        android:id="@+id/nav_main_dump_file"
+        android:name="cc.ioctl.nfcdevicehost.activity.ui.dump.HalDumpFileViewFragment"
+        android:label="@string/label_nav_main_dump_file" />
+
 </navigation>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
@@ -62,5 +62,6 @@ NCI Host 的开发人员不对使用此应用程序造成的任何损失负责
     <string name="action_view_dump_file">浏览转储文件</string>
     <string name="ui_dialog_title_requesting_root">请求 root 权限</string>
     <string name="ui_dialog_msg_body_requesting_root">正在请求 root 权限，请授予本应用 root 权限</string>
+    <string name="label_nav_main_dump_file">HAL Dump File</string>
 
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -91,4 +91,5 @@ By using this application, you accept all responsibility using it and agree that
     <string name="action_view_dump_file">View dump file</string>
     <string name="ui_dialog_title_requesting_root">Requesting root</string>
     <string name="ui_dialog_msg_body_requesting_root">Please grant root permission</string>
+    <string name="label_nav_main_dump_file">HAL Dump File</string>
 </resources>