diff --git a/app/components/CityBackground.tsx b/app/components/CityBackground.tsx
new file mode 100644
index 00000000..e117b9be
--- /dev/null
+++ b/app/components/CityBackground.tsx
@@ -0,0 +1,28 @@
+import { Image, StyleSheet, View } from "react-native"
+
+export const CityBackground = () => {
+ return (
+
+
+
+
+ )
+}
diff --git a/app/components/index.ts b/app/components/index.ts
index c1e92af3..d9078789 100644
--- a/app/components/index.ts
+++ b/app/components/index.ts
@@ -1,6 +1,7 @@
export * from "./AutoImage"
export * from "./Button"
export * from "./Card"
+export * from "./CityBackground"
export * from "./Header"
export * from "./Icon"
export * from "./ListItem"
diff --git a/app/screens/CreateAccountScreen.tsx b/app/screens/CreateAccountScreen.tsx
index b609298c..daee240e 100644
--- a/app/screens/CreateAccountScreen.tsx
+++ b/app/screens/CreateAccountScreen.tsx
@@ -42,7 +42,12 @@ export const CreateAccountScreen: FC = observer(
}, [])
return (
-
+
= observer(
>
{({ handleChange, handleBlur, submitForm, values }) => (
<>
-
+
= observer(
autoCapitalize="none"
autoFocus={false}
/>
-
@@ -101,13 +111,13 @@ const $root: ViewStyle = {
const $container: ViewStyle = {
flex: 1,
flexDirection: "column",
- justifyContent: "center",
paddingHorizontal: spacing.medium,
}
const $title: TextStyle = {
textAlign: "center",
- marginBottom: spacing.massive,
+ marginTop: spacing.medium,
+ marginBottom: spacing.huge,
}
const $inputWrapper: ViewStyle = {
@@ -134,11 +144,10 @@ const $input: ViewStyle = {
}
const $button: ViewStyle = {
- backgroundColor: colors.palette.cyan500,
- borderWidth: 0,
+ backgroundColor: "transparent",
+ borderColor: colors.palette.cyan900,
width: "100%",
- marginTop: spacing.small,
- marginBottom: spacing.small,
+ marginVertical: spacing.medium,
height: 50,
minHeight: 50,
}
diff --git a/app/screens/HomeScreen.tsx b/app/screens/HomeScreen.tsx
index adc79bb1..e66bcc64 100644
--- a/app/screens/HomeScreen.tsx
+++ b/app/screens/HomeScreen.tsx
@@ -3,7 +3,7 @@ import { observer } from "mobx-react-lite"
import { TextStyle, View, ViewStyle } from "react-native"
import { NativeStackScreenProps } from "@react-navigation/native-stack"
import { AppStackScreenProps } from "app/navigators"
-import { Button, Screen, Spotlight, Text } from "app/components"
+import { Button, CityBackground, Screen, Spotlight, Text } from "app/components"
import { useNavigation } from "@react-navigation/native"
import { colors, spacing } from "app/theme"
@@ -19,20 +19,21 @@ export const HomeScreen: FC = observer(function HomeScreen() {
safeAreaEdges={["top", "bottom"]}
contentContainerStyle={$container}
>
-
+
+ {/* */}
navigate("Login")}
+ text="Create Account"
+ onPress={() => navigate("CreateAccount")}
style={$mainButton}
pressedStyle={$mainButton}
/>
navigate("CreateAccount")}
+ text="Login"
+ onPress={() => navigate("Login")}
style={$button}
pressedStyle={$button}
/>
@@ -66,14 +67,14 @@ const $arcade: TextStyle = {
}
const $mainButton: ViewStyle = {
- backgroundColor: "black", // colors.palette.cyan500,
+ backgroundColor: "rgba(0,0,0,0.5)", // "black", // colors.palette.cyan500,
borderWidth: 1,
width: "100%",
- marginBottom: spacing.small,
+ marginBottom: spacing.medium,
borderColor: colors.palette.cyan500,
}
const $button: ViewStyle = {
- backgroundColor: "black", // colors.palette.cyan900,
+ backgroundColor: "rgba(0,0,0,0.5)", // colors.palette.cyan900,
borderColor: colors.palette.cyan900,
}
diff --git a/app/screens/LoginScreen.tsx b/app/screens/LoginScreen.tsx
index 782d6b7f..2c9814d9 100644
--- a/app/screens/LoginScreen.tsx
+++ b/app/screens/LoginScreen.tsx
@@ -44,9 +44,14 @@ export const LoginScreen: FC = observer(function LoginScreen()
}, [])
return (
-
+
-
+
= observer(function LoginScreen()
autoCapitalize="none"
autoFocus={true}
/>
-
+
)
@@ -71,13 +76,13 @@ const $root: ViewStyle = {
const $container: ViewStyle = {
flex: 1,
flexDirection: "column",
- justifyContent: "center",
paddingHorizontal: spacing.medium,
}
const $title: TextStyle = {
textAlign: "center",
- marginBottom: spacing.massive,
+ marginTop: spacing.medium,
+ marginBottom: spacing.huge,
}
const $inputWrapper: ViewStyle = {
@@ -104,11 +109,10 @@ const $input: ViewStyle = {
}
const $button: ViewStyle = {
- backgroundColor: colors.palette.cyan500,
- borderWidth: 0,
+ backgroundColor: "transparent",
+ borderColor: colors.palette.cyan900,
width: "100%",
- marginTop: spacing.small,
- marginBottom: spacing.small,
+ marginVertical: spacing.medium,
height: 50,
minHeight: 50,
}
diff --git a/assets/images/city-cyan.png b/assets/images/city-cyan.png
new file mode 100644
index 00000000..3160cfe0
Binary files /dev/null and b/assets/images/city-cyan.png differ
diff --git a/assets/images/city.png b/assets/images/city.png
new file mode 100644
index 00000000..933abe3a
Binary files /dev/null and b/assets/images/city.png differ
diff --git a/ios/Podfile b/ios/Podfile
index 253c6e9a..22c2e7c8 100644
--- a/ios/Podfile
+++ b/ios/Podfile
@@ -84,6 +84,13 @@ target 'arcade' do
__apply_Xcode_12_5_M1_post_install_workaround(installer)
File.delete("./.xcode.env.local") if File.exist?("./.xcode.env.local")
+ # Fix dupe accessibilityresources error - https://stackoverflow.com/a/63503302
+ installer.pods_project.targets.each do |target|
+ if target.name == "React-Core.common-AccessibilityResources"
+ target.remove_from_project
+ end
+ end
+
# This is necessary for Xcode 14, because it signs resource bundles by default
# when building for devices.
installer.target_installation_results.pod_target_installation_results
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 142aac63..e449482a 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -791,6 +791,6 @@ SPEC CHECKSUMS:
Yoga: d56980c8914db0b51692f55533409e844b66133c
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
-PODFILE CHECKSUM: 6bea9a0b051b5e15bd2f5c43c9fcb4dcf4f7a8c5
+PODFILE CHECKSUM: dd7224095aa55df328773a2005164244afd423b1
COCOAPODS: 1.12.1
diff --git a/ios/arcade/Info.plist b/ios/arcade/Info.plist
index 8bb9015d..7fa94006 100644
--- a/ios/arcade/Info.plist
+++ b/ios/arcade/Info.plist
@@ -21,7 +21,7 @@
CFBundleSignature
????
CFBundleVersion
- 43
+ 45
ITSAppUsesNonExemptEncryption
LSRequiresIPhoneOS