Skip to content

Commit

Permalink
fix settings labels on iOS
Browse files Browse the repository at this point in the history
  • Loading branch information
@EthanLipnik
EthanLipnik committed Dec 29, 2022
1 parent 73b681c commit 2cdb968
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 28 deletions.
40 changes: 20 additions & 20 deletions OpenSesame.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1217,19 +1217,19 @@
buildSettings = {
CODE_SIGN_ENTITLEMENTS = "AutoFill iOS/AutoFill_iOS.entitlements";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 34;
CURRENT_PROJECT_VERSION = 37;
DEVELOPMENT_TEAM = B6QG723P8Z;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = "AutoFill iOS/Info.plist";
INFOPLIST_KEY_CFBundleDisplayName = "AutoFill iOS";
INFOPLIST_KEY_NSHumanReadableCopyright = "";
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 1.1.1;
MARKETING_VERSION = 1.2.0;
PRODUCT_BUNDLE_IDENTIFIER = "com.ethanlipnik.OpenSesame.AutoFill-iOS";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
Expand All @@ -1246,19 +1246,19 @@
buildSettings = {
CODE_SIGN_ENTITLEMENTS = "AutoFill iOS/AutoFill_iOS.entitlements";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 34;
CURRENT_PROJECT_VERSION = 37;
DEVELOPMENT_TEAM = B6QG723P8Z;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = "AutoFill iOS/Info.plist";
INFOPLIST_KEY_CFBundleDisplayName = "AutoFill iOS";
INFOPLIST_KEY_NSHumanReadableCopyright = "";
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 1.1.1;
MARKETING_VERSION = 1.2.0;
PRODUCT_BUNDLE_IDENTIFIER = "com.ethanlipnik.OpenSesame.AutoFill-iOS";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
Expand All @@ -1277,7 +1277,7 @@
CODE_SIGN_ENTITLEMENTS = "AutoFill macOS/AutoFill_macOS.entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 35;
CURRENT_PROJECT_VERSION = 37;
DEVELOPMENT_TEAM = B6QG723P8Z;
ENABLE_APP_SANDBOX = YES;
ENABLE_HARDENED_RUNTIME = YES;
Expand All @@ -1290,8 +1290,8 @@
"@executable_path/../Frameworks",
"@executable_path/../../../../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 12.0;
MARKETING_VERSION = 1.1.1;
MACOSX_DEPLOYMENT_TARGET = 13.0;
MARKETING_VERSION = 1.2.0;
PRODUCT_BUNDLE_IDENTIFIER = "com.ethanlipnik.OpenSesame.AutoFill-macOS";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
Expand All @@ -1308,7 +1308,7 @@
CODE_SIGN_ENTITLEMENTS = "AutoFill macOS/AutoFill_macOS.entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 35;
CURRENT_PROJECT_VERSION = 37;
DEVELOPMENT_TEAM = B6QG723P8Z;
ENABLE_APP_SANDBOX = YES;
ENABLE_HARDENED_RUNTIME = YES;
Expand All @@ -1321,8 +1321,8 @@
"@executable_path/../Frameworks",
"@executable_path/../../../../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 12.0;
MARKETING_VERSION = 1.1.1;
MACOSX_DEPLOYMENT_TARGET = 13.0;
MARKETING_VERSION = 1.2.0;
PRODUCT_BUNDLE_IDENTIFIER = "com.ethanlipnik.OpenSesame.AutoFill-macOS";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
Expand Down Expand Up @@ -1452,7 +1452,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = OpenSesame.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 34;
CURRENT_PROJECT_VERSION = 37;
DEVELOPMENT_TEAM = B6QG723P8Z;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
Expand All @@ -1473,7 +1473,7 @@
"@executable_path/Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 13.0;
MARKETING_VERSION = 1.1.1;
MARKETING_VERSION = 1.2.0;
PRODUCT_BUNDLE_IDENTIFIER = com.ethanlipnik.OpenSesame;
PRODUCT_NAME = OpenSesame;
SDKROOT = iphoneos;
Expand All @@ -1494,7 +1494,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = OpenSesame.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 34;
CURRENT_PROJECT_VERSION = 37;
DEVELOPMENT_TEAM = B6QG723P8Z;
ENABLE_PREVIEWS = YES;
GCC_OPTIMIZATION_LEVEL = z;
Expand All @@ -1516,7 +1516,7 @@
"@executable_path/Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 13.0;
MARKETING_VERSION = 1.1.1;
MARKETING_VERSION = 1.2.0;
PRODUCT_BUNDLE_IDENTIFIER = com.ethanlipnik.OpenSesame;
PRODUCT_NAME = OpenSesame;
SDKROOT = iphoneos;
Expand All @@ -1539,7 +1539,7 @@
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = B6QG723P8Z;
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -1564,7 +1564,7 @@
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = B6QG723P8Z;
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -1596,7 +1596,7 @@
"@executable_path/../Frameworks",
"@loader_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 11.5;
MACOSX_DEPLOYMENT_TARGET = 13.0;
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = "com.ethanlipnik.OpenSesame.Tests-macOS";
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -1621,7 +1621,7 @@
"@executable_path/../Frameworks",
"@loader_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 11.5;
MACOSX_DEPLOYMENT_TARGET = 13.0;
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = "com.ethanlipnik.OpenSesame.Tests-macOS";
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down
2 changes: 1 addition & 1 deletion OpenSesame.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"location" : "https://github.com/OpenSesameManager/FaviconFinder.git",
"state" : {
"branch" : "main",
"revision" : "3d6e27515504ca4598e5a4db942849c347780f47"
"revision" : "60415a51c4b7b6052e9e4f46fce2116c21259957"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion OpenSesame/Views/SettingsView/CreditsView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ struct CreditsView: View {
} icon: {
AsyncImage(
url: URL(
string: "https://pbs.twimg.com/profile_images/1384494074955173888/EkfIwNyD.jpg"
string: "https://www.ethanlipnik.com/_next/image?url=%2F_next%2Fstatic%2Fmedia%2FProfilePic.4dd0e195.png&w=1080&q=75"
)
) { phase in
switch phase {
Expand Down
12 changes: 6 additions & 6 deletions OpenSesame/Views/SettingsView/iOS/SettingsView-iOS.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,15 +94,15 @@ struct SettingsView: View {

Section("Appearance") {
HStack {
Label("Color Scheme", systemImage: "circle.fill")
Spacer()
Picker("Color Scheme", selection: $userSettings.colorScheme) {
Picker(selection: $userSettings.colorScheme) {
Text("System")
.tag(0)
Text("Light")
.tag(1)
Text("Dark")
.tag(2)
} label: {
Label("Color Scheme", systemImage: "circle.fill")
}
.pickerStyle(.menu)
}
Expand Down Expand Up @@ -142,9 +142,7 @@ struct SettingsView: View {
.tint(.accentColor)
.disabled(availableBiometrics.isEmpty)
HStack {
Label("Auto-Lock", systemImage: "lock.fill")
Spacer()
Picker("Auto-lock", selection: $userSettings.autoLockTimer) {
Picker(selection: $userSettings.autoLockTimer) {
Text("Immediately")
.tag(0)
Text("30 seconds")
Expand All @@ -157,6 +155,8 @@ struct SettingsView: View {
.tag(4)
Text("5 minutes")
.tag(5)
} label: {
Label("Auto-Lock", systemImage: "lock.fill")
}
.pickerStyle(.menu)
}
Expand Down

0 comments on commit 2cdb968

Please sign in to comment.