[SAVE] Update disconnection in profile

* Popup when press button for disconnect which ask if the user is sure about that
gorbat-o · Apr 9, 2018 · 7ffe076 · 7ffe076
1 parent 6c757ba
commit 7ffe076
Show file tree

Hide file tree

Showing 12 changed files with 100 additions and 117 deletions.
diff --git a/EisenhowerTaskManager/EisenhowerTaskManager.xcodeproj/project.pbxproj b/EisenhowerTaskManager/EisenhowerTaskManager.xcodeproj/project.pbxproj
@@ -455,7 +455,6 @@
 				695ED5B92044AFC500BB12DF /* Frameworks */,
 				695ED5BA2044AFC500BB12DF /* Resources */,
 				9B79554B316F26EE3FFD85F7 /* [CP] Embed Pods Frameworks */,
-				A4D3ADE4C28A0FF0EBE371D7 /* [CP] Copy Pods Resources */,
 				693D97492055B06900F4EE14 /* Crashlytics */,
 			);
 			buildRules = (
@@ -477,7 +476,6 @@
 				695ED5C72044AFC800BB12DF /* Frameworks */,
 				695ED5C82044AFC800BB12DF /* Resources */,
 				A1440D166117BEF9A791F8C8 /* [CP] Embed Pods Frameworks */,
-				D84EE1D2445D4FEC29CFBC8B /* [CP] Copy Pods Resources */,
 				693D974A2055B07D00F4EE14 /* Crashlytics */,
 			);
 			buildRules = (
@@ -498,7 +496,6 @@
 				69BFBE742055A46A00D0B8A1 /* Frameworks */,
 				69BFBE752055A46A00D0B8A1 /* Resources */,
 				1881600768F76AD00BC232C9 /* [CP] Embed Pods Frameworks */,
-				A35ECC999251F7C3C41BE837 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -524,7 +521,6 @@
 				69E0B9642044AE050083ED7D /* Frameworks */,
 				69E0B9652044AE050083ED7D /* Resources */,
 				F15541C99F9E27980B686188 /* [CP] Embed Pods Frameworks */,
-				4A6ECB1EBF765435319CFF5D /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -542,7 +538,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0920;
-				LastUpgradeCheck = 0920;
+				LastUpgradeCheck = 0930;
 				ORGANIZATIONNAME = "Oleg Gorbatchev";
 				TargetAttributes = {
 					695ED5B52044AFC500BB12DF = {
@@ -696,24 +692,6 @@
 			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-EisenhowerTaskManagerTests/Pods-EisenhowerTaskManagerTests-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		4A6ECB1EBF765435319CFF5D /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-EisenhowerTaskManager-development/Pods-EisenhowerTaskManager-development-resources.sh",
-				"${PODS_CONFIGURATION_BUILD_DIR}/EasyAbout/Settings.bundle",
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Settings.bundle",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-EisenhowerTaskManager-development/Pods-EisenhowerTaskManager-development-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		5BD7BBD30A22008BCF698337 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -992,57 +970,6 @@
 			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-EisenhowerTaskManager-appstore/Pods-EisenhowerTaskManager-appstore-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		A35ECC999251F7C3C41BE837 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-EisenhowerTaskManagerTests/Pods-EisenhowerTaskManagerTests-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		A4D3ADE4C28A0FF0EBE371D7 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-EisenhowerTaskManager-adhoc/Pods-EisenhowerTaskManager-adhoc-resources.sh",
-				"${PODS_CONFIGURATION_BUILD_DIR}/EasyAbout/Settings.bundle",
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Settings.bundle",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-EisenhowerTaskManager-adhoc/Pods-EisenhowerTaskManager-adhoc-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		D84EE1D2445D4FEC29CFBC8B /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-EisenhowerTaskManager-appstore/Pods-EisenhowerTaskManager-appstore-resources.sh",
-				"${PODS_CONFIGURATION_BUILD_DIR}/EasyAbout/Settings.bundle",
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Settings.bundle",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-EisenhowerTaskManager-appstore/Pods-EisenhowerTaskManager-appstore-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		F15541C99F9E27980B686188 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -1327,13 +1254,15 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -1385,13 +1314,15 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;

diff --git a/...senhowerTaskManager.xcodeproj/xcshareddata/xcschemes/EisenhowerTaskManager-adhoc.xcscheme b/...senhowerTaskManager.xcodeproj/xcshareddata/xcschemes/EisenhowerTaskManager-adhoc.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0920"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -46,7 +45,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

diff --git a/...howerTaskManager.xcodeproj/xcshareddata/xcschemes/EisenhowerTaskManager-appstore.xcscheme b/...howerTaskManager.xcodeproj/xcshareddata/xcschemes/EisenhowerTaskManager-appstore.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0920"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
       buildConfiguration = "Release"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -46,7 +45,6 @@
       buildConfiguration = "Release"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

diff --git a/...erTaskManager.xcodeproj/xcshareddata/xcschemes/EisenhowerTaskManager-development.xcscheme b/...erTaskManager.xcodeproj/xcshareddata/xcschemes/EisenhowerTaskManager-development.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0920"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -40,7 +40,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "NO">
       <Testables>
          <TestableReference
@@ -70,7 +69,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

diff --git a/...nhowerTaskManager/EisenhowerTaskManager.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/...nhowerTaskManager/EisenhowerTaskManager.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?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>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/...EisenhowerTaskManager/Bundles/Settings.bundle/com.mono0926.LicensePlist.latest_result.txt b/...EisenhowerTaskManager/Bundles/Settings.bundle/com.mono0926.LicensePlist.latest_result.txt
@@ -1,18 +1,18 @@
 name: Alamofire, nameSpecified: 
 body: Copyright (c) 2014-2…
-version: 4.7.0
+version: 4.7.1
 
 name: Alamofire, nameSpecified: 
 body: Copyright (c) 2014-2…
-version: 4.7.0
+version: 4.7.1
 
 name: Alamofire, nameSpecified: 
 body: Copyright (c) 2014-2…
-version: 4.7.0
+version: 4.7.1
 
 name: Alamofire, nameSpecified: 
 body: Copyright (c) 2014-2…
-version: 4.7.0
+version: 4.7.1
 
 name: Crashlytics, nameSpecified: 
 body: Fabric: Copyright 20…
@@ -229,46 +229,46 @@ version: 2.1.3
 name: GTMSessionFetcher, nameSpecified: 
 body: 
                    …
-version: 1.1.14
+version: 1.1.15
 
 name: GTMSessionFetcher, nameSpecified: 
 body: 
                    …
-version: 1.1.14
+version: 1.1.15
 
 name: GTMSessionFetcher, nameSpecified: 
 body: 
                    …
-version: 1.1.14
+version: 1.1.15
 
 name: GTMSessionFetcher, nameSpecified: 
 body: 
                    …
-version: 1.1.14
+version: 1.1.15
 
 name: Haptica, nameSpecified: 
 body: MIT License
 
 Copyrig…
-version: 2.0.0
+version: 2.0.1
 
 name: Haptica, nameSpecified: 
 body: MIT License
 
 Copyrig…
-version: 2.0.0
+version: 2.0.1
 
 name: Haptica, nameSpecified: 
 body: MIT License
 
 Copyrig…
-version: 2.0.0
+version: 2.0.1
 
 name: Haptica, nameSpecified: 
 body: MIT License
 
 Copyrig…
-version: 2.0.0
+version: 2.0.1
 
 name: leveldb-library, nameSpecified: 
 body: Copyright (c) 2011 T…
@@ -348,7 +348,7 @@ version: 5.3.0
 
 name: SwiftLint, nameSpecified: 
 body: The MIT License (MIT…
-version: 0.25.0
+version: 0.25.1
 
 name: TTGSnackbar, nameSpecified: 
 body: The MIT License (MIT…

diff --git a/EisenhowerTaskManager/EisenhowerTaskManager/Localization/en.lproj/Localizable.strings b/EisenhowerTaskManager/EisenhowerTaskManager/Localization/en.lproj/Localizable.strings
@@ -28,6 +28,8 @@
 "generic.registration" = "Registration";
 "generic.authentication" = "Authentication";
 "generic.delete" = "Delete";
-"popup.disconnectAction.title" = "Log out";
+"popup.disconnectAction.title" = "Disconnection";
 "popup.disconnectAction.text" = "Are you sure you want to disconnect ?";
 "generic.today" = "Today";
+"generic.yes" = "Yes";
+"generic.no" = "No";
diff --git a/EisenhowerTaskManager/EisenhowerTaskManager/Localization/fr.lproj/Localizable.strings b/EisenhowerTaskManager/EisenhowerTaskManager/Localization/fr.lproj/Localizable.strings
@@ -31,3 +31,5 @@
 "popup.disconnectAction.title" = "Déconnexion";
 "popup.disconnectAction.text" = "Êtes-vous sûr de vouloir vous déconnecter?";
 "generic.today" = "Aujourd'hui";
+"generic.yes" = "Oui";
+"generic.no" = "Non";
diff --git a/EisenhowerTaskManager/EisenhowerTaskManager/Localization/ru.lproj/Localizable.strings b/EisenhowerTaskManager/EisenhowerTaskManager/Localization/ru.lproj/Localizable.strings
@@ -31,3 +31,5 @@
 "popup.disconnectAction.title" = "Отключить";
 "popup.disconnectAction.text" = "Вы действительно хотите отключиться?";
 "generic.today" = "Сегодня";
+"generic.yes" = "Да";
+"generic.no" = "Нет";
diff --git a/EisenhowerTaskManager/EisenhowerTaskManager/Localization/strings.swift b/EisenhowerTaskManager/EisenhowerTaskManager/Localization/strings.swift
@@ -51,6 +51,8 @@ internal enum L10n {
     internal static let incomplete = L10n.tr("Localizable", "generic.incomplete")
     /// Matrix
     internal static let matrix = L10n.tr("Localizable", "generic.matrix")
+    /// No
+    internal static let no = L10n.tr("Localizable", "generic.no")
     /// Password
     internal static let password = L10n.tr("Localizable", "generic.password")
     /// Registration
@@ -77,14 +79,16 @@ internal enum L10n {
     internal static let toSchedule = L10n.tr("Localizable", "generic.toSchedule")
     /// Welcome
     internal static let welcome = L10n.tr("Localizable", "generic.welcome")
+    /// Yes
+    internal static let yes = L10n.tr("Localizable", "generic.yes")
   }
 
   internal enum Popup {
 
     internal enum Disconnectaction {
       /// Are you sure you want to disconnect ?
       internal static let text = L10n.tr("Localizable", "popup.disconnectAction.text")
-      /// Log out
+      /// Disconnection
       internal static let title = L10n.tr("Localizable", "popup.disconnectAction.title")
     }
   }