Skip to content
This repository was archived by the owner on Oct 6, 2023. It is now read-only.

Commit

Permalink
Removed tip jar from macOS settings
Browse files Browse the repository at this point in the history
  • Loading branch information
@EthanLipnik
EthanLipnik committed Nov 15, 2021
1 parent 948f626 commit f5c9640
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 36 deletions.
24 changes: 12 additions & 12 deletions OpenSesame.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1563,7 +1563,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 1.1;
MARKETING_VERSION = 1.1.1;
PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).AutoFill-iOS";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
Expand Down Expand Up @@ -1591,7 +1591,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 1.1;
MARKETING_VERSION = 1.1.1;
PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).AutoFill-iOS";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
Expand All @@ -1610,7 +1610,7 @@
CODE_SIGN_ENTITLEMENTS = "AutoFill macOS/AutoFill_macOS.entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 34;
CURRENT_PROJECT_VERSION = 35;
ENABLE_APP_SANDBOX = YES;
ENABLE_HARDENED_RUNTIME = YES;
GENERATE_INFOPLIST_FILE = YES;
Expand All @@ -1623,7 +1623,7 @@
"@executable_path/../../../../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 12.0;
MARKETING_VERSION = 1.1;
MARKETING_VERSION = 1.1.1;
PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).AutoFill-macOS";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
Expand All @@ -1640,7 +1640,7 @@
CODE_SIGN_ENTITLEMENTS = "AutoFill macOS/AutoFill_macOS.entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 34;
CURRENT_PROJECT_VERSION = 35;
ENABLE_APP_SANDBOX = YES;
ENABLE_HARDENED_RUNTIME = YES;
GENERATE_INFOPLIST_FILE = YES;
Expand All @@ -1653,7 +1653,7 @@
"@executable_path/../../../../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 12.0;
MARKETING_VERSION = 1.1;
MARKETING_VERSION = 1.1.1;
PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).AutoFill-macOS";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
Expand Down Expand Up @@ -1803,7 +1803,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.1;
MARKETING_VERSION = 1.1.1;
PRODUCT_BUNDLE_IDENTIFIER = "$(inherited)";
PRODUCT_NAME = OpenSesame;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -1840,7 +1840,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.1;
MARKETING_VERSION = 1.1.1;
PRODUCT_BUNDLE_IDENTIFIER = "$(inherited)";
PRODUCT_NAME = OpenSesame;
SDKROOT = iphoneos;
Expand All @@ -1862,7 +1862,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 34;
CURRENT_PROJECT_VERSION = 35;
ENABLE_APP_SANDBOX = YES;
ENABLE_HARDENED_RUNTIME = YES;
ENABLE_PREVIEWS = YES;
Expand All @@ -1879,7 +1879,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 12.0;
MARKETING_VERSION = 1.1;
MARKETING_VERSION = 1.1.1;
OTHER_SWIFT_FLAGS = "-Xfrontend -warn-long-expression-type-checking=300 -Xfrontend -warn-long-function-bodies=500 -Onone";
PRODUCT_BUNDLE_IDENTIFIER = com.ethanlipnik.OpenSesame;
PRODUCT_NAME = OpenSesame;
Expand All @@ -1900,7 +1900,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 34;
CURRENT_PROJECT_VERSION = 35;
ENABLE_APP_SANDBOX = YES;
ENABLE_HARDENED_RUNTIME = YES;
ENABLE_PREVIEWS = YES;
Expand All @@ -1917,7 +1917,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 12.0;
MARKETING_VERSION = 1.1;
MARKETING_VERSION = 1.1.1;
OTHER_SWIFT_FLAGS = "-Xfrontend -warn-long-expression-type-checking=300 -Xfrontend -warn-long-function-bodies=500";
PRODUCT_BUNDLE_IDENTIFIER = com.ethanlipnik.OpenSesame;
PRODUCT_NAME = OpenSesame;
Expand Down
46 changes: 27 additions & 19 deletions Shared/Views/AccountView/AccountView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ struct AccountView: View {

let columns: [GridItem] = {
#if os(macOS)
return [.init(), .init()]
return [.init()]
#else
return UIDevice.current.userInterfaceIdiom == .pad ? [.init(), .init()] : [.init()]
#endif
Expand All @@ -59,28 +59,36 @@ struct AccountView: View {
.frame(maxWidth: .infinity, alignment: .leading)
LazyVGrid(columns: columns) {
ForEach(otherAccounts) { account in
let content = GroupBox {
HStack {
if let domain = account.domain {
FaviconView(website: domain)
.frame(width: 40, height: 40)
}
VStack(alignment: .leading) {
Text(account.domain ?? "Unknwon domain")
.bold()
.frame(maxWidth: .infinity, alignment: .leading)
Text(account.username ?? "Unknown email or username")
.foregroundColor(Color.secondary)
}
Spacer()
Image(systemName: "chevron.right")
.foregroundColor(.secondary)
}
}

#if os(iOS)
NavigationLink {
AccountView(account: account)
} label: {
GroupBox {
HStack {
if let domain = account.domain {
FaviconView(website: domain)
.frame(width: 40, height: 40)
}
VStack(alignment: .leading) {
Text(account.domain ?? "Unknwon domain")
.bold()
.frame(maxWidth: .infinity, alignment: .leading)
Text(account.username ?? "Unknown email or username")
.foregroundColor(Color.secondary)
}
Spacer()
Image(systemName: "chevron.right")
.foregroundColor(.secondary)
}
}
content
}.buttonStyle(.plain)
#else
Link(destination: URL(string: "opensesame://account")!) {
content
}.buttonStyle(.plain)
#endif
}
}
}
Expand Down
10 changes: 5 additions & 5 deletions Shared/Views/SettingsView/macOS/SettingsView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ struct SettingsView: View {
Label("Syncing", systemImage: "cloud.fill")
}
.tag(2)
TipJarView()
.tabItem {
Label("Tip Jar", systemImage: "heart.fill")
}
.tag(3)
// TipJarView()
// .tabItem {
// Label("Tip Jar", systemImage: "heart.fill")
// }
// .tag(3)
}
.frame(width: 450, height: selectedTab == 3 ? 200 : nil)
}
Expand Down

0 comments on commit f5c9640

Please sign in to comment.