style(app): fixes various styling issues

neuland-ingolstadt · Oct 21, 2024 · ffae4e8 · ffae4e8
1 parent ca19292
commit ffae4e8
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 18 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -114,7 +114,7 @@ android {
         applicationId 'app.neuland'
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 179
+        versionCode 180
         versionName "0.10.0"
     }
     signingConfigs {

diff --git a/app.config.json b/app.config.json
@@ -44,7 +44,7 @@
         "android": {
             "package": "app.neuland",
             "userInterfaceStyle": "automatic",
-            "versionCode": 179,
+            "versionCode": 180,
             "splash": {
                 "image": "./src/assets/splash/splashLight.png",
                 "resizeMode": "contain",

diff --git a/package.json b/package.json
@@ -17,7 +17,7 @@
     "format": "prettier --write .",
     "lint": "eslint .",
     "lint:fix": "eslint --fix .",
-    "licences": "npm-license-crawler -onlyDirectDependencies -json src/data/licenses.json",
+    "licences": "npm-license-crawler -onlyDirectDependencies -json src/data/licenses.json --exclude docs/",
     "prepare": "husky"
   },
   "dependencies": {

diff --git a/src/app/(screens)/lecturer.tsx b/src/app/(screens)/lecturer.tsx
@@ -67,7 +67,7 @@ export default function LecturerDetail(): JSX.Element {
                     title: t('pages.lecturer.contact.room'),
                     value: lecturer?.room_short,
                     disabled: lecturer?.room_short === '',
-                    iconColor: colors.primary,
+                    textColor: colors.primary,
                     onPress: () => {
                         updateRouteParams(lecturer?.room_short ?? '')
                         router.navigate('(tabs)/map')
@@ -77,7 +77,7 @@ export default function LecturerDetail(): JSX.Element {
                     title: t('pages.lecturer.contact.phone'),
                     value: lecturer?.tel_dienst,
                     disabled: lecturer?.tel_dienst === '',
-                    iconColor: colors.primary,
+                    textColor: colors.primary,
                     onPress: () => {
                         void Linking.openURL(
                             `tel:${
@@ -91,7 +91,7 @@ export default function LecturerDetail(): JSX.Element {
                     value: lecturer?.email,
                     disabled: validEmail,
                     layout: validEmail ? 'column' : 'row',
-                    iconColor:
+                    textColor:
                         (lecturer?.email.includes('@') ?? false)
                             ? colors.primary
                             : undefined,

diff --git a/src/app/(screens)/lecturers.tsx b/src/app/(screens)/lecturers.tsx
@@ -329,9 +329,11 @@ export default function LecturersCard(): JSX.Element {
                 keyExtractor={(_, index) => index.toString()}
                 contentContainerStyle={{
                     marginHorizontal: PAGE_PADDING,
+
                     backgroundColor: colors.card,
                     ...styles.loadedRows,
                 }}
+                contentInsetAdjustmentBehavior="always"
                 refreshControl={
                     <RefreshControl
                         refreshing={
@@ -570,7 +572,7 @@ const styles = StyleSheet.create({
         paddingVertical: 8,
         paddingHorizontal: 4,
     },
-    searchContainer: { flex: 1, gap: 10 },
+    searchContainer: { flex: 1, gap: 10, paddingTop: 4 },
     resultsCountContainer: {
         position: 'absolute',
         right: 0,

diff --git a/src/app/(screens)/meal.tsx b/src/app/(screens)/meal.tsx
@@ -288,7 +288,7 @@ export default function FoodDetail(): JSX.Element {
                         restaurant as keyof typeof humanLocations
                     ],
                     onPress: handlePress,
-                    iconColor: locationExists ? colors.primary : undefined,
+                    textColor: locationExists ? colors.primary : undefined,
                     disabled: !locationExists,
                 },
                 {

diff --git a/src/components/Elements/Universal/FormList.tsx b/src/components/Elements/Universal/FormList.tsx
@@ -273,7 +273,7 @@ const styles = StyleSheet.create({
         flexDirection: 'column',
         alignItems: 'flex-start',
         paddingHorizontal: 15,
-        marginVertical: 23,
+        marginVertical: 13,
     },
     blockFooter: {
         fontSize: 12,
@@ -292,6 +292,7 @@ const styles = StyleSheet.create({
     },
     columnDetails: {
         textAlign: 'left',
+        paddingTop: 2,
         fontSize: 16,
     },
 })

diff --git a/src/components/allCards.tsx b/src/components/allCards.tsx
@@ -36,7 +36,7 @@ export const AllCards: Card[] = [
     {
         key: 'food',
         removable: true,
-        default: [USER_GUEST],
+        default: [USER_GUEST, USER_STUDENT, USER_EMPLOYEE],
         card: () => <FoodCard />,
     },
     {

diff --git a/src/data/licenses.json b/src/data/licenses.json
@@ -17,7 +17,7 @@
         "licenseUrl": "https://github.com/expo/vector-icons/raw/master/LICENSE",
         "parents": "neuland"
     },
-    "@gorhom/[email protected].2": {
+    "@gorhom/[email protected].4": {
         "licenses": "MIT",
         "repository": "https://github.com/gorhom/react-native-bottom-sheet",
         "licenseUrl": "https://github.com/gorhom/react-native-bottom-sheet/raw/master/LICENSE",
@@ -185,12 +185,6 @@
         "licenseUrl": "https://github.com/expo/expo",
         "parents": "neuland"
     },
-    "[email protected]": {
-        "licenses": "MIT",
-        "repository": "https://github.com/expressjs/express",
-        "licenseUrl": "https://github.com/expressjs/express/raw/master/LICENSE",
-        "parents": "neuland-next-docs"
-    },
     "[email protected]": {
         "licenses": "Apache-2.0",
         "repository": "https://github.com/krisk/Fuse",
@@ -209,7 +203,7 @@
         "licenseUrl": "https://github.com/graphql/graphql-js/raw/master/LICENSE",
         "parents": "neuland"
     },
-    "[email protected].1": {
+    "[email protected].2": {
         "licenses": "MIT",
         "repository": "https://github.com/i18next/i18next",
         "licenseUrl": "https://github.com/i18next/i18next/raw/master/LICENSE",