Merge branch 'main' into main

.github/workflows/Analyze.yml

@@ -0,0 +1,40 @@
+name: Analyze
+
+on:
+  pull_request:
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'java' ]
+
+    steps:
+    - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+
+    - uses: ./.github/actions/setup-java
+
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+
+    - name: Build project
+      run: ./gradlew :app-android:assemble --stacktrace
+
+    - name: Perform analysis
+      uses: github/codeql-action/analyze@v2
+      with:
+        category: "/language:${{matrix.language}}"

app-ios/Modules/Sources/Assets/Resources/Icons.xcassets/bookmarks.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "bookmarks.pdf",
+      "filename" : "trailing-icon 2.pdf",
       "idiom" : "universal"
     }
   ],

app-ios/Modules/Sources/Timetable/TimetableView.swift

@@ -101,11 +101,13 @@ public struct TimetableView<SessionView: View>: View {
                             NavigationLink(value: TimetableRouting.search) {
                                 Assets.Icons.search.swiftUIImage
                             }
+                            .buttonStyle(.plain)
                         }
                         ToolbarItem {
                             NavigationLink(value: TimetableRouting.bookmark) {
                                 Assets.Icons.bookmarks.swiftUIImage
                             }
+                            .buttonStyle(.plain)
                         }
                         ToolbarItem {
                             Assets.Icons.gridView.swiftUIImage