Skip to content

Commit

Permalink
feat: add app icon (#12)
Browse files Browse the repository at this point in the history
  • Loading branch information
Celve authored Dec 9, 2024
1 parent 610b4cd commit 598e1be
Show file tree
Hide file tree
Showing 10 changed files with 57 additions and 45 deletions.
4 changes: 2 additions & 2 deletions Peninsula.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@
CODE_SIGN_ENTITLEMENTS = Peninsula/Peninsula.entitlements;
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 3;
CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_ASSET_PATHS = "\"Peninsula/Preview Content\"";
DEVELOPMENT_TEAM = 8TDYAWS6VC;
ENABLE_HARDENED_RUNTIME = YES;
Expand Down Expand Up @@ -340,7 +340,7 @@
CODE_SIGN_ENTITLEMENTS = Peninsula/Peninsula.entitlements;
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 3;
CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_ASSET_PATHS = "\"Peninsula/Preview Content\"";
DEVELOPMENT_TEAM = 8TDYAWS6VC;
ENABLE_HARDENED_RUNTIME = YES;
Expand Down
80 changes: 45 additions & 35 deletions Peninsula/Assets.xcassets/AppIcon.appiconset/Contents.json
Original file line number Diff line number Diff line change
@@ -1,58 +1,68 @@
{
"images" : [
"images": [
{
"idiom" : "mac",
"scale" : "1x",
"size" : "16x16"
"filename": "Peninsula@2x-5.png",
"idiom": "mac",
"scale": "1x",
"size": "16x16"
},
{
"idiom" : "mac",
"scale" : "2x",
"size" : "16x16"
"filename": "Peninsula@2x-4.png",
"idiom": "mac",
"scale": "2x",
"size": "16x16"
},
{
"idiom" : "mac",
"scale" : "1x",
"size" : "32x32"
"filename": "Peninsula@2x-4.png",
"idiom": "mac",
"scale": "1x",
"size": "32x32"
},
{
"idiom" : "mac",
"scale" : "2x",
"size" : "32x32"
"filename": "Peninsula@2x-3.png",
"idiom": "mac",
"scale": "2x",
"size": "32x32"
},
{
"idiom" : "mac",
"scale" : "1x",
"size" : "128x128"
"filename": "Peninsula@2x-2.png",
"idiom": "mac",
"scale": "1x",
"size": "128x128"
},
{
"idiom" : "mac",
"scale" : "2x",
"size" : "128x128"
"filename": "Peninsula@2x-1.png",
"idiom": "mac",
"scale": "2x",
"size": "128x128"
},
{
"idiom" : "mac",
"scale" : "1x",
"size" : "256x256"
"filename": "Peninsula@2x-1.png",
"idiom": "mac",
"scale": "1x",
"size": "256x256"
},
{
"idiom" : "mac",
"scale" : "2x",
"size" : "256x256"
"filename": "Peninsula@2x.png",
"idiom": "mac",
"scale": "2x",
"size": "256x256"
},
{
"idiom" : "mac",
"scale" : "1x",
"size" : "512x512"
"filename": "Peninsula@2x.png",
"idiom": "mac",
"scale": "1x",
"size": "512x512"
},
{
"idiom" : "mac",
"scale" : "2x",
"size" : "512x512"
"filename": "Peninsula.png",
"idiom": "mac",
"scale": "2x",
"size": "512x512"
}
],
"info" : {
"author" : "xcode",
"version" : 1
"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.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 10 additions & 8 deletions Peninsula/Notch/SettingsView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
// Created by 曹丁杰 on 2024/7/29.
//

import KeyboardShortcuts
import LaunchAtLogin
import SwiftUI
import KeyboardShortcuts

struct SettingsView: View {
@StateObject var vm: NotchViewModel
Expand All @@ -22,19 +22,21 @@ struct SettingsView: View {
}
}
.pickerStyle(MenuPickerStyle())
.frame(width: vm.selectedLanguage == .simplifiedChinese || vm.selectedLanguage == .traditionalChinese ? 220 : 160)

.frame(
width: vm.selectedLanguage == .simplifiedChinese
|| vm.selectedLanguage == .traditionalChinese ? 220 : 160)

Spacer()
LaunchAtLogin.Toggle {
Text(NSLocalizedString("Launch at Login", comment: ""))
}

Spacer()
Toggle("Haptic Feedback ", isOn: $vm.hapticFeedback)

Spacer()
}

HStack {
Text("File Storage Time: ")
Picker(String(), selection: $tvm.selectedFileStorageTime) {
Expand Down Expand Up @@ -62,7 +64,7 @@ struct SettingsView: View {
.padding()
}
.animation(vm.normalAnimation, value: vm.contentType)
.animation(vm.status == .opened ? vm.innerOnAnimation : vm.innerOffAnimation, value: vm.status)
.animation(
vm.status == .opened ? vm.innerOnAnimation : vm.innerOffAnimation, value: vm.status)
}
}

0 comments on commit 598e1be

Please sign in to comment.