Skip to content

Update app version (1.1) and fix some interface bugs #99

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 30, 2020
Merged

Update app version (1.1) and fix some interface bugs #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions Blink/Blink.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -721,6 +721,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.1;
PRODUCT_BUNDLE_IDENTIFIER = com.aev.blink;
PRODUCT_NAME = Blink;
SDKROOT = iphoneos;
Expand All @@ -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;
Expand All @@ -744,6 +745,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.1;
PRODUCT_BUNDLE_IDENTIFIER = com.aev.blink;
PRODUCT_NAME = Blink;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -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;
Expand All @@ -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 = "";
Expand All @@ -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;
Expand All @@ -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 = "";
Expand Down
4 changes: 2 additions & 2 deletions Blink/Blink/Brainstorming/ViewModels/BrainstormingViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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] = []
Expand Down
2 changes: 1 addition & 1 deletion Blink/Blink/Brainstorming/Views/BrainstormingView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Blink/Blink/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>LSRequiresIPhoneOS</key>
Expand Down
2 changes: 1 addition & 1 deletion Blink/Blink_iOS/Brainstorming/Views/BrainstormingView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ struct BrainstormingView: View {
}.navigationBarBackButtonHidden(true)
.frame(width: UIScreen.main.bounds.width)
.background(Color("Accent"))
.edgesIgnoringSafeArea(.vertical)
.edgesIgnoringSafeArea(.bottom)
}
}

2 changes: 1 addition & 1 deletion Blink/Blink_iOS/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>LSRequiresIPhoneOS</key>
Expand Down