💄 Android settings screen UI improvements

better-rail · Apr 28, 2021 · d4f4015 · d4f4015
1 parent 67d183f
commit d4f4015
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 16 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -134,7 +134,7 @@ android {
         applicationId "com.betterrail"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 2
+        versionCode 3
         versionName "1.0"
     }
     splits {

diff --git a/app/navigators/settings/settings-navigator.tsx b/app/navigators/settings/settings-navigator.tsx
@@ -17,7 +17,6 @@ export const SettingsNavigator = () => (
       stackPresentation: "modal",
       headerTintColor: color.primary,
       headerStatusBarHeight: Platform.select({ ios: 10, android: 5 }),
-      headerTitleStyle: { fontSize: 20, fontFamily: typography.primary, fontWeight: "400", marginRight: 10, marginBottom: 10 },
       headerBackTitleStyle: { fontFamily: typography.primary },
     }}
   >
@@ -26,6 +25,10 @@ export const SettingsNavigator = () => (
       component={SettingsScreen}
       options={({ navigation }) => ({
         title: "הגדרות",
+        headerTitleStyle: Platform.select({
+          ios: { fontSize: 20, fontFamily: typography.primary, fontWeight: "400", marginRight: 10, marginBottom: 10 },
+          android: { marginLeft: -18.5, marginBottom: 10 },
+        }),
         headerLeft: () => <CloseIcon onPress={() => navigation.goBack()} />,
       })}
     />

diff --git a/app/screens/settings/settings-screen.tsx b/app/screens/settings/settings-screen.tsx
@@ -35,18 +35,20 @@ const storeLink = Platform.select({ ios: "https://apps.apple.com/app/better-rail
 export const SettingsScreen = observer(function SettingsScreen() {
   return (
     <Screen style={ROOT} preset="scroll" unsafe={true}>
-      <View style={SETTING_GROUP}>
-        <SettingBox
-          first
-          last={Platform.select({ ios: false, android: true })}
-          title="שתפו את Better Rail"
-          icon="🕺"
-          onPress={() =>
-            Share.share({ message: "Better Rail - האלטרנטיבה לאפליקציית רכבת ישראל", url: "https://better-rail.co.il" })
-          }
-        />
-        {Platform.OS === "ios" && <SettingBox title="דרגו ב- App Store" icon="⭐️" onPress={() => Linking.openURL(storeLink)} />}
-      </View>
+      {Platform.OS === "ios" && (
+        <View style={SETTING_GROUP}>
+          <SettingBox
+            first
+            last={Platform.select({ ios: false, android: true })}
+            title="שתפו את Better Rail"
+            icon="🕺"
+            onPress={() =>
+              Share.share({ message: "Better Rail - האלטרנטיבה לאפליקציית רכבת ישראל", url: "https://better-rail.co.il" })
+            }
+          />
+          <SettingBox title="דרגו ב- App Store" icon="⭐️" onPress={() => Linking.openURL(storeLink)} />
+        </View>
+      )}
 
       <View style={SETTING_GROUP}>
         <SettingBox

diff --git a/ios/BetterRail.xcodeproj/project.pbxproj b/ios/BetterRail.xcodeproj/project.pbxproj
@@ -698,7 +698,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 15;
+				CURRENT_PROJECT_VERSION = 16;
 				DEVELOPMENT_TEAM = UE6BVYPPFX;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = BetterRail/Info.plist;
@@ -726,7 +726,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 15;
+				CURRENT_PROJECT_VERSION = 16;
 				DEVELOPMENT_TEAM = UE6BVYPPFX;
 				INFOPLIST_FILE = BetterRail/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.1;