Merge pull request #154 from fassko/develop

fassko · Jun 7, 2020 · 64db5e6 · 64db5e6
2 parents bf83197 + ffe4bb8
commit 64db5e6
Show file tree

Hide file tree

Showing 8 changed files with 97 additions and 95 deletions.
diff --git 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;
@@ -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
diff --git 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()
   }
@@ -72,10 +81,10 @@ class DetailsViewController: UIViewController, Storyboarded {
       for: UIControl.State.normal)
 
     if point.km == "" {
-      lenght.isHidden = true
-      lengthTitle.isHidden = true
+      lengthStackView.isHidden = true
     } else {
       lenght.text = "\(point.km) km"
+      lengthStackView.isHidden = false
     }
 
     let formatterFrom = DateFormatter()
@@ -85,9 +94,9 @@ class DetailsViewController: UIViewController, Storyboarded {
       let formatter = DateFormatter()
       formatter.dateFormat = "dd.MM.yyyy"
       checked.text = formatter.string(from: date)
+      checkedStackView.isHidden = false
     } else {
-      checkedTitle.isHidden = true
-      checked.isHidden = true
+      checkedStackView.isHidden = true
     }
   }
 

diff --git a/Dodies.lv/Info.plist b/Dodies.lv/Info.plist
@@ -23,7 +23,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.13.200401.1912</string>
+	<string>1.15.200606.2120</string>
 	<key>Fabric</key>
 	<dict>
 		<key>APIKey</key>

diff --git 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()
@@ -111,7 +112,6 @@ class MapViewController: UIViewController, CLLocationManagerDelegate, Storyboard
     downloadData()
   }
 
-
   // download data from server
   func downloadData() {
     firstly {

diff --git a/Dodies.lv/SettingsViewController.swift b/Dodies.lv/SettingsViewController.swift
@@ -25,6 +25,9 @@ class SettingsViewController: UIViewController, Storyboarded {
     changeLanguageButton.setTitle("Change Language".localized())
     changeLanguageButton.layer.cornerRadius = Constants.buttonCornerRadius
 
+    changeLanguageButton.titleLabel?.font = .preferredFont(forTextStyle: .title2)
+    changeLanguageButton.titleLabel?.adjustsFontForContentSizeCategory = true
+
     //swiftlint:disable line_length
     aboutText.text = "Dodies.lv is a collection of free nature trails, hiking paths, birdwatching towers and picnic places in Latvia. \nWould 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.\n\nThe green icons represent places which we have verified ourselves, they have photos and longer descriptions.\nThe grey icons show places we have not yet given our approval.\n\nHiking in Latvia is now made simple, select a point of interest and use Google Maps, Waze or Apple Maps to navigate there.".localized()
     aboutText.contentInsetAdjustmentBehavior = .never

diff --git a/Dodies.lvUITests/Info.plist b/Dodies.lvUITests/Info.plist
@@ -17,6 +17,6 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
-	<string>1.13.200401.1912</string>
+	<string>1.15.200606.2120</string>
 </dict>
 </plist>
diff --git a/Podfile.lock b/Podfile.lock
@@ -5,9 +5,9 @@ PODS:
   - ImageSlideshow/Kingfisher (1.8.3):
     - ImageSlideshow/Core
     - Kingfisher (> 3.0)
-  - Kingfisher (5.13.3):
-    - Kingfisher/Core (= 5.13.3)
-  - Kingfisher/Core (5.13.3)
+  - Kingfisher (5.14.0):
+    - Kingfisher/Core (= 5.14.0)
+  - Kingfisher/Core (5.14.0)
 
 DEPENDENCIES:
   - ImageSlideshow
@@ -21,7 +21,7 @@ SPEC REPOS:
 
 SPEC CHECKSUMS:
   ImageSlideshow: 4694d7d699a1549582e7cc631fb392d8f91630f3
-  Kingfisher: d2b3d6a7200c93b34de9afcdf25c8dd9282ec277
+  Kingfisher: 7b64389a43139c903ec434788344c288217c792d
 
 PODFILE CHECKSUM: 5bf24953f6cb11c6516abf8baba083bfb6b92b8a