From 70a35423112615b92b0e4f4d58079960eb47dfda Mon Sep 17 00:00:00 2001
From: Robert Eggl <github@roberteggl.dev>
Date: Mon, 23 Dec 2024 23:01:18 +0100
Subject: [PATCH] feat(timetable): update dropdown menu items and localization
 strings

---
 android/app/src/main/res/drawable/check.xml   |  11 ++
 bun.lockb                                     | Bin 677632 -> 677632 bytes
 ios/Podfile.lock                              |   8 +-
 package.json                                  |  12 +-
 src/components/Menu/DropdownMenuCheckIcon.tsx |  28 ----
 src/components/Menu/DropdownMenuTrigger.tsx   |   3 +-
 .../Timetable/{Menu.web.tsx => Menu.ios.tsx}  |  65 +++++----
 src/components/Timetable/Menu.tsx             | 129 +++++++++---------
 src/components/Timetable/TimetableScreen.tsx  |   1 -
 .../Timetable/WeekEventComponent.tsx          |   2 +-
 src/localization/de/timetable.json            |   7 +-
 src/localization/en/timetable.json            |   7 +-
 12 files changed, 131 insertions(+), 142 deletions(-)
 create mode 100644 android/app/src/main/res/drawable/check.xml
 delete mode 100644 src/components/Menu/DropdownMenuCheckIcon.tsx
 rename src/components/Timetable/{Menu.web.tsx => Menu.ios.tsx} (64%)

