letro/letro-ios
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases 2 Wiki Activity

Merge pull request #4 from p-num/letroMain

Browse Source 
Leftover IOS app issues
This commit is contained in:
Letro Bot
2026-04-16 22:03:38 +04:00
parent 95192e4b4d 303f58f94d
commit 361100fdbb
8 changed files with 188 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ElementX/Resources/Localizations/en.lproj/Letro.strings
View File

@@ -154,6 +154,7 @@
"screen_room_timeline_tombstoned_room_message" = "This silo has been replaced and is no longer active";
"screen_room_timeline_upgraded_room_message" = "This silo is a continuation of another silo";
"screen_roomlist_a11y_create_message" = "Create a new conversation or silo";
"screen_roomlist_empty_title" = "";
"screen_roomlist_filter_people" = "Directs";
"screen_roomlist_filter_rooms" = "Silos";
"screen_roomlist_filter_rooms_empty_state_title" = "You’re not in any silo yet";
@@ -183,7 +184,7 @@
"screen_space_announcement_title" = "Introducing Workspaces";
"screen_space_empty_state_title" = "Add your first silo";
"screen_space_list_description" = "Workspaces you have created or joined.";
"screen_space_list_empty_state_title" = "Create spaces to organize silos";
"screen_space_list_empty_state_title" = "Create workspaces to organize your desk";
"screen_space_list_parent_space" = "%1$@ workspace";
"screen_space_list_title" = "Workspaces";
"screen_space_remove_rooms_confirmation_content" = "Removing a silo will not affect the silo access. To change the access go to Silo info > Privacy & security.";

400
ElementX/Resources/Localizations/en.lproj/Letro.stringsdict
View File

