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

Commit f5c9640

Browse files
EthanLipnikEthanLipnik
committed
Removed tip jar from macOS settings
1 parent 948f626 commit f5c9640

File tree

3 files changed

+44
-36
lines changed

3 files changed

+44
-36
lines changed

‎OpenSesame.xcodeproj/project.pbxproj

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1563,7 +1563,7 @@
15631563
"@executable_path/Frameworks",
15641564
"@executable_path/../../Frameworks",
15651565
);
1566-
MARKETING_VERSION = 1.1;
1566+
MARKETING_VERSION = 1.1.1;
15671567
PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).AutoFill-iOS";
15681568
PRODUCT_NAME = "$(TARGET_NAME)";
15691569
SDKROOT = iphoneos;
@@ -1591,7 +1591,7 @@
15911591
"@executable_path/Frameworks",
15921592
"@executable_path/../../Frameworks",
15931593
);
1594-
MARKETING_VERSION = 1.1;
1594+
MARKETING_VERSION = 1.1.1;
15951595
PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).AutoFill-iOS";
15961596
PRODUCT_NAME = "$(TARGET_NAME)";
15971597
SDKROOT = iphoneos;
@@ -1610,7 +1610,7 @@
16101610
CODE_SIGN_ENTITLEMENTS = "AutoFill macOS/AutoFill_macOS.entitlements";
16111611
CODE_SIGN_IDENTITY = "Apple Development";
16121612
CODE_SIGN_STYLE = Automatic;
1613-
CURRENT_PROJECT_VERSION = 34;
1613+
CURRENT_PROJECT_VERSION = 35;
16141614
ENABLE_APP_SANDBOX = YES;
16151615
ENABLE_HARDENED_RUNTIME = YES;
16161616
GENERATE_INFOPLIST_FILE = YES;
@@ -1623,7 +1623,7 @@
16231623
"@executable_path/../../../../Frameworks",
16241624
);
16251625
MACOSX_DEPLOYMENT_TARGET = 12.0;
1626-
MARKETING_VERSION = 1.1;
1626+
MARKETING_VERSION = 1.1.1;
16271627
PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).AutoFill-macOS";
16281628
PRODUCT_NAME = "$(TARGET_NAME)";
16291629
SDKROOT = macosx;
@@ -1640,7 +1640,7 @@
16401640
CODE_SIGN_ENTITLEMENTS = "AutoFill macOS/AutoFill_macOS.entitlements";
16411641
CODE_SIGN_IDENTITY = "Apple Development";
16421642
CODE_SIGN_STYLE = Automatic;
1643-
CURRENT_PROJECT_VERSION = 34;
1643+
CURRENT_PROJECT_VERSION = 35;
16441644
ENABLE_APP_SANDBOX = YES;
16451645
ENABLE_HARDENED_RUNTIME = YES;
16461646
GENERATE_INFOPLIST_FILE = YES;
@@ -1653,7 +1653,7 @@
16531653
"@executable_path/../../../../Frameworks",
16541654
);
16551655
MACOSX_DEPLOYMENT_TARGET = 12.0;
1656-
MARKETING_VERSION = 1.1;
1656+
MARKETING_VERSION = 1.1.1;
16571657
PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).AutoFill-macOS";
16581658
PRODUCT_NAME = "$(TARGET_NAME)";
16591659
SDKROOT = macosx;
@@ -1803,7 +1803,7 @@
18031803
"$(inherited)",
18041804
"@executable_path/Frameworks",
18051805
);
1806-
MARKETING_VERSION = 1.1;
1806+
MARKETING_VERSION = 1.1.1;
18071807
PRODUCT_BUNDLE_IDENTIFIER = "$(inherited)";
18081808
PRODUCT_NAME = OpenSesame;
18091809
SDKROOT = iphoneos;
@@ -1840,7 +1840,7 @@
18401840
"$(inherited)",
18411841
"@executable_path/Frameworks",
18421842
);
1843-
MARKETING_VERSION = 1.1;
1843+
MARKETING_VERSION = 1.1.1;
18441844
PRODUCT_BUNDLE_IDENTIFIER = "$(inherited)";
18451845
PRODUCT_NAME = OpenSesame;
18461846
SDKROOT = iphoneos;
@@ -1862,7 +1862,7 @@
18621862
CODE_SIGN_IDENTITY = "Apple Development";
18631863
CODE_SIGN_STYLE = Automatic;
18641864
COMBINE_HIDPI_IMAGES = YES;
1865-
CURRENT_PROJECT_VERSION = 34;
1865+
CURRENT_PROJECT_VERSION = 35;
18661866
ENABLE_APP_SANDBOX = YES;
18671867
ENABLE_HARDENED_RUNTIME = YES;
18681868
ENABLE_PREVIEWS = YES;
@@ -1879,7 +1879,7 @@
18791879
"@executable_path/../Frameworks",
18801880
);
18811881
MACOSX_DEPLOYMENT_TARGET = 12.0;
1882-
MARKETING_VERSION = 1.1;
1882+
MARKETING_VERSION = 1.1.1;
18831883
OTHER_SWIFT_FLAGS = "-Xfrontend -warn-long-expression-type-checking=300 -Xfrontend -warn-long-function-bodies=500 -Onone";
18841884
PRODUCT_BUNDLE_IDENTIFIER = com.ethanlipnik.OpenSesame;
18851885
PRODUCT_NAME = OpenSesame;
@@ -1900,7 +1900,7 @@
19001900
CODE_SIGN_IDENTITY = "Apple Development";
19011901
CODE_SIGN_STYLE = Automatic;
19021902
COMBINE_HIDPI_IMAGES = YES;
1903-
CURRENT_PROJECT_VERSION = 34;
1903+
CURRENT_PROJECT_VERSION = 35;
19041904
ENABLE_APP_SANDBOX = YES;
19051905
ENABLE_HARDENED_RUNTIME = YES;
19061906
ENABLE_PREVIEWS = YES;
@@ -1917,7 +1917,7 @@
19171917
"@executable_path/../Frameworks",
19181918
);
19191919
MACOSX_DEPLOYMENT_TARGET = 12.0;
1920-
MARKETING_VERSION = 1.1;
1920+
MARKETING_VERSION = 1.1.1;
19211921
OTHER_SWIFT_FLAGS = "-Xfrontend -warn-long-expression-type-checking=300 -Xfrontend -warn-long-function-bodies=500";
19221922
PRODUCT_BUNDLE_IDENTIFIER = com.ethanlipnik.OpenSesame;
19231923
PRODUCT_NAME = OpenSesame;