diff --git a/android/app/src/main/res/drawable/check.xml b/android/app/src/main/res/drawable/check.xml
new file mode 100644
index 00000000..4241129c
--- /dev/null
+++ b/android/app/src/main/res/drawable/check.xml
@@ -0,0 +1,11 @@
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M382,720L154,492L211,435L382,606L749,239L806,296L382,720Z"/>
+</vector>
diff --git a/bun.lockb b/bun.lockb
index dfd4fd482c0c7d53c29ffb0f316292dc3ccc70f5..dee33e0f12f8a708ea5ebbc5b537e404d0f1250e 100755
GIT binary patch
delta 1791
zcma)5c{G%39R9vB<C~d^$lOe08C*wFW0`Cz<3=bkCCNUPvL2TPZRc8UQ_ZND8R8Wx
zOQr3~+O%AfeJk25mk^ay$~I9k-A~HVe|_hC=Xu`e`TgGC`#tA-<MOrR^0fsts!=IM
zrCO(^@1ySn+z__Jp>eP9M0*y6C5edno2E8W^S48(15ETvRw!GUToH^1JTG|Z>;hQW
z!vxUa1<TG`c-EZtt<HAALd0XiJus0D^}E%Em)|&~nOqR8DB}6R0w!>|4C?{gLU`#M
z<IS`Bd4?~71#@nF(T_TO@egMEgK>Gqu!vWTvHud=+R+unW=(4Bfzyt>?c7^a|1yyn
zZJj81@u}r()P+=ydy-nR$BMk&-EpUT58oYLw6;z+y?fQu7OSQSUo8fu5{4iclE_L>
z9Fl_OAMDAU$j9VsW*Yl$!#tZNzm~8Jt2MInXKv9x+m{`t@@%pgDP1wTLF8it4h9Em
zZZFR2_FL=1uZ#WzJ3L@i9zdxDq1UApV*$e7UvKZLB<PP|#4DJ)Z^)GC(k8!hRdV)U
zq~Gv9pwX+h%r4q6dSkzzuUzN9@ji*CA4g7g6`GnKW$C}O;V(Ge+l9wldSH-JKn>hh
zcSO%E7}sNHNKMzZbc)J<u78s4<{y9bo}YTFVeUGz?bY(vdCD0#gQ+<CP9?ikev0J$
z;iwR^l|Z>bO3|WO!KvP<<ycQ1H(u$(BMmy0mAHdnN#3rN$D$Bf6uiFzJBh|P^f04t
za6rC92H7CJ6>}h3GhB|WZyTRA_(T*{AQgwP$QN!m=j;S#)gCdIP8g@?4_oin*)2^X
zf6$AwwHYdyxSKsvnv>vMle6Vbr0?R0Nu9t0DGhbaSeZ^c7we>R7e$7}Qh}isO?N!5
z9{Go(Al2{vcCz2SE6;T*vU5gT^-9X4<9Vk%g`=ihb6pIsWni+kn8TP;ks~HD#|ka7
z@NDEhBQMJLCU{20D#p5olSJnZs;u)*8J%L6oT1OSvm3L&c&Ly_ypX5OOx1Sfb35?4
zO4rM7mE2h6@|v#Q&dI-EQ|-1UUz{o5VC1kMazotw4*_ADUwBl;V0!+0;6}Ydk`mWt
zi)z-g0~|XVItK=K$z`6+t|o`fRPxE}&F1TKpHxk@r%yK8H=Bh?8&`D{b5#5SK!O@p
z(IQ~F>y+itXr*r2=FguWS5c!V)*mKXP6r1JgylGX+9GaarnffTO<=1U)0yQgdWl!5
zkmQ4j>oZtZ`%cp|iVR+=Ve2itg^tmpNPOB@`|+>x;`9qV(sPxKs_R0F8dq@q%$g$I
zh9g2lviVSQ3nS?m(jo4jN@J}Ww|Z|ajH%r8dA$S-tD{i`b!0tX-9j@KJTxs&{Ic@C
zS`N{L*LkUD`_ft!qkXBa6;m>IR90@Zd?gAFVIH+UzkmCMioYDKryuy+xyw&6%@;&v
zwlFG4we7m&c(3!g^5{j035BFgLaa{ePI-3Bu<HysbiQJm<U^RcJy}^!e;aeezgnXU
zhbb%Nj-@YAaxbK1C1-*&8fa9+a;P<?s?<?dcr~}b`jMw=j1%c>1v54`ff(-jcvst%
z#g?hrd-s2RBj?dJ)@?-J(--IP@mW&sYI5cfAT-W!#Tr=j#fiik((P2769IyDh#p!=
zo0;QgFVh>Y97kFt$3fB-!KT359Z>+~i3k<ty@`n80tpWk_{efp5F{dGj4AZp7kTrM
zVjtK5Y#l?$D9}a`GQ|LbbZTMfcL<8Rto*G0Y0;*S7}$iSZ$dKwBZG)S>I9+=(ngWu
z?|o8e1Be+#R)E7}h(0Qoj3M-eUh7L_IiQRqfvEUr1<EtV5vA`1D9jE;;rrIyUz^`C
zfqo9!G=b26sev0QMnsWfJU0UkVOl_lLV+zLxPcshyc!r560GK#EU;LQ{|)R<B4~co
zL}f{YAPh_wX{8Xt1JI%2UkS^>^=U#M$^|n77O?EaQ$fKJqBLN9B`le>a6n5!keM@j
hM+gY;kPym#uG5>_Df4G_NeY9wY+gc24-&b~{{wBD>(2lH

delta 1790
zcma)5c{o&S7(d70%uyM#%nTBtv6QUQOfrw5<Vtl_7iGK2nyoCCmeHb_HpY60sV*Yf
zO-u_ylvEFLaoxy_OkGQ5nQ<d@kCJEp>^$Fj-uL%=-{1Fs&+qxZxKh2iQazTT2B>P)
zKz`xX7Jl#3+#uOZU*Sk7bYD=K-(J4akF_&+{~4z$Cs4*CW#4h#l=?s{!t?;;76C%t
z1;WTP4-mIp!g_u$ee1Iq16-yj_y&|Q29#9@{Z1LD;#0~430$T($l9Hf8uEQ#`wCS2
z12Dxw%MwVh1T&U9S}Mibu^cgAF9sM)4#;J4BzAqF^V^>5Qa15|GPy=i6#wXvbMq~s
zSLOEDs@#%4q(C{J289m$<<h9vp5hXXKK2Rp-U$EX+Z1`-aVKecydBWh2LS*C7H|t_
z9L504pX7x3hP%af^K-@O7kexGtuMsT4oDa8>X;bD-RSvZeRJ}nWP0n~!@WeglPeq_
zXP&JNDLwn*QoanSk1UjaH+dwn0|_p}5a@hSbocm}v%yQ1O6C^Y?vm^ex$8tz)twh&
z<;dfBc~{q9-O{aZ1L*3}qo-Hu7KD~t77g_!sDzq1$h+N)c$6h}yixJvt;pn05@WO?
zU##{!acR(mm)g`5(j4@F7~iVmYc4Bri`C&ZYjyL9Y(J~0e?r?0rUz1NJnH`S4Enf1
zQb5@-Z-=ZY#}KH#*sLIuOW<Ee9!u~}JnV|(b4=68Upy1M;38u3OoO)KC5BY>%&e`A
zXNyK&wnF;r+cD4TPG1*<IW!wsx+?l`Bg-*y5>&>p+HVaH%!W2aQ{U98Wxv}F@CK7x
zTSIVmszfHs{(YBi@fEV|Cf6z+QEAAW*%&ZaP&Y;sUM5TBfG;b`)w$*zjDIk-nAqtO
z#tuHWIbEHfs5A1!N!U0`dc%%?RygSUzEVK$BdB=ByG2kGu8ph=65(9plN_E+H{HN*
z=4W;VS7~FBeho<iy{&n3*Y8`nYJ%P<*@O3L&u4_+%(<%Ss^)zDc+2b7l5Se&y`hY9
z|A~9*%t2p_Q{H8hmQQ7kSUEstpFm!)wpGk>bE)ME0Z1OOQZ@{s`_>D4qSW^kE*Lo0
z6gZn*nGGk~u#Z}WK|9CZN8QiYaUpgdeM@(m-gV!$fu|bIjAzcSHgX>-5O~KUS2ZOG
z)Q=;;ul2d3ci85bfVJK=rrOQvP|<@>!{GTUPQ)wI$ai`tm^b*-4kZ4ZZFTlk;>Ghx
zI$qix<3k6jI4M6pIwH`NY@x2jKh5<O{zu!w34J7D^H>D?QMn!CgEq>>^CpVhuE!FK
zlq~A|d^TFAxke@{`C067@BK__!|1bN3xALHHW>M^4z<es`B)Jvr7ws-JGi~QM(098
z@k3x>Z@6$R<!GwKj21tt9;Es-g?UxzmJS!{*1V$x8G=#ts{UYU*;PKwT3E~~invu*
zu+9->?N1Ny+}fGa9P8NVob!ub$qxVNsfZ8TZVl<;cZ~B^UL&LuPtI$vx3DhM+|m_0
z(&?Qm?53DX)Hy4KtwGpYs8y4n^O(%(m<Nq~ANMebb}Znd2=~JMq{fW)z+3A6Q`YKD
z<TEg>zcp(roHnsKZ@WH@y74x#!!Fy)!0$_Z^+kqAOA`I1xFRj-9t|mH7y$NhJ8Y#X
z+oVR&$27{2KPSzVKL=&304))(gODOpmjG#?`9K0h5Tme&Vj_f>umpY-SP2jjwB&jv
zLL6_<7;&6Lp)q1O0TES=0l?r12xtR9T;ZDjmaa;>X$jEM&=_6F_<Kk(T?nm1GA1C-
zk`99kkkb>83UYQ5GDgX}laQ%+tz7`&5!ETkA0<QT(L8GkQd??3!{SghEN#vBx%qz!
zA^f692$}wrfDs{rxDg^OBMWt9js-`e;aC#vhM44IHIT6+*lszKL#SJ^%1CrFtn-cI
z)+ED$5}+}clm>_Sp+m#I!g!=?4(6dbYaaGQa;mWF5$mt;szp``AuYhN$g4}RCc+zs
frIAAmaP4x7(RY3JGO;SnT1H_Jk*Z>37zh3b9u@XQ

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 5258dcbc..e01598d1 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -318,11 +318,11 @@ PODS:
   - hermes-engine (0.76.5):
     - hermes-engine/Pre-built (= 0.76.5)
   - hermes-engine/Pre-built (0.76.5)
-  - maplibre-react-native (10.0.0-beta.11):
-    - maplibre-react-native/DynamicLibrary (= 10.0.0-beta.11)
+  - maplibre-react-native (10.0.0-beta.13):
+    - maplibre-react-native/DynamicLibrary (= 10.0.0-beta.13)
     - React
     - React-Core
-  - maplibre-react-native/DynamicLibrary (10.0.0-beta.11):
+  - maplibre-react-native/DynamicLibrary (10.0.0-beta.13):
     - React
     - React-Core
   - RCT-Folly (2024.01.01.00):
@@ -2788,7 +2788,7 @@ SPEC CHECKSUMS:
   fmt: 10c6e61f4be25dc963c36bd73fc7b1705fe975be
   glog: 08b301085f15bcbb6ff8632a8ebaf239aae04e6a
   hermes-engine: 06a9c6900587420b90accc394199527c64259db4
-  maplibre-react-native: e0b56ed1bc9d8c895e5999ba5ee03268f5b734bf
+  maplibre-react-native: fd8dd338959f3bb5038ce85d21eb60498176a8da
   RCT-Folly: bf5c0376ffe4dd2cf438dcf86db385df9fdce648
   RCTDeprecation: fb7d408617e25d7f537940000d766d60149c5fea
   RCTRequired: 9aaf0ffcc1f41f0c671af863970ef25c422a9920
diff --git a/package.json b/package.json
index d4cfaea5..d5988c8a 100644
--- a/package.json
+++ b/package.json
@@ -33,16 +33,16 @@
     "@gorhom/bottom-sheet": "^5.0.6",
     "@howljs/calendar-kit": "^2.2.1",
     "@kichiyaki/react-native-barcode-generator": "^0.6.7",
-    "@maplibre/maplibre-react-native": "^10.0.0-beta.11",
+    "@maplibre/maplibre-react-native": "^10.0.0-beta.13",
     "@react-native-community/datetimepicker": "8.2.0",
     "@react-native-community/netinfo": "11.4.1",
     "@react-native-menu/menu": "^1.1.7",
     "@react-navigation/native": "^7.0.14",
     "@react-navigation/stack": "^7.1.1",
     "@shopify/flash-list": "1.7.1",
-    "@tanstack/query-sync-storage-persister": "^5.62.8",
-    "@tanstack/react-query": "^5.62.8",
-    "@tanstack/react-query-persist-client": "^5.62.8",
+    "@tanstack/query-sync-storage-persister": "^5.62.9",
+    "@tanstack/react-query": "^5.62.9",
+    "@tanstack/react-query-persist-client": "^5.62.9",
     "@th3rdwave/react-navigation-bottom-sheet": "0.3.2",
     "burnt": "^0.12.2",
     "color": "^4.2.3",
@@ -129,8 +129,8 @@
     "@types/prop-types": "^15.7.14",
     "@types/react": "~18.3.18",
     "@types/sanitize-html": "^2.13.0",
-    "@typescript-eslint/eslint-plugin": "^8.18.1",
-    "@typescript-eslint/parser": "^8.18.1",
+    "@typescript-eslint/eslint-plugin": "^8.18.2",
+    "@typescript-eslint/parser": "^8.18.2",
     "ajv": "^8.17.1",
     "babel-plugin-formatjs": "^10.5.29",
     "babel-plugin-transform-inline-environment-variables": "^0.4.4",
diff --git a/src/components/Menu/DropdownMenuCheckIcon.tsx b/src/components/Menu/DropdownMenuCheckIcon.tsx
deleted file mode 100644
index e25a18f0..00000000
--- a/src/components/Menu/DropdownMenuCheckIcon.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import { Check } from 'lucide-react-native'
-import React from 'react'
-import { StyleSheet } from 'react-native'
-import * as DropdownMenu from 'zeego/dropdown-menu'
-
-type ItemProps = React.ComponentProps<(typeof DropdownMenu)['ItemIcon']>
-
-const DropdownMenuCheckIcon = DropdownMenu.create((props: ItemProps) => {
-    return (
-        <DropdownMenu.ItemIcon
-            ios={{
-                name: 'checkmark',
-            }}
-            style={styles.check}
-            {...props}
-        >
-            <Check size={18} />
-        </DropdownMenu.ItemIcon>
-    )
-}, 'ItemIcon')
-
-const styles = StyleSheet.create({
-    // eslint-disable-next-line react-native/no-color-literals
-    check: {
-        color: 'white',
-    },
-})
-export default DropdownMenuCheckIcon
diff --git a/src/components/Menu/DropdownMenuTrigger.tsx b/src/components/Menu/DropdownMenuTrigger.tsx
index 40de9220..02f226cd 100644
--- a/src/components/Menu/DropdownMenuTrigger.tsx
+++ b/src/components/Menu/DropdownMenuTrigger.tsx
@@ -20,7 +20,8 @@ const stylesheet = createStyleSheet((theme) => ({
         borderWidth: 0,
         fontSize: 18,
         outlineStyle: 'none',
-        paddingLeft: Platform.OS === 'web' ? 14 : 0,
+        paddingLeft:
+            Platform.OS === 'web' ? 14 : Platform.OS === 'android' ? 10 : 0,
         paddingVertical: 10,
     },
 }))
diff --git a/src/components/Timetable/Menu.web.tsx b/src/components/Timetable/Menu.ios.tsx
similarity index 64%
rename from src/components/Timetable/Menu.web.tsx
rename to src/components/Timetable/Menu.ios.tsx
index d17ef587..e5e5f1ea 100644
--- a/src/components/Timetable/Menu.web.tsx
+++ b/src/components/Timetable/Menu.ios.tsx
@@ -4,9 +4,7 @@ import { useTranslation } from 'react-i18next'
 import { createStyleSheet, useStyles } from 'react-native-unistyles'
 import * as DropdownMenu from 'zeego/dropdown-menu'
 
-import DropdownMenuCheckIcon from '../Menu/DropdownMenuCheckIcon'
 import DropdownMenuContent from '../Menu/DropdownMenuContent'
-import DropdownMenuItem from '../Menu/DropdownMenuItem'
 import DropdownMenuSeparator from '../Menu/DropdownMenuItemSeparator'
 import DropdownMenuItemTitle from '../Menu/DropdownMenuItemTitle'
 import DropdownMenuTrigger from '../Menu/DropdownMenuTrigger'
@@ -25,7 +23,7 @@ export function MyMenu() {
             <DropdownMenuTrigger>
                 <PlatformIcon
                     ios={{
-                        name: 'calendar',
+                        name: 'calendar.day.timeline.left',
                         size: 20,
                     }}
                     android={{
@@ -40,61 +38,72 @@ export function MyMenu() {
                 />
             </DropdownMenuTrigger>
             <DropdownMenuContent>
-                <DropdownMenuItem
+                <DropdownMenu.CheckboxItem
                     key="1"
-                    onSelect={() => {
+                    value={timetableMode === TimetableMode.Timeline1}
+                    onValueChange={() => {
                         setTimetableMode(TimetableMode.Timeline1)
                     }}
                 >
                     <DropdownMenuItemTitle>
                         {t('menu.oneDay')}
                     </DropdownMenuItemTitle>
-                    {timetableMode === TimetableMode.Timeline1 && (
-                        <DropdownMenuCheckIcon />
-                    )}
-                </DropdownMenuItem>
+                    <DropdownMenu.ItemIcon
+                        ios={{
+                            name: '1.circle',
+                        }}
+                    />
+                </DropdownMenu.CheckboxItem>
                 <DropdownMenuSeparator />
-                <DropdownMenuItem
+                <DropdownMenu.CheckboxItem
                     key="3"
-                    onSelect={() => {
+                    value={timetableMode === TimetableMode.Timeline3}
+                    onValueChange={() => {
                         setTimetableMode(TimetableMode.Timeline3)
                     }}
                 >
                     <DropdownMenuItemTitle>
                         {t('menu.threeDays')}
                     </DropdownMenuItemTitle>
-                    {timetableMode === TimetableMode.Timeline3 && (
-                        <DropdownMenuCheckIcon />
-                    )}
-                </DropdownMenuItem>
+                    <DropdownMenu.ItemIcon
+                        ios={{
+                            name: '3.circle',
+                        }}
+                    />
+                </DropdownMenu.CheckboxItem>
                 <DropdownMenuSeparator />
-                <DropdownMenuItem
+                <DropdownMenu.CheckboxItem
                     key="5"
-                    onSelect={() => {
+                    value={timetableMode === TimetableMode.Timeline5}
+                    onValueChange={() => {
                         setTimetableMode(TimetableMode.Timeline5)
                     }}
                 >
                     <DropdownMenuItemTitle>
                         {t('menu.fiveDays')}
                     </DropdownMenuItemTitle>
-                    {timetableMode === TimetableMode.Timeline5 && (
-                        <DropdownMenuCheckIcon />
-                    )}
-                </DropdownMenuItem>
-                <DropdownMenuSeparator />
-                <DropdownMenuItem
+                    <DropdownMenu.ItemIcon
+                        ios={{
+                            name: '5.circle',
+                        }}
+                    />
+                </DropdownMenu.CheckboxItem>
+                <DropdownMenu.CheckboxItem
                     key="list"
-                    onSelect={() => {
+                    value={timetableMode === TimetableMode.List}
+                    onValueChange={() => {
                         setTimetableMode(TimetableMode.List)
                     }}
                 >
                     <DropdownMenuItemTitle>
                         {t('menu.list')}
                     </DropdownMenuItemTitle>
-                    {timetableMode === TimetableMode.List && (
-                        <DropdownMenuCheckIcon />
-                    )}
-                </DropdownMenuItem>
+                    <DropdownMenu.ItemIcon
+                        ios={{
+                            name: 'list.dash',
+                        }}
+                    />
+                </DropdownMenu.CheckboxItem>
             </DropdownMenuContent>
         </DropdownMenu.Root>
     )
diff --git a/src/components/Timetable/Menu.tsx b/src/components/Timetable/Menu.tsx
index 9662821f..5c895aa8 100644
--- a/src/components/Timetable/Menu.tsx
+++ b/src/components/Timetable/Menu.tsx
@@ -1,4 +1,5 @@
 import { TimetableMode, usePreferencesStore } from '@/hooks/usePreferencesStore'
+import { Check } from 'lucide-react-native'
 import React from 'react'
 import { useTranslation } from 'react-i18next'
 import { createStyleSheet, useStyles } from 'react-native-unistyles'
@@ -8,7 +9,6 @@ import DropdownMenuContent from '../Menu/DropdownMenuContent'
 import DropdownMenuItem from '../Menu/DropdownMenuItem'
 import DropdownMenuSeparator from '../Menu/DropdownMenuItemSeparator'
 import DropdownMenuItemTitle from '../Menu/DropdownMenuItemTitle'
-import DropdownMenuSubContent from '../Menu/DropdownMenuSubContent'
 import DropdownMenuTrigger from '../Menu/DropdownMenuTrigger'
 import PlatformIcon from '../Universal/Icon'
 
@@ -30,7 +30,7 @@ export function MyMenu() {
                     }}
                     android={{
                         name: 'calendar_month',
-                        size: 20,
+                        size: 22,
                     }}
                     web={{
                         name: 'Calendar',
@@ -40,68 +40,63 @@ export function MyMenu() {
                 />
             </DropdownMenuTrigger>
             <DropdownMenuContent>
-                <DropdownMenu.Sub>
-                    <DropdownMenu.SubTrigger key="timeline">
-                        {t('menu.timeline')}
-                    </DropdownMenu.SubTrigger>
-
-                    <DropdownMenuSubContent>
-                        <DropdownMenuItem
-                            key="1"
-                            onSelect={() => {
-                                setTimetableMode(TimetableMode.Timeline1)
-                            }}
+                <DropdownMenuItem
+                    key="1"
+                    onSelect={() => {
+                        setTimetableMode(TimetableMode.Timeline1)
+                    }}
+                >
+                    <DropdownMenuItemTitle>
+                        {t('menu.oneDay')}
+                    </DropdownMenuItemTitle>
+                    {timetableMode === TimetableMode.Timeline1 && (
+                        <DropdownMenu.ItemIcon
+                            androidIconName="check"
+                            style={styles.check}
                         >
-                            <DropdownMenuItemTitle>
-                                {t('menu.oneDay')}
-                            </DropdownMenuItemTitle>
-                            {timetableMode === TimetableMode.Timeline1 && (
-                                <DropdownMenu.ItemIcon
-                                    ios={{
-                                        name: 'checkmark',
-                                    }}
-                                />
-                            )}
-                        </DropdownMenuItem>
-                        <DropdownMenuSeparator />
-                        <DropdownMenuItem
-                            key="3"
-                            onSelect={() => {
-                                setTimetableMode(TimetableMode.Timeline3)
-                            }}
+                            <Check size={18} />
+                        </DropdownMenu.ItemIcon>
+                    )}
+                </DropdownMenuItem>
+                <DropdownMenuSeparator />
+                <DropdownMenuItem
+                    key="3"
+                    onSelect={() => {
+                        setTimetableMode(TimetableMode.Timeline3)
+                    }}
+                >
+                    <DropdownMenuItemTitle>
+                        {t('menu.threeDays')}
+                    </DropdownMenuItemTitle>
+                    {timetableMode === TimetableMode.Timeline3 && (
+                        <DropdownMenu.ItemIcon
+                            androidIconName="check"
+                            style={styles.check}
                         >
-                            <DropdownMenuItemTitle>
-                                {t('menu.threeDays')}
-                            </DropdownMenuItemTitle>
-                            {timetableMode === TimetableMode.Timeline3 && (
-                                <DropdownMenu.ItemIcon
-                                    ios={{
-                                        name: 'checkmark',
-                                    }}
-                                />
-                            )}
-                        </DropdownMenuItem>
-                        <DropdownMenuSeparator />
-                        <DropdownMenuItem
-                            key="5"
-                            onSelect={() => {
-                                setTimetableMode(TimetableMode.Timeline5)
-                            }}
+                            <Check size={18} />
+                        </DropdownMenu.ItemIcon>
+                    )}
+                </DropdownMenuItem>
+                <DropdownMenuSeparator />
+                <DropdownMenuItem
+                    key="5"
+                    onSelect={() => {
+                        setTimetableMode(TimetableMode.Timeline5)
+                    }}
+                >
+                    <DropdownMenuItemTitle>
+                        {t('menu.fiveDays')}
+                    </DropdownMenuItemTitle>
+                    {timetableMode === TimetableMode.Timeline5 && (
+                        <DropdownMenu.ItemIcon
+                            androidIconName="check"
+                            style={styles.check}
                         >
-                            <DropdownMenuItemTitle>
-                                {t('menu.fiveDays')}
-                            </DropdownMenuItemTitle>
-                            {timetableMode === TimetableMode.Timeline5 && (
-                                <DropdownMenu.ItemIcon
-                                    ios={{
-                                        name: 'checkmark',
-                                    }}
-                                />
-                            )}
-                        </DropdownMenuItem>
-                    </DropdownMenuSubContent>
-                </DropdownMenu.Sub>
-
+                            <Check size={18} />
+                        </DropdownMenu.ItemIcon>
+                    )}
+                </DropdownMenuItem>
+                <DropdownMenuSeparator />
                 <DropdownMenuItem
                     key="list"
                     onSelect={() => {
@@ -113,10 +108,11 @@ export function MyMenu() {
                     </DropdownMenuItemTitle>
                     {timetableMode === TimetableMode.List && (
                         <DropdownMenu.ItemIcon
-                            ios={{
-                                name: 'checkmark',
-                            }}
-                        />
+                            androidIconName="check"
+                            style={styles.check}
+                        >
+                            <Check size={18} />
+                        </DropdownMenu.ItemIcon>
                     )}
                 </DropdownMenuItem>
             </DropdownMenuContent>
@@ -125,6 +121,9 @@ export function MyMenu() {
 }
 
 const stylesheet = createStyleSheet((theme) => ({
+    check: {
+        color: theme.colors.labelColor,
+    },
     trigger: {
         color: theme.colors.text,
     },
diff --git a/src/components/Timetable/TimetableScreen.tsx b/src/components/Timetable/TimetableScreen.tsx
index 211f459d..c7d0f282 100644
--- a/src/components/Timetable/TimetableScreen.tsx
+++ b/src/components/Timetable/TimetableScreen.tsx
@@ -77,7 +77,6 @@ function TimetableScreen(): React.JSX.Element {
         )
     }
 
-    console.warn('timetableMode', timetableMode)
     return (
         <SafeAreaProvider>
             <SafeAreaView style={styles.page} edges={['top']}>
diff --git a/src/components/Timetable/WeekEventComponent.tsx b/src/components/Timetable/WeekEventComponent.tsx
index cd2cdd1b..08a6c198 100644
--- a/src/components/Timetable/WeekEventComponent.tsx
+++ b/src/components/Timetable/WeekEventComponent.tsx
@@ -92,7 +92,7 @@ const EventComponent = ({
                 backgroundColor: background,
             }}
         >
-            {isIOS && isExam ? <ExamLine /> : <LectureLine />}
+            {isIOS && (isExam ? <ExamLine /> : <LectureLine />)}
             <View style={styles.eventText}>
                 <View>
                     <Text
diff --git a/src/localization/de/timetable.json b/src/localization/de/timetable.json
index 5102304e..82ff5461 100644
--- a/src/localization/de/timetable.json
+++ b/src/localization/de/timetable.json
@@ -47,9 +47,8 @@
     },
     "menu": {
         "oneDay": "Ein Tag",
-        "threeDays": "Drei Tage",
-        "fiveDays": "Fünf Tage",
-        "list": "Liste",
-        "timeline": "Zeitstrahl"
+        "threeDays": "Mehrtägig",
+        "fiveDays": "Woche",
+        "list": "Liste"
     }
 }
diff --git a/src/localization/en/timetable.json b/src/localization/en/timetable.json
index cea852b9..ac605331 100644
--- a/src/localization/en/timetable.json
+++ b/src/localization/en/timetable.json
@@ -47,9 +47,8 @@
     },
     "menu": {
         "oneDay": "Single Day",
-        "threeDays": "Three Days",
-        "fiveDays": "Five Days",
-        "list": "List",
-        "timeline": "Timeline"
+        "threeDays": "Multi Day",
+        "fiveDays": "Week",
+        "list": "List"
     }
 }