From def6de321cc9a561ab57a0bcfc5a040e6428322b Mon Sep 17 00:00:00 2001 From: Jon Staab Date: Fri, 31 Jan 2025 17:09:46 -0800 Subject: [PATCH] Some ios stuff --- .ackrc | 3 ++ .gitignore | 2 ++ capacitor.config.ts | 2 +- ios/App/App.xcodeproj/project.pbxproj | 42 +++++++++++++++------------ ios/App/Podfile | 2 +- src/app.css | 11 +++++++ src/app.html | 2 +- src/routes/settings/+page.svelte | 2 +- 8 files changed, 44 insertions(+), 22 deletions(-) diff --git a/.ackrc b/.ackrc index 2c9f666..98e5ab2 100644 --- a/.ackrc +++ b/.ackrc @@ -1,3 +1,6 @@ --ignore-dir=.svelte-kit --ignore-dir=android --ignore-dir=build +--ignore-dir=ios/DerivedData +--ignore-dir=ios/App/App/public + diff --git a/.gitignore b/.gitignore index ee029ab..07cdee5 100644 --- a/.gitignore +++ b/.gitignore @@ -28,6 +28,8 @@ build/ .svelte-kit/ # iOS +ios/App/App/public +ios/DerivedData xcuserdata/ *.xcworkspace/ *.mode1v3 diff --git a/capacitor.config.ts b/capacitor.config.ts index 908bdc3..6fdc3d2 100644 --- a/capacitor.config.ts +++ b/capacitor.config.ts @@ -11,7 +11,7 @@ const config: CapacitorConfig = { SplashScreen: { androidSplashResourceName: "splash" } - } + }, }; export default config; diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj index 1e5bfbc..aa5550f 100644 --- a/ios/App/App.xcodeproj/project.pbxproj +++ b/ios/App/App.xcodeproj/project.pbxproj @@ -14,21 +14,23 @@ 504EC30F1FED79650016851F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 504EC30E1FED79650016851F /* Assets.xcassets */; }; 504EC3121FED79650016851F /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 504EC3101FED79650016851F /* LaunchScreen.storyboard */; }; 50B271D11FEDC1A000F3C39B /* public in Resources */ = {isa = PBXBuildFile; fileRef = 50B271D01FEDC1A000F3C39B /* public */; }; - A084ECDBA7D38E1E42DFC39D /* Pods_App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AF277DCFFFF123FFC6DF26C7 /* Pods_App.framework */; }; + AC8D5382B9575A9124613C5D /* Pods_Flotilla_Chat.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA42C7E3CF3FFF7A17A3A729 /* Pods_Flotilla_Chat.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 1F53EE54954731A2328CBC4B /* Pods-Flotilla Chat.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Flotilla Chat.release.xcconfig"; path = "Pods/Target Support Files/Pods-Flotilla Chat/Pods-Flotilla Chat.release.xcconfig"; sourceTree = ""; }; 2FAD9762203C412B000D30F8 /* config.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = config.xml; sourceTree = ""; }; 50379B222058CBB4000EE86E /* capacitor.config.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = capacitor.config.json; sourceTree = ""; }; - 504EC3041FED79650016851F /* App.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = App.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 504EC3041FED79650016851F /* Flotilla Chat.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Flotilla Chat.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 504EC3071FED79650016851F /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 504EC30C1FED79650016851F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; 504EC30E1FED79650016851F /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 504EC3111FED79650016851F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 504EC3131FED79650016851F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 50B271D01FEDC1A000F3C39B /* public */ = {isa = PBXFileReference; lastKnownFileType = folder; path = public; sourceTree = ""; }; - AF277DCFFFF123FFC6DF26C7 /* Pods_App.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_App.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 7B9FA71C362B734D9F965709 /* Pods-Flotilla Chat.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Flotilla Chat.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Flotilla Chat/Pods-Flotilla Chat.debug.xcconfig"; sourceTree = ""; }; AF51FD2D460BCFE21FA515B2 /* Pods-App.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App.release.xcconfig"; path = "Pods/Target Support Files/Pods-App/Pods-App.release.xcconfig"; sourceTree = ""; }; + DA42C7E3CF3FFF7A17A3A729 /* Pods_Flotilla_Chat.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Flotilla_Chat.framework; sourceTree = BUILT_PRODUCTS_DIR; }; FC68EB0AF532CFC21C3344DD /* Pods-App.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App.debug.xcconfig"; path = "Pods/Target Support Files/Pods-App/Pods-App.debug.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ @@ -37,7 +39,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - A084ECDBA7D38E1E42DFC39D /* Pods_App.framework in Frameworks */, + AC8D5382B9575A9124613C5D /* Pods_Flotilla_Chat.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -47,7 +49,7 @@ 27E2DDA53C4D2A4D1A88CE4A /* Frameworks */ = { isa = PBXGroup; children = ( - AF277DCFFFF123FFC6DF26C7 /* Pods_App.framework */, + DA42C7E3CF3FFF7A17A3A729 /* Pods_Flotilla_Chat.framework */, ); name = Frameworks; sourceTree = ""; @@ -65,7 +67,7 @@ 504EC3051FED79650016851F /* Products */ = { isa = PBXGroup; children = ( - 504EC3041FED79650016851F /* App.app */, + 504EC3041FED79650016851F /* Flotilla Chat.app */, ); name = Products; sourceTree = ""; @@ -90,6 +92,8 @@ children = ( FC68EB0AF532CFC21C3344DD /* Pods-App.debug.xcconfig */, AF51FD2D460BCFE21FA515B2 /* Pods-App.release.xcconfig */, + 7B9FA71C362B734D9F965709 /* Pods-Flotilla Chat.debug.xcconfig */, + 1F53EE54954731A2328CBC4B /* Pods-Flotilla Chat.release.xcconfig */, ); name = Pods; sourceTree = ""; @@ -97,9 +101,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 504EC3031FED79650016851F /* App */ = { + 504EC3031FED79650016851F /* Flotilla Chat */ = { isa = PBXNativeTarget; - buildConfigurationList = 504EC3161FED79650016851F /* Build configuration list for PBXNativeTarget "App" */; + buildConfigurationList = 504EC3161FED79650016851F /* Build configuration list for PBXNativeTarget "Flotilla Chat" */; buildPhases = ( 6634F4EFEBD30273BCE97C65 /* [CP] Check Pods Manifest.lock */, 504EC3001FED79650016851F /* Sources */, @@ -111,9 +115,9 @@ ); dependencies = ( ); - name = App; + name = "Flotilla Chat"; productName = App; - productReference = 504EC3041FED79650016851F /* App.app */; + productReference = 504EC3041FED79650016851F /* Flotilla Chat.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -141,13 +145,11 @@ Base, ); mainGroup = 504EC2FB1FED79650016851F; - packageReferences = ( - ); productRefGroup = 504EC3051FED79650016851F /* Products */; projectDirPath = ""; projectRoot = ""; targets = ( - 504EC3031FED79650016851F /* App */, + 504EC3031FED79650016851F /* Flotilla Chat */, ); }; /* End PBXProject section */ @@ -180,7 +182,7 @@ ); name = "[CP] Check Pods Manifest.lock"; outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-App-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-Flotilla Chat-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -199,7 +201,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-App/Pods-App-frameworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Flotilla Chat/Pods-Flotilla Chat-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -344,9 +346,10 @@ }; 504EC3171FED79650016851F /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = FC68EB0AF532CFC21C3344DD /* Pods-App.debug.xcconfig */; + baseConfigurationReference = 7B9FA71C362B734D9F965709 /* Pods-Flotilla Chat.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = S26U9DYW3A; @@ -357,6 +360,7 @@ OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\""; PRODUCT_BUNDLE_IDENTIFIER = social.flotilla; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -365,9 +369,10 @@ }; 504EC3181FED79650016851F /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = AF51FD2D460BCFE21FA515B2 /* Pods-App.release.xcconfig */; + baseConfigurationReference = 1F53EE54954731A2328CBC4B /* Pods-Flotilla Chat.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = S26U9DYW3A; @@ -377,6 +382,7 @@ MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = social.flotilla; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_ACTIVE_COMPILATION_CONDITIONS = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -395,7 +401,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 504EC3161FED79650016851F /* Build configuration list for PBXNativeTarget "App" */ = { + 504EC3161FED79650016851F /* Build configuration list for PBXNativeTarget "Flotilla Chat" */ = { isa = XCConfigurationList; buildConfigurations = ( 504EC3171FED79650016851F /* Debug */, diff --git a/ios/App/Podfile b/ios/App/Podfile index 8f9ff68..843ee07 100644 --- a/ios/App/Podfile +++ b/ios/App/Podfile @@ -15,7 +15,7 @@ def capacitor_pods pod 'NostrSignerCapacitorPlugin', :path => '../../node_modules/nostr-signer-capacitor-plugin' end -target 'App' do +target 'Flotilla Chat' do capacitor_pods # Add your Pods here end diff --git a/src/app.css b/src/app.css index 00c8427..1c7ef74 100644 --- a/src/app.css +++ b/src/app.css @@ -2,6 +2,8 @@ @tailwind components; @tailwind utilities; +/* Fonts */ + @font-face { font-family: "Satoshis"; font-style: normal; @@ -38,6 +40,8 @@ url("/fonts/Italic.ttf") format("truetype"); } +/* root */ + :root { font-family: Lato; --base-100: oklch(var(--b1)); @@ -50,6 +54,13 @@ --secondary-content: oklch(var(--sc)); } +body, +html { + @apply bg-base-300; +} + +/* utilities */ + .bg-alt, .bg-alt .bg-alt .bg-alt, .hover\:bg-alt:hover, diff --git a/src/app.html b/src/app.html index 9f2217c..4813665 100644 --- a/src/app.html +++ b/src/app.html @@ -2,7 +2,7 @@ - + diff --git a/src/routes/settings/+page.svelte b/src/routes/settings/+page.svelte index 842a5b7..62b989e 100644 --- a/src/routes/settings/+page.svelte +++ b/src/routes/settings/+page.svelte @@ -82,7 +82,7 @@

Media Server

-
+