Babacros todayextension

ISICbalance/Assets.xcassets/todayExtension.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Icon-180.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

ISICbalance/Generated/Assets.swift

@@ -22,6 +22,7 @@ internal enum Asset {
   internal static let janmisar = ImageAsset(name: "janmisar")
   internal static let mightycreations = ImageAsset(name: "mightycreations")
   internal static let reloadIcon = ImageAsset(name: "reloadIcon")
+  internal static let todayExtension = ImageAsset(name: "todayExtension")
 }
 // swiftlint:enable identifier_name line_length nesting type_body_length type_name
 

ISICbalance/ISICbalance.entitlements

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.security.application-groups</key>
+	<array>
+		<string>group.eu.cz.babacros.ISICbalance</string>
+	</array>
+	<key>keychain-access-groups</key>
+	<array>
+		<string>eu.cz.babacros.ISICbalance.keychaingroup</string>
+	</array>
+</dict>
+</plist>

ISICbalance/Info.plist

@@ -16,6 +16,20 @@
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
 	<string>$(APP_VERSION)</string>
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleURLName</key>
+			<string>eu.cz.babacros.ISICbalance</string>
+		</dict>
+		<dict>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>ISICbalance</string>
+			</array>
+		</dict>
+		<dict/>
+	</array>
 	<key>CFBundleVersion</key>
 	<string>BUILD_NUMBER</string>
 	<key>LSRequiresIPhoneOS</key>

ISICbalance/Services/KeychainManager.swift

@@ -9,22 +9,22 @@
 import Foundation
 import ReactiveSwift
 import SwiftKeychainWrapper
