diff --git a/NativeAppTemplate.xcodeproj/project.pbxproj b/NativeAppTemplate.xcodeproj/project.pbxproj index 15067d8..4a1bfc8 100644 --- a/NativeAppTemplate.xcodeproj/project.pbxproj +++ b/NativeAppTemplate.xcodeproj/project.pbxproj @@ -73,6 +73,8 @@ 0172051A25AAF6C0008FD63B /* SessionsService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0172051925AAF6BF008FD63B /* SessionsService.swift */; }; 0172052525AAFA43008FD63B /* Shopkeeper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0172052425AAFA43008FD63B /* Shopkeeper.swift */; }; 0172052F25AC41A7008FD63B /* SessionRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0172052E25AC41A7008FD63B /* SessionRequest.swift */; }; + 017278072D7D4F5800CE424F /* OnboardingRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = 017278062D7D4F5800CE424F /* OnboardingRepository.swift */; }; + 017278092D7D4F7400CE424F /* Onboarding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 017278082D7D4F7400CE424F /* Onboarding.swift */; }; 0182D37025B258A7001E881D /* KeychainAccess in Frameworks */ = {isa = PBXBuildFile; productRef = 0182D36F25B258A7001E881D /* KeychainAccess */; }; 0182D37825B277FA001E881D /* KeychainStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0182D37625B277D6001E881D /* KeychainStore.swift */; }; 0182D38225B296B9001E881D /* ShopkeeperAdapter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0182D38125B296B9001E881D /* ShopkeeperAdapter.swift */; }; @@ -183,6 +185,8 @@ 0172051925AAF6BF008FD63B /* SessionsService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SessionsService.swift; sourceTree = ""; }; 0172052425AAFA43008FD63B /* Shopkeeper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Shopkeeper.swift; sourceTree = ""; }; 0172052E25AC41A7008FD63B /* SessionRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SessionRequest.swift; sourceTree = ""; }; + 017278062D7D4F5800CE424F /* OnboardingRepository.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingRepository.swift; sourceTree = ""; }; + 017278082D7D4F7400CE424F /* Onboarding.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Onboarding.swift; sourceTree = ""; }; 0182D37625B277D6001E881D /* KeychainStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeychainStore.swift; sourceTree = ""; }; 0182D38125B296B9001E881D /* ShopkeeperAdapter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShopkeeperAdapter.swift; sourceTree = ""; }; 0182D39925B4424B001E881D /* LoggedInShopkeeperKeychainStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoggedInShopkeeperKeychainStore.swift; sourceTree = ""; }; @@ -425,6 +429,7 @@ isa = PBXGroup; children = ( 01B526532AF4E36400655131 /* MainTab.swift */, + 017278082D7D4F7400CE424F /* Onboarding.swift */, 01B526552AF4E82A00655131 /* ScrollToTopID.swift */, 0110A15E2AC816F5003EDCBA /* SendConfirmation.swift */, 0150A36529B14BB300907F96 /* SendResetPassword.swift */, @@ -468,6 +473,7 @@ isa = PBXGroup; children = ( 017203F525AA675E008FD63B /* LoginRepository.swift */, + 017278062D7D4F5800CE424F /* OnboardingRepository.swift */, 0172052E25AC41A7008FD63B /* SessionRequest.swift */, 0172051925AAF6BF008FD63B /* SessionsService.swift */, 011DDC20287669EA00C6C21F /* SignUpRepository.swift */, @@ -817,6 +823,7 @@ 017204D925AA847E008FD63B /* ShopRepository.swift in Sources */, 0172046625AA82BF008FD63B /* MessageBarView.swift in Sources */, 01E0A63025BD53FD00298D35 /* Shop.swift in Sources */, + 017278072D7D4F5800CE424F /* OnboardingRepository.swift in Sources */, 013292BE262C3EA400690B75 /* LoggedInShopkeeper.swift in Sources */, 0172035825A9642E008FD63B /* ShopsService.swift in Sources */, 018E21CD2B36377800FFD1F6 /* MeService.swift in Sources */, @@ -833,6 +840,7 @@ 010F86AE2621A2A900B6C62A /* ShopDetailView.swift in Sources */, 011F6DF1259EF16400BED22E /* App.swift in Sources */, 01FA23A12B00CE5700F1D446 /* MailView.swift in Sources */, + 017278092D7D4F7400CE424F /* Onboarding.swift in Sources */, 01467357299902230005423D /* ShopSettingsView.swift in Sources */, 0172048125AA8343008FD63B /* Color+Extensions.swift in Sources */, 011DDC2528766CEC00C6C21F /* SignUpRequest.swift in Sources */, diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding1.imageset/Contents.json b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding1.imageset/Contents.json index ecf9814..3ad151e 100644 --- a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding1.imageset/Contents.json +++ b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding1.imageset/Contents.json @@ -1,17 +1,17 @@ { "images" : [ { - "filename" : "overview.png", + "filename" : "overview1~universal@1x.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "overview@2x.png", + "filename" : "overview1~universal@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "overview@3x.png", + "filename" : "overview1~universal@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding1.imageset/overview.png b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding1.imageset/overview.png deleted file mode 100644 index 32ee9de..0000000 Binary files a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding1.imageset/overview.png and /dev/null differ diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding1.imageset/overview1~universal@1x.png b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding1.imageset/overview1~universal@1x.png new file mode 100644 index 0000000..a489aeb Binary files /dev/null and b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding1.imageset/overview1~universal@1x.png differ diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding1.imageset/overview1~universal@2x.png b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding1.imageset/overview1~universal@2x.png new file mode 100644 index 0000000..981debb Binary files /dev/null and b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding1.imageset/overview1~universal@2x.png differ diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding1.imageset/overview1~universal@3x.png b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding1.imageset/overview1~universal@3x.png new file mode 100644 index 0000000..24f277b Binary files /dev/null and b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding1.imageset/overview1~universal@3x.png differ diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding1.imageset/overview@2x.png b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding1.imageset/overview@2x.png deleted file mode 100644 index a4bfff2..0000000 Binary files a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding1.imageset/overview@2x.png and /dev/null differ diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding1.imageset/overview@3x.png b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding1.imageset/overview@3x.png deleted file mode 100644 index 41f096f..0000000 Binary files a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding1.imageset/overview@3x.png and /dev/null differ diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding10.imageset/Contents.json b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding10.imageset/Contents.json new file mode 100644 index 0000000..217fd0c --- /dev/null +++ b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding10.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "overview9~universal@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "overview9~universal@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "overview9~universal@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding10.imageset/overview9~universal@1x.png b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding10.imageset/overview9~universal@1x.png new file mode 100644 index 0000000..f99c88b Binary files /dev/null and b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding10.imageset/overview9~universal@1x.png differ diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding10.imageset/overview9~universal@2x.png b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding10.imageset/overview9~universal@2x.png new file mode 100644 index 0000000..5e3b376 Binary files /dev/null and b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding10.imageset/overview9~universal@2x.png differ diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding10.imageset/overview9~universal@3x.png b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding10.imageset/overview9~universal@3x.png new file mode 100644 index 0000000..475cb1e Binary files /dev/null and b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding10.imageset/overview9~universal@3x.png differ diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding11.imageset/Contents.json b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding11.imageset/Contents.json new file mode 100644 index 0000000..74fb7ff --- /dev/null +++ b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding11.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "overview9_phone_customer1~universal@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "overview9_phone_customer1~universal@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "overview9_phone_customer1~universal@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding11.imageset/overview9_phone_customer1~universal@1x.png b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding11.imageset/overview9_phone_customer1~universal@1x.png new file mode 100644 index 0000000..7a3b4e5 Binary files /dev/null and b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding11.imageset/overview9_phone_customer1~universal@1x.png differ diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding11.imageset/overview9_phone_customer1~universal@2x.png b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding11.imageset/overview9_phone_customer1~universal@2x.png new file mode 100644 index 0000000..1a21a15 Binary files /dev/null and b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding11.imageset/overview9_phone_customer1~universal@2x.png differ diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding11.imageset/overview9_phone_customer1~universal@3x.png b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding11.imageset/overview9_phone_customer1~universal@3x.png new file mode 100644 index 0000000..63d4876 Binary files /dev/null and b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding11.imageset/overview9_phone_customer1~universal@3x.png differ diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding12.imageset/Contents.json b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding12.imageset/Contents.json new file mode 100644 index 0000000..b91d394 --- /dev/null +++ b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding12.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "overview13~universal@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "overview13~universal@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "overview13~universal@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding12.imageset/overview13~universal@1x.png b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding12.imageset/overview13~universal@1x.png new file mode 100644 index 0000000..aa04c1d Binary files /dev/null and b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding12.imageset/overview13~universal@1x.png differ diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding12.imageset/overview13~universal@2x.png b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding12.imageset/overview13~universal@2x.png new file mode 100644 index 0000000..2be7d25 Binary files /dev/null and b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding12.imageset/overview13~universal@2x.png differ diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding12.imageset/overview13~universal@3x.png b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding12.imageset/overview13~universal@3x.png new file mode 100644 index 0000000..3e9cd7c Binary files /dev/null and b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding12.imageset/overview13~universal@3x.png differ diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding13.imageset/Contents.json b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding13.imageset/Contents.json new file mode 100644 index 0000000..b4514a7 --- /dev/null +++ b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding13.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "overview14~universal@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "overview14~universal@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "overview14~universal@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding13.imageset/overview14~universal@1x.png b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding13.imageset/overview14~universal@1x.png new file mode 100644 index 0000000..72ddc38 Binary files /dev/null and b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding13.imageset/overview14~universal@1x.png differ diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding13.imageset/overview14~universal@2x.png b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding13.imageset/overview14~universal@2x.png new file mode 100644 index 0000000..2f796d3 Binary files /dev/null and b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding13.imageset/overview14~universal@2x.png differ diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding13.imageset/overview14~universal@3x.png b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding13.imageset/overview14~universal@3x.png new file mode 100644 index 0000000..7d9bf57 Binary files /dev/null and b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding13.imageset/overview14~universal@3x.png differ diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding1Slim.imageset/Contents.json b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding1Slim.imageset/Contents.json index d863165..f732902 100644 --- a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding1Slim.imageset/Contents.json +++ b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding1Slim.imageset/Contents.json @@ -1,17 +1,17 @@ { "images" : [ { - "filename" : "overview1_slim.png", + "filename" : "overview1_slim~universal@1x.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "overview1_slim@2x.png", + "filename" : "overview1_slim~universal@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "overview1_slim@3x.png", + "filename" : "overview1_slim~universal@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding1Slim.imageset/overview1_slim.png b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding1Slim.imageset/overview1_slim.png deleted file mode 100644 index 018f747..0000000 Binary files a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding1Slim.imageset/overview1_slim.png and /dev/null differ diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding1Slim.imageset/overview1_slim@2x.png b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding1Slim.imageset/overview1_slim@2x.png deleted file mode 100644 index e25ffa2..0000000 Binary files a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding1Slim.imageset/overview1_slim@2x.png and /dev/null differ diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding1Slim.imageset/overview1_slim@3x.png b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding1Slim.imageset/overview1_slim@3x.png deleted file mode 100644 index d7670c8..0000000 Binary files a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding1Slim.imageset/overview1_slim@3x.png and /dev/null differ diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding1Slim.imageset/overview1_slim~universal@1x.png b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding1Slim.imageset/overview1_slim~universal@1x.png new file mode 100644 index 0000000..1132e9b Binary files /dev/null and b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding1Slim.imageset/overview1_slim~universal@1x.png differ diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding1Slim.imageset/overview1_slim~universal@2x.png b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding1Slim.imageset/overview1_slim~universal@2x.png new file mode 100644 index 0000000..0db8518 Binary files /dev/null and b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding1Slim.imageset/overview1_slim~universal@2x.png differ diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding1Slim.imageset/overview1_slim~universal@3x.png b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding1Slim.imageset/overview1_slim~universal@3x.png new file mode 100644 index 0000000..24e8755 Binary files /dev/null and b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding1Slim.imageset/overview1_slim~universal@3x.png differ diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding2.imageset/Contents.json b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding2.imageset/Contents.json index 80ce2d1..150d51a 100644 --- a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding2.imageset/Contents.json +++ b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding2.imageset/Contents.json @@ -1,17 +1,17 @@ { "images" : [ { - "filename" : "overview2.png", + "filename" : "overview2~universal@1x.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "overview2@2x.png", + "filename" : "overview2~universal@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "overview2@3x.png", + "filename" : "overview2~universal@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding2.imageset/overview2.png b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding2.imageset/overview2.png deleted file mode 100644 index 59d43f6..0000000 Binary files a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding2.imageset/overview2.png and /dev/null differ diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding2.imageset/overview2@2x.png b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding2.imageset/overview2@2x.png deleted file mode 100644 index 41f531b..0000000 Binary files a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding2.imageset/overview2@2x.png and /dev/null differ diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding2.imageset/overview2@3x.png b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding2.imageset/overview2@3x.png deleted file mode 100644 index 4ee4f0c..0000000 Binary files a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding2.imageset/overview2@3x.png and /dev/null differ diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding2.imageset/overview2~universal@1x.png b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding2.imageset/overview2~universal@1x.png new file mode 100644 index 0000000..208e71b Binary files /dev/null and b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding2.imageset/overview2~universal@1x.png differ diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding2.imageset/overview2~universal@2x.png b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding2.imageset/overview2~universal@2x.png new file mode 100644 index 0000000..5688e42 Binary files /dev/null and b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding2.imageset/overview2~universal@2x.png differ diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding2.imageset/overview2~universal@3x.png b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding2.imageset/overview2~universal@3x.png new file mode 100644 index 0000000..f95799a Binary files /dev/null and b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding2.imageset/overview2~universal@3x.png differ diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding3.imageset/Contents.json b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding3.imageset/Contents.json index 431760d..0afd4d1 100644 --- a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding3.imageset/Contents.json +++ b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding3.imageset/Contents.json @@ -1,17 +1,17 @@ { "images" : [ { - "filename" : "overview3.png", + "filename" : "overview6~universal@1x.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "overview3@2x.png", + "filename" : "overview6~universal@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "overview3@3x.png", + "filename" : "overview6~universal@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding3.imageset/overview3.png b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding3.imageset/overview3.png deleted file mode 100644 index 5fc33b0..0000000 Binary files a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding3.imageset/overview3.png and /dev/null differ diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding3.imageset/overview3@2x.png b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding3.imageset/overview3@2x.png deleted file mode 100644 index 8f1338a..0000000 Binary files a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding3.imageset/overview3@2x.png and /dev/null differ diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding3.imageset/overview3@3x.png b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding3.imageset/overview3@3x.png deleted file mode 100644 index 006ec41..0000000 Binary files a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding3.imageset/overview3@3x.png and /dev/null differ diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding3.imageset/overview6~universal@1x.png b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding3.imageset/overview6~universal@1x.png new file mode 100644 index 0000000..8f95ac6 Binary files /dev/null and b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding3.imageset/overview6~universal@1x.png differ diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding3.imageset/overview6~universal@2x.png b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding3.imageset/overview6~universal@2x.png new file mode 100644 index 0000000..e6851de Binary files /dev/null and b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding3.imageset/overview6~universal@2x.png differ diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding3.imageset/overview6~universal@3x.png b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding3.imageset/overview6~universal@3x.png new file mode 100644 index 0000000..208ff05 Binary files /dev/null and b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding3.imageset/overview6~universal@3x.png differ diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding4.imageset/Contents.json b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding4.imageset/Contents.json new file mode 100644 index 0000000..bac0322 --- /dev/null +++ b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding4.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "overview6_phone_customer2~universal@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "overview6_phone_customer2~universal@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "overview6_phone_customer2~universal@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding4.imageset/overview6_phone_customer2~universal@1x.png b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding4.imageset/overview6_phone_customer2~universal@1x.png new file mode 100644 index 0000000..ae5b650 Binary files /dev/null and b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding4.imageset/overview6_phone_customer2~universal@1x.png differ diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding4.imageset/overview6_phone_customer2~universal@2x.png b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding4.imageset/overview6_phone_customer2~universal@2x.png new file mode 100644 index 0000000..bbbcf98 Binary files /dev/null and b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding4.imageset/overview6_phone_customer2~universal@2x.png differ diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding4.imageset/overview6_phone_customer2~universal@3x.png b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding4.imageset/overview6_phone_customer2~universal@3x.png new file mode 100644 index 0000000..103473a Binary files /dev/null and b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding4.imageset/overview6_phone_customer2~universal@3x.png differ diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding5.imageset/Contents.json b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding5.imageset/Contents.json new file mode 100644 index 0000000..ce975c3 --- /dev/null +++ b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding5.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "overview7~universal@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "overview7~universal@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "overview7~universal@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding5.imageset/overview7~universal@1x.png b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding5.imageset/overview7~universal@1x.png new file mode 100644 index 0000000..a0d1f14 Binary files /dev/null and b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding5.imageset/overview7~universal@1x.png differ diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding5.imageset/overview7~universal@2x.png b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding5.imageset/overview7~universal@2x.png new file mode 100644 index 0000000..44b4331 Binary files /dev/null and b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding5.imageset/overview7~universal@2x.png differ diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding5.imageset/overview7~universal@3x.png b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding5.imageset/overview7~universal@3x.png new file mode 100644 index 0000000..33eb96c Binary files /dev/null and b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding5.imageset/overview7~universal@3x.png differ diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding6.imageset/Contents.json b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding6.imageset/Contents.json new file mode 100644 index 0000000..1199c20 --- /dev/null +++ b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding6.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "overview8~universal@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "overview8~universal@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "overview8~universal@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding6.imageset/overview8~universal@1x.png b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding6.imageset/overview8~universal@1x.png new file mode 100644 index 0000000..9a7322e Binary files /dev/null and b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding6.imageset/overview8~universal@1x.png differ diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding6.imageset/overview8~universal@2x.png b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding6.imageset/overview8~universal@2x.png new file mode 100644 index 0000000..4a42338 Binary files /dev/null and b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding6.imageset/overview8~universal@2x.png differ diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding6.imageset/overview8~universal@3x.png b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding6.imageset/overview8~universal@3x.png new file mode 100644 index 0000000..fb195d4 Binary files /dev/null and b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding6.imageset/overview8~universal@3x.png differ diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding7.imageset/Contents.json b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding7.imageset/Contents.json new file mode 100644 index 0000000..37efc1f --- /dev/null +++ b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding7.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "overview8_phone_server2~universal@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "overview8_phone_server2~universal@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "overview8_phone_server2~universal@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding7.imageset/overview8_phone_server2~universal@1x.png b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding7.imageset/overview8_phone_server2~universal@1x.png new file mode 100644 index 0000000..69ba137 Binary files /dev/null and b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding7.imageset/overview8_phone_server2~universal@1x.png differ diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding7.imageset/overview8_phone_server2~universal@2x.png b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding7.imageset/overview8_phone_server2~universal@2x.png new file mode 100644 index 0000000..121547b Binary files /dev/null and b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding7.imageset/overview8_phone_server2~universal@2x.png differ diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding7.imageset/overview8_phone_server2~universal@3x.png b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding7.imageset/overview8_phone_server2~universal@3x.png new file mode 100644 index 0000000..29d4130 Binary files /dev/null and b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding7.imageset/overview8_phone_server2~universal@3x.png differ diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding8.imageset/Contents.json b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding8.imageset/Contents.json new file mode 100644 index 0000000..8089f48 --- /dev/null +++ b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding8.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "overview8_phone_server3~universal@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "overview8_phone_server3~universal@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "overview8_phone_server3~universal@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding8.imageset/overview8_phone_server3~universal@1x.png b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding8.imageset/overview8_phone_server3~universal@1x.png new file mode 100644 index 0000000..109baf9 Binary files /dev/null and b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding8.imageset/overview8_phone_server3~universal@1x.png differ diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding8.imageset/overview8_phone_server3~universal@2x.png b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding8.imageset/overview8_phone_server3~universal@2x.png new file mode 100644 index 0000000..670d83b Binary files /dev/null and b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding8.imageset/overview8_phone_server3~universal@2x.png differ diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding8.imageset/overview8_phone_server3~universal@3x.png b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding8.imageset/overview8_phone_server3~universal@3x.png new file mode 100644 index 0000000..0d0db3b Binary files /dev/null and b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding8.imageset/overview8_phone_server3~universal@3x.png differ diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding9.imageset/Contents.json b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding9.imageset/Contents.json new file mode 100644 index 0000000..2fc221b --- /dev/null +++ b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding9.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "overview8_2~universal@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "overview8_2~universal@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "overview8_2~universal@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding9.imageset/overview8_2~universal@1x.png b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding9.imageset/overview8_2~universal@1x.png new file mode 100644 index 0000000..ee74b05 Binary files /dev/null and b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding9.imageset/overview8_2~universal@1x.png differ diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding9.imageset/overview8_2~universal@2x.png b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding9.imageset/overview8_2~universal@2x.png new file mode 100644 index 0000000..56ad329 Binary files /dev/null and b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding9.imageset/overview8_2~universal@2x.png differ diff --git a/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding9.imageset/overview8_2~universal@3x.png b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding9.imageset/overview8_2~universal@3x.png new file mode 100644 index 0000000..d644a5a Binary files /dev/null and b/NativeAppTemplate/Assets.xcassets/Onboarding/onboarding9.imageset/overview8_2~universal@3x.png differ diff --git a/NativeAppTemplate/Constants.swift b/NativeAppTemplate/Constants.swift index 9522e1b..5a31d7e 100644 --- a/NativeAppTemplate/Constants.swift +++ b/NativeAppTemplate/Constants.swift @@ -68,6 +68,7 @@ extension String { // MARK: Settings View static let supportMail: String = "support@nativeapptemplate.com" static let supportWebsiteUrl: String = "https://nativeapptemplate.com" + static let howToUseUrl: String = "https://myturntag.com/how" static let discussionsUrl: String = "https://github.com/nativeapptemplate/NativeAppTemplate-Free-iOS/discussions" static let privacyPolicyUrl: String = "https://nativeapptemplate.com/privacy" static let termsOfUseUrl: String = "https://nativeapptemplate.com/terms" @@ -76,6 +77,7 @@ extension String { static let profile = "Profile" static let information = "Information" static let supportWebsite = "Support Website" + static let howToUse = "How To Use" static let faqs = "FAQs" static let discussions = "Discussions" static let rateApp = "Rate or Review the App" @@ -139,10 +141,20 @@ extension String { static let email = "Email" static let password = "Password" - static let onboardingDescription1 = "Onboarding description1" - static let onboardingDescription2 = "Onboarding description2" - static let onboardingDescription3 = "Onboarding description3" - + static let onboardingDescription1 = String(localized: "A **Server Tag** and a **Customer Tag** are NFCs.") + static let onboardingDescription2 = String(localized: "The staff gives the **Customer Tag** to the customer.") + static let onboardingDescription3 = String(localized: "The customer scans the **Customer Tag** or the **Customer QR code**.") + static let onboardingDescription4 = String(localized: "The customer can view the **Number Tags Webpage** on his mobile browser.") + static let onboardingDescription5 = String(localized: "The staff is cooking KILITANPOs.") + static let onboardingDescription6 = String(localized: "The staff completed cooking KILITANPOs. The staff scans the **Server Tag**.") + static let onboardingDescription7 = String(localized: "Tag completed with Background Tag Reading.") + static let onboardingDescription8 = String(localized: "If you do not want to scan, you can complete the tag by swiping the tag(Shops > [Shop]).") + static let onboardingDescription9 = String(localized: "**Number Tags Webpage** displays the completed number tag.") + static let onboardingDescription10 = String(localized: "The customer's **Number Tags Webpage** updated.") + static let onboardingDescription11 = String(localized: "The customer\'s **Number Tags Webpage** displays the completed **Customer Tag**(A07).") + static let onboardingDescription12 = String(localized: "The customer returns the **Customer Tag**.") + static let onboardingDescription13 = String(localized: "The customer finally got the delicious KILITANPO!") + static let unauthorized = "You are not authorized to perform this action." // MARK: Other diff --git a/NativeAppTemplate/Login/OnboardingRepository.swift b/NativeAppTemplate/Login/OnboardingRepository.swift new file mode 100644 index 0000000..2d901d4 --- /dev/null +++ b/NativeAppTemplate/Login/OnboardingRepository.swift @@ -0,0 +1,34 @@ +// +// OnboardingRepository.swift +// NativeAppTemplate +// +// Created by Daisuke Adachi on 2025/03/04. +// + +import Foundation +import OrderedCollections + +@MainActor @Observable class OnboardingRepository { + var onboardings: [Onboarding] = [] + let onboardingsDictionary: OrderedDictionary = [ + 1: false, + 2: false, + 3: false, + 4: true, + 5: false, + 6: false, + 7: true, + 8: true, + 9: false, + 10: false, + 11: true, + 12: false, + 13: false + ] + + func reload() { + onboardings = onboardingsDictionary.map { key, value in + Onboarding(id: key, isPortraitImage: value) + } + } +} diff --git a/NativeAppTemplate/Models/Onboarding.swift b/NativeAppTemplate/Models/Onboarding.swift new file mode 100644 index 0000000..dea5fd2 --- /dev/null +++ b/NativeAppTemplate/Models/Onboarding.swift @@ -0,0 +1,11 @@ +// +// Onboarding.swift +// NativeAppTemplate +// +// Created by Daisuke Adachi on 2025/03/04. +// + +struct Onboarding: Hashable, Codable, Identifiable { + var id: Int + var isPortraitImage: Bool = false +} diff --git a/NativeAppTemplate/UI/App Root/OnboardingView.swift b/NativeAppTemplate/UI/App Root/OnboardingView.swift index 5f376c0..65aef22 100644 --- a/NativeAppTemplate/UI/App Root/OnboardingView.swift +++ b/NativeAppTemplate/UI/App Root/OnboardingView.swift @@ -8,11 +8,15 @@ import SwiftUI struct OnboardingView: View { - let isAppStorePromotion = false - + let isAppStorePromotion = false + @State private var onboardingRepository = OnboardingRepository() + var body: some View { NavigationStack { contentView + .task { + reload() + } } } } @@ -22,16 +26,21 @@ private extension OnboardingView { var contentView: some View { @ViewBuilder var contentView: some View { VStack { - TabView { - ForEach(1..<4) { - page(image: "onboarding\($0)", text: onboardingDescription(index: $0)) + SwiftUI.TabView { + ForEach(onboardingRepository.onboardings) { onboarding in + let id = onboarding.id + page( + image: "onboarding\(id)", + text: onboardingDescription(index: id), + isPortraitImage: onboarding.isPortraitImage + ) } } .tabViewStyle(.page(indexDisplayMode: (isAppStorePromotion ? .never : .always))) .toolbar { if !isAppStorePromotion { ToolbarItem(placement: .navigationBarLeading) { - Link(String.supportWebsite, destination: URL(string: String.supportWebsiteUrl)!) + Link(String.howToUse, destination: URL(string: String.howToUseUrl)!) } ToolbarItem(placement: .navigationBarTrailing) { NavigationLink(destination: SignUpOrSignInView()) { @@ -47,6 +56,10 @@ private extension OnboardingView { return contentView } + func reload() { + onboardingRepository.reload() + } + private var logo: some View { Image("logo") .resizable() @@ -54,14 +67,14 @@ private extension OnboardingView { .frame(width: 256, height: 24) } - private func page(image: String, text: String) -> some View { + private func page(image: String, text: String, isPortraitImage: Bool) -> some View { ZStack(alignment: .bottom) { Image(image) .resizable() .aspectRatio(contentMode: .fit) .padding(.top, 24) - .padding(.bottom, 192) - + .padding(.bottom, (isPortraitImage ? 0 : 192)) + ZStack(alignment: .top) { VStack { Text(.init(text)) @@ -83,14 +96,34 @@ private extension OnboardingView { String.onboardingDescription2 case 3: String.onboardingDescription3 + case 4: + String.onboardingDescription4 + case 5: + String.onboardingDescription5 + case 6: + String.onboardingDescription6 + case 7: + String.onboardingDescription7 + case 8: + String.onboardingDescription8 + case 9: + String.onboardingDescription9 + case 10: + String.onboardingDescription10 + case 11: + String.onboardingDescription11 + case 12: + String.onboardingDescription12 + case 13: + String.onboardingDescription13 default: String.onboardingDescription1 } } -} - -struct OnboardingView_Previews: PreviewProvider { - static var previews: some View { - OnboardingView() + + struct OnboardingView_Previews: PreviewProvider { + static var previews: some View { + OnboardingView() + } } }