‎Shared/Views/AccountView/AccountView.swift

Lines changed: 27 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ struct AccountView: View {
4343

4444
let columns: [GridItem] = {
4545
#if os(macOS)
46-
return [.init(), .init()]
46+
return [.init()]
4747
#else
4848
return UIDevice.current.userInterfaceIdiom == .pad ? [.init(), .init()] : [.init()]
4949
#endif
@@ -59,28 +59,36 @@ struct AccountView: View {
5959
.frame(maxWidth: .infinity, alignment: .leading)
6060
LazyVGrid(columns: columns) {
6161
ForEach(otherAccounts) { account in
62+
let content = GroupBox {
63+
HStack {
64+
if let domain = account.domain {
65+
FaviconView(website: domain)
66+
.frame(width: 40, height: 40)
67+
}
68+
VStack(alignment: .leading) {
69+
Text(account.domain ?? "Unknwon domain")
70+
.bold()
71+
.frame(maxWidth: .infinity, alignment: .leading)
72+
Text(account.username ?? "Unknown email or username")
73+
.foregroundColor(Color.secondary)
74+
}
75+
Spacer()
76+
Image(systemName: "chevron.right")
77+
.foregroundColor(.secondary)
78+
}
79+
}
80+
81+
#if os(iOS)
6282
NavigationLink {
6383
AccountView(account: account)
6484
} label: {
65-
GroupBox {
66-
HStack {
67-
if let domain = account.domain {
68-
FaviconView(website: domain)
69-
.frame(width: 40, height: 40)
70-
}
71-
VStack(alignment: .leading) {
72-
Text(account.domain ?? "Unknwon domain")
73-
.bold()
74-
.frame(maxWidth: .infinity, alignment: .leading)
75-
Text(account.username ?? "Unknown email or username")
76-
.foregroundColor(Color.secondary)
77-
}
78-
Spacer()
79-
Image(systemName: "chevron.right")
80-
.foregroundColor(.secondary)
81-
}
82-
}
85+
content
86+
}.buttonStyle(.plain)
87+
#else
88+
Link(destination: URL(string: "opensesame://account")!) {
89+
content
8390
}.buttonStyle(.plain)
91+
#endif
8492
}
8593
}
8694
}

‎Shared/Views/SettingsView/macOS/SettingsView.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ struct SettingsView: View {
3737
Label("Syncing", systemImage: "cloud.fill")
3838
}
3939
.tag(2)
40-
TipJarView()
41-
.tabItem {
42-
Label("Tip Jar", systemImage: "heart.fill")
43-
}
44-
.tag(3)
40+
// TipJarView()
41+
// .tabItem {
42+
// Label("Tip Jar", systemImage: "heart.fill")
43+
// }
44+
// .tag(3)
4545
}
4646
.frame(width: 450, height: selectedTab == 3 ? 200 : nil)
4747
}

0 commit comments

Comments
 (0)