Merge branch 'rebased-redesign' into 'master'

Rebased redesign

See merge request bloodyhealth/drip!305

.eslintrc

@@ -4,10 +4,7 @@
     "mocha": true,
     "es6": true
   },
-  "extends": [
-    "eslint:recommended",
-    "plugin:react/recommended"
-  ],
+  "extends": ["eslint:recommended", "plugin:react/recommended"],
   "parser": "babel-eslint",
   "parserOptions": {
     "sourceType": "module",
@@ -16,31 +13,18 @@
     },
     "ecmaVersion": 2018
   },
-  "plugins": [
-    "react"
-  ],
+  "plugins": ["react"],
   "settings": {
     "react": {
-      "version": require('./package.json').dependencies.react,
-    },
+      "version": require("./package.json").dependencies.react
+    }
   },
   "rules": {
-    "indent": [
-      "error",
-      2
-    ],
-    "no-console": [
-      "error",
-      { allow: ["warn", "error"] }
-    ],
+    "indent": ["error", 2],
+    "no-console": ["error", { "allow": ["warn", "error"] }],
     "space-before-function-paren": 0,
-    "semi": [
-      "warn",
-      "never"
-    ],
-    "space-infix-ops": [
-      "warn"
-    ],
+    "semi": ["warn", "never"],
+    "space-infix-ops": ["warn"],
     "no-var": "error",
     "prefer-const": "error",
     "no-trailing-spaces": "error",
@@ -53,6 +37,6 @@
         "ignoreTemplateLiterals": true
       }
     ],
-    "no-multi-spaces": 2,
+    "no-multi-spaces": 2
   }
 }

.gitignore

@@ -2,6 +2,9 @@
 #
 .DS_Store
 
+# VSCode
+.vscode/
+
 # Xcode
 #
 build/
@@ -65,6 +68,7 @@ android/app/.project
 
 ios/Podfile.lock
 android/app/src/main/res/drawable-*
+android/app/src/main/assets/*
 
 # nodejs-mobile creates these with every npm install
 nodejs-assets/nodejs-project/sample-*

CONTRIBUTING.md

-# Contributing to drip aka CONDRIBUTING
+# Contributing to drip aka CONDRIPUTING
 So good to see you here, hello :wave\_tone1: :wave\_tone2: :wave\_tone3: :wave\_tone4: :wave\_tone5:
 
 
@@ -8,7 +8,7 @@ So good to see you here, hello :wave\_tone1: :wave\_tone2: :wave\_tone3: :wave\_
 
 [What should I know before I get started?](#what-should-i-know-before-i-get-started)
 
-[How can I condribute?](#how-can-i-condribute)
+[How can I condripute?](#how-can-i-condripute)
 
 [Thank you](#thank-you)
 
@@ -23,9 +23,9 @@ We have prepared something for **you**: check out our [README](https://gitlab.co
 
 Let us know if you want to suggest improvements for the README and open a merge request (which is just like Github's pull request)
 
-## How can I condribute?
+## How can I condripute?
 
-### Your First Code Condribution
+### Your First Code Condripution
 
 We are fans of labels, at least for our issues. You can find a list of `newbie` issues [here](https://gitlab.com/bloodyhealth/drip/issues?label_name%5B%5D=Newbie).
 If you decide to work on an issue, please click on `Create branch` based on that issue. You can find this as a dropdown option right under `Create merge request`.
@@ -54,5 +54,5 @@ To send us a new issue you can also use our [gitlab email](mailto:incoming+blood
 
 ![](https://media.giphy.com/media/kPA88elN9kYco/giphy.gif)
 
-Thank you for condributing to open source, thank you for condributing to drip!
+Thank you for condriputing to open source, thank you for condriputing to drip!
 Much love from Bloody Health :heart\_exclamation:

android/app/src/main/AndroidManifest.xml

@@ -23,13 +23,15 @@
       android:name=".MainApplication"
       android:label="@string/app_name"
       android:icon="@mipmap/ic_launcher"
+      android:roundIcon="@mipmap/ic_launcher_round"
       android:allowBackup="false"
       android:theme="@style/AppTheme">
       <activity
         android:name=".MainActivity"
         android:label="@string/app_name"
         android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
-        android:windowSoftInputMode="adjustResize">
+        android:windowSoftInputMode="adjustResize"
+        android:screenOrientation="sensorPortrait">
         <intent-filter>
             <action android:name="android.intent.action.MAIN" />
             <category android:name="android.intent.category.LAUNCHER" />

android/app/src/main/res/font/jost_normal.xml

+<?xml version="1.0" encoding="utf-8"?>
+<font-family xmlns:android="http://schemas.android.com/apk/res/android">
+  <font
+    android:font="@font/jost400"
+    android:fontStyle="normal"
+    android:fontWeight="400" />
+</font-family>
\ No newline at end of file

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-</adaptive-icon>
\ No newline at end of file

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-</adaptive-icon>
\ No newline at end of file