talksik/nirvana-ios
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixing things to get it solid on ipod touch

Browse Source
This commit is contained in:
talksik
2021-12-12 15:29:11 -08:00
parent 48a7206408
commit 13297d91d0
4 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nirvana-ios.xcodeproj/project.pbxproj
+6
View File
@@ -396,9 +396,11 @@
buildSettings = { buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1; CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "\"nirvana-ios/Preview Content\""; DEVELOPMENT_ASSET_PATHS = "\"nirvana-ios/Preview Content\"";
DEVELOPMENT_TEAM = RK9WWM4Q99;
ENABLE_PREVIEWS = YES; ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES; GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = "nirvana-ios/Info.plist"; INFOPLIST_FILE = "nirvana-ios/Info.plist";
@@ -414,6 +416,7 @@
MARKETING_VERSION = 1.0; MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = "com.usenirvana.nirvana-ios"; PRODUCT_BUNDLE_IDENTIFIER = "com.usenirvana.nirvana-ios";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0; SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2";
@@ -425,9 +428,11 @@
buildSettings = { buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1; CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "\"nirvana-ios/Preview Content\""; DEVELOPMENT_ASSET_PATHS = "\"nirvana-ios/Preview Content\"";
DEVELOPMENT_TEAM = RK9WWM4Q99;
ENABLE_PREVIEWS = YES; ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES; GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = "nirvana-ios/Info.plist"; INFOPLIST_FILE = "nirvana-ios/Info.plist";
@@ -443,6 +448,7 @@
MARKETING_VERSION = 1.0; MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = "com.usenirvana.nirvana-ios"; PRODUCT_BUNDLE_IDENTIFIER = "com.usenirvana.nirvana-ios";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0; SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2";
nirvana-ios/ContentView.swift
-2
View File
@@ -10,8 +10,6 @@ import SwiftUI
struct ContentView: View { struct ContentView: View {
var body: some View { var body: some View {
WelcomeView() WelcomeView()
HomeView()
} }
} }
nirvana-ios/Globals/colors.swift
+1
View File
@@ -40,4 +40,5 @@ final class NirvanaColor {
static let teal:Color = Color(red: 0.0, green: 0.314, blue: 0.314) static let teal:Color = Color(red: 0.0, green: 0.314, blue: 0.314)
static let bgLightGrey:Color = Color(red: 0.898, green: 0.898, blue: 0.898) static let bgLightGrey:Color = Color(red: 0.898, green: 0.898, blue: 0.898)
static let white: Color = Color.white static let white: Color = Color.white
static let black: Color = Color.black
} }
nirvana-ios/Views/WelcomeView/WelcomeView.swift
+20 -18
View File
@@ -8,6 +8,9 @@
import SwiftUI import SwiftUI
struct WelcomeView: View { struct WelcomeView: View {
let screenWidth = UIScreen.main.bounds.width
let screenHeight = UIScreen.main.bounds.height
var body: some View { var body: some View {
VStack { VStack {
// nav bar // nav bar
@@ -19,26 +22,27 @@ struct WelcomeView: View {
.renderingMode(.original) .renderingMode(.original)
.resizable() .resizable()
.aspectRatio(contentMode: .fit) .aspectRatio(contentMode: .fit)
.padding(.horizontal, 30)
.padding(.top, 30) Spacer()
VStack(alignment: .leading) { VStack(alignment: .leading) {
Text("Your ") Text("Your ")
.font(.title) .font(.title)
.foregroundColor(NirvanaColor.black)
+ Text("minimalist ") + Text("minimalist ")
.font(.title) .font(.title)
.foregroundColor(NirvanaColor.teal) .foregroundColor(NirvanaColor.teal)
+ Text("social media.") + Text("social media.")
.font(.title) .font(.title)
.foregroundColor(NirvanaColor.black)
Text("tired of the rat race on insta, tik-tok, snap, meta?") Text("tired of the rat race on insta, tik-tok, snap, meta?")
.foregroundColor(Color.gray) .foregroundColor(Color.gray)
.padding(.top, 5) .padding(.top, 5)
.fixedSize(horizontal: false, vertical: true)
} }
.frame(maxWidth: .infinity) .frame(maxWidth: screenWidth - 20)
.padding(.horizontal, 30)
.padding(.top, 20)
Spacer() Spacer()
@@ -51,35 +55,33 @@ struct WelcomeView: View {
Text("Start Your Detox") Text("Start Your Detox")
.bold() .bold()
.foregroundColor(NirvanaColor.white) .foregroundColor(NirvanaColor.white)
} .frame(maxWidth: .infinity)
) .padding(.vertical, 25)
.frame(maxWidth: .infinity) .background(NirvanaColor.teal)
.padding(.vertical, 25) .clipShape(Capsule())
.background(NirvanaColor.teal) .shadow(radius:10)
.clipShape(Capsule()) })
// .shadow(color: NirvanaColors.teal, radius: 3, x: 1, y: 2)
// .cornerRadius(8)
Button( Button(
action: { action: {
print("link to w ebsite learn more clicked") print("link to website learn more clicked")
}, },
label: { label: {
Text("Learn More") Text("Learn More")
.bold() .bold()
} })
)
.background(NirvanaColor.bgLightGrey) .background(NirvanaColor.bgLightGrey)
//learn more button to usenirvana.com //learn more button to usenirvana.com
} }
.frame(maxWidth: .infinity)
.padding(.horizontal, 30)
.padding(.top, 20) .padding(.top, 20)
.frame(maxWidth: 300)
Spacer() Spacer()
} }
.padding() .padding()
.frame(maxWidth: screenWidth - 20)
} }
.frame(maxWidth: .infinity, maxHeight: .infinity) .frame(maxWidth: .infinity, maxHeight: .infinity)