v1.0.1 & clean code & refine icon

k3-cat · Apr 7, 2021 · 662c723 · 662c723
1 parent 06306a4
commit 662c723
Show file tree

Hide file tree

Showing 12 changed files with 41 additions and 48 deletions.
diff --git a/app.json b/app.json
@@ -3,7 +3,7 @@
     "name": "TransBox",
     "slug": "TransBox",
     "privacy": "public",
-    "version": "1.0.0",
+    "version": "1.1.0",
     "orientation": "portrait",
     "icon": "./assets/icon.png",
     "splash": {
@@ -12,7 +12,7 @@
       "backgroundColor": "#fcfcfc"
     },
     "updates": {
-      "fallbackToCacheTimeout": 7000
+      "fallbackToCacheTimeout": 5000
     },
     "assetBundlePatterns": [
       "assets/*"

diff --git a/app/App.tsx b/app/App.tsx
@@ -4,7 +4,7 @@ import React from 'react';
 import { SafeAreaProvider } from 'react-native-safe-area-context';
 import { enableScreens } from 'react-native-screens';
 
-import Navigator from './screens/Navigator';
+import Screens from './screens/Index';
 import { rootStore, StoreProvider } from './stores/rootStore';
 import { initTheme } from './themes/themeManager';
 
@@ -24,7 +24,7 @@ export default function Main() {
   return (
     <StoreProvider value={rootStore}>
       <SafeAreaProvider>
-        <Navigator />
+        <Screens />
       </SafeAreaProvider>
     </StoreProvider>
   );

diff --git a/app/screens/Index.tsx b/app/screens/Index.tsx
@@ -4,9 +4,9 @@ import React, { useRef } from 'react';
 import { createDrawerNavigator } from '@react-navigation/drawer';
 import { NavigationContainer, NavigationContainerRef } from '@react-navigation/native';
 
-import Header from '../components/Header';
-import { pages } from '../components/pages';
-import SideDrawer from '../components/SideDrawer';
+import Header from './navigator/Header';
+import { pages } from './navigator/pages';
+import SideDrawer from './navigator/SideDrawer';
 
 const Drawer = createDrawerNavigator();
 

diff --git a/app/screens/ho_units/MolInput.tsx b/app/screens/ho_units/MolInput.tsx
@@ -83,7 +83,7 @@ function MolInput() {
             </TouchableOpacity>}
         />
       </Dialog>
-    </Fragment >
+    </Fragment>
   );
 }
 

diff --git a/app/screens/ho_units/Output.tsx b/app/screens/ho_units/Output.tsx
@@ -6,6 +6,8 @@ import { TouchableWithoutFeedback } from 'react-native-gesture-handler';
 import { RadioButton } from 'react-native-ui-lib';
 import { Text, View } from 'react-native-ui-lib/core';
 
+import { Ionicons } from '@expo/vector-icons';
+
 import { useStore } from '../../stores/rootStore';
 
 const com = ['pg/mL', 'ng/dL', 'ng/mL'];
@@ -48,8 +50,10 @@ function Output() {
                 bottom: 10
               }}
             >
-              <View row>
-                <Text text50M>{'=>  '}</Text>
+              <View row centerV>
+                <Text style={{ fontSize: 27, color: '#808080', marginRight: -7, marginTop: -3 }}>=</Text>
+                <Ionicons size={27} color='#808080' name='chevron-forward-outline' />
+                <View paddingR-12 />
                 <Text text50M style={{ color: !strResult.endsWith(' ') ? '#64b5f6' : '#ef5350' }}>
                   {strResult}
                 </Text>
@@ -58,27 +62,17 @@ function Output() {
         }
       </View>
       <View row paddingH-10 style={{ alignContent: 'space-between' }}>
-        <View flexG>
-          <RadioButton
-            label={com[0]}
-            selected={R.unit.tUnit === com[0]}
-            onPress={() => R.unit.setT(com[0])}
-          />
-        </View>
-        <View flexG>
-          <RadioButton
-            label={com[1]}
-            selected={R.unit.tUnit === com[1]}
-            onPress={() => R.unit.setT(com[1])}
-          />
-        </View>
-        <View flexG>
-          <RadioButton
-            label={com[2]}
-            selected={R.unit.tUnit === com[2]}
-            onPress={() => R.unit.setT(com[2])}
-          />
-        </View>
+        {
+          com.map((u, i) =>
+            <View key={i} flexG>
+              <RadioButton
+                label={u}
+                selected={R.unit.tUnit === u}
+                onPress={() => R.unit.setT(u)}
+              />
+            </View>
+          )
+        }
         <View>
           <RadioButton
             label={com.includes(R.unit.tUnit) ? '自定义' : R.unit.tUnit}
