diff options
| author | Iván Ávalos <avalos@disroot.org> | 2022-03-01 22:18:00 -0600 |
|---|---|---|
| committer | Iván Ávalos <avalos@disroot.org> | 2022-03-01 22:18:00 -0600 |
| commit | 9b8eee4362c368e682bfe18d5cef44d6b9d109bf (patch) | |
| tree | 821f7d517229a6d3eab8c0a78968e49efbe17761 | |
| parent | bb604a0c95fe344a5a5f4392c6bd33bc941b2ce5 (diff) | |
| download | etbsa-trackermap-mobile-9b8eee4362c368e682bfe18d5cef44d6b9d109bf.tar.gz etbsa-trackermap-mobile-9b8eee4362c368e682bfe18d5cef44d6b9d109bf.tar.bz2 etbsa-trackermap-mobile-9b8eee4362c368e682bfe18d5cef44d6b9d109bf.zip | |
Fixed horizontal scroll and bumped version to 1.1
| -rw-r--r-- | iosApp/iosApp.xcodeproj/project.pbxproj | 2 | ||||
| -rw-r--r-- | iosApp/iosApp/Details/Reports/UnitReportsView.swift | 6 | ||||
| -rw-r--r-- | iosApp/iosApp/Info.plist | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/iosApp/iosApp.xcodeproj/project.pbxproj b/iosApp/iosApp.xcodeproj/project.pbxproj index 8e5838d..dc4bdc2 100644 --- a/iosApp/iosApp.xcodeproj/project.pbxproj +++ b/iosApp/iosApp.xcodeproj/project.pbxproj @@ -570,6 +570,7 @@ "$(inherited)", "@executable_path/Frameworks", ); + MARKETING_VERSION = 1.1; OTHER_LDFLAGS = ( "$(inherited)", "-framework", @@ -606,6 +607,7 @@ "$(inherited)", "@executable_path/Frameworks", ); + MARKETING_VERSION = 1.1; OTHER_LDFLAGS = ( "$(inherited)", "-framework", diff --git a/iosApp/iosApp/Details/Reports/UnitReportsView.swift b/iosApp/iosApp/Details/Reports/UnitReportsView.swift index 9973189..2143b3b 100644 --- a/iosApp/iosApp/Details/Reports/UnitReportsView.swift +++ b/iosApp/iosApp/Details/Reports/UnitReportsView.swift @@ -40,8 +40,8 @@ struct UnitReportsView: View { private var eventsGridItems: [GridItem] = [ GridItem(.flexible(minimum: 100), alignment: .leading), GridItem(.flexible(minimum: 100), alignment: .leading), - GridItem(.flexible(minimum: 100), alignment: .leading), - GridItem(.flexible(minimum: 100), alignment: .leading), + GridItem(.flexible(minimum: 100, maximum: 150), alignment: .leading), + GridItem(.flexible(minimum: 150, maximum: 250), alignment: .leading), ] @ViewBuilder @@ -94,7 +94,7 @@ struct UnitReportsView: View { VStack { if unitReportsViewModel.reportType == .events { if let report = unitReportsViewModel.report as? ReportController.ReportEventsReport { - SidewaysScroller(minWidth: 400) { + SidewaysScroller(minWidth: 1000) { TablerList(eventsConfig, headerContent: eventsHeader, rowContent: eventsRow, diff --git a/iosApp/iosApp/Info.plist b/iosApp/iosApp/Info.plist index 99c8b7b..da4a45d 100644 --- a/iosApp/iosApp/Info.plist +++ b/iosApp/iosApp/Info.plist @@ -17,7 +17,7 @@ <key>CFBundlePackageType</key> <string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string> <key>CFBundleShortVersionString</key> - <string>1.0</string> + <string>$(MARKETING_VERSION)</string> <key>CFBundleVersion</key> <string>1</string> <key>LSRequiresIPhoneOS</key> |