Skip to content

Commit

Permalink
Merge branch 'develop' into feature/add-appsflyer
Browse files Browse the repository at this point in the history
  • Loading branch information
@kcw-grunt
kcw-grunt committed Dec 12, 2024
2 parents 7768d71 + 38fdab3 commit 6f026fd
Show file tree
Hide file tree
Showing 33 changed files with 472 additions and 164 deletions.
34 changes: 29 additions & 5 deletions litewallet.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,6 @@
C3423C242B7904B80051BD6D /* SeedWordView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3423C232B7904B80051BD6D /* SeedWordView.swift */; };
C3423C262B7904E30051BD6D /* AnnounceUpdatesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3423C252B7904E30051BD6D /* AnnounceUpdatesView.swift */; };
C3423C2A2B7905330051BD6D /* SafariServices+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3423C272B7905330051BD6D /* SafariServices+Extension.swift */; };
C3423C2B2B7905330051BD6D /* SignupWebViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3423C282B7905330051BD6D /* SignupWebViewModel.swift */; };
C3423C2C2B7905330051BD6D /* SignupWebView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3423C292B7905330051BD6D /* SignupWebView.swift */; };
C3423C3E2B796D820051BD6D /* 日本語.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = C3423C302B796D820051BD6D /* 日本語.mp3 */; settings = {ASSET_TAGS = (speakTag, ); }; };
C3423C3F2B796D820051BD6D /* Pt.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = C3423C312B796D820051BD6D /* Pt.mp3 */; settings = {ASSET_TAGS = (speakTag, ); }; };
Expand Down Expand Up @@ -299,6 +298,9 @@
C3C8973825CD6B9300241FBE /* HostingTransactionCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3C8973725CD6B9300241FBE /* HostingTransactionCell.swift */; };
C3D4379F2566EA3E00F423E1 /* LWActivityIndicator.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3D4379E2566EA3E00F423E1 /* LWActivityIndicator.swift */; };
C3DBBE312BFE15AF00B95939 /* BuyTileView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3DBBE302BFE15AF00B95939 /* BuyTileView.swift */; };
C3E587AF2CFC7CB4000592D8 /* SeedWordsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3E587AE2CFC7CB4000592D8 /* SeedWordsTests.swift */; };
C3E587B22CFC81A3000592D8 /* SeedWordContainerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3E587B12CFC81A3000592D8 /* SeedWordContainerView.swift */; };
C3E587B42CFC84B5000592D8 /* SeedViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3E587B32CFC84B5000592D8 /* SeedViewModel.swift */; };
C3E5A9052BFDEEF1002FBE04 /* BuyViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3E5A9042BFDEEF1002FBE04 /* BuyViewModel.swift */; };
C3E751C22AF689BA005571CA /* BRKeyExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3E751C12AF689BA005571CA /* BRKeyExtension.swift */; };
C3E751C42AF68A50005571CA /* BRAddressExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3E751C32AF68A50005571CA /* BRAddressExtension.swift */; };
Expand Down Expand Up @@ -1406,7 +1408,6 @@
C3423C232B7904B80051BD6D /* SeedWordView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SeedWordView.swift; sourceTree = "<group>"; };
C3423C252B7904E30051BD6D /* AnnounceUpdatesView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AnnounceUpdatesView.swift; sourceTree = "<group>"; };
C3423C272B7905330051BD6D /* SafariServices+Extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "SafariServices+Extension.swift"; path = "Extensions/SafariServices+Extension.swift"; sourceTree = "<group>"; };
C3423C282B7905330051BD6D /* SignupWebViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SignupWebViewModel.swift; sourceTree = "<group>"; };
C3423C292B7905330051BD6D /* SignupWebView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SignupWebView.swift; sourceTree = "<group>"; };
C3423C302B796D820051BD6D /* 日本語.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = "日本語.mp3"; sourceTree = "<group>"; };
C3423C312B796D820051BD6D /* Pt.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = Pt.mp3; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1451,6 +1452,9 @@
C3C8973725CD6B9300241FBE /* HostingTransactionCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HostingTransactionCell.swift; sourceTree = "<group>"; };
C3D4379E2566EA3E00F423E1 /* LWActivityIndicator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LWActivityIndicator.swift; sourceTree = "<group>"; };
C3DBBE302BFE15AF00B95939 /* BuyTileView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BuyTileView.swift; sourceTree = "<group>"; };
C3E587AE2CFC7CB4000592D8 /* SeedWordsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SeedWordsTests.swift; sourceTree = "<group>"; };
C3E587B12CFC81A3000592D8 /* SeedWordContainerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SeedWordContainerView.swift; sourceTree = "<group>"; };
C3E587B32CFC84B5000592D8 /* SeedViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SeedViewModel.swift; sourceTree = "<group>"; };
C3E5A9042BFDEEF1002FBE04 /* BuyViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BuyViewModel.swift; sourceTree = "<group>"; };
C3E751C12AF689BA005571CA /* BRKeyExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BRKeyExtension.swift; sourceTree = "<group>"; };
C3E751C32AF68A50005571CA /* BRAddressExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BRAddressExtension.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -2081,6 +2085,7 @@
2465873723A5AAD100A32E9E /* litewalletTests */ = {
isa = PBXGroup;
children = (
C3E587AD2CFC7C69000592D8 /* Seed Word Tests */,
584E24FF2951DA97005E0E8B /* Language Selection Tests */,
C3EFA9A42651A7C4005C59B5 /* Lock Screen Tests */,
C3B7C3EC255FF56100E98A64 /* Constants Tests */,
Expand Down Expand Up @@ -3029,12 +3034,11 @@
C35ABD07257404C6002BB9BB /* SwiftUI+UIKit */ = {
isa = PBXGroup;
children = (
C3E587B02CFC817D000592D8 /* ShowSeed */,
C3B419C92BFCF0C900EBD935 /* Buy */,
C3423C272B7905330051BD6D /* SafariServices+Extension.swift */,
C3423C292B7905330051BD6D /* SignupWebView.swift */,
C3423C282B7905330051BD6D /* SignupWebViewModel.swift */,
C3423C252B7904E30051BD6D /* AnnounceUpdatesView.swift */,
C3423C232B7904B80051BD6D /* SeedWordView.swift */,
C3423C1D2B7904070051BD6D /* StartHostingController.swift */,
C3423C212B79047D0051BD6D /* StartViewModel.swift */,
C3423C1F2B79046A0051BD6D /* StartView.swift */,
Expand Down Expand Up @@ -3098,6 +3102,24 @@
path = "Constants Tests";
sourceTree = "<group>";
};
C3E587AD2CFC7C69000592D8 /* Seed Word Tests */ = {
isa = PBXGroup;
children = (
C3E587AE2CFC7CB4000592D8 /* SeedWordsTests.swift */,
);
path = "Seed Word Tests";
sourceTree = "<group>";
};
C3E587B02CFC817D000592D8 /* ShowSeed */ = {
isa = PBXGroup;
children = (
C3423C232B7904B80051BD6D /* SeedWordView.swift */,
C3E587B12CFC81A3000592D8 /* SeedWordContainerView.swift */,
C3E587B32CFC84B5000592D8 /* SeedViewModel.swift */,
);
name = ShowSeed;
sourceTree = "<group>";
};
C3E751C02AF689A0005571CA /* BRExtensions */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -3887,6 +3909,7 @@
2494037623AD35C000369261 /* BuyWKWebVCTests.swift in Sources */,
24470E3223A5F5B100ADDA27 /* NSDataExtensionTests.swift in Sources */,
24470E2C23A5F43B00ADDA27 /* DefaultFiatCurrencyTests.swift in Sources */,
C3E587AF2CFC7CB4000592D8 /* SeedWordsTests.swift in Sources */,
C3EFA9A62651A808005C59B5 /* LockScreenTests.swift in Sources */,
24470E4023A6004800ADDA27 /* WalletCreationTests.swift in Sources */,
24470E3823A5FEF200ADDA27 /* SpendingLimitTests.swift in Sources */,
Expand Down Expand Up @@ -4088,6 +4111,7 @@
1B3F74241FFB106200CCA50C /* BiometricsSpendingLimitViewController.swift in Sources */,
CEC6F8451E886723000795B8 /* PaymentRequest.swift in Sources */,
C3FF4D6128AC5AC100713139 /* SendAddressCellViewModel.swift in Sources */,
C3E587B42CFC84B5000592D8 /* SeedViewModel.swift in Sources */,
CE4C1CC81ED88B600063E184 /* URLController.swift in Sources */,
C3DBBE312BFE15AF00B95939 /* BuyTileView.swift in Sources */,
C30029EB25D019BC00F08C2B /* CopyButtonView.swift in Sources */,
Expand Down Expand Up @@ -4154,7 +4178,6 @@
CEC6AA421DEFC88F00EE5AFD /* ReceiveViewController.swift in Sources */,
CEE20C2D1EA288FA0086F724 /* UpdatingLabel.swift in Sources */,
CE3D4C591EF743EF0016B1C8 /* Functions.swift in Sources */,
C3423C2B2B7905330051BD6D /* SignupWebViewModel.swift in Sources */,
CEE20C341EA5B4550086F724 /* ArticleIds.swift in Sources */,
CEE65DF01E39056F0002994D /* Rate.swift in Sources */,
CEE20C361EA5B4620086F724 /* Constants+Events.swift in Sources */,
Expand Down Expand Up @@ -4190,6 +4213,7 @@
22A9A94B1DF61945000F0016 /* BRCoding.swift in Sources */,
CEF3E8361DE60222007C0A9E /* ModalNavigationController.swift in Sources */,
CEB909FA1E5FF242001804DC /* RecoverWalletIntroViewController.swift in Sources */,
C3E587B22CFC81A3000592D8 /* SeedWordContainerView.swift in Sources */,
CE25BF911DF9ADE700BC67B6 /* UIImage+Utils.swift in Sources */,
CEBF33041DDE17A600348FC6 /* Transaction.swift in Sources */,
CEAA9E911DC0FDFE0066731D /* UIViewPropertyAnimator+BRWAdditions.swift in Sources */,
Expand Down
21 changes: 0 additions & 21 deletions litewallet/Assets.xcassets/Branding/launchLiteWalletImage.imageset/Contents.json
View file

This file was deleted.

Binary file removed ...ssets.xcassets/Branding/launchLiteWalletImage.imageset/litewalletLaunchLogo.png
View file
Binary file not shown.
21 changes: 0 additions & 21 deletions litewallet/Assets.xcassets/Branding/litecoinFoundationLogo.imageset/Contents.json
View file

This file was deleted.

Binary file removed ...allet/Assets.xcassets/Branding/litecoinFoundationLogo.imageset/lfLaunchLogo.png
View file
Binary file not shown.
8 changes: 7 additions & 1 deletion litewallet/BartyCrouch.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,13 @@ import Foundation

enum BartyCrouch {
enum SupportedLanguage: String {
// TODO: remove unsupported languages from the following cases list & add any missing languages
/* NOTE: remove unsupported languages from the following cases list & add any missing languages
When adding more localizations:
1. Copy the new label here in from the Strings.swift file
2. Include the English version
3. Go to a translator and add the localization within the Localizable file
4. Test
*/
case chineseSimplified = "zh-Hans"
case chineseTraditional = "zh-Hant"
case english = "en"
Expand Down
21 changes: 5 additions & 16 deletions litewallet/Base.lproj/LaunchScreen.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,28 +20,18 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="new-logotype-white" translatesAutoresizingMaskIntoConstraints="NO" id="UyL-pz-ADP">
<rect key="frame" x="67.5" y="249.5" width="240" height="128"/>
<rect key="frame" x="87.5" y="280" width="200" height="107"/>
<constraints>
<constraint firstAttribute="height" constant="128" id="2T7-QM-N2k"/>
<constraint firstAttribute="width" secondItem="UyL-pz-ADP" secondAttribute="height" multiplier="15:8" id="gVV-Cv-OOs"/>
<constraint firstAttribute="width" constant="240" id="qRO-re-ZCk"/>
</constraints>
</imageView>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="litecoinFoundationLogo" translatesAutoresizingMaskIntoConstraints="NO" id="4Uy-2W-2oq">
<rect key="frame" x="137" y="587.5" width="101" height="54.5"/>
<constraints>
<constraint firstAttribute="width" secondItem="4Uy-2W-2oq" secondAttribute="height" multiplier="50:27" id="LXi-Mv-tv8"/>
<constraint firstAttribute="height" constant="54.5" id="kNp-6s-xRq"/>
<constraint firstAttribute="height" constant="107" id="2T7-QM-N2k"/>
<constraint firstAttribute="width" constant="200" id="qRO-re-ZCk"/>
</constraints>
</imageView>
</subviews>
<color key="backgroundColor" red="0.086274509799999996" green="0.24313725489999999" blue="0.49803921569999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color key="tintColor" red="0.086274509799999996" green="0.24313725489999999" blue="0.49803921569999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="4Uy-2W-2oq" firstAttribute="centerX" secondItem="UyL-pz-ADP" secondAttribute="centerX" id="LCk-KH-GoU"/>
<constraint firstItem="UyL-pz-ADP" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="UlD-yW-hJ1"/>
<constraint firstItem="xb3-aO-Qok" firstAttribute="top" secondItem="4Uy-2W-2oq" secondAttribute="bottom" constant="25" id="f5H-Dd-1vk"/>
<constraint firstItem="UyL-pz-ADP" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" constant="-20" id="lUV-Or-9fO"/>
<constraint firstItem="UyL-pz-ADP" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="Qbz-7S-fK2"/>
<constraint firstItem="UyL-pz-ADP" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="tbD-f8-Q9O"/>
</constraints>
</view>
<simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="lightContent"/>
Expand All @@ -52,7 +42,6 @@
</scene>
</scenes>
<resources>
<image name="litecoinFoundationLogo" width="126.33333587646484" height="47"/>
<image name="new-logotype-white" width="3688" height="825"/>
</resources>
</document>
7 changes: 7 additions & 0 deletions litewallet/Constants/Strings.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,7 @@ enum S {
static let litewalletPartners = Localization(key: "Settings.litewallet.partners", value: "Litewallet Partners:", comment: "Litewallet Partners")
static let currentLocale = Localization(key: "Settings.currentLocale", value: "Current Locale:", comment: "Current Locale")
static let changeLanguageMessage = Localization(key: "Settings.ChangeLanguage.alertMessage", value: nil, comment: nil)
static let showSeed = Localization(key: "Settings.ShowSeed", value: "Show Seed", comment: "Show Seed")
}

enum About {
Expand Down Expand Up @@ -705,10 +706,16 @@ enum S {
static let body = Localization(key: "Welcome.body", value: "Litewallet now has a brand new look and some new features.\n\nAll coins are displayed in lites (ł). 1 Litecoin (Ł) = 1000 lites (ł).", comment: "Welcome view body text")
}

enum ShowWords {
static let modalTitle = Localization(key: "ShowWords.modalTitle", value: "Show seed phrase", comment: "ShowWords.modalTitle")
static let titleWarning = Localization(key: "ShowWords.titleWarning", value: "These are your seed words. If you show them to anyone, they can take your Litecoin", comment: "ShowWords.titleWarning")
}

enum Fragments {
static let or = Localization(key: "Fragment.or", value: "or", comment: "Or")
static let confirm = Localization(key: "Fragment.confirm", value: "confirm", comment: "Confirm")
static let to = Localization(key: "Fragment.to", value: "to", comment: "to")
static let sorry = Localization(key: "Fragment.sorry", value: "sorry", comment: "sorry")
static let back = Localization(key: "Fragment.back", value: "Back", comment: "Back")
}
}
Loading

0 comments on commit 6f026fd

Please sign in to comment.