From 3d819be5d7243f699f5ec537a52eda65e7ed04a3 Mon Sep 17 00:00:00 2001 From: EdgSgroi Date: Thu, 30 Jul 2020 18:34:39 -0300 Subject: [PATCH] Update app version (1.1) and fix some interface bugs --- Blink/Blink.xcodeproj/project.pbxproj | 12 ++++++++---- .../ViewModels/BrainstormingViewModel.swift | 4 ++-- .../Brainstorming/Views/BrainstormingView.swift | 2 +- Blink/Blink/Info.plist | 2 +- .../Brainstorming/Views/BrainstormingView.swift | 2 +- Blink/Blink_iOS/Info.plist | 2 +- 6 files changed, 14 insertions(+), 10 deletions(-) diff --git a/Blink/Blink.xcodeproj/project.pbxproj b/Blink/Blink.xcodeproj/project.pbxproj index b9f6c5b..4ffeda8 100644 --- a/Blink/Blink.xcodeproj/project.pbxproj +++ b/Blink/Blink.xcodeproj/project.pbxproj @@ -711,7 +711,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 3; + CURRENT_PROJECT_VERSION = 4; DEVELOPMENT_ASSET_PATHS = "\"Blink_iOS/Preview Content\""; DEVELOPMENT_TEAM = 93JG72P729; ENABLE_PREVIEWS = YES; @@ -721,6 +721,7 @@ "$(inherited)", "@executable_path/Frameworks", ); + MARKETING_VERSION = 1.1; PRODUCT_BUNDLE_IDENTIFIER = com.aev.blink; PRODUCT_NAME = Blink; SDKROOT = iphoneos; @@ -734,7 +735,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 3; + CURRENT_PROJECT_VERSION = 4; DEVELOPMENT_ASSET_PATHS = "\"Blink_iOS/Preview Content\""; DEVELOPMENT_TEAM = 93JG72P729; ENABLE_PREVIEWS = YES; @@ -744,6 +745,7 @@ "$(inherited)", "@executable_path/Frameworks", ); + MARKETING_VERSION = 1.1; PRODUCT_BUNDLE_IDENTIFIER = com.aev.blink; PRODUCT_NAME = Blink; SDKROOT = iphoneos; @@ -918,7 +920,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image"; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2; + CURRENT_PROJECT_VERSION = 3; DEVELOPMENT_ASSET_PATHS = "\"Blink/Preview Content\""; DEVELOPMENT_TEAM = 93JG72P729; ENABLE_PREVIEWS = YES; @@ -927,6 +929,7 @@ "$(inherited)", "@executable_path/Frameworks", ); + MARKETING_VERSION = 1.1; PRODUCT_BUNDLE_IDENTIFIER = com.aev.blink; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -942,7 +945,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image"; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2; + CURRENT_PROJECT_VERSION = 3; DEVELOPMENT_ASSET_PATHS = "\"Blink/Preview Content\""; DEVELOPMENT_TEAM = 93JG72P729; ENABLE_PREVIEWS = YES; @@ -951,6 +954,7 @@ "$(inherited)", "@executable_path/Frameworks", ); + MARKETING_VERSION = 1.1; PRODUCT_BUNDLE_IDENTIFIER = com.aev.blink; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/Blink/Blink/Brainstorming/ViewModels/BrainstormingViewModel.swift b/Blink/Blink/Brainstorming/ViewModels/BrainstormingViewModel.swift index c4bb8db..c99ef60 100644 --- a/Blink/Blink/Brainstorming/ViewModels/BrainstormingViewModel.swift +++ b/Blink/Blink/Brainstorming/ViewModels/BrainstormingViewModel.swift @@ -37,7 +37,7 @@ class BrainstormingViewModel: NSObject, ObservableObject { /// String array variable to store ideas. /// When an idea is sent through P2P connection, /// It will be stored in this array. - private var ideas: [Idea] = [Idea]() + var ideas: [Idea] = [Idea]() /// Initialize a new instance of this type. /// Sets itself as the MultipeerConnectivity delegate. @@ -74,7 +74,7 @@ class BrainstormingViewModel: NSObject, ObservableObject { /// in an idea 2D String matrix with 3 columns and N rows. /// This function is called with the following parameters: /// - Parameter ideas: The String array that contains the ideas sent through P2P connection. - private func convertIdeasArrayInMatrix(ideas: [Idea]) -> [[Idea]] { + func convertIdeasArrayInMatrix(ideas: [Idea]) -> [[Idea]] { var matrixIdeas: [[Idea]] = [] var colIndex: Int = 0 var ideaArray: [Idea] = [] diff --git a/Blink/Blink/Brainstorming/Views/BrainstormingView.swift b/Blink/Blink/Brainstorming/Views/BrainstormingView.swift index 1cd72b2..7a56bbf 100644 --- a/Blink/Blink/Brainstorming/Views/BrainstormingView.swift +++ b/Blink/Blink/Brainstorming/Views/BrainstormingView.swift @@ -103,7 +103,7 @@ struct BrainstormingView: View { /// The conditional responsible for creating the NavigationLink if self.shouldVote { - NavigationLink(destination: VotingView(viewmodel: VotingViewModel(ideas: viewmodel.ideasMatrix, topic: viewmodel.topic)), isActive: $shouldVote) { EmptyView() } + NavigationLink(destination: VotingView(viewmodel: VotingViewModel(ideas: viewmodel.convertIdeasArrayInMatrix(ideas: viewmodel.ideas), topic: viewmodel.topic)), isActive: $shouldVote) { EmptyView() } } }.frame(height: UIScreen.main.bounds.height * 0.15) diff --git a/Blink/Blink/Info.plist b/Blink/Blink/Info.plist index 846bdc5..0039fac 100644 --- a/Blink/Blink/Info.plist +++ b/Blink/Blink/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 1.0 + $(MARKETING_VERSION) CFBundleVersion $(CURRENT_PROJECT_VERSION) LSRequiresIPhoneOS diff --git a/Blink/Blink_iOS/Brainstorming/Views/BrainstormingView.swift b/Blink/Blink_iOS/Brainstorming/Views/BrainstormingView.swift index 8dd30a0..ac2dd3d 100644 --- a/Blink/Blink_iOS/Brainstorming/Views/BrainstormingView.swift +++ b/Blink/Blink_iOS/Brainstorming/Views/BrainstormingView.swift @@ -76,7 +76,7 @@ struct BrainstormingView: View { }.navigationBarBackButtonHidden(true) .frame(width: UIScreen.main.bounds.width) .background(Color("Accent")) - .edgesIgnoringSafeArea(.vertical) + .edgesIgnoringSafeArea(.bottom) } } diff --git a/Blink/Blink_iOS/Info.plist b/Blink/Blink_iOS/Info.plist index 4e4ac7c..d6c288d 100644 --- a/Blink/Blink_iOS/Info.plist +++ b/Blink/Blink_iOS/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 1.0 + $(MARKETING_VERSION) CFBundleVersion $(CURRENT_PROJECT_VERSION) LSRequiresIPhoneOS