refactor: move apps/app -> app

krystxf · Jun 17, 2024 · 743702e · 743702e
1 parent b79d7a3
commit 743702e
Show file tree

Hide file tree

Showing 60 changed files with 17 additions and 201 deletions.
diff --git a/.github/workflows/app-ci.yaml b/.github/workflows/app-ci.yaml
@@ -20,15 +20,15 @@ jobs:
 
             - name: Setup Xcode
               run: |
-                  cd ./apps/app
+                  cd ./app
                   xcodebuild -downloadAllPlatforms
 
             - name: Build
               run: |
-                  cd ./apps/app
+                  cd ./app
                   xcodebuild build -scheme metro-now -project metro-now.xcodeproj -destination 'platform=iOS Simulator,name=iPhone ${{ matrix.device }},OS=${{ matrix.iOS }}' | xcpretty && exit ${PIPESTATUS[0]}
 
             - name: Test
               run: |
-                  cd ./apps/app
+                  cd ./app
                   xcodebuild test -scheme metro-now -project metro-now.xcodeproj -destination 'platform=iOS Simulator,name=iPhone ${{ matrix.device }},OS=${{ matrix.iOS }}' | xcpretty && exit ${PIPESTATUS[0]}
diff --git a/apps/app/Common/Components/.gitkeep → app/Common/Components/.gitkeep b/apps/app/Common/Components/.gitkeep → app/Common/Components/.gitkeep
diff --git a/apps/app/Common/Data/.gitkeep → app/Common/Data/.gitkeep b/apps/app/Common/Data/.gitkeep → app/Common/Data/.gitkeep
diff --git a/apps/app/Common/Data/test-coordinates.swift → app/Common/Data/test-coordinates.swift b/apps/app/Common/Data/test-coordinates.swift → app/Common/Data/test-coordinates.swift
diff --git a/apps/app/Common/Models/LocationModel.swift → app/Common/Models/LocationModel.swift b/apps/app/Common/Models/LocationModel.swift → app/Common/Models/LocationModel.swift
diff --git a/...ommon/Types/departuresResponseTypes.swift → ...ommon/Types/departuresResponseTypes.swift b/...ommon/Types/departuresResponseTypes.swift → ...ommon/Types/departuresResponseTypes.swift
diff --git a/apps/app/Common/Types/metroRoutesTypes.swift → app/Common/Types/metroRoutesTypes.swift b/apps/app/Common/Types/metroRoutesTypes.swift → app/Common/Types/metroRoutesTypes.swift
diff --git a/...app/Common/Types/metroStationsTypes.swift → app/Common/Types/metroStationsTypes.swift b/...app/Common/Types/metroStationsTypes.swift → app/Common/Types/metroStationsTypes.swift
diff --git a/apps/app/Common/Utils/fileUtils.swift → app/Common/Utils/fileUtils.swift b/apps/app/Common/Utils/fileUtils.swift → app/Common/Utils/fileUtils.swift
diff --git a/apps/app/Common/Utils/jsonUtils.swift → app/Common/Utils/jsonUtils.swift b/apps/app/Common/Utils/jsonUtils.swift → app/Common/Utils/jsonUtils.swift
diff --git a/apps/app/Common/Utils/mapUtils.swift → app/Common/Utils/mapUtils.swift b/apps/app/Common/Utils/mapUtils.swift → app/Common/Utils/mapUtils.swift
diff --git a/apps/app/Common/Utils/metroUtils.swift → app/Common/Utils/metroUtils.swift b/apps/app/Common/Utils/metroUtils.swift → app/Common/Utils/metroUtils.swift
diff --git a/apps/app/Common/Utils/networkUtils.swift → app/Common/Utils/networkUtils.swift b/apps/app/Common/Utils/networkUtils.swift → app/Common/Utils/networkUtils.swift
diff --git a/apps/app/Common/Utils/timeUtils.swift → app/Common/Utils/timeUtils.swift b/apps/app/Common/Utils/timeUtils.swift → app/Common/Utils/timeUtils.swift
diff --git a/apps/app/README.md → app/README.md b/apps/app/README.md → app/README.md
diff --git a/.../app/metro-now-tests/jsonUtilsTests.swift → app/metro-now-tests/jsonUtilsTests.swift b/.../app/metro-now-tests/jsonUtilsTests.swift → app/metro-now-tests/jsonUtilsTests.swift
diff --git a/...app/metro-now-tests/metroUtilsTests.swift → app/metro-now-tests/metroUtilsTests.swift b/...app/metro-now-tests/metroUtilsTests.swift → app/metro-now-tests/metroUtilsTests.swift
diff --git a/.../app/metro-now-tests/timeUtilsTests.swift → app/metro-now-tests/timeUtilsTests.swift b/.../app/metro-now-tests/timeUtilsTests.swift → app/metro-now-tests/timeUtilsTests.swift
diff --git a/...assets/AccentColor.colorset/Contents.json → ...assets/AccentColor.colorset/Contents.json b/...assets/AccentColor.colorset/Contents.json → ...assets/AccentColor.colorset/Contents.json
diff --git a/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json b/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json
diff --git a/...ets/AppIcon.appiconset/icon-1024x1024.png → ...ets/AppIcon.appiconset/icon-1024x1024.png b/...ets/AppIcon.appiconset/icon-1024x1024.png → ...ets/AppIcon.appiconset/icon-1024x1024.png
diff --git a/...h Watch App/Assets.xcassets/Contents.json → ...h Watch App/Assets.xcassets/Contents.json b/...h Watch App/Assets.xcassets/Contents.json → ...h Watch App/Assets.xcassets/Contents.json
diff --git a/...tro-now-watch Watch App/ContentView.swift → ...tro-now-watch Watch App/ContentView.swift b/...tro-now-watch Watch App/ContentView.swift → ...tro-now-watch Watch App/ContentView.swift
diff --git a/...ent/Preview Assets.xcassets/Contents.json → ...ent/Preview Assets.xcassets/Contents.json b/...ent/Preview Assets.xcassets/Contents.json → ...ent/Preview Assets.xcassets/Contents.json
diff --git a/...-watch Watch App/metro_now_watchApp.swift → ...-watch Watch App/metro_now_watchApp.swift b/...-watch Watch App/metro_now_watchApp.swift → ...-watch Watch App/metro_now_watchApp.swift
diff --git a/...assets/AccentColor.colorset/Contents.json → ...assets/AccentColor.colorset/Contents.json b/...assets/AccentColor.colorset/Contents.json → ...assets/AccentColor.colorset/Contents.json
diff --git a/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json b/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json
diff --git a/...now-widgets/Assets.xcassets/Contents.json → ...now-widgets/Assets.xcassets/Contents.json b/...now-widgets/Assets.xcassets/Contents.json → ...now-widgets/Assets.xcassets/Contents.json
diff --git a/...s/WidgetBackground.colorset/Contents.json → ...s/WidgetBackground.colorset/Contents.json b/...s/WidgetBackground.colorset/Contents.json → ...s/WidgetBackground.colorset/Contents.json
diff --git a/...app/metro-now-widgets/Core/Provider.swift → app/metro-now-widgets/Core/Provider.swift b/...app/metro-now-widgets/Core/Provider.swift → app/metro-now-widgets/Core/Provider.swift
diff --git a/...-widgets/Core/Types/SimpleEntryType.swift → ...-widgets/Core/Types/SimpleEntryType.swift b/...-widgets/Core/Types/SimpleEntryType.swift → ...-widgets/Core/Types/SimpleEntryType.swift
diff --git a/...ow-widgets/Core/Views/DepartureView.swift → ...ow-widgets/Core/Views/DepartureView.swift b/...ow-widgets/Core/Views/DepartureView.swift → ...ow-widgets/Core/Views/DepartureView.swift
diff --git a/...w-widgets/Core/Views/ListWidgetView.swift → ...w-widgets/Core/Views/ListWidgetView.swift b/...w-widgets/Core/Views/ListWidgetView.swift → ...w-widgets/Core/Views/ListWidgetView.swift
diff --git a/...ow-widgets/Core/Views/WidgetHeading.swift → ...ow-widgets/Core/Views/WidgetHeading.swift b/...ow-widgets/Core/Views/WidgetHeading.swift → ...ow-widgets/Core/Views/WidgetHeading.swift
diff --git a/.../medium/MediumWidgetPlaceholderView.swift → .../medium/MediumWidgetPlaceholderView.swift b/.../medium/MediumWidgetPlaceholderView.swift → .../medium/MediumWidgetPlaceholderView.swift
diff --git a/.../Core/Views/medium/MediumWidgetView.swift → .../Core/Views/medium/MediumWidgetView.swift b/.../Core/Views/medium/MediumWidgetView.swift → .../Core/Views/medium/MediumWidgetView.swift
diff --git a/...ws/small/SmallWidgetPlaceholderView.swift → ...ws/small/SmallWidgetPlaceholderView.swift b/...ws/small/SmallWidgetPlaceholderView.swift → ...ws/small/SmallWidgetPlaceholderView.swift
diff --git a/...ts/Core/Views/small/SmallWidgetView.swift → ...ts/Core/Views/small/SmallWidgetView.swift b/...ts/Core/Views/small/SmallWidgetView.swift → ...ts/Core/Views/small/SmallWidgetView.swift
diff --git a/apps/app/metro-now-widgets/Info.plist → app/metro-now-widgets/Info.plist b/apps/app/metro-now-widgets/Info.plist → app/metro-now-widgets/Info.plist
diff --git a/apps/app/metro-now-widgets/WidgetView.swift → app/metro-now-widgets/WidgetView.swift b/apps/app/metro-now-widgets/WidgetView.swift → app/metro-now-widgets/WidgetView.swift
diff --git a/apps/app/metro-now-widgets/Widgets.swift → app/metro-now-widgets/Widgets.swift b/apps/app/metro-now-widgets/Widgets.swift → app/metro-now-widgets/Widgets.swift
diff --git a/...metro-now-widgets/metro_now_widgets.swift → ...metro-now-widgets/metro_now_widgets.swift b/...metro-now-widgets/metro_now_widgets.swift → ...metro-now-widgets/metro_now_widgets.swift
diff --git a/apps/app/metro-now.xcodeproj/project.pbxproj → app/metro-now.xcodeproj/project.pbxproj b/apps/app/metro-now.xcodeproj/project.pbxproj → app/metro-now.xcodeproj/project.pbxproj
diff --git a/...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata b/...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata
diff --git a/...ace/xcshareddata/IDEWorkspaceChecks.plist → ...ace/xcshareddata/IDEWorkspaceChecks.plist b/...ace/xcshareddata/IDEWorkspaceChecks.plist → ...ace/xcshareddata/IDEWorkspaceChecks.plist
diff --git a/...assets/AccentColor.colorset/Contents.json → ...assets/AccentColor.colorset/Contents.json b/...assets/AccentColor.colorset/Contents.json → ...assets/AccentColor.colorset/Contents.json
diff --git a/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json b/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json
diff --git a/...ets/AppIcon.appiconset/icon-1024x1024.png → ...ets/AppIcon.appiconset/icon-1024x1024.png b/...ets/AppIcon.appiconset/icon-1024x1024.png → ...ets/AppIcon.appiconset/icon-1024x1024.png
diff --git a/...p/metro-now/Assets.xcassets/Contents.json → app/metro-now/Assets.xcassets/Contents.json b/...p/metro-now/Assets.xcassets/Contents.json → app/metro-now/Assets.xcassets/Contents.json
diff --git a/...w/Core/Map/MapStationAnnotationView.swift → ...w/Core/Map/MapStationAnnotationView.swift b/...w/Core/Map/MapStationAnnotationView.swift → ...w/Core/Map/MapStationAnnotationView.swift
diff --git a/apps/app/metro-now/Core/Map/MapView.swift → app/metro-now/Core/Map/MapView.swift b/apps/app/metro-now/Core/Map/MapView.swift → app/metro-now/Core/Map/MapView.swift
diff --git a/...il/PlatformDetailDepartureListView:.swift → ...il/PlatformDetailDepartureListView:.swift b/...il/PlatformDetailDepartureListView:.swift → ...il/PlatformDetailDepartureListView:.swift
diff --git a/...e/PlatformDetail/PlatformDetailView.swift → ...e/PlatformDetail/PlatformDetailView.swift b/...e/PlatformDetail/PlatformDetailView.swift → ...e/PlatformDetail/PlatformDetailView.swift
diff --git a/.../Core/PlatformList/PlatformListItem.swift → .../Core/PlatformList/PlatformListItem.swift b/.../Core/PlatformList/PlatformListItem.swift → .../Core/PlatformList/PlatformListItem.swift
diff --git a/.../Core/PlatformList/PlatformListView.swift → .../Core/PlatformList/PlatformListView.swift b/.../Core/PlatformList/PlatformListView.swift → .../Core/PlatformList/PlatformListView.swift
diff --git a/.../PlatformList/PlatformListViewModel.swift → .../PlatformList/PlatformListViewModel.swift b/.../PlatformList/PlatformListViewModel.swift → .../PlatformList/PlatformListViewModel.swift
diff --git a/...p/metro-now/Core/TabBar/MainTabView.swift → app/metro-now/Core/TabBar/MainTabView.swift b/...p/metro-now/Core/TabBar/MainTabView.swift → app/metro-now/Core/TabBar/MainTabView.swift
diff --git a/...ent/Preview Assets.xcassets/Contents.json → ...ent/Preview Assets.xcassets/Contents.json b/...ent/Preview Assets.xcassets/Contents.json → ...ent/Preview Assets.xcassets/Contents.json
diff --git a/apps/app/metro-now/metro_nowApp.swift → app/metro-now/metro_nowApp.swift b/apps/app/metro-now/metro_nowApp.swift → app/metro-now/metro_nowApp.swift