-import Result
 
 protocol HasKeychainManager {
     var keychainManager: KeychainManagering { get }
 }
 
 protocol KeychainManagering {
     func saveCredentials(username: String, password: String) -> SignalProducer<(),LoginError>
-    func getCredentialsFromKeychain() -> SignalProducer<User, NoError>
+    func getCredentialsFromKeychain() -> SignalProducer<User, Never>
 }
 
 final class KeychainManager: KeychainManagering {
     func saveCredentials(username: String, password: String) -> SignalProducer<(),LoginError> {
         return SignalProducer { observer, _ in
-            let saveUsername: Bool = KeychainWrapper.standard.set(username, forKey: "username")
-            let savePassword: Bool = KeychainWrapper.standard.set(password, forKey: "password")
+            let wrapper = KeychainWrapper(serviceName: "eu.cz.babacros", accessGroup: "eu.cz.babacros.ISICbalance.keychaingroup")
+            let saveUsername: Bool = wrapper.set(username, forKey: "username")
+            let savePassword: Bool = wrapper.set(password, forKey: "password")
 
             if saveUsername && savePassword {
                 observer.sendCompleted()
@@ -34,10 +34,11 @@ final class KeychainManager: KeychainManagering {
         }
     }
 
-    func getCredentialsFromKeychain() -> SignalProducer<User, NoError> {
-        return SignalProducer<User, NoError> { observer, _ in
-            let username = KeychainWrapper.standard.string(forKey: "username") ?? ""
-            let password = KeychainWrapper.standard.string(forKey: "password") ?? ""
+    func getCredentialsFromKeychain() -> SignalProducer<User, Never> {
+        return SignalProducer<User, Never> { observer, _ in
+            let wrapper = KeychainWrapper(serviceName: "eu.cz.babacros", accessGroup: "eu.cz.babacros.ISICbalance.keychaingroup")
+            let username = wrapper.string(forKey: "username") ?? ""
+            let password = wrapper.string(forKey: "password") ?? ""
             let user = User(username: username, password: password)
 
             observer.send(value: user)

ISICbalance/Services/RequestManager.swift

@@ -11,7 +11,6 @@ import Alamofire
 import SwiftSoup
 import SwiftKeychainWrapper
 import ReactiveSwift
-import Result
 
 protocol HasRequestManager {
     var requestManager: RequestManagering { get }
@@ -159,8 +158,6 @@ final class RequestManager: RequestManagering {
             Alamofire.request("https://agata.suz.cvut.cz/secure/index.php").responseString { response in
                 switch response.result {
                 case .success:
-                    // TODO: delete after dev
-                    print("Agata request success")
                     observer.send(value: response)
                     observer.sendCompleted()
                 case .failure:
@@ -175,8 +172,6 @@ final class RequestManager: RequestManagering {
             Alamofire.request(urlString).responseString { responseShibboleth in
                 switch responseShibboleth.result {
                 case .success:
-                    // TODO: delete after dev
-                    print("SSO request success")
                     observer.send(value: responseShibboleth)
                     observer.sendCompleted()
                 case .failure:
@@ -191,8 +186,6 @@ final class RequestManager: RequestManagering {
             Alamofire.request(credentialsUrl, method: .post, parameters: parameters).responseString { responseCredentials in
                 switch responseCredentials.result {
                 case .success:
-                    // TODO: delete after dev
-                    print("Credentials request success")
                     observer.send(value: responseCredentials)
                     observer.sendCompleted()
                 case .failure:
@@ -207,8 +200,6 @@ final class RequestManager: RequestManagering {
             Alamofire.request(action, method: .post, parameters: formParameters) .responseString { responseBalanceSite in
                 switch responseBalanceSite.result {
                 case .success:
-                    // TODO: delete after dev
-                    print("Balance site request success")
                     observer.send(value: responseBalanceSite)
                     observer.sendCompleted()
                 case .failure:

ISICbalance/ViewControllers/AccountViewController.swift

@@ -105,7 +105,7 @@ class AccountViewController: BaseViewController, ValidateErrorPresentable {
     }
 
     // MARK: - Bindings
-    func setupBindings() {
+    private func setupBindings() {
         usernameTextField <~> viewModel.username
         passwordTextField <~> viewModel.password
         loginButton.reactive.isEnabled <~ viewModel.actions.login.isExecuting.negate()
@@ -124,7 +124,8 @@ class AccountViewController: BaseViewController, ValidateErrorPresentable {
     }
 
     // MARK: - Actions
-    @objc func saveCredentials() {
+    @objc
+    private func saveCredentials(_ sender: UIButton) {
         viewModel.actions.login.apply().start()
     }
 }

ISICbalance/ViewControllers/BalanceViewController.swift

@@ -67,7 +67,7 @@ class BalanceViewController: BaseViewController {
         super.viewDidLoad()
         // Do any additional setup after loading the view, typically from a nib.
         accountButton.addTarget(self, action: #selector(accountBtnHandle), for: .touchUpInside)
-        reloadButton.addTarget(self, action: #selector(reloadBalance), for: .touchUpInside)
+        reloadButton.addTarget(self, action: #selector(reloadBtnHandle), for: .touchUpInside)
         setupBindings()
     }
 
@@ -87,7 +87,7 @@ class BalanceViewController: BaseViewController {
     }
 
     // MARK: - UI setup
-    fileprivate func setupBalanceField() {
+    private func setupBalanceField() {
         let balanceTitle = UILabel()
         balanceTitle.text = L10n.Balance.title
         balanceTitle.textColor = UIColor.theme.labelBlue
@@ -105,7 +105,7 @@ class BalanceViewController: BaseViewController {
         screenStackView.addArrangedSubview(balanceLabel)
     }
 
-    fileprivate func setupButtonsStack() {
+    private func setupButtonsStack() {
         let reloadButton = UIButton()
         reloadButton.setImage(Asset.reloadIcon.image, for: .normal)
         self.reloadButton = reloadButton
@@ -121,8 +121,8 @@ class BalanceViewController: BaseViewController {
     }
 
     // MARK: - Bindings
-    func setupBindings() {
-        self.balanceLabel.reactive.text <~ viewModel.localeBalance
+    private func setupBindings() {
+        balanceLabel.reactive.text <~ viewModel.localeBalance
         // push accountViewController if there is some error duting balanceAction
         viewModel.actions.getBalance.errors
             .observe(on: UIScheduler())
@@ -136,19 +136,25 @@ class BalanceViewController: BaseViewController {
         viewModel.actions.getBalance.completed
             .observe(on: UIScheduler())
             .observeValues {
-                SVProgressHUD.dismiss()
+                SVProgressHUD.dismiss(withDelay: 1)
             }
     }
 
     // MARK: - Actions
-    @objc func reloadBalance() {
+    private func reloadBalance() {
         DispatchQueue.main.async {
             SVProgressHUD.show(withStatus: L10n.Balance.loading)
         }
         viewModel.actions.getBalance.apply().start()
     }
+
+    @objc
+    private func reloadBtnHandle(_ sender: UIButton) {
+        reloadBalance()
+    }
 
-    @objc func accountBtnHandle() {
+    @objc
+    private func accountBtnHandle(_ sender: UIButton) {
         flowDelegate?.accountButtonTapped(in: self)
     }
 }

ISICbalance/ViewModels/AccountViewModel.swift

@@ -8,7 +8,6 @@
 
 import Foundation
 import ReactiveSwift
-import Result
 import SwiftKeychainWrapper
 
 protocol AccountViewModeling {
@@ -19,7 +18,7 @@ protocol AccountViewModeling {
 }
 
 protocol AccountViewModelingActions {
-    var login: Action<(),(),LoginError> { get }
+    var login: Action<Void,Void,LoginError> { get }
 }
 
 extension AccountViewModelingActions where Self: AccountViewModeling {
@@ -32,11 +31,10 @@ final class AccountViewModel: BaseViewModel, AccountViewModeling, AccountViewMod
     let username: MutableProperty<String>
     let password: MutableProperty<String>
 
-    let login: Action<(),(),LoginError>
+    let login: Action<Void,Void,LoginError>
 
     // MARK: - Initialization
     init(dependencies: Dependencies) {
-
         username = MutableProperty("")
         password = MutableProperty("")
 
@@ -57,7 +55,7 @@ final class AccountViewModel: BaseViewModel, AccountViewModeling, AccountViewMod
             if validationErrors.isEmpty {
                 return dependencies.keychainManager.saveCredentials(username: username, password: password)
             } else {
-                return SignalProducer<(), LoginError>(error: LoginError.validation(message: L10n.Validate.errorMessage))
+                return SignalProducer<Void, LoginError>(error: LoginError.validation(message: L10n.Validate.errorMessage))
             }
         }
 

ISICbalance/ViewModels/BalanceViewModel.swift

@@ -7,9 +7,7 @@
 //
 
 import Foundation
-import Result
 import ReactiveSwift
-import Alamofire
 import UIKit
 
 protocol BalanceViewModeling {
@@ -19,7 +17,7 @@ protocol BalanceViewModeling {
 }
 
 protocol BalanceViewModelingActions {
-    var getBalance: Action<(),Balance,RequestError> { get }
+    var getBalance: Action<Void,Balance,RequestError> { get }
 }
 
 extension BalanceViewModelingActions where Self: BalanceViewModeling {
@@ -31,7 +29,7 @@ final class BalanceViewModel: BaseViewModel, BalanceViewModeling, BalanceViewMod
 
     let balance: Property<Int>
     let localeBalance: Property<String>
-    let getBalance: Action<(),Balance,RequestError>
+    let getBalance: Action<Void,Balance,RequestError>
 
     // MARK: - Initialization
     init(dependencies: Dependencies) {
@@ -41,7 +39,7 @@ final class BalanceViewModel: BaseViewModel, BalanceViewModeling, BalanceViewMod
 
         balance = Property<Int>(initial: 0, then: getBalance.values.map { $0.balance })
 
-        localeBalance = Property(initial: " ", then: balance.producer.map { $0.asLocalCurrency() })
+        localeBalance = Property<String>(initial: " ", then: balance.producer.map { $0.asLocalCurrency() })
 
         super.init()
     }

ISICbalanceExtension/Base.lproj/MainInterface.storyboard

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13122.16" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="M4Y-Lb-cyx">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13104.12"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <scenes>
+        <!--Today View Controller-->
+        <scene sceneID="cwh-vc-ff4">
+            <objects>
+                <viewController id="M4Y-Lb-cyx" customClass="TodayViewController" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" simulatedAppContext="notificationCenter" id="S3S-Oj-5AN">
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="37"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="top" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Hello World" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="280" translatesAutoresizingMaskIntoConstraints="NO" id="GcN-lo-r42">
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <color key="textColor" cocoaTouchSystemColor="lightTextColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                        </subviews>
+                        <constraints>
+                            <constraint firstItem="ssy-KU-ocm" firstAttribute="bottom" secondItem="GcN-lo-r42" secondAttribute="bottom" constant="20" symbolic="YES" id="0Q0-KW-PJ6"/>
+                            <constraint firstItem="GcN-lo-r42" firstAttribute="leading" secondItem="ssy-KU-ocm" secondAttribute="leading" constant="20" symbolic="YES" id="6Vq-gs-PHe"/>
+                            <constraint firstItem="ssy-KU-ocm" firstAttribute="trailing" secondItem="GcN-lo-r42" secondAttribute="trailing" constant="20" symbolic="YES" id="L8K-9R-egU"/>
+                            <constraint firstItem="GcN-lo-r42" firstAttribute="top" secondItem="ssy-KU-ocm" secondAttribute="top" constant="20" symbolic="YES" id="mYS-Cv-VNx"/>
+                        </constraints>
+                        <viewLayoutGuide key="safeArea" id="ssy-KU-ocm"/>
+                    </view>
+                    <extendedEdge key="edgesForExtendedLayout"/>
+                    <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+                    <size key="freeformSize" width="320" height="37"/>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="vXp-U4-Rya" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+        </scene>
+    </scenes>
+</document>

ISICbalanceExtension/ISICbalanceExtension.entitlements

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.security.application-groups</key>
+	<array>
+		<string>group.eu.cz.babacros.ISICbalance</string>
+	</array>
+	<key>keychain-access-groups</key>
+	<array>
+		<string>eu.cz.babacros.ISICbalance.keychaingroup</string>
+	</array>
+</dict>
+</plist>