@@ -88,7 +82,7 @@ function Output() {
           />
         </View>
       </View>
-    </Fragment >
+    </Fragment>
   );
 }
 

diff --git a/app/screens/ho_units/QuickAccess.tsx b/app/screens/ho_units/QuickAccess.tsx
@@ -23,9 +23,9 @@ function QuickAccess() {
         R.unit.qa.presets.length === 0 ?
           <View centerV flexG>
             <View style={{ top: '-7%' }}>
-              <Text center text60M grey30 >点击按钮保存预设</Text>
+              <Text center text60M grey30>点击按钮保存预设</Text>
               <View paddingV-3 />
-              <Text center text60M grey30 >长按加载&emsp;左滑移除</Text>
+              <Text center text60M grey30>长按加载&emsp;左滑移除</Text>
             </View>
           </View>
           :
@@ -51,8 +51,7 @@ function QuickAccess() {
                     </Text>
                   </ListItem.Part>
                 </ListItem>
-              </Drawer>
-            }
+              </Drawer>}
           />
       }
     </View>

diff --git a/app/screens/ho_units/UnitDiag.tsx b/app/screens/ho_units/UnitDiag.tsx
@@ -78,12 +78,11 @@ function UnitDiag() {
                 <View paddingL-20 paddingR-30 paddingV-10>
                   <Text center text70M style={{ color: o === ob.vv ? '#ff5722' : '#2196f3' }}>{o}</Text>
                 </View>
-              </TouchableOpacity>}
-            </Observer>}
+              </TouchableOpacity>}</Observer>}
           />
         </View>
       </View>
-    </Dialog >
+    </Dialog>
   );
 }
 

diff --git a/app/screens/navigator/pages.ts b/app/screens/navigator/pages.ts
@@ -1,8 +1,8 @@
-import About from '../screens/About';
-import HoUnits from '../screens/ho_units/Index';
-import Lollipop from '../screens/Lollipop';
-import Memorial from '../screens/memorial/Index';
-import Reminder from '../screens/reminder/Index';
+import About from '../About';
+import HoUnits from '../ho_units/Index';
+import Lollipop from '../Lollipop';
+import Memorial from '../memorial/Index';
+import Reminder from '../reminder/Index';
 
 interface page {
   name: string;

diff --git a/app/stores/rootStore.ts b/app/stores/rootStore.ts
@@ -1,7 +1,7 @@
 import { types } from 'mobx-state-tree';
 import React, { useContext } from 'react';
 
-import { UnitStore, unitStore } from './unit/unit';
+import { UnitStore, unitStore } from './unit/store';
 import { UpdaterStore, updaterStore } from './updater/store';
 import { triggerUpdateAction } from './updater/trigger';
 

diff --git a/app/stores/unit/convertor.ts b/app/stores/unit/convertor.ts
@@ -1,18 +1,19 @@
 import { comMolIndex, vUnitIndex, wUnitIndex } from '../../screens/ho_units/utils';
 
-function getMol(mol: string) {
+function getMol(mol?: string) {
+  if (!mol) { return NaN; }
   if (comMolIndex.has(mol)) {
     return comMolIndex.get(mol)!;
   }
   const n = parseFloat(mol);
   return n > 100 ? n : NaN;
 }
 
-export function convert(value: string, sUnit: string, tUnit: string, mol: string = '') {
+export function convert(source: string, sUnit: string, tUnit: string, mol?: string) {
   const s = sUnit.split('/');
   const t = tUnit.split('/');
 
-  let result = parseFloat(value) * wUnitIndex.get(s[0])! / wUnitIndex.get(t[0])! / vUnitIndex.get(s[1])! * vUnitIndex.get(t[1])!;
+  let result = parseFloat(source) * wUnitIndex.get(s[0])! / wUnitIndex.get(t[0])! / vUnitIndex.get(s[1])! * vUnitIndex.get(t[1])!;
 
   if (s[0].endsWith('mol')) { result *= getMol(mol); }
   else if (s[0].endsWith('IU')) { result /= getMol(mol); }

diff --git a/app/stores/unit/unit.ts → app/stores/unit/store.ts b/app/stores/unit/unit.ts → app/stores/unit/store.ts
diff --git a/assets/icon.png b/assets/icon.png