@@ -1,286 +1,118 @@
<?xml version='1.0' encoding='UTF-8'?>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version='1.0'>
<dict>
<key>
common_spaces
</key>
<dict>
<key>
NSStringLocalizedFormatKey
</key>
<string>
%#@COUNT@
</string>
<key>
COUNT
</key>
<dict>
<key>
NSStringFormatSpecTypeKey
</key>
<string>
NSStringPluralRuleType
</string>
<key>
NSStringFormatValueTypeKey
</key>
<string>
d
</string>
<key>
one
</key>
<string>
%1$d Workspace
</string>
<key>
other
</key>
<string>
%1$d Workspaces
</string>
</dict>
</dict>
<key>
screen_leave_space_submit
</key>
<dict>
<key>
NSStringLocalizedFormatKey
</key>
<string>
%#@COUNT@
</string>
<key>
COUNT
</key>
<dict>
<key>
NSStringFormatSpecTypeKey
</key>
<string>
NSStringPluralRuleType
</string>
<key>
NSStringFormatValueTypeKey
</key>
<string>
d
</string>
<key>
one
</key>
<string>
Leave %1$d silo and space
</string>
<key>
other
</key>
<string>
Leave %1$d silos and space
</string>
</dict>
</dict>
<key>
common_rooms
</key>
<dict>
<key>
NSStringLocalizedFormatKey
</key>
<string>
%#@COUNT@
</string>
<key>
COUNT
</key>
<dict>
<key>
NSStringFormatSpecTypeKey
</key>
<string>
NSStringPluralRuleType
</string>
<key>
NSStringFormatValueTypeKey
</key>
<string>
d
</string>
<key>
one
</key>
<string>
%1$d Silo
</string>
<key>
other
</key>
<string>
%1$d Silos
</string>
</dict>
</dict>
<key>
notification_unread_notified_messages_in_room_rooms
</key>
<dict>
<key>
NSStringLocalizedFormatKey
</key>
<string>
%#@COUNT@
</string>
<key>
COUNT
</key>
<dict>
<key>
NSStringFormatSpecTypeKey
</key>
<string>
NSStringPluralRuleType
</string>
<key>
NSStringFormatValueTypeKey
</key>
<string>
d
</string>
<key>
one
</key>
<string>
%d silo
</string>
<key>
other
</key>
<string>
%d silos
</string>
</dict>
</dict>
<key>
screen_room_multiple_knock_requests_title
</key>
<dict>
<key>
NSStringLocalizedFormatKey
</key>
<string>
%#@COUNT@
</string>
<key>
COUNT
</key>
<dict>
<key>
NSStringFormatSpecTypeKey
</key>
<string>
NSStringPluralRuleType
</string>
<key>
NSStringFormatValueTypeKey
</key>
<string>
d
</string>
<key>
one
</key>
<string>
%1$@ +%2$d other want to join this silo
</string>
<key>
other
</key>
<string>
%1$@ +%2$d others want to join this silo
</string>
</dict>
</dict>
<key>
screen_room_timeline_state_changes
</key>
<dict>
<key>
NSStringLocalizedFormatKey
</key>
<string>
%#@COUNT@
</string>
<key>
COUNT
</key>
<dict>
<key>
NSStringFormatSpecTypeKey
</key>
<string>
NSStringPluralRuleType
</string>
<key>
NSStringFormatValueTypeKey
</key>
<string>
d
</string>
<key>
one
</key>
<string>
%1$d change
</string>
<key>
other
</key>
<string>
%1$d changes
</string>
</dict>
</dict>
<key>
screen_space_remove_rooms_confirmation_title
</key>
<dict>
<key>
NSStringLocalizedFormatKey
</key>
<string>
%#@COUNT@
</string>
<key>
COUNT
</key>
<dict>
<key>
NSStringFormatSpecTypeKey
</key>
<string>
NSStringPluralRuleType
</string>
<key>
NSStringFormatValueTypeKey
</key>
<string>
d
</string>
<key>
one
</key>
<string>
Remove %1$d silo from %2$@
</string>
<key>
other
</key>
<string>
Remove %1$d silos from %2$@
</string>
</dict>
</dict>
</dict>
<plist version="1.0">
<dict>
<key>common_rooms</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@COUNT@</string>
<key>COUNT</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>d</string>
<key>one</key>
<string>%1$d Silo</string>
<key>other</key>
<string>%1$d Silos</string>
</dict>
</dict>
<key>common_spaces</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@COUNT@</string>
<key>COUNT</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>d</string>
<key>one</key>
<string>%1$d Workspace</string>
<key>other</key>
<string>%1$d Workspaces</string>
</dict>
</dict>
<key>notification_unread_notified_messages_in_room_rooms</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@COUNT@</string>
<key>COUNT</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>d</string>
<key>one</key>
<string>%d silo</string>
<key>other</key>
<string>%d silos</string>
</dict>
</dict>
<key>screen_leave_space_submit</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@COUNT@</string>
<key>COUNT</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>d</string>
<key>one</key>
<string>Leave %1$d silo and space</string>
<key>other</key>
<string>Leave %1$d silos and space</string>
</dict>
</dict>
<key>screen_room_multiple_knock_requests_title</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@COUNT@</string>
<key>COUNT</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>d</string>
<key>one</key>
<string>%1$@ +%2$d other want to join this silo</string>
<key>other</key>
<string>%1$@ +%2$d others want to join this silo</string>
</dict>
</dict>
<key>screen_room_timeline_state_changes</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@COUNT@</string>
<key>COUNT</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>d</string>
<key>one</key>
<string>%1$d change</string>
<key>other</key>
<string>%1$d changes</string>
</dict>
</dict>
<key>screen_space_remove_rooms_confirmation_title</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@COUNT@</string>
<key>COUNT</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>d</string>
<key>one</key>
<string>Remove %1$d silo from %2$@</string>
<key>other</key>
<string>Remove %1$d silos from %2$@</string>
</dict>
</dict>
</dict>
</plist>

14
ElementX/Sources/Application/Settings/AppSettings.swift
View File

