Merge branch 'dev' of github.com:chaion/Makkii into dev

makkii-dev · Oct 16, 2019 · d285f86 · d285f86
2 parents e01904d + 5931d39
commit d285f86
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/app/components/TouchableView.js b/app/components/TouchableView.js
@@ -1,5 +1,6 @@
 import React from 'react';
 import { View, PanResponder, Dimensions } from 'react-native';
+import { STATUSBAR_HEIGHT, HEADER_HEIGHT } from '../styles';
 
 const TouchableContext = React.createContext();
 const { width, height } = Dimensions.get('window');
@@ -17,6 +18,8 @@ const TouchableView = props => {
     const { posState, dispatchToPosState } = React.useContext(TouchableContext);
     const right = posState.right || currentRight;
     const bottom = posState.bottom || currentBottom;
+    const sizeW = props.width || 80;
+    const sizeH = STATUSBAR_HEIGHT + HEADER_HEIGHT + (props.height || 80);
     let newRight;
     let newBottom;
     const panResponder = PanResponder.create({
@@ -35,8 +38,8 @@ const TouchableView = props => {
                 presentState = true;
                 newRight = right - gestureState.dx;
                 newBottom = bottom - gestureState.dy;
-                newRight = newRight > 0 && newRight < width - 40 ? newRight : right;
-                newBottom = newBottom > 0 && newBottom < height - 100 ? newBottom : bottom;
+                newRight = newRight > 0 ? (newRight < width - sizeW ? newRight : width - sizeW) : 0;
+                newBottom = newBottom > 0 ? (newBottom < height - sizeH ? newBottom : height - sizeH) : 0;
                 touchBackView.current.setNativeProps({
                     style: {
                         right: newRight,

diff --git a/app/pages/signed/vault/home.js b/app/pages/signed/vault/home.js
@@ -840,7 +840,7 @@ class Home extends Component {
                                 this.handleActivity();
                             }}
                         >
-                            <Image source={{ uri: activity.imgUrl }} style={{ width: 50, height: 50 }} resizeMode="contain" />
+                            <Image source={{ uri: activity.imgUrl }} style={{ width: 80, height: 80 }} resizeMode="contain" />
                         </TouchableView>
                     ) : null}
                 </TouchableOpacity>

diff --git a/models/settings.model.js b/models/settings.model.js
@@ -95,6 +95,7 @@ export default {
                 yield put(createAction('updateState')(payload));
             }
             yield put(createAction('getCoinPrices')());
+            yield put(createAction('getSupportedModule')());
             return true;
         },
         *getSupportedModule(action, { select, call, put }) {