neon443/NearFuture
1
0
Fork 0
mirror of https://github.com/neon443/NearFuture.git synced 2026-03-11 06:49:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

accent color picking

Browse Source 
added about
added saveSettings()
backported to 16.0
new title bar
This commit is contained in:
neon443
2025-05-06 09:36:56 +01:00
parent f03ea73813
commit 4157520ff4
15 changed files with 295 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
NearFuture.xcodeproj/project.pbxproj
View File

@@ -571,7 +571,7 @@
"INFOPLIST_KEY_UIStatusBarStyle[sdk=iphonesimulator*]" = UIStatusBarStyleDefault;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
IPHONEOS_DEPLOYMENT_TARGET = 16.4;
IPHONEOS_DEPLOYMENT_TARGET = 16;
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 13;
@@ -622,7 +622,7 @@
"INFOPLIST_KEY_UIStatusBarStyle[sdk=iphonesimulator*]" = UIStatusBarStyleDefault;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
IPHONEOS_DEPLOYMENT_TARGET = 16.4;
IPHONEOS_DEPLOYMENT_TARGET = 16;
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 13;

12
NearFuture/AddEventView.swift
View File

@@ -59,7 +59,11 @@ struct AddEventView: View {
title: "Choose a Symbol",
searchLabel: "Search...",
autoDismiss: true)
.presentationBackground(.ultraThinMaterial)
.apply {
if #available(iOS 16.4, *) {
$0.presentationBackground(.ultraThinMaterial)
}
}
}
ColorPicker("", selection: $eventColor, supportsOpacity: false)
.fixedSize()
@@ -249,6 +253,10 @@ struct MagicClearButton: View {
adding: true
)
.presentationDragIndicator(.visible)
.presentationBackground(.ultraThinMaterial)
.apply {
if #available(iOS 16.4, *) {
$0.presentationBackground(.ultraThinMaterial)
}
}
}
}

6
NearFuture/ArchiveView.swift
View File

@@ -59,7 +59,11 @@ struct ArchiveView: View {
adding: true
)
.presentationDragIndicator(.visible)
.presentationBackground(.ultraThinMaterial)
.apply {
if #available(iOS 16.4, *) {
$0.presentationBackground(.ultraThinMaterial)
}
}
}
}
}

9
NearFuture/Assets.xcassets/uiColors/Contents.json Normal file
View File

@@ -0,0 +1,9 @@
{
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"provides-namespace" : true
}
}

38
NearFuture/Assets.xcassets/uiColors/basic.colorset/Contents.json Normal file
View File