@@ -224,15 +224,15 @@ final class AppSettings {
/// A URL where users can go read more about identity pinning violations
private(set) var identityPinningViolationDetailsURL: URL = "https://letro.com/help#encryption18"
/// A URL describing how history sharing works
private(set) var historySharingDetailsURL: URL = "https://letro.com/en/help#e2ee-history-sharing"
private(set) var historySharingDetailsURL: URL = "https://letro.com/help#e2ee-history-sharing"
/// Any domains that Element web may be hosted on - used for handling links.
private(set) var elementWebHosts = ["app.element.io", "staging.element.io", "develop.element.io"]
private(set) var elementWebHosts = ["app.letro.com", "staging.letro.com", "develop.letro.com"]
/// The domain that account provisioning links will be hosted on - used for handling the links.
private(set) var accountProvisioningHost = "mobile.element.io"
private(set) var accountProvisioningHost = "mobile.letro.com"
/// The App Store URL for Element Pro, shown to the user when a homeserver requires that app.
/// **Note:** This property isn't overridable as it in unexpected for forks to come across the error (or to even have a "Pro" app).
let elementProAppStoreURL: URL = "https://apps.apple.com/app/element-pro-for-work/id6502951615"
let elementProAppStoreURL: URL = "https://apps.apple.com/app/letro-pro/id6758909629"
@UserPreference(key: UserDefaultsKeys.appAppearance, defaultValue: .system, storageType: .userDefaults(store))
var appAppearance: AppAppearance
@@ -279,7 +279,7 @@ final class AppSettings {
#endif
}
private(set) var pushGatewayBaseURL: URL = "https://matrix.org"
private(set) var pushGatewayBaseURL: URL = "https://letro.com"
var pushGatewayNotifyEndpoint: URL {
pushGatewayBaseURL.appending(path: "_matrix/push/v1/notify")
}
@@ -318,14 +318,14 @@ final class AppSettings {
let bugReportSentryURL: URL? = Secrets.sentryDSN.map { URL(string: $0)! } // swiftlint:disable:this force_unwrapping
let bugReportSentryRustURL: URL? = Secrets.sentryRustDSN.map { URL(string: $0)! } // swiftlint:disable:this force_unwrapping
/// The name allocated by the bug report server
private(set) var bugReportApplicationID = "element-x-ios"
private(set) var bugReportApplicationID = "letro"
// MARK: - Analytics
/// The configuration to use for analytics. Set to `nil` to disable analytics.
let analyticsConfiguration: AnalyticsConfiguration? = AppSettings.makeAnalyticsConfiguration()
/// The URL to open with more information about analytics terms. When this is `nil` the "Learn more" link will be hidden.
private(set) var analyticsTermsURL: URL? = "https://element.io/cookie-policy"
private(set) var analyticsTermsURL: URL? = "https://letro.com/cookie-policy"
/// Whether or not there the app is able ask for user consent to enable analytics or sentry reporting.
var canPromptForAnalytics: Bool {
analyticsConfiguration != nil || bugReportSentryURL != nil

46
ElementX/Sources/Letro/Extensions/CompoundExtensions.swift
View File

@@ -20,28 +20,42 @@ enum CompoundExtensions {
extension CompoundColors {
@MainActor
func applyLetroOverrides() {
override(\.gradientSubtleStop1, with: CompoundCoreColorTokens.alphaOrange500)
override(\.gradientSubtleStop2, with: CompoundCoreColorTokens.alphaOrange400)
override(\.gradientSubtleStop3, with: CompoundCoreColorTokens.alphaOrange300)
override(\.gradientSubtleStop4, with: CompoundCoreColorTokens.alphaOrange200)
override(\.gradientSubtleStop5, with: CompoundCoreColorTokens.alphaOrange100)
override(\.gradientSubtleStop6, with: CompoundCoreColorTokens.transparent)
override(\.iconAccentTertiary, with: CompoundCoreColorTokens.orange800)
override(\.bgAccentRest, with: CompoundCoreColorTokens.orange900)
override(\.gradientActionStop1, with: .letroGradient1)
override(\.gradientActionStop2, with: .letroGradient2)
override(\.gradientActionStop3, with: .letroGradient3)
override(\.gradientActionStop4, with: .letroGradient5)
override(\.gradientSubtleStop1, with: .letroGradient1.opacity(0.33))
override(\.gradientSubtleStop2, with: .letroGradient2.opacity(0.22))
override(\.gradientSubtleStop3, with: .letroGradient3.opacity(0.11))
override(\.gradientSubtleStop4, with: .letroGradient4.opacity(0.07))
override(\.gradientSubtleStop5, with: .letroGradient5.opacity(0.04))
override(\.bgActionPrimaryRest, with: .letroPrimary)
override(\.bgActionPrimaryPressed, with: .letroGradient1)
override(\.bgActionPrimaryDisabled, with: .letroGray.opacity(0.4))
override(\.iconAccentTertiary, with: .letroPrimary)
override(\.bgAccentRest, with: .letroPrimary)
override(\.textActionPrimary, with: .letroPrimary)
}
}
extension CompoundUIColors {
@MainActor
func applyLetroOverrides() {
override(\.gradientSubtleStop1, with: CompoundCoreUIColorTokens.alphaOrange500)
override(\.gradientSubtleStop2, with: CompoundCoreUIColorTokens.alphaOrange400)
override(\.gradientSubtleStop3, with: CompoundCoreUIColorTokens.alphaOrange300)
override(\.gradientSubtleStop4, with: CompoundCoreUIColorTokens.alphaOrange200)
override(\.gradientSubtleStop5, with: CompoundCoreUIColorTokens.alphaOrange100)
override(\.gradientSubtleStop6, with: CompoundCoreUIColorTokens.transparent)
override(\.iconAccentTertiary, with: CompoundCoreUIColorTokens.orange800)
override(\.bgAccentRest, with: CompoundCoreUIColorTokens.orange900)
override(\.gradientActionStop1, with: .letroGradient1)
override(\.gradientActionStop2, with: .letroGradient2)
override(\.gradientActionStop3, with: .letroGradient3)
override(\.gradientActionStop4, with: .letroGradient5)
override(\.gradientSubtleStop1, with: .letroGradient1.withAlphaComponent(0.33))
override(\.gradientSubtleStop2, with: .letroGradient2.withAlphaComponent(0.22))
override(\.gradientSubtleStop3, with: .letroGradient3.withAlphaComponent(0.11))
override(\.gradientSubtleStop4, with: .letroGradient4.withAlphaComponent(0.07))
override(\.gradientSubtleStop5, with: .letroGradient5.withAlphaComponent(0.04))
override(\.bgActionPrimaryRest, with: .letroPrimary)
override(\.bgActionPrimaryPressed, with: .letroGradient1)
override(\.bgActionPrimaryDisabled, with: .letroGray.withAlphaComponent(0.4))
override(\.iconAccentTertiary, with: .letroPrimary)
override(\.bgAccentRest, with: .letroPrimary)
override(\.textActionPrimary, with: .letroPrimary)
}
}

17
ElementX/Sources/Letro/Extensions/SwiftUIExtensions.swift
View File

@@ -9,8 +9,15 @@ import SwiftUI
import UIKit
public extension Color {
static let letroPrimary = Color(hex: 0xC20000)
static let letroPrimary = Color(hex: 0xF32D1B)
static let letroSecondary = Color(hex: 0xF9BC15)
static let letroGray = Color(hex: 0xB1B3B9)
static let letroGradient1 = Color(hex: 0xCB2000)
static let letroGradient2 = Color(hex: 0xD33900)
static let letroGradient3 = Color(hex: 0xDD5A00)
static let letroGradient4 = Color(hex: 0xE98200)
static let letroGradient5 = Color(hex: 0xF7B000)
init(hex: UInt32) {
self.init(.sRGB, red: Double((hex >> 16) & 0xFF) / 255.0, green: Double((hex >> 8) & 0xFF) / 255.0, blue: Double(hex & 0xFF) / 255.0, opacity: 1)
@@ -18,8 +25,14 @@ public extension Color {
}
public extension UIColor {
static let letroPrimary = UIColor(hex: 0xC20000)
static let letroPrimary = UIColor(hex: 0xF32D1B)
static let letroSecondary = UIColor(hex: 0xF9BC15)
static let letroGray = UIColor(hex: 0xB1B3B9)
static let letroGradient1 = UIColor(hex: 0xCB2000)
static let letroGradient2 = UIColor(hex: 0xD33900)
static let letroGradient3 = UIColor(hex: 0xDD5A00)
static let letroGradient4 = UIColor(hex: 0xE98200)
static let letroGradient5 = UIColor(hex: 0xF7B000)
convenience init(hex: UInt32) {
self.init(red: CGFloat((hex >> 16) & 0xFF) / 255.0, green: CGFloat((hex >> 8) & 0xFF) / 255.0, blue: CGFloat(hex & 0xFF) / 255.0, alpha: 1)

2
ElementX/SupportingFiles/Info.plist
View File

@@ -69,6 +69,8 @@
<string>To take pictures or videos and send them as a message $(APP_DISPLAY_NAME) needs access to the camera.</string>
<key>NSFaceIDUsageDescription</key>
<string>Face ID is used to access your app.</string>
<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
<string>To share your live location, $(APP_DISPLAY_NAME) needs location access when the app is in the background.</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>Grant location access so that $(APP_DISPLAY_NAME) can share your location.</string>
<key>NSMicrophoneUsageDescription</key>

1
ElementX/SupportingFiles/target.yml
View File

@@ -88,6 +88,7 @@ targets:
NSCameraUsageDescription: To take pictures or videos and send them as a message $(APP_DISPLAY_NAME) needs access to the camera.
NSMicrophoneUsageDescription: To record and send messages with audio, $(APP_DISPLAY_NAME) needs to access the microphone.
NSPhotoLibraryAddUsageDescription: This lets you save images and videos to your photo library.
NSLocationAlwaysAndWhenInUseUsageDescription: To share your live location, $(APP_DISPLAY_NAME) needs location access when the app is in the background.
NSLocationWhenInUseUsageDescription: Grant location access so that $(APP_DISPLAY_NAME) can share your location.
NSFaceIDUsageDescription: Face ID is used to access your app.
UIBackgroundModes: [

16
compound-ios/Sources/Compound/BaseStyles/CompoundButtonStyle.swift
View File

@@ -138,7 +138,7 @@ public struct CompoundButtonStyle: ButtonStyle {
Capsule().strokeBorder(strokeColor(configuration: configuration))
}
case .primary:
Capsule().fill(fillColor(configuration: configuration))
makePrimaryBackground(configuration: configuration)
case .secondary:
Capsule().strokeBorder(strokeColor(configuration: configuration))
case .tertiary:
@@ -148,6 +148,20 @@ public struct CompoundButtonStyle: ButtonStyle {
}
}
// Letro: custom action buttons
@ViewBuilder
private func makePrimaryBackground(configuration: Self.Configuration) -> some View {
if !isEnabled || configuration.role == .destructive {
Capsule().fill(fillColor(configuration: configuration))
} else {
Capsule()
.fill(LinearGradient(gradient: .compound.action,
startPoint: .bottomLeading,
endPoint: .topTrailing))
.opacity(configuration.isPressed ? pressedOpacity : 1)
}
}
private var contentShape: AnyShape {
switch kind {
case .super, .primary, .secondary, .tertiary: