Skip to content

Commit

Permalink
Merge pull request #63 from techstartucalgary/newdesign-initial-pages
Browse files Browse the repository at this point in the history
Initial Redesign
  • Loading branch information
ParsaKargari authored Feb 12, 2024
2 parents 65c6e58 + 91a6608 commit bd07764
Show file tree
Hide file tree
Showing 28 changed files with 467 additions and 407 deletions.
Binary file modified .DS_Store
Binary file not shown.
Binary file modified Rethread/.DS_Store
Binary file not shown.
34 changes: 34 additions & 0 deletions Rethread/GoogleService-Info.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?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>CLIENT_ID</key>
<string>69711373157-smt51cs82nik0nceo6slguta9vmaip00.apps.googleusercontent.com</string>
<key>REVERSED_CLIENT_ID</key>
<string>com.googleusercontent.apps.69711373157-smt51cs82nik0nceo6slguta9vmaip00</string>
<key>API_KEY</key>
<string>AIzaSyCt95kuSORiMMuxgV7BXBI0LqhQ78E3CS0</string>
<key>GCM_SENDER_ID</key>
<string>69711373157</string>
<key>PLIST_VERSION</key>
<string>1</string>
<key>BUNDLE_ID</key>
<string>techstart.Rethread</string>
<key>PROJECT_ID</key>
<string>rethread-6c539</string>
<key>STORAGE_BUCKET</key>
<string>rethread-6c539.appspot.com</string>
<key>IS_ADS_ENABLED</key>
<false></false>
<key>IS_ANALYTICS_ENABLED</key>
<false></false>
<key>IS_APPINVITE_ENABLED</key>
<true></true>
<key>IS_GCM_ENABLED</key>
<true></true>
<key>IS_SIGNIN_ENABLED</key>
<true></true>
<key>GOOGLE_APP_ID</key>
<string>1:69711373157:ios:31a3f912661197e84ef78c</string>
</dict>
</plist>
33 changes: 25 additions & 8 deletions Rethread/Rethread.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
983286C62B05698F00851B19 /* RethreadTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 983286C52B05698F00851B19 /* RethreadTests.swift */; };
983286D02B05698F00851B19 /* RethreadUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 983286CF2B05698F00851B19 /* RethreadUITests.swift */; };
983286D22B05698F00851B19 /* RethreadUITestsLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 983286D12B05698F00851B19 /* RethreadUITestsLaunchTests.swift */; };
983D40F92B68B81800905D4E /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 983D40F82B68B81800905D4E /* GoogleService-Info.plist */; };
98434A5D2B63342700F81127 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98434A5C2B63342700F81127 /* ContentView.swift */; };
984674952B747FD200AFB77A /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 984674942B747FD200AFB77A /* GoogleService-Info.plist */; };
985674F12B663E0D003FA5A0 /* FirebaseAuth in Frameworks */ = {isa = PBXBuildFile; productRef = 985674F02B663E0D003FA5A0 /* FirebaseAuth */; };
985674F32B663E0D003FA5A0 /* FirebaseFirestore in Frameworks */ = {isa = PBXBuildFile; productRef = 985674F22B663E0D003FA5A0 /* FirebaseFirestore */; };
985674F52B663E0D003FA5A0 /* FirebaseFirestoreSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 985674F42B663E0D003FA5A0 /* FirebaseFirestoreSwift */; };
Expand All @@ -24,7 +24,6 @@
988A0F992B3C112300ACDC90 /* DatePickerModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 988A0F982B3C112300ACDC90 /* DatePickerModel.swift */; };
9897C7732B3E6C4000EDE9D9 /* CustomDropdownMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9897C7722B3E6C4000EDE9D9 /* CustomDropdownMenu.swift */; };
98A1838C2B38D32A001E324A /* ColorPalette.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98A1838B2B38D32A001E324A /* ColorPalette.swift */; };
98BBA11C2B68A6A100003AC2 /* QuestionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98BBA10E2B68A6A100003AC2 /* QuestionView.swift */; };
98BBA11D2B68A6A100003AC2 /* ProfileView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98BBA10F2B68A6A100003AC2 /* ProfileView.swift */; };
98BBA11E2B68A6A100003AC2 /* VerificationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98BBA1102B68A6A100003AC2 /* VerificationView.swift */; };
98BBA11F2B68A6A100003AC2 /* ProductView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98BBA1112B68A6A100003AC2 /* ProductView.swift */; };
Expand All @@ -40,6 +39,8 @@
98BBA1292B68A6A100003AC2 /* OnboardingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98BBA11B2B68A6A100003AC2 /* OnboardingView.swift */; };
98BBA12B2B68A75200003AC2 /* OnboardingApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98BBA12A2B68A75200003AC2 /* OnboardingApp.swift */; };
98BBA12D2B68ACBF00003AC2 /* Verification.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98BBA12C2B68ACBF00003AC2 /* Verification.swift */; };
98D04FFD2B7871F200889156 /* CustomTextField in Frameworks */ = {isa = PBXBuildFile; productRef = 98D04FFC2B7871F200889156 /* CustomTextField */; };
98D04FFF2B78763C00889156 /* CustomField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98D04FFE2B78763C00889156 /* CustomField.swift */; };
98EA47352B6065C600AA2E8F /* User.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98EA47342B6065C600AA2E8F /* User.swift */; };
98F525C92B469BBD00CCAD78 /* PlayerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98F525C82B469BBD00CCAD78 /* PlayerView.swift */; };
98F525CB2B469BEB00CCAD78 /* UIPlayerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98F525CA2B469BEB00CCAD78 /* UIPlayerView.swift */; };
Expand Down Expand Up @@ -74,14 +75,13 @@
983286CB2B05698F00851B19 /* RethreadUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RethreadUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
983286CF2B05698F00851B19 /* RethreadUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RethreadUITests.swift; sourceTree = "<group>"; };
983286D12B05698F00851B19 /* RethreadUITestsLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RethreadUITestsLaunchTests.swift; sourceTree = "<group>"; };
983D40F82B68B81800905D4E /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
983D40FA2B68D13E00905D4E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
98434A5C2B63342700F81127 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
984674942B747FD200AFB77A /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
9868A7DD2B1FAE780063D9BA /* ButtonStyles.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ButtonStyles.swift; sourceTree = "<group>"; };
988A0F982B3C112300ACDC90 /* DatePickerModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DatePickerModel.swift; sourceTree = "<group>"; };
9897C7722B3E6C4000EDE9D9 /* CustomDropdownMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomDropdownMenu.swift; sourceTree = "<group>"; };
98A1838B2B38D32A001E324A /* ColorPalette.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ColorPalette.swift; sourceTree = "<group>"; };
98BBA10E2B68A6A100003AC2 /* QuestionView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = QuestionView.swift; sourceTree = "<group>"; };
98BBA10F2B68A6A100003AC2 /* ProfileView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ProfileView.swift; sourceTree = "<group>"; };
98BBA1102B68A6A100003AC2 /* VerificationView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VerificationView.swift; sourceTree = "<group>"; };
98BBA1112B68A6A100003AC2 /* ProductView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ProductView.swift; sourceTree = "<group>"; };
Expand All @@ -97,6 +97,7 @@
98BBA11B2B68A6A100003AC2 /* OnboardingView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OnboardingView.swift; sourceTree = "<group>"; };
98BBA12A2B68A75200003AC2 /* OnboardingApp.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OnboardingApp.swift; sourceTree = "<group>"; };
98BBA12C2B68ACBF00003AC2 /* Verification.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Verification.swift; sourceTree = "<group>"; };
98D04FFE2B78763C00889156 /* CustomField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomField.swift; sourceTree = "<group>"; };
98EA47342B6065C600AA2E8F /* User.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = User.swift; sourceTree = "<group>"; };
98F525C82B469BBD00CCAD78 /* PlayerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlayerView.swift; sourceTree = "<group>"; };
98F525CA2B469BEB00CCAD78 /* UIPlayerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIPlayerView.swift; sourceTree = "<group>"; };
Expand All @@ -110,6 +111,7 @@
buildActionMask = 2147483647;
files = (
983014C22B451A3E004A6A07 /* NavigationTransitions in Frameworks */,
98D04FFD2B7871F200889156 /* CustomTextField in Frameworks */,
985674F12B663E0D003FA5A0 /* FirebaseAuth in Frameworks */,
985674F32B663E0D003FA5A0 /* FirebaseFirestore in Frameworks */,
985674F72B663E0D003FA5A0 /* FirebaseStorage in Frameworks */,
Expand Down Expand Up @@ -164,7 +166,7 @@
isa = PBXGroup;
children = (
983286B32B05698E00851B19 /* Rethread */,
983D40F82B68B81800905D4E /* GoogleService-Info.plist */,
984674942B747FD200AFB77A /* GoogleService-Info.plist */,
983286C42B05698F00851B19 /* RethreadTests */,
983286CE2B05698F00851B19 /* RethreadUITests */,
983286B22B05698E00851B19 /* Products */,
Expand Down Expand Up @@ -230,6 +232,7 @@
children = (
98BBA12C2B68ACBF00003AC2 /* Verification.swift */,
9897C7722B3E6C4000EDE9D9 /* CustomDropdownMenu.swift */,
98D04FFE2B78763C00889156 /* CustomField.swift */,
);
path = Components;
sourceTree = "<group>";
Expand All @@ -244,7 +247,6 @@
98BBA10D2B68A6A100003AC2 /* Views */ = {
isa = PBXGroup;
children = (
98BBA10E2B68A6A100003AC2 /* QuestionView.swift */,
98BBA10F2B68A6A100003AC2 /* ProfileView.swift */,
98BBA1102B68A6A100003AC2 /* VerificationView.swift */,
98BBA1112B68A6A100003AC2 /* ProductView.swift */,
Expand Down Expand Up @@ -311,6 +313,7 @@
985674F22B663E0D003FA5A0 /* FirebaseFirestore */,
985674F42B663E0D003FA5A0 /* FirebaseFirestoreSwift */,
985674F62B663E0D003FA5A0 /* FirebaseStorage */,
98D04FFC2B7871F200889156 /* CustomTextField */,
);
productName = Rethread;
productReference = 983286B12B05698E00851B19 /* Rethread.app */;
Expand Down Expand Up @@ -388,6 +391,7 @@
packageReferences = (
983014C02B451A3E004A6A07 /* XCRemoteSwiftPackageReference "swiftui-navigation-transitions" */,
985674EF2B663E0D003FA5A0 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */,
98D04FFB2B7871F200889156 /* XCRemoteSwiftPackageReference "SwiftUI-Custom-TextField" */,
);
productRefGroup = 983286B22B05698E00851B19 /* Products */;
projectDirPath = "";
Expand All @@ -406,7 +410,7 @@
buildActionMask = 2147483647;
files = (
983286BC2B05698F00851B19 /* Preview Assets.xcassets in Resources */,
983D40F92B68B81800905D4E /* GoogleService-Info.plist in Resources */,
984674952B747FD200AFB77A /* GoogleService-Info.plist in Resources */,
983286B92B05698F00851B19 /* Assets.xcassets in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -435,7 +439,6 @@
98BBA1292B68A6A100003AC2 /* OnboardingView.swift in Sources */,
98BBA1222B68A6A100003AC2 /* testest.swift in Sources */,
98BBA1262B68A6A100003AC2 /* ClothingItemView.swift in Sources */,
98BBA11C2B68A6A100003AC2 /* QuestionView.swift in Sources */,
9868A7DE2B1FAE780063D9BA /* ButtonStyles.swift in Sources */,
98EA47352B6065C600AA2E8F /* User.swift in Sources */,
98BBA12D2B68ACBF00003AC2 /* Verification.swift in Sources */,
Expand All @@ -455,6 +458,7 @@
98BBA1212B68A6A100003AC2 /* HomeView.swift in Sources */,
98BBA1252B68A6A100003AC2 /* SwiftUIView.swift in Sources */,
98BBA11E2B68A6A100003AC2 /* VerificationView.swift in Sources */,
98D04FFF2B78763C00889156 /* CustomField.swift in Sources */,
98BBA11F2B68A6A100003AC2 /* ProductView.swift in Sources */,
98BBA1282B68A6A100003AC2 /* SignUpView.swift in Sources */,
98BBA1202B68A6A100003AC2 /* MapView.swift in Sources */,
Expand Down Expand Up @@ -811,6 +815,14 @@
minimumVersion = 10.20.0;
};
};
98D04FFB2B7871F200889156 /* XCRemoteSwiftPackageReference "SwiftUI-Custom-TextField" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/esatgozcu/SwiftUI-Custom-TextField";
requirement = {
branch = main;
kind = branch;
};
};
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
Expand Down Expand Up @@ -839,6 +851,11 @@
package = 985674EF2B663E0D003FA5A0 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
productName = FirebaseStorage;
};
98D04FFC2B7871F200889156 /* CustomTextField */ = {
isa = XCSwiftPackageProductDependency;
package = 98D04FFB2B7871F200889156 /* XCRemoteSwiftPackageReference "SwiftUI-Custom-TextField" */;
productName = CustomTextField;
};
/* End XCSwiftPackageProductDependency section */
};
rootObject = 983286A92B05698E00851B19 /* Project object */;
Expand Down
21 changes: 21 additions & 0 deletions Rethread/Rethread/Assets.xcassets/appleLogo.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "appleLogo.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "Screenshot 2024-02-10 at 7.44.59 PM.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "googleLogo.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"images" : [
{
"filename" : "starSky.jpg",
"filename" : "metaLogo.png",
"idiom" : "universal",
"scale" : "1x"
},
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
4 changes: 2 additions & 2 deletions Rethread/Rethread/Components/CustomDropdownMenu.swift
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ struct CustomDropdownMenu: View {
}
.padding(.horizontal)
.padding(.vertical, 1.5)
.foregroundColor(Color.primaryTextColor)
.foregroundColor(Color.primaryDark)

