Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🍱 Replace Simon app icon with Daylight #614

Merged
merged 1 commit into from
Nov 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,12 @@ If your language is not listed, it may not yet be localised! Interested in helpi
- Synthwave Sunset
- Black Hole
- Neon
- Simon
- [@N-coder82](https://github.com/N-coder82)
- Simon (Retired)
- [**@N-coder82**](https://github.com/N-coder82)
- Developer
- Sunset
- [**@0w0x**](https://github.com/0w0x)
- Daylight

## Documentation

Expand Down
Original file line number Diff line number Diff line change
@@ -1,61 +1,61 @@
{
"images" : [
{
"filename" : "Simon-16.png",
"filename" : "Daylight-16.png",
"idiom" : "mac",
"scale" : "1x",
"size" : "16x16"
},
{
"filename" : "Simon-32.png",
"filename" : "Daylight-32.png",
"idiom" : "mac",
"scale" : "2x",
"size" : "16x16"
},
{
"filename" : "Simon-32.png",
"filename" : "Daylight-32.png",
"idiom" : "mac",
"scale" : "1x",
"size" : "32x32"
},
{
"filename" : "Simon-64.png",
"filename" : "Daylight-64.png",
"idiom" : "mac",
"scale" : "2x",
"size" : "32x32"
},
{
"filename" : "Simon-128.png",
"filename" : "Daylight-128.png",
"idiom" : "mac",
"scale" : "1x",
"size" : "128x128"
},
{
"filename" : "Simon-256.png",
"filename" : "Daylight-256.png",
"idiom" : "mac",
"scale" : "2x",
"size" : "128x128"
},
{
"filename" : "Simon-256.png",
"filename" : "Daylight-256.png",
"idiom" : "mac",
"scale" : "1x",
"size" : "256x256"
},
{
"filename" : "Simon-512.png",
"filename" : "Daylight-512.png",
"idiom" : "mac",
"scale" : "2x",
"size" : "256x256"
},
{
"filename" : "Simon-512.png",
"filename" : "Daylight-512.png",
"idiom" : "mac",
"scale" : "1x",
"size" : "512x512"
},
{
"filename" : "Simon-1024.png",
"filename" : "Daylight-1024.png",
"idiom" : "mac",
"scale" : "2x",
"size" : "512x512"
Expand Down
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.
6 changes: 6 additions & 0 deletions Loop/Assets.xcassets/App Icons/0w0x/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
11 changes: 11 additions & 0 deletions Loop/Localizable.xcstrings
Original file line number Diff line number Diff line change
Expand Up @@ -5545,6 +5545,17 @@
}
}
},
"Icon Name: Daylight" : {
"extractionState" : "extracted_with_value",
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "new",
"value" : "Daylight"
}
}
}
},
"Icon Name: Developer" : {
"extractionState" : "manual",
"localizations" : {
Expand Down
35 changes: 28 additions & 7 deletions Loop/Utilities/Icon.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,22 @@
import Luminare
import SwiftUI

/// Unlock Flow:
/// - Developer: 0 Loops **(Debug builds only)**
/// - Classic: 0 Loops
/// - Holo: 25 Loops
/// - Rosé Pine: 50 Loops
/// - Meta Loop: 100 Loops
/// - Keycap: 200 Loops
/// - White: 400 Loops
/// - Black: 500 Loops
/// - Daylight: 1000 Loops
/// - Neon: 1500 Loops
/// - Synthwave Sunset: 2000 Loops
/// - Black Hole: 2500 Loops
/// - Summer: 3000 Loops
/// - Master: 5000 Loops

struct Icon: Hashable, LuminarePickerData {
var name: String
var iconName: String
Expand All @@ -28,7 +44,7 @@ struct Icon: Hashable, LuminarePickerData {
.keycap,
.white,
.black,
.simon,
.daylight,
.neon,
.synthwaveSunset,
.blackHole,
Expand All @@ -44,7 +60,7 @@ struct Icon: Hashable, LuminarePickerData {
.keycap,
.white,
.black,
.simon,
.daylight,
.neon,
.synthwaveSunset,
.blackHole,
Expand Down Expand Up @@ -116,11 +132,6 @@ extension Icon {
// MARK: - Greg Lassale

extension Icon {
static let simon = Icon(
name: .init(localized: .init("Icon Name: Simon", defaultValue: "Simon")),
iconName: "AppIcon-Simon",
unlockTime: 1000
)
static let neon = Icon(
name: .init(localized: .init("Icon Name: Neon", defaultValue: "Neon")),
iconName: "AppIcon-Neon",
Expand Down Expand Up @@ -153,3 +164,13 @@ extension Icon {
unlockTime: 3000
)
}

// MARK: - 0w0x

extension Icon {
static let daylight = Icon(
name: .init(localized: .init("Icon Name: Daylight", defaultValue: "Daylight")),
iconName: "AppIcon-Daylight",
unlockTime: 1000
)
}
Loading