diff --git a/TraccarClient.xcodeproj/project.pbxproj b/TraccarClient.xcodeproj/project.pbxproj index 04660e65fe0749020893f52354ffaddc1cb2bb74..2964b519786b0c3678771df28520051e0dbee82d 100644 --- a/TraccarClient.xcodeproj/project.pbxproj +++ b/TraccarClient.xcodeproj/project.pbxproj @@ -101,6 +101,7 @@ 53554AE52AED1BF10018BAEE /* UIButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53554AE42AED1BF10018BAEE /* UIButton.swift */; }; 5370B4702AEFB8A900AE08CC /* splash.json in Resources */ = {isa = PBXBuildFile; fileRef = 5370B46F2AEFB8A900AE08CC /* splash.json */; }; 5392C4232B037942004EF18A /* ShiftsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5392C4222B037942004EF18A /* ShiftsModel.swift */; }; + 5392C4252B04A760004EF18A /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 5392C4242B04A760004EF18A /* GoogleService-Info.plist */; }; 53D62E3F2AEFA31200C80BAC /* InitialViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53D62E3D2AEFA31200C80BAC /* InitialViewController.swift */; }; 53D62E402AEFA31200C80BAC /* InitialViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 53D62E3E2AEFA31200C80BAC /* InitialViewController.xib */; }; 53D62E432AEFA4DC00C80BAC /* Lottie in Frameworks */ = {isa = PBXBuildFile; productRef = 53D62E422AEFA4DC00C80BAC /* Lottie */; }; @@ -113,7 +114,6 @@ 53EBC60C2AF1A5C200601AA7 /* SettingsSegmentTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 53EBC60A2AF1A5C200601AA7 /* SettingsSegmentTableViewCell.xib */; }; 53EBC6102AF3960800601AA7 /* SettingsLogoutTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53EBC60E2AF3960800601AA7 /* SettingsLogoutTableViewCell.swift */; }; 53EBC6112AF3960800601AA7 /* SettingsLogoutTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 53EBC60F2AF3960800601AA7 /* SettingsLogoutTableViewCell.xib */; }; - 53EBC6132AF3A1D100601AA7 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 53EBC6122AF3A1D100601AA7 /* GoogleService-Info.plist */; }; 53F10AE22AF05C57004D0529 /* KNNavigationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53F10AE12AF05C57004D0529 /* KNNavigationController.swift */; }; 53F10AE42AF05E68004D0529 /* AuthenticationStep.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53F10AE32AF05E68004D0529 /* AuthenticationStep.swift */; }; 53F10AE62AF05E97004D0529 /* AuthenticationCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53F10AE52AF05E97004D0529 /* AuthenticationCoordinator.swift */; }; @@ -273,6 +273,7 @@ 53554AE42AED1BF10018BAEE /* UIButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIButton.swift; sourceTree = "<group>"; }; 5370B46F2AEFB8A900AE08CC /* splash.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = splash.json; sourceTree = "<group>"; }; 5392C4222B037942004EF18A /* ShiftsModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShiftsModel.swift; sourceTree = "<group>"; }; + 5392C4242B04A760004EF18A /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; }; 53D62E3D2AEFA31200C80BAC /* InitialViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InitialViewController.swift; sourceTree = "<group>"; }; 53D62E3E2AEFA31200C80BAC /* InitialViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = InitialViewController.xib; sourceTree = "<group>"; }; 53EBC5FC2AF199FF00601AA7 /* SettingsTextTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsTextTableViewCell.swift; sourceTree = "<group>"; }; @@ -284,7 +285,6 @@ 53EBC60A2AF1A5C200601AA7 /* SettingsSegmentTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SettingsSegmentTableViewCell.xib; sourceTree = "<group>"; }; 53EBC60E2AF3960800601AA7 /* SettingsLogoutTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsLogoutTableViewCell.swift; sourceTree = "<group>"; }; 53EBC60F2AF3960800601AA7 /* SettingsLogoutTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SettingsLogoutTableViewCell.xib; sourceTree = "<group>"; }; - 53EBC6122AF3A1D100601AA7 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; }; 53F10AE12AF05C57004D0529 /* KNNavigationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KNNavigationController.swift; sourceTree = "<group>"; }; 53F10AE32AF05E68004D0529 /* AuthenticationStep.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthenticationStep.swift; sourceTree = "<group>"; }; 53F10AE52AF05E97004D0529 /* AuthenticationCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthenticationCoordinator.swift; sourceTree = "<group>"; }; @@ -812,7 +812,7 @@ CED4872217DB1BF6007FCF57 /* Supporting Files */ = { isa = PBXGroup; children = ( - 53EBC6122AF3A1D100601AA7 /* GoogleService-Info.plist */, + 5392C4242B04A760004EF18A /* GoogleService-Info.plist */, 5326833E2AE91A6200A364C0 /* Fonts */, CED4872317DB1BF6007FCF57 /* TraccarClient-Info.plist */, 5370B46F2AEFB8A900AE08CC /* splash.json */, @@ -996,7 +996,7 @@ 5370B4702AEFB8A900AE08CC /* splash.json in Resources */, 532683512AE91A6F00A364C0 /* Montserrat-ExtraLightItalic.ttf in Resources */, 530080392AF15CE000A05E04 /* TransactionsViewController.xib in Resources */, - 53EBC6132AF3A1D100601AA7 /* GoogleService-Info.plist in Resources */, + 5392C4252B04A760004EF18A /* GoogleService-Info.plist in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/TraccarClient.xcodeproj/project.xcworkspace/xcuserdata/g.makhoul.xcuserdatad/UserInterfaceState.xcuserstate b/TraccarClient.xcodeproj/project.xcworkspace/xcuserdata/g.makhoul.xcuserdatad/UserInterfaceState.xcuserstate index e8439dcef841c8139ed9e9161e8a8ef2b1456eff..13f4b4488327543b9bf9fcccddc068240586c86a 100644 Binary files a/TraccarClient.xcodeproj/project.xcworkspace/xcuserdata/g.makhoul.xcuserdatad/UserInterfaceState.xcuserstate and b/TraccarClient.xcodeproj/project.xcworkspace/xcuserdata/g.makhoul.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/TraccarClient/Images.xcassets/AppIcon.appiconset/1024-1024.png b/TraccarClient/Images.xcassets/AppIcon.appiconset/1024-1024.png new file mode 100644 index 0000000000000000000000000000000000000000..933dc7dfb48197ebdee87d7bf8efb2e0200be36f Binary files /dev/null and b/TraccarClient/Images.xcassets/AppIcon.appiconset/1024-1024.png differ diff --git a/TraccarClient/Images.xcassets/AppIcon.appiconset/1024-20.png b/TraccarClient/Images.xcassets/AppIcon.appiconset/1024-20.png new file mode 100644 index 0000000000000000000000000000000000000000..f61d3fe17c20734d194f244edc8c2fd182bb12d3 Binary files /dev/null and b/TraccarClient/Images.xcassets/AppIcon.appiconset/1024-20.png differ diff --git a/TraccarClient/Images.xcassets/AppIcon.appiconset/1024-20@2x.png b/TraccarClient/Images.xcassets/AppIcon.appiconset/1024-20@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..0f04cedbd299c4f611881353eb509d99b42df0e6 Binary files /dev/null and b/TraccarClient/Images.xcassets/AppIcon.appiconset/1024-20@2x.png differ diff --git a/TraccarClient/Images.xcassets/AppIcon.appiconset/1024-20@3x.png b/TraccarClient/Images.xcassets/AppIcon.appiconset/1024-20@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..0e53c04713338d7d34b3b90ebd5a5df2c4e962a7 Binary files /dev/null and b/TraccarClient/Images.xcassets/AppIcon.appiconset/1024-20@3x.png differ diff --git a/TraccarClient/Images.xcassets/AppIcon.appiconset/1024-29.png b/TraccarClient/Images.xcassets/AppIcon.appiconset/1024-29.png new file mode 100644 index 0000000000000000000000000000000000000000..de946b7354f20108b7ea59a7337c02487c956ca4 Binary files /dev/null and b/TraccarClient/Images.xcassets/AppIcon.appiconset/1024-29.png differ diff --git a/TraccarClient/Images.xcassets/AppIcon.appiconset/1024-29@2x.png b/TraccarClient/Images.xcassets/AppIcon.appiconset/1024-29@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..eaf43fca7b806e0ad695465fd23344b3f0ab4ba5 Binary files /dev/null and b/TraccarClient/Images.xcassets/AppIcon.appiconset/1024-29@2x.png differ diff --git a/TraccarClient/Images.xcassets/AppIcon.appiconset/1024-29@3x.png b/TraccarClient/Images.xcassets/AppIcon.appiconset/1024-29@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..edd8752ad3e2f843837c2bc906722abfa0e6c18e Binary files /dev/null and b/TraccarClient/Images.xcassets/AppIcon.appiconset/1024-29@3x.png differ diff --git a/TraccarClient/Images.xcassets/AppIcon.appiconset/1024-40.png b/TraccarClient/Images.xcassets/AppIcon.appiconset/1024-40.png new file mode 100644 index 0000000000000000000000000000000000000000..0f04cedbd299c4f611881353eb509d99b42df0e6 Binary files /dev/null and b/TraccarClient/Images.xcassets/AppIcon.appiconset/1024-40.png differ diff --git a/TraccarClient/Images.xcassets/AppIcon.appiconset/1024-40@2x.png b/TraccarClient/Images.xcassets/AppIcon.appiconset/1024-40@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..6f71eda03e7e6d1e2a0093e3adbd2b70a0ee8fe9 Binary files /dev/null and b/TraccarClient/Images.xcassets/AppIcon.appiconset/1024-40@2x.png differ diff --git a/TraccarClient/Images.xcassets/AppIcon.appiconset/1024-40@3x.png b/TraccarClient/Images.xcassets/AppIcon.appiconset/1024-40@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..729e9770683c65c8d82646217b681933d596f43e Binary files /dev/null and b/TraccarClient/Images.xcassets/AppIcon.appiconset/1024-40@3x.png differ diff --git a/TraccarClient/Images.xcassets/AppIcon.appiconset/1024-60@2x.png b/TraccarClient/Images.xcassets/AppIcon.appiconset/1024-60@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..729e9770683c65c8d82646217b681933d596f43e Binary files /dev/null and b/TraccarClient/Images.xcassets/AppIcon.appiconset/1024-60@2x.png differ diff --git a/TraccarClient/Images.xcassets/AppIcon.appiconset/1024-60@3x.png b/TraccarClient/Images.xcassets/AppIcon.appiconset/1024-60@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..7aac0589bf8b8cd475838c829106bdb3e286eb87 Binary files /dev/null and b/TraccarClient/Images.xcassets/AppIcon.appiconset/1024-60@3x.png differ diff --git a/TraccarClient/Images.xcassets/AppIcon.appiconset/1024-76.png b/TraccarClient/Images.xcassets/AppIcon.appiconset/1024-76.png new file mode 100644 index 0000000000000000000000000000000000000000..b8331d3e6ee9e5661160eff729ac4a26735f6ab8 Binary files /dev/null and b/TraccarClient/Images.xcassets/AppIcon.appiconset/1024-76.png differ diff --git a/TraccarClient/Images.xcassets/AppIcon.appiconset/1024-76@2x.png b/TraccarClient/Images.xcassets/AppIcon.appiconset/1024-76@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..a7e9988f433130960609c59ac188ef529435fa6b Binary files /dev/null and b/TraccarClient/Images.xcassets/AppIcon.appiconset/1024-76@2x.png differ diff --git a/TraccarClient/Images.xcassets/AppIcon.appiconset/1024-83.5@2x.png b/TraccarClient/Images.xcassets/AppIcon.appiconset/1024-83.5@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..20f5da357046eb1cc589f2bcd621cbdad1037324 Binary files /dev/null and b/TraccarClient/Images.xcassets/AppIcon.appiconset/1024-83.5@2x.png differ diff --git a/TraccarClient/Images.xcassets/AppIcon.appiconset/1024.png b/TraccarClient/Images.xcassets/AppIcon.appiconset/1024.png deleted file mode 100644 index e99e2a635dcb2fe151c3bc4cf43f6c7c73556cd2..0000000000000000000000000000000000000000 Binary files a/TraccarClient/Images.xcassets/AppIcon.appiconset/1024.png and /dev/null differ diff --git a/TraccarClient/Images.xcassets/AppIcon.appiconset/114.png b/TraccarClient/Images.xcassets/AppIcon.appiconset/114.png deleted file mode 100644 index d149871669a351d62041eec106fd23503ab407ee..0000000000000000000000000000000000000000 Binary files a/TraccarClient/Images.xcassets/AppIcon.appiconset/114.png and /dev/null differ diff --git a/TraccarClient/Images.xcassets/AppIcon.appiconset/120.png b/TraccarClient/Images.xcassets/AppIcon.appiconset/120.png deleted file mode 100644 index d95a99b26225e4deb783c664856fb9c5d2ffd242..0000000000000000000000000000000000000000 Binary files a/TraccarClient/Images.xcassets/AppIcon.appiconset/120.png and /dev/null differ diff --git a/TraccarClient/Images.xcassets/AppIcon.appiconset/180.png b/TraccarClient/Images.xcassets/AppIcon.appiconset/180.png deleted file mode 100644 index 9c74097a8d8a7bc5abd577dcb65dd31353dea94f..0000000000000000000000000000000000000000 Binary files a/TraccarClient/Images.xcassets/AppIcon.appiconset/180.png and /dev/null differ diff --git a/TraccarClient/Images.xcassets/AppIcon.appiconset/29.png b/TraccarClient/Images.xcassets/AppIcon.appiconset/29.png deleted file mode 100644 index ba88e87cbbbae7d2b596c7c8c21f5e2eb4f2ff6e..0000000000000000000000000000000000000000 Binary files a/TraccarClient/Images.xcassets/AppIcon.appiconset/29.png and /dev/null differ diff --git a/TraccarClient/Images.xcassets/AppIcon.appiconset/40.png b/TraccarClient/Images.xcassets/AppIcon.appiconset/40.png deleted file mode 100644 index 29cb59ce3605ee78fb03cb7d888310cc153e7da4..0000000000000000000000000000000000000000 Binary files a/TraccarClient/Images.xcassets/AppIcon.appiconset/40.png and /dev/null differ diff --git a/TraccarClient/Images.xcassets/AppIcon.appiconset/57.png b/TraccarClient/Images.xcassets/AppIcon.appiconset/57.png deleted file mode 100644 index 21cde5c02fc8016cf9235e74f902e8a3e2b1788d..0000000000000000000000000000000000000000 Binary files a/TraccarClient/Images.xcassets/AppIcon.appiconset/57.png and /dev/null differ diff --git a/TraccarClient/Images.xcassets/AppIcon.appiconset/58.png b/TraccarClient/Images.xcassets/AppIcon.appiconset/58.png deleted file mode 100644 index b975349bf7c705f6e9b52ddc74923643fb73803a..0000000000000000000000000000000000000000 Binary files a/TraccarClient/Images.xcassets/AppIcon.appiconset/58.png and /dev/null differ diff --git a/TraccarClient/Images.xcassets/AppIcon.appiconset/60.png b/TraccarClient/Images.xcassets/AppIcon.appiconset/60.png deleted file mode 100644 index eef25887c92ec4fe0f4b10e3b712440f40aec68c..0000000000000000000000000000000000000000 Binary files a/TraccarClient/Images.xcassets/AppIcon.appiconset/60.png and /dev/null differ diff --git a/TraccarClient/Images.xcassets/AppIcon.appiconset/80.png b/TraccarClient/Images.xcassets/AppIcon.appiconset/80.png deleted file mode 100644 index 0a635a93c9142f8c47d33ea65db62a0bde857765..0000000000000000000000000000000000000000 Binary files a/TraccarClient/Images.xcassets/AppIcon.appiconset/80.png and /dev/null differ diff --git a/TraccarClient/Images.xcassets/AppIcon.appiconset/87.png b/TraccarClient/Images.xcassets/AppIcon.appiconset/87.png deleted file mode 100644 index a1c42a757ee62b35b8346a2cc5a120858ddeb54b..0000000000000000000000000000000000000000 Binary files a/TraccarClient/Images.xcassets/AppIcon.appiconset/87.png and /dev/null differ diff --git a/TraccarClient/Images.xcassets/AppIcon.appiconset/Contents.json b/TraccarClient/Images.xcassets/AppIcon.appiconset/Contents.json index 73d3b7f6d10839e48787d4ed581df4a1194b51fb..8737afdf3b1f8c045ac98668a3d37f061c053ebc 100644 --- a/TraccarClient/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/TraccarClient/Images.xcassets/AppIcon.appiconset/Contents.json @@ -1 +1,116 @@ -{"images":[{"size":"60x60","expected-size":"180","filename":"180.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"40x40","expected-size":"80","filename":"80.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"40x40","expected-size":"120","filename":"120.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"60x60","expected-size":"120","filename":"120.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"57x57","expected-size":"57","filename":"57.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"1x"},{"size":"29x29","expected-size":"58","filename":"58.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"29x29","expected-size":"29","filename":"29.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"1x"},{"size":"29x29","expected-size":"87","filename":"87.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"57x57","expected-size":"114","filename":"114.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"20x20","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"20x20","expected-size":"60","filename":"60.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"1024x1024","filename":"1024.png","expected-size":"1024","idiom":"ios-marketing","folder":"Assets.xcassets/AppIcon.appiconset/","scale":"1x"}]} \ No newline at end of file +{ + "images" : [ + { + "filename" : "1024-20@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "20x20" + }, + { + "filename" : "1024-20@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "20x20" + }, + { + "filename" : "1024-29@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "29x29" + }, + { + "filename" : "1024-29@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "29x29" + }, + { + "filename" : "1024-40@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "40x40" + }, + { + "filename" : "1024-40@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "40x40" + }, + { + "filename" : "1024-60@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "60x60" + }, + { + "filename" : "1024-60@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "60x60" + }, + { + "filename" : "1024-20.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "20x20" + }, + { + "filename" : "1024-20@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "20x20" + }, + { + "filename" : "1024-29.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "29x29" + }, + { + "filename" : "1024-29@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "29x29" + }, + { + "filename" : "1024-40.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "40x40" + }, + { + "filename" : "1024-40@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "40x40" + }, + { + "filename" : "1024-76.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "76x76" + }, + { + "filename" : "1024-76@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "76x76" + }, + { + "filename" : "1024-83.5@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "83.5x83.5" + }, + { + "filename" : "1024-1024.png", + "idiom" : "ios-marketing", + "scale" : "1x", + "size" : "1024x1024" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +}