Merge branch 'develop'

Author: Augsorn Chanklad

.babelrc

@@ -1,9 +1,22 @@
 {
-  "presets": ["babel-preset-expo"],
-  "plugins": [ [ "babel-plugin-root-import", [ { "rootPathSuffix": "src" } ] ] ],
+  "presets": [
+    "babel-preset-react-native-stage-0/decorator-support"
+  ],
+  "plugins": [
+    [
+      "babel-plugin-root-import",
+      [
+        {
+          "rootPathSuffix": "src"
+        }
+      ]
+    ]
+  ],
   "env": {
     "development": {
-      "plugins": ["transform-react-jsx-source"]
+      "plugins": [
+        "transform-react-jsx-source"
+      ]
     }
   }
-}
+}

App.js

@@ -6,7 +6,6 @@ import appStore from './src/app/appStore'
 import { PersistGate } from 'redux-persist/integration/react'
 import { StyleProvider } from 'native-base'
 import { View } from 'react-native'
-import { Font } from 'expo';
 import StorybookUI from './storybook';
 import { COLOR, ThemeProvider } from 'react-native-material-ui';
 
@@ -25,26 +24,9 @@ const uiTheme = {
 class App extends React.Component {
     constructor(props) {
         super(props)
-        this.state = {
-            fontLoaded: false
-        };
-    }
-
-    async componentDidMount() {
-        await Font.loadAsync({
-            'Roboto': require('native-base/Fonts/Roboto.ttf'),
-            'Roboto_medium': require('native-base/Fonts/Roboto_medium.ttf'),
-        });
-
-        this.setState({ fontLoaded: true });
     }
 
     render () {
-
-        if(!this.state.fontLoaded) {
-            return (<View />)
-        }
-
         return (
             <ThemeProvider uiTheme={uiTheme}>
                     <Provider store={appStore().store}>

README.md

@@ -8,13 +8,13 @@ New VocaDB app with React native.
 ## Download
 
 - [Playstore](https://play.google.com/store/apps/details?id=com.coolappz.Vocadb)
-- [Alpha/Beta](https://play.google.com/apps/testing/com.coolappz.Vocadb)
+- [Playstore (Alpha/Beta)](https://play.google.com/apps/testing/com.coolappz.Vocadb)
 
 ## Setup on local 
 
 ### Prerequisite
 - [NodeJS](https://nodejs.org/en/)
-- [Expo Client](https://expo.io) (Availiable on both [iOS](https://itunes.apple.com/app/apple-store/id982107779?ct=www&mt=8) and [Android](https://play.google.com/store/apps/details?id=host.exp.exponent&referrer=www))
+- [react-native-cli](https://www.npmjs.com/package/react-native-cli)
 - [Storybook](https://storybook.js.org) like a component dictionary.
 
 ### Install
@@ -40,38 +40,20 @@ $ npm run storybook
 
 ### Run App
 
-There was several ways to run app.
-
 #### iOS
 Mac OS Only. You must have Xcode installed first.
 
 ```shell
-$ npm run ios
+$ react-native run-ios
 ```
 
 #### Android
 
-I never tried this before but you can try if you have android emulator or with actual device.
-```shell
-$ npm run android
-```
-
-#### Default Expo
-
 ```shell
-$ npm start
+$ react-native run-android
 ```
 
-Now you can use Expo app to scan QR code that display in terminal (make sure you are in the same network with your PC)
-
-#### Expo XDE
-[Expo XDE](https://docs.expo.io/versions/latest/introduction/installation.html) is required.
-
-- Open Expo XDE
-- Open Project
-- Locate to VocaDB-App directory
-- Wait for building script
-- When done. You can sacn QR code from `Share` button via `Expo Client` from your phone.
+Getting started instruction is [here](https://facebook.github.io/react-native/docs/getting-started.html) 
 
 #### Using storybook
 
@@ -81,4 +63,14 @@ See in `App.js` file.
 - Export `App` if you want to test real app.
 
 ### Config
-in *src/constants/config* you can switch **useMock** to **false** to fetch real data from VocaDB API instead of mock.
+in *src/constants/config* you can switch **useMock** to **false** to fetch real data from VocaDB API instead of mock.
+
+## Assets
+
+Icon and splash images are inside *resources* directory.
+
+- Icon 1024x1024 px
+
+- Splash 2208x2208 px
+
+Generated with [React Native Toolbox](https://github.com/bamlab/generator-rn-toolbox)

android/.gitignore

@@ -0,0 +1,65 @@
+# Built application files
+*.apk
+*.ap_
+
+# Files for the ART/Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+out/
+
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+
+# Android Studio Navigation editor temp files
+.navigation/
+
+# Android Studio captures folder
+captures/
+
+# IntelliJ
+*.iml
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/gradle.xml
+.idea/assetWizardSettings.xml
+.idea/dictionaries
+.idea/libraries
+.idea/caches
+
+# Keystore files
+# Uncomment the following line if you do not want to check your keystore files in.
+#*.jks
+
+# External native build folder generated in Android Studio 2.2 and later
+.externalNativeBuild
+
+# Google Services (e.g. APIs or Firebase)
+google-services.json
+
+# Freeline
+freeline.py
+freeline/
+freeline_project_description.json
+
+# fastlane
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots
+fastlane/test_output
+fastlane/readme.md

android/app/BUCK

@@ -0,0 +1,65 @@
+# To learn about Buck see [Docs](https://buckbuild.com/).
+# To run your application with Buck:
+# - install Buck
+# - `npm start` - to start the packager
+# - `cd android`
+# - `keytool -genkey -v -keystore keystores/debug.keystore -storepass android -alias androiddebugkey -keypass android -dname "CN=Android Debug,O=Android,C=US"`
+# - `./gradlew :app:copyDownloadableDepsToLibs` - make all Gradle compile dependencies available to Buck
+# - `buck install -r android/app` - compile, install and run application
+#
+
+lib_deps = []
+
+for jarfile in glob(['libs/*.jar']):
+  name = 'jars__' + jarfile[jarfile.rindex('/') + 1: jarfile.rindex('.jar')]
+  lib_deps.append(':' + name)
+  prebuilt_jar(
+    name = name,
+    binary_jar = jarfile,
+  )
+
+for aarfile in glob(['libs/*.aar']):
+  name = 'aars__' + aarfile[aarfile.rindex('/') + 1: aarfile.rindex('.aar')]
+  lib_deps.append(':' + name)
+  android_prebuilt_aar(
+    name = name,
+    aar = aarfile,
+  )
+
+android_library(
+    name = "all-libs",
+    exported_deps = lib_deps,
+)
+
+android_library(
+    name = "app-code",
+    srcs = glob([
+        "src/main/java/**/*.java",
+    ]),
+    deps = [
+        ":all-libs",
+        ":build_config",
+        ":res",
+    ],
+)
+
+android_build_config(
+    name = "build_config",
+    package = "com.vocadb",
+)
+
+android_resource(
+    name = "res",
+    package = "com.vocadb",
+    res = "src/main/res",
+)
+
+android_binary(
+    name = "app",
+    keystore = "//android/keystores:debug",
+    manifest = "src/main/AndroidManifest.xml",
+    package_type = "debug",
+    deps = [
+        ":app-code",
+    ],
+)