@@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "display-p3",
"components" : {
"alpha" : "1.000",
"blue" : "0.000",
"green" : "0.000",
"red" : "0.000"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "display-p3",
"components" : {
"alpha" : "1.000",
"blue" : "1.000",
"green" : "1.000",
"red" : "1.000"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

20
NearFuture/Assets.xcassets/uiColors/blue.colorset/Contents.json Normal file
View File

@@ -0,0 +1,20 @@
{
"colors" : [
{
"color" : {
"color-space" : "display-p3",
"components" : {
"alpha" : "1.000",
"blue" : "0.961",
"green" : "0.510",
"red" : "0.227"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

20
NearFuture/Assets.xcassets/uiColors/green.colorset/Contents.json Normal file
View File

@@ -0,0 +1,20 @@
{
"colors" : [
{
"color" : {
"color-space" : "display-p3",
"components" : {
"alpha" : "1.000",
"blue" : "0.216",
"green" : "0.737",
"red" : "0.337"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

20
NearFuture/Assets.xcassets/uiColors/indigo.colorset/Contents.json Normal file
View File

@@ -0,0 +1,20 @@
{
"colors" : [
{
"color" : {
"color-space" : "display-p3",
"components" : {
"alpha" : "1.000",
"blue" : "0.871",
"green" : "0.329",
"red" : "0.345"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

20
NearFuture/Assets.xcassets/uiColors/orange.colorset/Contents.json Normal file
View File

@@ -0,0 +1,20 @@
{
"colors" : [
{
"color" : {
"color-space" : "extended-srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0.000",
"green" : "0.376",
"red" : "1.000"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

20
NearFuture/Assets.xcassets/uiColors/pink.colorset/Contents.json Normal file
View File

@@ -0,0 +1,20 @@
{
"colors" : [
{
"color" : {
"color-space" : "display-p3",
"components" : {
"alpha" : "1.000",
"blue" : "0.349",
"green" : "0.000",
"red" : "1.000"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

20
NearFuture/Assets.xcassets/uiColors/red.colorset/Contents.json Normal file
View File

@@ -0,0 +1,20 @@
{
"colors" : [
{
"color" : {
"color-space" : "display-p3",
"components" : {
"alpha" : "1.000",
"blue" : "0.242",
"green" : "0.197",
"red" : "0.910"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

20
NearFuture/Assets.xcassets/uiColors/yellow.colorset/Contents.json Normal file
View File

@@ -0,0 +1,20 @@
{
"colors" : [
{
"color" : {
"color-space" : "display-p3",
"components" : {
"alpha" : "1.000",
"blue" : "0.239",
"green" : "0.690",
"red" : "0.933"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

6
NearFuture/ContentView.swift
View File

@@ -118,7 +118,11 @@ struct ContentView: View {
adding: true //adding event
)
.presentationDragIndicator(.visible)
.presentationBackground(.ultraThinMaterial)
.apply {
if #available(iOS 16.4, *) {
$0.presentationBackground(.ultraThinMaterial)
}
}
}
.toolbar {
ToolbarItem(placement: .topBarTrailing) {

10
NearFuture/Item.swift
View File

@@ -128,6 +128,16 @@ class SettingsViewModel: ObservableObject {
}
}
}
func saveSettings() {
let encoder = JSONEncoder()
if let encoded = try? encoder.encode(settings) {
appGroupSettingsStore.set(encoded, forKey: "settings")
icSettStore.set(encoded, forKey: "settings")
icSettStore.synchronize()
loadSettings()
}
}
}
class EventViewModel: ObservableObject {

78
NearFuture/SettingsView.swift
View File

@@ -39,15 +39,16 @@ struct SettingsView: View {
return .red
}
}
let rainbow = [
Color.red,
Color.orange,
Color.yellow,
Color.green,
Color.blue,
Color.indigo,
Color.purple
let rainbow: [Color] = [
Color.UiColors.red,
Color.UiColors.orange,
Color.UiColors.yellow,
Color.UiColors.green,
Color.UiColors.blue,
Color.UiColors.indigo,
Color.UiColors.basic
]
@State private var selectedIndex: Int = 1
var body: some View {
NavigationStack {
@@ -56,12 +57,22 @@ struct SettingsView: View {
List {
ScrollView(.horizontal) {
HStack {
ForEach(rainbow, id: \.self) { color in
ForEach(0..<rainbow.count, id: \.self) { index in
ZStack {
Button() {
settingsModel.settings.tint.colorBind = color
selectedIndex = index
settingsModel.settings.tint.colorBind = rainbow[index]
settingsModel.saveSettings()
} label: {
Circle()
.foregroundStyle(color)
.foregroundStyle(rainbow[index])
.frame(width: 30)
}
if selectedIndex == index {
Circle()
.foregroundStyle(index == rainbow.count-1 ? .two : .one)
.frame(width: 10)
}
}
}
}
@@ -127,6 +138,25 @@ struct SettingsView: View {
viewModel.dangerResetiCloud()
}
}
Section("About") {
VStack {
if let image = UIImage(named: getAppIcon()) {
Image(uiImage: image)
.resizable()
.scaledToFit()
.frame(width: 100)
.clipShape(RoundedRectangle(cornerRadius: 25))
}
Text("Near Future")
.bold()
.monospaced()
.font(.title)
.frame(maxWidth: .infinity)
Text("Version " + getVersion() + " (\(getBuildID()))")
.frame(maxWidth: .infinity)
}
}
}
}
.scrollContentBackground(.hidden)
.navigationTitle("Settings")
@@ -140,7 +170,6 @@ struct SettingsView: View {
}
}
}
}
#Preview {
SettingsView(
@@ -148,3 +177,28 @@ struct SettingsView: View {
settingsModel: dummySettingsViewModel()
)
}
func getAppIcon() -> String {
let bundle = Bundle.main
guard let icons = bundle.object(forInfoDictionaryKey: "CFBundleIcons") as? [String: Any],
let primaryIcon = icons["CFBundlePrimaryIcon"] as? [String: Any],
let iconFiles = primaryIcon["CFBundleIconFiles"] as? [String],
let iconFileName = iconFiles.last else {
fatalError("hell na where ur icon")
}
return iconFileName
}
func getVersion() -> String {
guard let version = Bundle.main.infoDictionary?["CFBundleShortVersionString"] else {
fatalError("no bundle id wtf lol")
}
return "\(version)"
}
func getBuildID() -> String {
guard let build = Bundle.main.infoDictionary?["CFBundleVersion"] else {
fatalError("wtf did u do w the build number")
}
return "\(build)"
}