From 64dd134e01124436246d3eaf507e9d44d08cd76c Mon Sep 17 00:00:00 2001 From: Kristaps Grinbergs Date: Sat, 6 Jun 2020 17:35:26 +0300 Subject: [PATCH 1/3] Accesability in Settings screen --- Dodies.lv.xcodeproj/project.pbxproj | 4 ++-- Dodies.lv/Base.lproj/Main.storyboard | 19 ++++++++----------- Dodies.lv/MapViewController.swift | 1 - Dodies.lv/SettingsViewController.swift | 3 +++ Podfile.lock | 8 ++++---- 5 files changed, 17 insertions(+), 18 deletions(-) diff --git a/Dodies.lv.xcodeproj/project.pbxproj b/Dodies.lv.xcodeproj/project.pbxproj index 005c6a3..9e03bfb 100644 --- a/Dodies.lv.xcodeproj/project.pbxproj +++ b/Dodies.lv.xcodeproj/project.pbxproj @@ -858,7 +858,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.14; + MARKETING_VERSION = 1.15; PRODUCT_BUNDLE_IDENTIFIER = "com.fassko.Dodies-lv"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; @@ -889,7 +889,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.14; + MARKETING_VERSION = 1.15; PRODUCT_BUNDLE_IDENTIFIER = "com.fassko.Dodies-lv"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = "334705a6-af7c-42ae-8215-32bf7fe3481d"; diff --git a/Dodies.lv/Base.lproj/Main.storyboard b/Dodies.lv/Base.lproj/Main.storyboard index 80d1ed6..ff2ef13 100644 --- a/Dodies.lv/Base.lproj/Main.storyboard +++ b/Dodies.lv/Base.lproj/Main.storyboard @@ -1,9 +1,9 @@ - + - + @@ -59,7 +59,7 @@ - + Dodies.lv is a collection of free nature trails, hiking paths, birdwatching towers and picnic places in Latvia. Would you like to spend some time in Latvian nature, make a fire, stay in a tent? Our map contains freely accessible places closer to nature, available at any time for anyone. @@ -68,17 +68,14 @@ The grey icons show places we have not yet given our approval. Hiking in Latvia is now made simple, select a point of interest and use Google Maps, Waze or Apple Maps to navigate there. - + - + + + + + + - - - - - - - - - + + - - - - - + + @@ -210,36 +205,35 @@ Hiking in Latvia is now made simple, select a point of interest and use Google M + + - - - + + - - - - - - @@ -250,19 +244,22 @@ Hiking in Latvia is now made simple, select a point of interest and use Google M - + + - - - + + + + - - + + + diff --git a/Dodies.lv/DetailsViewController.swift b/Dodies.lv/DetailsViewController.swift index 5621ab7..cb722f0 100644 --- a/Dodies.lv/DetailsViewController.swift +++ b/Dodies.lv/DetailsViewController.swift @@ -26,7 +26,10 @@ class DetailsViewController: UIViewController, Storyboarded { @IBOutlet weak var lenght: UILabel! @IBOutlet weak var checked: UILabel! + @IBOutlet weak var lengthStackView: UIStackView! @IBOutlet weak var lengthTitle: UILabel! + + @IBOutlet weak var checkedStackView: UIStackView! @IBOutlet weak var checkedTitle: UILabel! @IBOutlet weak var slideShow: ImageSlideshow! @@ -61,6 +64,12 @@ class DetailsViewController: UIViewController, Storyboarded { navigationButton.layer.cornerRadius = Constants.buttonCornerRadius moreInfoButton.layer.cornerRadius = Constants.buttonCornerRadius + navigationButton.titleLabel?.adjustsFontForContentSizeCategory = true + navigationButton.titleLabel?.font = .preferredFont(forTextStyle: .title2) + + moreInfoButton.titleLabel?.adjustsFontForContentSizeCategory = true + moreInfoButton.titleLabel?.font = .preferredFont(forTextStyle: .title2) + setupDetails() setupImage() } diff --git a/Dodies.lv/MapViewController.swift b/Dodies.lv/MapViewController.swift index 1be8b01..5570098 100644 --- a/Dodies.lv/MapViewController.swift +++ b/Dodies.lv/MapViewController.swift @@ -19,6 +19,7 @@ class MapViewController: UIViewController, CLLocationManagerDelegate, Storyboard weak var coordinator: MainCoordinator? + @IBOutlet private weak var settingsButton: UIBarButtonItem! @IBOutlet private weak var mapView: MKMapView! private var selectedPoint: DodiesAnnotation! @@ -57,7 +58,7 @@ class MapViewController: UIViewController, CLLocationManagerDelegate, Storyboard navigationItem.title = "Map".localized() navigationItem.titleView = UIImageView(image: UIImage(named: "dodies_nav_logo")) - navigationItem.rightBarButtonItem?.title = "Settings".localized() + settingsButton.title = "Settings".localized() if CLLocationManager.authorizationStatus() == .notDetermined { locationManager.requestWhenInUseAuthorization() From ffe4bb8bd71a4a7c4d55f0f04832f6342dd649c4 Mon Sep 17 00:00:00 2001 From: Kristaps Grinbergs Date: Sat, 6 Jun 2020 21:51:54 +0300 Subject: [PATCH 3/3] Fixed details view --- Dodies.lv.xcodeproj/project.pbxproj | 4 ++-- Dodies.lv/Base.lproj/Main.storyboard | 12 ++++-------- Dodies.lv/DetailsViewController.swift | 8 ++++---- Dodies.lv/Info.plist | 2 +- Dodies.lvUITests/Info.plist | 2 +- 5 files changed, 12 insertions(+), 16 deletions(-) diff --git a/Dodies.lv.xcodeproj/project.pbxproj b/Dodies.lv.xcodeproj/project.pbxproj index 9e03bfb..ebb14c7 100644 --- a/Dodies.lv.xcodeproj/project.pbxproj +++ b/Dodies.lv.xcodeproj/project.pbxproj @@ -741,7 +741,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer: Kristaps Grinbergs (MMGQCA8E72)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Kristaps Grinbergs (MMGQCA8E72)"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1.14.200402.1735; + CURRENT_PROJECT_VERSION = 1.15.200606.2120; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_BITCODE = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -808,7 +808,7 @@ CODE_SIGN_IDENTITY = "iPhone Distribution: Kristaps Grinbergs (3SGNZQGS68)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Kristaps Grinbergs (3SGNZQGS68)"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1.14.200402.1735; + CURRENT_PROJECT_VERSION = 1.15.200606.2120; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_BITCODE = NO; ENABLE_NS_ASSERTIONS = NO; diff --git a/Dodies.lv/Base.lproj/Main.storyboard b/Dodies.lv/Base.lproj/Main.storyboard index 9e287b0..a29f6ab 100644 --- a/Dodies.lv/Base.lproj/Main.storyboard +++ b/Dodies.lv/Base.lproj/Main.storyboard @@ -143,13 +143,13 @@ Hiking in Latvia is now made simple, select a point of interest and use Google M