Skip to content

Commit

Permalink
Minor UI fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@Stjin
Stjin committed Jul 24, 2024
1 parent 5c574c4 commit 67a7452
Show file tree
Hide file tree
Showing 30 changed files with 219 additions and 144 deletions.
Binary file modified .DS_Store
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion LICENSE
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2022 Stjin
Copyright (c) 2024 Stjin

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
Binary file modified ...xcodeproj/project.xcworkspace/xcuserdata/stjin.xcuserdatad/UserInterfaceState.xcuserstate
View file
Binary file not shown.
96 changes: 48 additions & 48 deletions addy.xcodeproj/xcuserdata/stjin.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -446,8 +446,8 @@
filePath = "addy/View/appsettings/features/AppSettingsFeaturesNotifySubscriptionExpiryView.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "66"
endingLineNumber = "66"
startingLineNumber = "62"
endingLineNumber = "62"
landmarkName = "setSubscriptionInfoText(user:)"
landmarkType = "7">
</BreakpointContent>
Expand All @@ -462,8 +462,8 @@
filePath = "addy/View/appsettings/features/AppSettingsFeaturesNotifySubscriptionExpiryView.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "65"
endingLineNumber = "65"
startingLineNumber = "61"
endingLineNumber = "61"
landmarkName = "setSubscriptionInfoText(user:)"
landmarkType = "7">
</BreakpointContent>
Expand Down Expand Up @@ -606,8 +606,8 @@
filePath = "addy/View/rules/manage/CreateRulesView.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "379"
endingLineNumber = "379"
startingLineNumber = "376"
endingLineNumber = "376"
landmarkName = "body"
landmarkType = "24">
</BreakpointContent>
Expand All @@ -622,8 +622,8 @@
filePath = "addy/View/rules/manage/CreateRulesView.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "380"
endingLineNumber = "380"
startingLineNumber = "377"
endingLineNumber = "377"
landmarkName = "body"
landmarkType = "24">
</BreakpointContent>
Expand All @@ -638,8 +638,8 @@
filePath = "addy/View/rules/manage/CreateRulesView.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "381"
endingLineNumber = "381"
startingLineNumber = "378"
endingLineNumber = "378"
landmarkName = "body"
landmarkType = "24">
</BreakpointContent>
Expand All @@ -654,8 +654,8 @@
filePath = "addy/View/rules/manage/CreateRulesView.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "382"
endingLineNumber = "382"
startingLineNumber = "379"
endingLineNumber = "379"
landmarkName = "body"
landmarkType = "24">
</BreakpointContent>
Expand All @@ -670,8 +670,8 @@
filePath = "addy/View/rules/manage/CreateRulesView.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "383"
endingLineNumber = "383"
startingLineNumber = "380"
endingLineNumber = "380"
landmarkName = "body"
landmarkType = "24">
</BreakpointContent>
Expand All @@ -686,8 +686,8 @@
filePath = "addy/View/rules/manage/CreateRulesView.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "384"
endingLineNumber = "384"
startingLineNumber = "381"
endingLineNumber = "381"
landmarkName = "body"
landmarkType = "24">
</BreakpointContent>
Expand Down Expand Up @@ -862,8 +862,8 @@
filePath = "addy/View/rules/manage/CreateRulesView.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "357"
endingLineNumber = "357"
startingLineNumber = "354"
endingLineNumber = "354"
landmarkName = "body"
landmarkType = "24">
</BreakpointContent>
Expand All @@ -878,8 +878,8 @@
filePath = "addy/View/rules/manage/CreateRulesView.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "358"
endingLineNumber = "358"
startingLineNumber = "355"
endingLineNumber = "355"
landmarkName = "body"
landmarkType = "24">
</BreakpointContent>
Expand All @@ -894,8 +894,8 @@
filePath = "addy/View/rules/manage/CreateRulesView.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "367"
endingLineNumber = "367"
startingLineNumber = "364"
endingLineNumber = "364"
landmarkName = "body"
landmarkType = "24">
</BreakpointContent>
Expand All @@ -910,8 +910,8 @@
filePath = "addy/View/rules/manage/CreateRulesView.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "377"
endingLineNumber = "377"
startingLineNumber = "374"
endingLineNumber = "374"
landmarkName = "body"
landmarkType = "24">
</BreakpointContent>
Expand All @@ -926,8 +926,8 @@
filePath = "addy/View/rules/manage/CreateRulesView.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "368"
endingLineNumber = "368"
startingLineNumber = "365"
endingLineNumber = "365"
landmarkName = "body"
landmarkType = "24">
</BreakpointContent>
Expand All @@ -942,8 +942,8 @@
filePath = "addy/View/rules/manage/CreateRulesView.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "369"
endingLineNumber = "369"
startingLineNumber = "366"
endingLineNumber = "366"
landmarkName = "body"
landmarkType = "24">
</BreakpointContent>
Expand Down Expand Up @@ -1102,8 +1102,8 @@
filePath = "addy/View/rules/RulesView.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "343"
endingLineNumber = "343"
startingLineNumber = "339"
endingLineNumber = "339"
landmarkName = "getRuleDescription(rule:recipients:)"
landmarkType = "7">
</BreakpointContent>
Expand All @@ -1118,8 +1118,8 @@
filePath = "addy/View/rules/RulesView.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "331"
endingLineNumber = "331"
startingLineNumber = "327"
endingLineNumber = "327"
landmarkName = "getRuleDescription(rule:recipients:)"
landmarkType = "7">
</BreakpointContent>
Expand All @@ -1134,8 +1134,8 @@
filePath = "addy/View/rules/RulesView.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "344"
endingLineNumber = "344"
startingLineNumber = "340"
endingLineNumber = "340"
landmarkName = "getRuleDescription(rule:recipients:)"
landmarkType = "7">
</BreakpointContent>
Expand Down Expand Up @@ -1358,8 +1358,8 @@
filePath = "addy/View/rules/RulesView.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "325"
endingLineNumber = "325"
startingLineNumber = "321"
endingLineNumber = "321"
landmarkName = "getRuleDescription(rule:recipients:)"
landmarkType = "7">
</BreakpointContent>
Expand All @@ -1374,8 +1374,8 @@
filePath = "addy/View/rules/RulesView.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "326"
endingLineNumber = "326"
startingLineNumber = "322"
endingLineNumber = "322"
landmarkName = "getRuleDescription(rule:recipients:)"
landmarkType = "7">
</BreakpointContent>
Expand All @@ -1390,8 +1390,8 @@
filePath = "addy/View/rules/RulesView.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "328"
endingLineNumber = "328"
startingLineNumber = "324"
endingLineNumber = "324"
landmarkName = "getRuleDescription(rule:recipients:)"
landmarkType = "7">
</BreakpointContent>
Expand All @@ -1406,8 +1406,8 @@
filePath = "addy/View/rules/RulesView.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "329"
endingLineNumber = "329"
startingLineNumber = "325"
endingLineNumber = "325"
landmarkName = "getRuleDescription(rule:recipients:)"
landmarkType = "7">
</BreakpointContent>
Expand Down Expand Up @@ -4734,8 +4734,8 @@
filePath = "addy/View/addyApp.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "34"
endingLineNumber = "34"
startingLineNumber = "31"
endingLineNumber = "31"
landmarkName = "body"
landmarkType = "24">
</BreakpointContent>
Expand All @@ -4750,8 +4750,8 @@
filePath = "addy/View/addyApp.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "35"
endingLineNumber = "35"
startingLineNumber = "32"
endingLineNumber = "32"
landmarkName = "body"
landmarkType = "24">
</BreakpointContent>
Expand All @@ -4766,8 +4766,8 @@
filePath = "addy/View/addyApp.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "33"
endingLineNumber = "33"
startingLineNumber = "30"
endingLineNumber = "30"
landmarkName = "body"
landmarkType = "24">
</BreakpointContent>
Expand Down
56 changes: 56 additions & 0 deletions addy/Assets.xcassets/Features/integration_web_intent_resolution.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
{
"images" : [
{
"filename" : "integration_web_intent_resolution_light.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"filename" : "integration_web_intent_resolution_dark.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Binary file added ...ation_web_intent_resolution.imageset/integration_web_intent_resolution_dark.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...on_web_intent_resolution.imageset/[email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...on_web_intent_resolution.imageset/[email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...tion_web_intent_resolution.imageset/integration_web_intent_resolution_light.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...n_web_intent_resolution.imageset/[email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...n_web_intent_resolution.imageset/[email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 22 additions & 0 deletions addy/Localizable.xcstrings
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2986,6 +2986,17 @@
}
}
},
"forget_alias_are_you_sure_confirmation_desc" : {
"extractionState" : "manual",
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "This will PERMANENTLY DELETE your alias and all the statistics.\n\nIf this alias uses a shared domain then it can never be restored or used again so make sure you are certain. If it is a standard alias then it can be created again since it will be as if it never existed."
}
}
}
},
"forget_alias_confirmation_desc" : {
"extractionState" : "manual",
"localizations" : {
Expand Down Expand Up @@ -3363,6 +3374,17 @@
}
}
},
"ios_background_limitations_note" : {
"extractionState" : "manual",
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Please note that due to inherent limitations on the iOS platform, the timely delivery of notifications for some features cannot be guaranteed."
}
}
}
},
"is_exactly" : {
"extractionState" : "manual",
"localizations" : {
Expand Down
3 changes: 0 additions & 3 deletions addy/View/addyApp.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,7 @@ struct addyApp: App {
.transition(.asymmetric(insertion: AnyTransition.scale(scale: 1.1).combined(with: .opacity), removal: AnyTransition.opacity.animation(.easeInOut(duration: 0.5))))
.animation(.easeInOut(duration: 0.5), value: appState.apiKey)
.onOpenURL {url in
print(url)

//TODO test if this works
// Check if the URL is in the expected format
if url.pathComponents.count > 2 && url.pathComponents[1] == "deactivate" {
let id = url.pathComponents[2]
MainViewState.shared.aliasToDisable = id
Expand Down
Loading

0 comments on commit 67a7452

Please sign in to comment.