Merge pull request #22 from xianshenglu/dev

fix #21, close #17

Author: xianshenglu

.github/workflows/android_build.yml

@@ -73,7 +73,7 @@ jobs:
           appName: xianshenglu/cloudflare-ip-tester-app
           token: ${{secrets.APP_CENTER_TOKEN}}
           group: Collaborators
-          file: android/app/build/outputs/apk/release/app-universal-release.apk
+          file: android/app/build/outputs/apk/release/app-universal-release-signed.apk
           notifyTesters: true
           debug: false
 

App.tsx

@@ -5,17 +5,18 @@ import { Provider as PaperProvider } from "react-native-paper";
 import useCachedResources from "./hooks/useCachedResources";
 import useColorScheme from "./hooks/useColorScheme";
 import Navigation from "./navigation";
-import { APP_THEME } from './theme';
+import { getAppTheme } from './theme';
+import useIsDarkMode from './hooks/userIsDarkMode';
 
 export default function App() {
   const isLoadingComplete = useCachedResources();
   const colorScheme = useColorScheme();
-
+  const isDark = useIsDarkMode()
   if (!isLoadingComplete) {
     return null;
   } else {
     return (
-      <PaperProvider theme={APP_THEME}>
+      <PaperProvider theme={getAppTheme(isDark)}>
         <SafeAreaProvider>
           <Navigation colorScheme={colorScheme} />
           <StatusBar />

README-ZH.MD

@@ -5,12 +5,13 @@
 ### 功能
 
 - 测试本地网络到 cloudflare 节点的速度
-
 - 根据你的测试结果，生成统计数据，可以排序，得到最好的结果
+- 自定义 Cloudflare Ipv4 列表。(如果你想一直用自定义的数据，需要开启"保存数据到设备"。) 你也许可以用它来测试其他 CDN 厂商的节点速度，如果你再修改测试地址的话。
 
 <div style="display: flex;flex-flow:row wrap;">
     <img src="./assets/images/test-run-min-zh.jpg" height="600">
     <img src="./assets/images/test-statistics-min-zh.jpg" height="600">
+    <img src="./assets/images/test-config-min-zh.jpg" height="600">
 </div>
 
 ### 灵感来源于

README.MD

@@ -4,12 +4,14 @@
 
 ### Functions
 
-- test cloudflare-ip as many as you want
-- generate a history statistics based on your test results.
+- Test cloudflare-ip as many as you want
+- Generate a history statistics based on your test results.
+- Customize Cloudflare Ipv4 list. (Need to enable "Save all data to device" if you want to keep the customization all the time.) You might be able to test other cdn vendors' nodes by changing the Ipv4 list and testUrl.
 
 <div style="display: flex;flex-flow:row wrap;">
     <img src="./assets/images/test-run-min.jpg" height="600">
     <img src="./assets/images/test-statistics-min.jpg" height="600">
+    <img src="./assets/images/test-config-min.jpg" height="600">
 </div>
 
 ### Inspired by

apis/index.ts

@@ -1,3 +1,4 @@
+import { userSettingsStore } from '@/store/UserSettings';
 import { getInitialCfIpResponse } from "./../screens/TestRunScreen/utils/index";
 import { RequestStatus } from "@/typings/index";
 import { getCfIpV4List, getRandomItems } from "@/utils/index";
@@ -148,6 +149,6 @@ export const getCfNodesDownloadTestTime = (
   );
 };
 export const getRandomCfIpList = (totalCount: number) => {
-  const ipList = getRandomItems(getCfIpV4List(), totalCount);
+  const ipList = getRandomItems(getCfIpV4List(userSettingsStore.getCurIpv4ListText()), totalCount);
   return ipList;
 };

assets/images/test-config-min-zh.jpg

@@ -39,7 +39,7 @@ export function TableHeader(props: {
   };
 
   return (
-    <View style={{ ...tableSharedStyles.tableHeader }}>
+    <View style={{ ...tableSharedStyles.tableHeader }} lightColor="#e6f6fa">
       {cols.map((column) => {
         return (
           <Pressable
@@ -76,7 +76,6 @@ export const styles = StyleSheet.create({
     alignSelf: "stretch",
     alignItems: "center",
     justifyContent: "center",
-    backgroundColor: "#e6f6fa",
   },
   tableHeaderCellText: {
     lineHeight: 18,

assets/images/test-config-min.jpg

@@ -3,7 +3,7 @@
  * https://docs.expo.io/guides/color-schemes/
  */
 
-import { Text as DefaultText, View as DefaultView } from 'react-native';
+import { Text as DefaultText, View as DefaultView, TextInput as DefaultTextInput } from 'react-native';
 
 import Colors from '../constants/Colors';
 import useColorScheme from '../hooks/useColorScheme';
@@ -29,6 +29,7 @@ type ThemeProps = {
 
 export type TextProps = ThemeProps & DefaultText['props'];
 export type ViewProps = ThemeProps & DefaultView['props'];
+export type TextInputProps = ThemeProps & DefaultTextInput['props'];
 
 export function Text(props: TextProps) {
   const { style, lightColor, darkColor, ...otherProps } = props;
@@ -43,3 +44,11 @@ export function View(props: ViewProps) {
 
   return <DefaultView style={[{ backgroundColor }, style]} {...otherProps} />;
 }
+
+export function TextInput(props: TextInputProps) {
+  const { style, lightColor, darkColor, ...otherProps } = props;
+  const backgroundColor = useThemeColor({ light: lightColor, dark: darkColor }, 'background');
+  const color = useThemeColor({ light: lightColor, dark: darkColor }, 'text');
+  const borderColor = color;
+  return <DefaultTextInput style={[{ backgroundColor,color,borderColor }, style]} {...otherProps} />;
+}

components/Table/TableHeader/index.tsx

@@ -0,0 +1,5 @@
+import useColorScheme from "./useColorScheme";
+
+export default function useIsDarkMode() {
+  return useColorScheme() === "dark";
+}