Merge branch 'develop'

Zeitblick · Nov 7, 2016 · a55aad6 · a55aad6
2 parents f0ecf14 + 69762c1
commit a55aad6
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/Zeitblick/Base.lproj/Localizable.strings b/Zeitblick/Base.lproj/Localizable.strings
@@ -23,7 +23,7 @@
 "Unknown" = "Unbekannt";
 
 /* ResultController */
-"Alert_error_title" = "Fehler";
+"Alert_error_title" = "Kein Treffer";
 "Alert_error_text"  = "Hm, da gab es einen Fehler...\nHast du eine stabile Internetverbindung?";
 "Alert_error_close" = "Zurück";
 

diff --git a/Zeitblick/Info.plist b/Zeitblick/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>0.2</string>
 	<key>CFBundleVersion</key>
-	<string>10</string>
+	<string>12</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>

diff --git a/Zeitblick/StartViewController.swift b/Zeitblick/StartViewController.swift
@@ -87,18 +87,15 @@ extension StartViewController: UIImagePickerControllerDelegate, UINavigationCont
 
         print("selected photo")
 
-        dismiss(animated: true) {
+        dismiss(animated: true) { [weak self] in
             UIApplication.shared.setStatusBarHidden(false, with: .fade)
+            self?.view.showLoading()
         }
 
         guard let image = info[UIImagePickerControllerOriginalImage] as? UIImage else {
             return
         }
 
-        Async.main { [weak self] in
-            self?.view.showLoading()
-        }
-
         // Change UI
         selfieImageView.image = image
         selfieImageView.isHidden = false

diff --git a/Zeitblick/en.lproj/Localizable.strings b/Zeitblick/en.lproj/Localizable.strings
@@ -23,7 +23,7 @@
 "Unknown" = "Unknown";
 
 /* ResultController */
-"Alert_error_title" = "Error";
+"Alert_error_title" = "No Match";
 "Alert_error_text"  = "Hm, something went wrong.\nIs your internet-connection working?";
 "Alert_error_close" = "Back";