Android design bugs are fixed

WrathChaos · Dec 9, 2019 · b702c0c · b702c0c
1 parent 529b594
commit b702c0c
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 22 deletions.
diff --git a/example/App.js b/example/App.js
@@ -1,5 +1,5 @@
 import React, { useState } from "react";
-import { Text, View, StatusBar } from "react-native";
+import { View, StatusBar } from "react-native";
 import LoginScreen from "react-native-login-screen";
 
 const bgImage =
@@ -16,8 +16,8 @@ const App = () => {
   return (
     <View>
       <StatusBar barStyle="light-content" />
-      <LoginScreen />
-      {/* <LoginScreen
+      {/* <LoginScreen /> */}
+      <LoginScreen
         source={{
           uri: bgImage
         }}
@@ -28,18 +28,8 @@ const App = () => {
         }}
         switchValue={switchValue}
         usernameOnChangeText={username => setUsername(username)}
-        passwordOnChangeText={password => alert("Password: ", password)}
-      >
-        <View
-          style={{
-            position: "relative",
-            alignSelf: "center",
-            marginTop: 64
-          }}
-        >
-          <Text style={{ color: "white", fontSize: 30 }}>{username}</Text>
-        </View>
-      </LoginScreen> */}
+        passwordOnChangeText={password => console.log("Password: ", password)}
+      />
     </View>
   );
 };

diff --git a/example/package.json b/example/package.json
@@ -10,11 +10,12 @@
     "lint": "eslint ."
   },
   "dependencies": {
+    "@freakycoder/react-native-helpers": "^0.1.0",
     "react": "16.9.0",
-    "react-native": "0.61.0",
+    "react-native": "0.61.5",
     "react-native-dynamic-vector-icons": "^0.2.1",
     "react-native-improved-text-input": "0.0.1",
-    "react-native-login-screen": "0.1.12",
+    "react-native-login-screen": "0.2.0",
     "react-native-vector-icons": "^6.6.0"
   },
   "devDependencies": {

diff --git a/lib/src/components/Card/Card.js b/lib/src/components/Card/Card.js
@@ -21,7 +21,7 @@ const Card = props => {
   return (
     <View style={styles.container}>
       <View style={styles.containerGlue}>
-        <View style={{ width: 35 }}>
+        <View style={{ width: 35, justifyContent: "center" }}>
           {iconComponent || (
             <Icon
               size={30}

diff --git a/lib/src/components/Card/Card.style.js b/lib/src/components/Card/Card.style.js
@@ -1,9 +1,13 @@
+import { isAndroid } from "@freakycoder/react-native-helpers";
+
 export const _textInputStyle = textColor => {
   return {
-    marginTop: 3,
     fontSize: 14,
     color: textColor,
-    fontWeight: "800"
+    fontWeight: "800",
+    right: isAndroid ? 5 : 0,
+    marginTop: isAndroid ? 0 : 3,
+    height: isAndroid ? 35 : null
   };
 };
 
@@ -33,6 +37,8 @@ export default {
   textContainer: {
     width: "90%",
     marginLeft: 12,
-    flexDirection: "column"
+    flexDirection: "column",
+    justifyContent: "center",
+    marginTop: isAndroid ? 10 : null
   }
 };
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-login-screen",
-  "version": "0.1.12",
+  "version": "0.2.0",
   "description": "Fully Customizable & Ready to use Login Screen for React Native",
   "keywords": [
     "login",
@@ -30,5 +30,8 @@
     "react-native-vector-icons": ">= 6.6.0",
     "react-native-improved-text-input": ">= 0.0.1",
     "react-native-dynamic-vector-icons": ">= 0.2.1"
+  },
+  "dependencies": {
+    "@freakycoder/react-native-helpers": "^0.1.0"
   }
 }