xianshenglu · xianshenglu · May 27, 2022 · May 24, 2022 · May 27, 2022 · May 27, 2022
diff --git a/App.tsx b/App.tsx
@@ -1,17 +1,11 @@
 import { StatusBar } from 'expo-status-bar';
 import { SafeAreaProvider } from 'react-native-safe-area-context';
-import { DefaultTheme, Provider as PaperProvider } from "react-native-paper";
+import { Provider as PaperProvider } from "react-native-paper";
 
 import useCachedResources from "./hooks/useCachedResources";
 import useColorScheme from "./hooks/useColorScheme";
 import Navigation from "./navigation";
-const theme = {
-  ...DefaultTheme,
-  colors: {
-    ...DefaultTheme.colors,
-    primary: "#2196f3",
-  },
-};
+import { APP_THEME } from './theme';
 
 export default function App() {
   const isLoadingComplete = useCachedResources();
@@ -21,7 +15,7 @@ export default function App() {
     return null;
   } else {
     return (
-      <PaperProvider theme={theme}>
+      <PaperProvider theme={APP_THEME}>
         <SafeAreaProvider>
           <Navigation colorScheme={colorScheme} />
           <StatusBar />

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -4,14 +4,17 @@
   <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
   <uses-permission android:name="android.permission.VIBRATE"/>
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+  <!-- for android 11 -->
+  <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
+
   <queries>
     <intent>
       <action android:name="android.intent.action.VIEW"/>
       <category android:name="android.intent.category.BROWSABLE"/>
       <data android:scheme="https"/>
     </intent>
   </queries>
-  <application android:name=".MainApplication" android:label="@string/app_name" android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round" android:allowBackup="true" android:theme="@style/AppTheme" android:usesCleartextTraffic="true">
+  <application android:name=".MainApplication" android:label="@string/app_name" android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round" android:allowBackup="true" android:theme="@style/AppTheme" android:usesCleartextTraffic="true" android:requestLegacyExternalStorage="true">
     <meta-data android:name="expo.modules.updates.ENABLED" android:value="true"/>
     <meta-data android:name="expo.modules.updates.EXPO_SDK_VERSION" android:value="44.0.0"/>
     <meta-data android:name="expo.modules.updates.EXPO_UPDATES_CHECK_ON_LAUNCH" android:value="ALWAYS"/>

diff --git a/lang/en-us.json b/lang/en-us.json
@@ -7,7 +7,8 @@
     "respondTime": "Respond Time",
     "downloadSpeed": "Download Speed",
     "showAllData": "Show All Data",
-    "showSortedTop": "Show Sorted Top"
+    "showSortedTop": "Show Sorted Top",
+    "getPermFailed": "Get Permissions Failed"
   },
   "testRun": {
     "title": "Test Run",
@@ -29,6 +30,8 @@
     "hideSomeColumns": "Hide Some Columns"
   },
   "testConfig": {
-    "title": "Test Config"
+    "title": "Test Config",
+    "clearHistoryStatistics": "Clear history statistics",
+    "saveAllDataToDevice": "Save all data to device"
   }
 }
diff --git a/lang/zh-cn.json b/lang/zh-cn.json
@@ -7,7 +7,8 @@
     "respondTime": "响应时长",
     "downloadSpeed": "下载速度",
     "showAllData": "展示所有数据",
-    "showSortedTop": "展示排序后的前"
+    "showSortedTop": "展示排序后的前",
+    "getPermFailed": "获取权限失败"
   },
   "testRun": {
     "title": "运行测试",
@@ -29,6 +30,8 @@
     "hideSomeColumns": "隐藏某些列"
   },
   "testConfig": {
-    "title": "测试配置"
+    "title": "测试配置",
+    "clearHistoryStatistics": "清除历史统计数据",
+    "saveAllDataToDevice": "保存数据到设备"
   }
 }
diff --git a/localize/index.ts b/localize/index.ts
@@ -23,4 +23,4 @@ I18n.translations = {
   en,
 };
 
-export { I18n };
+export { I18n as AppI18n };
diff --git a/navigation/index.tsx b/navigation/index.tsx
@@ -15,15 +15,15 @@ import useColorScheme from '../hooks/useColorScheme';
 import ModalScreen from '../screens/ModalScreen';
 import NotFoundScreen from '../screens/NotFoundScreen';
 import TestRunScreen from "../screens/TestRunScreen/index";
-import ConfigScreen from "../screens/TestConfigScreen";
+import TestConfigScreen from "../screens/TestConfigScreen/index";
 import {
   RootStackParamList,
   RootTabParamList,
   RootTabScreenProps,
 } from "../types";
 import LinkingConfiguration from "./LinkingConfiguration";
 import TestStatisticsScreen from "@/screens/TestStatisticsScreen";
-import { I18n } from "@/localize";
+import { AppI18n } from "@/localize";
 
 export default function Navigation({
   colorScheme,
@@ -86,7 +86,7 @@ function BottomTabNavigator() {
         name="TestRun"
         component={TestRunScreen}
         options={({ navigation }: RootTabScreenProps<"TestRun">) => ({
-          title: I18n.t("testRun.title"),
+          title: AppI18n.t("testRun.title"),
           tabBarIcon: ({ color }) => <TabBarIcon name="code" color={color} />,
           headerRight: () => (
             <Pressable
@@ -109,7 +109,7 @@ function BottomTabNavigator() {
         name="TestStatistics"
         component={TestStatisticsScreen}
         options={({ navigation }: RootTabScreenProps<"TestStatistics">) => ({
-          title: I18n.t("testStatistics.title"),
+          title: AppI18n.t("testStatistics.title"),
           tabBarIcon: ({ color }) => <TabBarIcon name="code" color={color} />,
           headerRight: () => (
             <Pressable
@@ -130,9 +130,9 @@ function BottomTabNavigator() {
       />
       <BottomTab.Screen
         name="TestConfig"
-        component={ConfigScreen}
+        component={TestConfigScreen}
         options={{
-          title: I18n.t("testConfig.title"),
+          title: AppI18n.t("testConfig.title"),
           tabBarIcon: ({ color }) => <TabBarIcon name="code" color={color} />,
         }}
       />
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,4 +23,4 @@ I18n.translations = { @@
       en,
     };
-    export { I18n };
+    export { I18n as AppI18n };