if isSelecting {
Divider()
Expand All @@ -40,7 +40,7 @@ struct CustomDropdownMenu: View {
.padding(.vertical)
.background(
RoundedRectangle(cornerRadius: 10)
.strokeBorder(Color.gray, lineWidth: 1)
.strokeBorder(Color.primaryDark, lineWidth: 1)
.background(Color.white)
.cornerRadius(10)
)
Expand Down
25 changes: 25 additions & 0 deletions Rethread/Rethread/Components/CustomField.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import SwiftUI
import CustomTextField

struct CustomField: View {
@Binding var text: String
var titleText: String
var placeHolderText: String
var secureText: Bool = false

var body: some View {
EGTextField(text: $text)
.setTitleText(titleText)
.setTitleColor(Color.primaryDark)
.setPlaceHolderText(placeHolderText)
.setPlaceHolderTextColor(Color.PrimaryLight)
.setTruncateMode(.tail)
.setBorderColor(.primaryDark)
.setTextColor(Color.primaryDark)
.setDisableAutoCorrection(true)
.setTextFieldHeight(48)
.setFocusedBorderColorEnable(true)
.setSecureText(secureText)
.setTrailingImageForegroundColor(Color.primaryDark)
}
}
4 changes: 2 additions & 2 deletions Rethread/Rethread/Components/Verification.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

import SwiftUI


struct Verification: View {
@Binding var otpFields: [String]
@State var otpText: String
Expand Down Expand Up @@ -62,7 +62,7 @@ struct Verification: View {
.multilineTextAlignment(.center)
.frame(width: 45, height: 45)
.overlay(RoundedRectangle(cornerRadius: 8).stroke(
activeField == activeStateForIndex(index: index) ? Color.primary.opacity(0.4) : Color.primary,
activeField == activeStateForIndex(index: index) ? Color.primaryDark.opacity(0.4) : Color.primaryDark,
lineWidth: 1))
.focused($activeField, equals: activeStateForIndex(index: index))

Expand Down
15 changes: 10 additions & 5 deletions Rethread/Rethread/Core/ContentView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,19 @@ import SwiftUI
struct ContentView: View {
@EnvironmentObject var viewModel: AuthViewModel


var body: some View {
Group {
if viewModel.currentUser?.onboardingComplete == false{
WelcomeView()
} else if viewModel.userSession != nil {
HomeView()
if viewModel.isLoading {
ProgressView("Loading...")
} else {
MainView()
if viewModel.currentUser?.onboardingComplete == false {
WelcomeView()
} else if viewModel.userSession != nil {
HomeView()
} else {
MainView()
}
}
}
}
Expand Down
Loading

0 comments on commit bd07764

Please sign in to comment.