Merge pull request #107 from wallabag/2.1.2-dev

2.1.2 release

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,16 @@
+| Q             | A
+| ------------- | ---
+| Device?       | iPhone/iPad
+| Device Os version    | 9.0/10.0
+| App Version   | 2.0
+| Wallabag server version | 2.0
+
+
+
+### Steps to reproduce/test case
+
+Please provide necessary steps for reproduction of this issue, or better the
+reduced test case.
+
+### Improvement
+If your issue involves a suggestion for improvement or a request to add functionality. You can delete this template and describe your request

.travis.yml

@@ -4,8 +4,8 @@ matrix:
   include:
   - osx_image: xcode8.3
     env: SDK="iphonesimulator10.3" DESTINATION="name=iPhone 6s,OS=9.0"
-  - osx_image: xcode8.3
-    env: SDK="iphonesimulator10.3" DESTINATION="name=iPhone 6s,OS=10.3.1"
+#  - osx_image: xcode8.3
+#    env: SDK="iphonesimulator10.3" DESTINATION="name=iPhone 6s,OS=10.3.1"
 env:
   global:
   - WORKSPACE=wallabag.xcworkspace

README.md

@@ -1,7 +1,15 @@
-[IMG](https://travis-ci.org/wallabag/ios-app)
+[![Build Status](https://travis-ci.org/wallabag/ios-app.svg?branch=master)](https://travis-ci.org/wallabag/ios-app)
 
 # wallabag 2 official iOS
 
+This is a self-learning project.
+
+I'm really happy to discover Swift and the apple ecosystem.
+
+You will find mistakes, many mistakes, do not blame me, learn me with a PR.
+
+You contribute to an excellent opensource project, and you will make me evolve in the Swift language
+
 ## Tools required to contribute
 * SwiftLint
 * Cocoapods

bagit/Info.plist

@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.1.1</string>
+	<string>2.1.2</string>
 	<key>CFBundleVersion</key>
-	<string>58</string>
+	<string>61</string>
 	<key>ITSEncryptionExportComplianceCode</key>
 	<string></string>
 	<key>NSAppTransportSecurity</key>

fastlane/metadata/de-DE/release_notes.txt

@@ -1,9 +1,11 @@
-Hallo wallabag-Nutzer!
-In diesem Update haben wir neue coole Features hinzugefügt:
-- Leseposition zum Artikel wird gespeichert
-- Artikel können direkt aus der Leseansicht hinzugefügt werden
-- Oberes Menü kann beim Lesen versteckt werden
-- Verzögerte Anmelde-Anforderung während der App-Konfiguration
-- Französische und deutsche Übersetzung hinzugefügt
+Hello wallabag user!
 
-Nun kannst du auch den Entwickler belohnen, wann immer du möchtest.
+In this release we fix some bugs:
+- Arrange Ipad UI
+- Badge always show
+- App freeze on article
+- Arrange text on swipe article
+- Top bar disappearing on the homepage 
+- Page Tip and About UI
+
+If you like our app, do not hesitate to add comments on the app store

fastlane/metadata/en-US/release_notes.txt

@@ -1,9 +1,11 @@
 Hello wallabag user!
-In this release we add some cool features:
-- Save read position on an article
-- You can now add an article from reading article page
-- Hide top menu when you read an article
-- We defer the request authorization for notification when your app is configured
-- French and german translation
 
-Now you can reward the developer when ever you want.
+In this release we fix some bugs:
+- Arrange Ipad UI
+- Badge always show
+- App freeze on article
+- Arrange text on swipe article
+- Top bar disappearing on the homepage 
+- Page Tip and About UI
+
+If you like our app, do not hesitate to add comments on the app store

fastlane/metadata/fr-FR/release_notes.txt

@@ -1,9 +1,11 @@
-Hello utilisateur de Wallabag!
-Dans cette version, nous avons ajoutés quelques fonctionnalités intéressantes:
-- Enregistrer la position de lecture sur un article
-- Vous pouvez maintenant ajouter un article depuis la page de lecture
-- Cacher le menu principal lorsque vous lisez un article
-- Nous reportons l'autorisation de la demande pour la notification lorsque votre application est configurée
-- traduction française et allemande
+Hello wallabag user!
 
-Maintenant, vous pouvez récompenser le développeur quand vous voulez.
+In this release we fix some bugs:
+- Arrange Ipad UI
+- Badge always show
+- App freeze on article
+- Arrange text on swipe article
+- Top bar disappearing on the homepage 
+- Page Tip and About UI
+
+If you like our app, do not hesitate to add comments on the app store

wallabag.xcodeproj/project.pbxproj

@@ -1122,7 +1122,7 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = wallabag/wallabag.entitlements;
-				CURRENT_PROJECT_VERSION = 58;
+				CURRENT_PROJECT_VERSION = 61;
 				DEVELOPMENT_TEAM = G97URPCGB8;
 				INFOPLIST_FILE = wallabag/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -1140,7 +1140,7 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = wallabag/wallabag.entitlements;
-				CURRENT_PROJECT_VERSION = 58;
+				CURRENT_PROJECT_VERSION = 61;
 				DEVELOPMENT_TEAM = G97URPCGB8;
 				INFOPLIST_FILE = wallabag/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";

wallabag/AppDelegate.swift

@@ -106,10 +106,16 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     }
 
     private func updateBadge() {
+        if !Setting.isBadgeEnable() {
+            UIApplication.shared.applicationIconBadgeNumber = 0
+            return
+        }
+
         if WallabagApi.isConfigured() {
             let sync = ArticleSync()
             sync.sync()
         }
+
         log.info("Update badge")
         let request = Entry.fetchEntryRequest()
         switch Setting.getDefaultMode() {

wallabag/Controller/ArticleViewController.swift

@@ -74,7 +74,11 @@ final class ArticleViewController: UIViewController {
         contentWeb.delegate = self
         contentWeb.scrollView.delegate = self
         contentWeb.backgroundColor = Setting.getTheme().backgroundColor
-        print(entry)
+    }
+
+    override func viewWillDisappear(_ animated: Bool) {
+        super.viewWillDisappear(animated)
+        navigationController?.setNavigationBarHidden(false, animated: animated)
     }
 
     private func loadArticleContent() {
@@ -115,9 +119,7 @@ extension ArticleViewController: UIScrollViewDelegate {
 
     func scrollViewWillBeginDecelerating(_ scrollView: UIScrollView) {
         let hide = scrollView.contentOffset.y > self.lastOffsetY
-        self.navigationController?.setNavigationBarHidden(hide, animated: true)
+        navigationController?.setNavigationBarHidden(hide, animated: true)
         entry.screen_position = Float(scrollView.contentOffset.y)
-
-        CoreData.saveContext()
     }
 }

wallabag/Controller/ArticlesTableViewController.swift

@@ -21,6 +21,7 @@ final class ArticlesTableViewController: UITableViewController {
     var refreshing: Bool = false
     var entries: [Entry] = []
     var mode: Setting.RetrieveMode = Setting.getDefaultMode()
+    var handleRefreshEnabled: Bool = true
 
     @IBOutlet weak var menu: UIBarButtonItem!
     @IBOutlet weak var add: UIBarButtonItem!
@@ -101,16 +102,20 @@ final class ArticlesTableViewController: UITableViewController {
                                        object: CoreData.context
         )
 
-        handleRefresh()
-
         searchController.searchResultsUpdater = self
         searchController.dimsBackgroundDuringPresentation = false
         definesPresentationContext = true
         tableView.tableHeaderView = searchController.searchBar
     }
 
+    override func viewWillAppear(_ animated: Bool) {
+        handleRefreshEnabled = true
+
+        handleRefresh()
+    }
+
     func managedObjectContextObjectsDidChange(notification: NSNotification) {
-        if  notification.userInfo == nil { return }
+        if notification.userInfo == nil { return }
         log.debug("managedObjectContextObjectsDidChange")
         handleRefresh()
     }
@@ -139,6 +144,9 @@ final class ArticlesTableViewController: UITableViewController {
     }
 
     func handleRefresh() {
+        if !handleRefreshEnabled {
+            return
+        }
         updateUi()
         sync.sync()
         log.debug("Handle refresh")
@@ -191,6 +199,7 @@ final class ArticlesTableViewController: UITableViewController {
     // MARK: - Navigation
     override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
         if segue.identifier == "readArticle" {
+            handleRefreshEnabled = false
             if let controller = segue.destination as? ArticleViewController {
                 controller.readHandler = { entry in
                     self.read(entry)

wallabag/Controller/HomeViewController.swift

@@ -10,4 +10,21 @@ import UIKit
 import WallabagKit
 
 final class HomeViewController: UIViewController {
+
+    override func viewDidLoad() {
+        let gesture = UITapGestureRecognizer(target: self, action: #selector(self.resetApp))
+        gesture.numberOfTapsRequired = 10
+
+        view.addGestureRecognizer(gesture)
+    }
+
+    @objc func resetApp() {
+        if let delegate = UIApplication.shared.delegate as? AppDelegate {
+            let alert = UIAlertController(title: "Resetting App", message: "App reset", preferredStyle: .alert)
+            alert.addAction(UIAlertAction(title: "Ok", style: .cancel, handler: nil))
+
+            present(alert, animated: true, completion: nil)
+            delegate.resetApplication()
+        }
+    }
 }

wallabag/Controller/TipViewController.swift

@@ -70,7 +70,9 @@ class TipViewController: UIViewController, SKProductsRequestDelegate, SKPaymentT
     override func viewDidLoad() {
         super.viewDidLoad()
 
+        view.backgroundColor = Setting.getTheme().backgroundColor
         tipContent.text = "This application is developed on free time, it is free and will remain so. But you can contribute financially by making a donation whenever you want to support the project.".localized
+        tipContent.textColor = Setting.getTheme().color
 
         SKPaymentQueue.default().add(self)
         requestProductInfo()

wallabag/Info.plist

@@ -15,9 +15,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.1.1</string>
+	<string>2.1.2</string>
 	<key>CFBundleVersion</key>
-	<string>58</string>
+	<string>61</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>
@@ -28,9 +28,7 @@
 		<true/>
 	</dict>
 	<key>UIBackgroundModes</key>
-	<array>
-		<string>fetch</string>
-	</array>
+	<array/>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>

wallabag/Lib/ThemeManager.swift

@@ -132,6 +132,8 @@ struct ThemeManager {
         let toolbar = UIToolbar.appearance()
         toolbar.setBackgroundImage(theme.navigationBarBackground, forToolbarPosition: .any, barMetrics: .default)
 
+        UITextView.appearance().backgroundColor = Setting.getTheme().backgroundColor
+
         UIBarButtonItem.appearance().setTitleTextAttributes([
             NSFontAttributeName: UIFont(name: "UbuntuTitling-Bold", size: 15.0)!
             ], for: .normal)