v1.3 (#20)

* fixing submit flow

* debugging splash screen error

* Fix word count

* Improve loading database

* Change swipe direction on iOS

* Change result order: noun first

* bump version

Author: zehfernandes

App.js

@@ -1,7 +1,7 @@
-import React, { useEffect, useState, useRef } from "react";
-import { UIManager, Platform, SplashScreen } from "react-native";
+import React, { useEffect, useState, useRef, useCallback } from "react";
+import { UIManager, Platform, View, Text, Alert } from "react-native";
 import { useFonts } from "expo-font";
-import AppLoading from "expo-app-loading";
+import * as SplashScreen from "expo-splash-screen";
 import i18n from "./lib/i18n";
 
 import {
@@ -38,6 +38,9 @@ if (Platform.OS === "android") {
 //TODO: Move Appereance to AppDB
 let MyTheme = generateTheme(false);
 
+// Keep the splash screen visible while we fetch resources
+SplashScreen.preventAutoHideAsync();
+
 export default function App() {
   const db = useRef(null);
   const [isDarkMode, setIsDarkMode] = useState(false);
@@ -52,21 +55,29 @@ export default function App() {
 
   useEffect(() => {
     const fetchData = async () => {
-      console.log("FETCH");
-      const settings = await getSettings();
-      const data = await getAllData();
-      db.current = await new DatabaseInit();
+      try {
+        const v = await Promise.all([
+          getAllData(),
+          getSettings(),
+          firstLaunch(),
+        ]);
 
-      await firstLaunch();
+        const data = v[0];
+        const settings = v[1];
 
-      setGlobalData(data);
-      setLoadedDatabase(true);
+        db.current = new DatabaseInit();
+        await db.current.init();
 
-      console.log("SET");
+        setGlobalData(data);
+        setLoadedDatabase(true);
 
-      updateTheme(settings.darkMode);
+        updateTheme(settings.darkMode);
 
-      //SplashScreen.hide();
+        await SplashScreen.hideAsync();
+      } catch (e) {
+        console.log(e);
+        // Alert.alert(e);
+      }
     };
 
     fetchData();
@@ -86,10 +97,8 @@ export default function App() {
     updateSettings(settings);
   };
 
-  //Onboarding?
-  // Load scren
   if (!loaded || !loadedDatabase) {
-    return <AppLoading />;
+    return null;
   }
 
   const commonProps = {

app.json

@@ -2,7 +2,7 @@
   "expo": {
     "name": "Wordnote Dictionary",
     "slug": "dictionote",
-    "version": "1.0.0",
+    "version": "1.3.0",
     "orientation": "portrait",
     "icon": "./assets/icon.png",
     "privacy": "unlisted",
@@ -15,21 +15,29 @@
     "updates": {
       "fallbackToCacheTimeout": 0
     },
-    "assetBundlePatterns": ["**/*", "assets/**"],
+    "assetBundlePatterns": [
+      "**/*",
+      "assets/**"
+    ],
     "ios": {
+      "buildNumber": "4",
       "supportsTablet": false,
       "infoPlist": {
         "CFBundleAllowMixedLocalizations": true
       },
-      "bundleIdentifier": "com.zehfernandes.dictionote"
+      "bundleIdentifier": "com.zehfernandes.dictionote",
+      "config": {
+        "usesNonExemptEncryption": false
+      }
     },
     "android": {
       "adaptiveIcon": {
         "foregroundImage": "./assets/adaptive-icon.png",
         "backgroundColor": "#FFFFFF"
       },
       "allowBackup": true,
-      "package": "com.zehfernandes.dictionote"
+      "package": "com.zehfernandes.dictionote",
+      "versionCode": 4
     },
     "locales": {
       "pt": "./storelocales/pt.json"

assets/dict_en.db assets/dict_en_v2.db

@@ -7,6 +7,7 @@ function HiddenItem({ rowMap, data }) {
   return (
     <View style={styles.rowBack}>
       <TrashIcon fill="#fff" width={18} height={18} />
+      <TrashIcon fill="#fff" width={18} height={18} />
     </View>
   );
 }
@@ -23,6 +24,7 @@ const styles = StyleSheet.create({
     flexDirection: "row",
     justifyContent: "space-between",
     paddingLeft: 20,
+    paddingRight: 20,
   },
   backRightBtn: {
     alignItems: "center",

components/ListHiddenItem.js

@@ -9,7 +9,10 @@ function ListItem({ title, content, createAt, press }) {
 
   let words = null;
   if (content) {
-    words = content.split("\n").length;
+    words = content
+      .trim()
+      .split("\n")
+      .filter((t) => t !== "").length;
   }
 
   return (

components/ListItem.js

@@ -10,7 +10,14 @@
     "preview": {
       "distribution": "internal"
     },
-    "production": {}
+    "production": {
+      "ios": {
+        "autoIncrement": true
+      },
+      "android": {
+        "autoIncrement": true
+      }
+    }
   },
   "submit": {
     "production": {}

eas.json

@@ -10,20 +10,23 @@ export const firstLaunch = async () => {
   try {
     const alreadyLaunch = await AsyncStorage.getItem(FIRSTVISITKEY);
     if (!alreadyLaunch) {
-      await AsyncStorage.setItem(FIRSTVISITKEY, "true");
-      await AsyncStorage.setItem(NOTESKEY, JSON.stringify([]));
-      await AsyncStorage.setItem(LANGUAGESKEY, JSON.stringify(["en"]));
-      await AsyncStorage.setItem(
-        SETTINGSKEY,
-        JSON.stringify({
-          userID: makeid(11),
-          isFullAppAvailable: true,
-          darkMode: Appearance.getColorScheme() === "dark",
-        })
-      );
+      await Promise.all([
+        AsyncStorage.setItem(FIRSTVISITKEY, "true"),
+        AsyncStorage.setItem(NOTESKEY, JSON.stringify([])),
+        AsyncStorage.setItem(LANGUAGESKEY, JSON.stringify(["en"])),
+        AsyncStorage.setItem(
+          SETTINGSKEY,
+          JSON.stringify({
+            userID: makeid(11),
+            isFullAppAvailable: true,
+            darkMode: Appearance.getColorScheme() === "dark",
+          })
+        ),
+      ]);
     }
   } catch (e) {
     console.log(e);
+    return true;
   }
 };
 
@@ -42,6 +45,7 @@ export const getAllData = async () => {
     return notes;
   } catch (e) {
     console.log(e);
+    return [];
   }
 };
 
@@ -214,6 +218,7 @@ export const getSettings = async (value) => {
     }
   } catch (error) {
     console.log(e);
+    return {};
   }
 };
 

lib/appDB.js

@@ -5,47 +5,63 @@ import { Asset } from "expo-asset";
 import { getOfflineLangs, deleteLang } from "./appDB";
 
 let databaseKey = {};
+
 export class DatabaseInit {
   constructor() {
-    return (async () => {
-      let baseDir = FileSystem.documentDirectory + "SQLite";
+    return this;
+  }
 
-      //Check Folder and Default idiom
-      if (!(await FileSystem.getInfoAsync(baseDir)).exists) {
-        await FileSystem.makeDirectoryAsync(baseDir);
-      }
+  async init() {
+    let baseDir = FileSystem.documentDirectory + "SQLite";
+
+    //Check Folder and Default idiom
+    if (!(await FileSystem.getInfoAsync(baseDir)).exists) {
+      await FileSystem.makeDirectoryAsync(baseDir);
+    }
 
-      if (!(await FileSystem.getInfoAsync(baseDir + "/dict_en.db")).exists) {
-        await FileSystem.downloadAsync(
-          Asset.fromModule(require("../assets/dict_en.db")).uri,
-          baseDir + "/dict_en.db"
-        );
+    // Delete previus version of database
+    if (await FileSystem.getInfoAsync(baseDir + "/dict_en.db").exists) {
+      await FileSystem.deleteAsync(baseDir + "/dict_en.db");
+    }
+
+    if (!(await FileSystem.getInfoAsync(baseDir + "/dict_en_v2.db")).exists) {
+      const file = require("../assets/dict_en_v2.db");
+      const dbURI = Asset.fromModule(file).uri;
+
+      if (dbURI.includes("http")) {
+        await FileSystem.downloadAsync(dbURI, baseDir + "/dict_en_v2.db");
+      } else {
+        await FileSystem.copyAsync({
+          from: dbURI,
+          to: baseDir + "/dict_en_v2.db",
+        });
       }
+    }
+
+    databaseKey["en"] = SQLite.openDatabase("dict_en_v2.db");
+
+    // get all idioms unless "en" (default one)
+    let langs = await getOfflineLangs();
+    langs = langs.filter((lang) => lang !== "en");
 
-      databaseKey["en"] = SQLite.openDatabase("dict_en.db");
-
-      // get all idioms unless "en" (default one)
-      let langs = await getOfflineLangs();
-      langs = langs.filter((lang) => lang !== "en");
-
-      //for langs
-      for (let i = 0; i < langs.length; i++) {
-        let langcode = langs[i];
-        let fileName = `/dict_${langcode}.db`;
-        if ((await FileSystem.getInfoAsync(baseDir + fileName)).exists) {
-          databaseKey[langcode] = SQLite.openDatabase(fileName);
-        } else {
-          console.log("File not found");
-          deleteLang(langcode);
-        }
+    //for langs
+    for (let i = 0; i < langs.length; i++) {
+      let langcode = langs[i];
+      let fileName = `/dict_${langcode}.db`;
+      if ((await FileSystem.getInfoAsync(baseDir + fileName)).exists) {
+        databaseKey[langcode] = SQLite.openDatabase(fileName);
+      } else {
+        console.log("File not found");
+        deleteLang(langcode);
       }
+    }
 
-      return this;
-    })();
+    return this;
   }
 
   getDatabase(key) {
     // TODO: If don't exist return error
+    console.log(databaseKey[key]);
     return databaseKey[key];
   }
 
@@ -61,9 +77,9 @@ export class DatabaseInit {
   }
 
   testDatabase() {
-    getDatabase("en").transaction((tx) => {
-      tx.executeSql(
-        "select * from words_en WHERE word='aasvogels'",
+    return this.getDatabase("en").transaction((tx) => {
+      return tx.executeSql(
+        "select * from words_en WHERE word='test'",
         [],
         (_, { rows }) => console.log(JSON.stringify(rows))
       );

lib/dictDB.js

@@ -1,12 +1,13 @@
 const { getDefaultConfig } = require("expo/metro-config");
 
-const defaultConfig = getDefaultConfig(__dirname);
+const config = getDefaultConfig(__dirname);
+
+config.transformer.minifierConfig.compress.drop_console = true;
+config.resolver.assetExts.push("db");
 
 module.exports = {
+  ...config,
   transformer: {
     assetPlugins: ["expo-asset/tools/hashAssetFiles"],
   },
-  resolver: {
-    assetExts: [...defaultConfig.resolver.assetExts, "db"],
-  },
 };