minor ui improvements

apps/mobile/src/components/NotebookItem/index.js

@@ -13,7 +13,7 @@ import {
 } from '../../common/common';
 import Icon from 'react-native-vector-icons/Feather';
 import {w, ToastEvent} from '../../utils/utils';
-import {db} from '../../../App';
+import {db, DDS} from '../../../App';
 import {Dialog} from '../Dialog';
 import {AddTopicDialog} from '../AddTopicDialog';
 import {useAppContext} from '../../provider/useAppContext';
@@ -94,7 +94,7 @@ export const NotebookItem = ({
         alignItems: 'center',
         flexDirection: 'row',
         paddingHorizontal: 0,
-        width: '100%',
+        width: DDS.isTab ? '95%' : '90%',
         alignSelf: 'center',
         borderBottomWidth: 1,
         borderBottomColor: colors.nav,

apps/mobile/src/components/NotesList/index.js

@@ -163,15 +163,7 @@ export const NotesList = ({
           }}></View>
       }
       contentContainerStyle={{
-        width:
-          numColumns === 2
-            ? DDS.isTab
-              ? '100%'
-              : null
-            : DDS.isTab
-            ? '95%'
-            : '90%',
-        alignItems: numColumns === 2 ? 'flex-start' : null,
+        width: '100%',
         alignSelf: 'center',
       }}
       ListFooterComponent={

apps/mobile/src/components/header/index.js

@@ -2,7 +2,7 @@ import React, {useEffect, useState} from 'react';
 import {View, TouchableOpacity, Platform, Text} from 'react-native';
 import Icon from 'react-native-vector-icons/Feather';
 import {SIZE, WEIGHT} from '../../common/common';
-import {h, SideMenuEvent} from '../../utils/utils';
+import {h, SideMenuEvent, getElevation} from '../../utils/utils';
 import * as Animatable from 'react-native-animatable';
 import NavigationService from '../../services/NavigationService';
 import {DDS} from '../../../App';

apps/mobile/src/views/AccountSettings/index.js

@@ -81,20 +81,25 @@ export const AccountSettings = ({navigation}) => {
           }}>
           Alex's Account
         </Text>
-        <Text
+
+        <View
           style={{
-            color: 'white',
-            fontFamily: WEIGHT.regular,
-            fontSize: SIZE.sm,
-            marginTop: 10,
-            backgroundColor: colors.accent,
             borderRadius: 5,
             padding: 5,
             paddingVertical: 2.5,
             marginBottom: 20,
+            marginTop: 10,
+            backgroundColor: colors.accent,
           }}>
-          Pro
-        </Text>
+          <Text
+            style={{
+              color: 'white',
+              fontFamily: WEIGHT.regular,
+              fontSize: SIZE.sm,
+            }}>
+            Pro
+          </Text>
+        </View>
       </View>
       <FlatList
         data={[
@@ -130,7 +135,6 @@ export const AccountSettings = ({navigation}) => {
               borderBottomColor: colors.nav,
               paddingVertical: pv + 5,
               flexDirection: 'row',
-              paddingHorizontal: ph,
               justifyContent: 'space-between',
               alignItems: 'center',
             }}>

apps/mobile/src/views/Folders/index.js

@@ -114,6 +114,7 @@ export const Folders = ({navigation}) => {
           <Header
             sendHeight={height => (headerHeight = height)}
             hide={hideHeader}
+            menu={true}
             showSearch={() => {
               setHideHeader(false);
               countUp = 0;
@@ -164,30 +165,8 @@ export const Folders = ({navigation}) => {
           }
           numColumns={numColumns}
           key={numColumns}
-          columnWrapperStyle={
-            numColumns === 1
-              ? null
-              : {
-                  width:
-                    notebooks.length === 1
-                      ? DDS.isTab
-                        ? '95%'
-                        : '90%'
-                      : DDS.isTab
-                      ? '45%'
-                      : '42.5%',
-                }
-          }
           contentContainerStyle={{
-            width:
-              numColumns === 2
-                ? DDS.isTab
-                  ? '100%'
-                  : null
-                : DDS.isTab
-                ? '95%'
-                : '90%',
-            alignItems: numColumns === 2 ? 'flex-start' : null,
+            width: '100%',
             alignSelf: 'center',
           }}
           ListFooterComponent={

apps/mobile/src/views/Home/index.js

@@ -9,7 +9,7 @@ import {
 } from 'react-native';
 import {COLOR_SCHEME, opacity, pv, br, SIZE, WEIGHT} from '../../common/common';
 import {Search} from '../../components/SearchInput';
-import {w, h, SideMenuEvent} from '../../utils/utils';
+import {w, h, SideMenuEvent, getElevation} from '../../utils/utils';
 import {Header} from '../../components/header';
 import {NavigationEvents} from 'react-navigation';
 import {NotesList} from '../../components/NotesList';

apps/mobile/src/views/Settings/index.js

@@ -29,7 +29,12 @@ export const Settings = ({navigation}) => {
         height: '100%',
       }}>
       <View>
-        <Header colors={colors} heading="Settings" canGoBack={false} />
+        <Header
+          menu={true}
+          colors={colors}
+          heading="Settings"
+          canGoBack={false}
+        />
 
         <FlatList
           data={[
@@ -91,7 +96,7 @@ export const Settings = ({navigation}) => {
                 borderBottomColor: colors.nav,
                 paddingVertical: pv + 5,
                 flexDirection: 'row',
-                paddingHorizontal: ph,
+
                 justifyContent: 'space-between',
                 alignItems: 'center',
                 marginLeft: item.step ? '10%' : '5%',
@@ -125,7 +130,6 @@ export const Settings = ({navigation}) => {
             borderBottomColor: colors.nav,
             paddingVertical: pv + 5,
 
-            paddingHorizontal: ph,
             justifyContent: 'space-between',
             alignItems: 'flex-start',
           }}>
@@ -143,6 +147,7 @@ export const Settings = ({navigation}) => {
               flexDirection: 'row',
               flexWrap: 'wrap',
               marginTop: 10,
+              marginHorizontal: 20,
             }}>
             {[
               '#e6194b',
@@ -196,7 +201,7 @@ export const Settings = ({navigation}) => {
             borderBottomColor: colors.nav,
             paddingVertical: pv + 5,
             flexDirection: 'row',
-            paddingHorizontal: ph,
+
             justifyContent: 'space-between',
             alignItems: 'center',
           }}>
@@ -219,7 +224,7 @@ export const Settings = ({navigation}) => {
             borderBottomColor: colors.nav,
             paddingVertical: pv + 5,
             flexDirection: 'row',
-            paddingHorizontal: ph,
+
             justifyContent: 'space-between',
             alignItems: 'center',
           }}>
@@ -242,7 +247,7 @@ export const Settings = ({navigation}) => {
             borderBottomColor: colors.nav,
             paddingVertical: pv + 5,
             flexDirection: 'row',
-            paddingHorizontal: ph,
+
             justifyContent: 'space-between',
             alignItems: 'center',
           }}>

apps/mobile/src/views/Trash/index.js

@@ -56,7 +56,7 @@ export const Trash = ({navigation}) => {
       <FlatList
         numColumns={1}
         style={{
-          width: DDS.isTab ? '95%' : '90%',
+          width: '100%',
           alignSelf: 'center',
         }}
         data={trash}