Mercurial > public > lazybear

changeset 200:6055ff3d400c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update project settings
author Dennis Concepción Martín <66180929+denniscm190@users.noreply.github.com>
date Fri, 26 Feb 2021 20:00:29 +0000
parents e15980164e2d
children 5c7a662c2d4e
files LazyBear.xcodeproj/project.pbxproj LazyBear.xcodeproj/project.xcworkspace/xcuserdata/dennis.xcuserdatad/UserInterfaceState.xcuserstate LazyBear/LazyBear.xcdatamodeld/LazyBear.xcdatamodel/contents
diffstat 3 files changed, 68 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/LazyBear.xcodeproj/project.pbxproj	Fri Feb 26 20:00:20 2021 +0000
+++ b/LazyBear.xcodeproj/project.pbxproj	Fri Feb 26 20:00:29 2021 +0000
@@ -9,6 +9,7 @@
 /* Begin PBXBuildFile section */
 		9549D63325E1903F0085C3CD /* Charts in Frameworks */ = {isa = PBXBuildFile; productRef = 9549D63225E1903F0085C3CD /* Charts */; };
 		9549D63625E191520085C3CD /* Normalize.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9549D63525E191520085C3CD /* Normalize.swift */; };
+		9564E66A25E989EC00A54D7D /* TestAlternative.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9564E66925E989EC00A54D7D /* TestAlternative.swift */; };
 		95672B8F25DDA54700DCBE4A /* LazyBearApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95672B8E25DDA54700DCBE4A /* LazyBearApp.swift */; };
 		95672B9125DDA54700DCBE4A /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95672B9025DDA54700DCBE4A /* ContentView.swift */; };
 		95672B9325DDA54700DCBE4A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 95672B9225DDA54700DCBE4A /* Assets.xcassets */; };
@@ -38,14 +39,26 @@
 		95BFAE4E25E2B0C200A70EC3 /* HUDManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95BFAE4D25E2B0C200A70EC3 /* HUDManager.swift */; };
 		95BFAE5425E2C52300A70EC3 /* HistoricalPriceModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95BFAE5325E2C52300A70EC3 /* HistoricalPriceModel.swift */; };
 		95BFAE5825E2C5A700A70EC3 /* HistoricalPriceView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95BFAE5725E2C5A700A70EC3 /* HistoricalPriceView.swift */; };
-		95BFAE6125E2D89700A70EC3 /* UserSettings+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95BFAE5F25E2D89700A70EC3 /* UserSettings+CoreDataClass.swift */; };
-		95BFAE6225E2D89700A70EC3 /* UserSettings+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95BFAE6025E2D89700A70EC3 /* UserSettings+CoreDataProperties.swift */; };
+		95F045FB25E96A58006A5A17 /* newsLanguages.json in Resources */ = {isa = PBXBuildFile; fileRef = 95F045FA25E96A58006A5A17 /* newsLanguages.json */; };
+		95F045FE25E96AA1006A5A17 /* NewsLanguageModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95F045FD25E96AA1006A5A17 /* NewsLanguageModel.swift */; };
+		95F0460425E96DBB006A5A17 /* UserSettings+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95F0460225E96DBB006A5A17 /* UserSettings+CoreDataClass.swift */; };
+		95F0460525E96DBB006A5A17 /* UserSettings+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95F0460325E96DBB006A5A17 /* UserSettings+CoreDataProperties.swift */; };
+		95F0460825E9704F006A5A17 /* ThemePicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95F0460725E9704F006A5A17 /* ThemePicker.swift */; };
+		95F0460B25E970DB006A5A17 /* NewsLanguagePicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95F0460A25E970DB006A5A17 /* NewsLanguagePicker.swift */; };
+		95F0461025E976B5006A5A17 /* SettingRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95F0460F25E976B5006A5A17 /* SettingRow.swift */; };
+		95F0461F25E98015006A5A17 /* Icon-2@x3.png in Resources */ = {isa = PBXBuildFile; fileRef = 95F0461B25E98015006A5A17 /* Icon-2@x3.png */; };
+		95F0462025E98015006A5A17 /* Icon-2@x2.png in Resources */ = {isa = PBXBuildFile; fileRef = 95F0461C25E98015006A5A17 /* Icon-2@x2.png */; };
+		95F0462825E98376006A5A17 /* Icon-1@x3.png in Resources */ = {isa = PBXBuildFile; fileRef = 95F0462625E98376006A5A17 /* Icon-1@x3.png */; };
+		95F0462925E98376006A5A17 /* Icon-1@x2.png in Resources */ = {isa = PBXBuildFile; fileRef = 95F0462725E98376006A5A17 /* Icon-1@x2.png */; };
+		95F0462E25E98461006A5A17 /* Icon-3@x2.png in Resources */ = {isa = PBXBuildFile; fileRef = 95F0462C25E98461006A5A17 /* Icon-3@x2.png */; };
+		95F0462F25E98461006A5A17 /* Icon-3@x3.png in Resources */ = {isa = PBXBuildFile; fileRef = 95F0462D25E98461006A5A17 /* Icon-3@x3.png */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
 		950BA46B25E944F500D065EF /* Production.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Production.xcconfig; sourceTree = "<group>"; };
 		950BA46C25E944FC00D065EF /* Sandbox.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Sandbox.xcconfig; sourceTree = "<group>"; };
 		9549D63525E191520085C3CD /* Normalize.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Normalize.swift; sourceTree = "<group>"; };
+		9564E66925E989EC00A54D7D /* TestAlternative.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestAlternative.swift; sourceTree = "<group>"; };
 		95672B8B25DDA54700DCBE4A /* LazyBear.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = LazyBear.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		95672B8E25DDA54700DCBE4A /* LazyBearApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LazyBearApp.swift; sourceTree = "<group>"; };
 		95672B9025DDA54700DCBE4A /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
@@ -77,8 +90,19 @@
 		95BFAE4D25E2B0C200A70EC3 /* HUDManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HUDManager.swift; sourceTree = "<group>"; };
 		95BFAE5325E2C52300A70EC3 /* HistoricalPriceModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HistoricalPriceModel.swift; sourceTree = "<group>"; };
 		95BFAE5725E2C5A700A70EC3 /* HistoricalPriceView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HistoricalPriceView.swift; sourceTree = "<group>"; };
-		95BFAE5F25E2D89700A70EC3 /* UserSettings+CoreDataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UserSettings+CoreDataClass.swift"; sourceTree = "<group>"; };
-		95BFAE6025E2D89700A70EC3 /* UserSettings+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UserSettings+CoreDataProperties.swift"; sourceTree = "<group>"; };
+		95F045FA25E96A58006A5A17 /* newsLanguages.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = newsLanguages.json; sourceTree = "<group>"; };
+		95F045FD25E96AA1006A5A17 /* NewsLanguageModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewsLanguageModel.swift; sourceTree = "<group>"; };
+		95F0460225E96DBB006A5A17 /* UserSettings+CoreDataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UserSettings+CoreDataClass.swift"; sourceTree = "<group>"; };
+		95F0460325E96DBB006A5A17 /* UserSettings+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UserSettings+CoreDataProperties.swift"; sourceTree = "<group>"; };
+		95F0460725E9704F006A5A17 /* ThemePicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThemePicker.swift; sourceTree = "<group>"; };
+		95F0460A25E970DB006A5A17 /* NewsLanguagePicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewsLanguagePicker.swift; sourceTree = "<group>"; };
+		95F0460F25E976B5006A5A17 /* SettingRow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingRow.swift; sourceTree = "<group>"; };
+		95F0461B25E98015006A5A17 /* Icon-2@x3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-2@x3.png"; sourceTree = "<group>"; };
+		95F0461C25E98015006A5A17 /* Icon-2@x2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-2@x2.png"; sourceTree = "<group>"; };
+		95F0462625E98376006A5A17 /* Icon-1@x3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-1@x3.png"; sourceTree = "<group>"; };
+		95F0462725E98376006A5A17 /* Icon-1@x2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-1@x2.png"; sourceTree = "<group>"; };
+		95F0462C25E98461006A5A17 /* Icon-3@x2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-3@x2.png"; sourceTree = "<group>"; };
+		95F0462D25E98461006A5A17 /* Icon-3@x3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-3@x3.png"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -98,6 +122,7 @@
 		950BA46D25E9450B00D065EF /* Tests */ = {
 			isa = PBXGroup;
 			children = (
+				9564E66925E989EC00A54D7D /* TestAlternative.swift */,
 			);
 			path = Tests;
 			sourceTree = "<group>";
@@ -105,8 +130,8 @@
 		95672B8225DDA54700DCBE4A = {
 			isa = PBXGroup;
 			children = (
-				95BFAE5F25E2D89700A70EC3 /* UserSettings+CoreDataClass.swift */,
-				95BFAE6025E2D89700A70EC3 /* UserSettings+CoreDataProperties.swift */,
+				95F0460225E96DBB006A5A17 /* UserSettings+CoreDataClass.swift */,
+				95F0460325E96DBB006A5A17 /* UserSettings+CoreDataProperties.swift */,
 				958A733825E00C3100FD7ECA /* Company+CoreDataClass.swift */,
 				958A733925E00C3100FD7ECA /* Company+CoreDataProperties.swift */,
 				95672B8D25DDA54700DCBE4A /* LazyBear */,
@@ -126,6 +151,7 @@
 		95672B8D25DDA54700DCBE4A /* LazyBear */ = {
 			isa = PBXGroup;
 			children = (
+				95F0463425E98788006A5A17 /* Icons */,
 				958A734E25E016FD00FD7ECA /* LazyBear.entitlements */,
 				95672B9C25DDA54800DCBE4A /* Info.plist */,
 				95672B9925DDA54800DCBE4A /* LazyBear.xcdatamodeld */,
@@ -158,6 +184,7 @@
 			isa = PBXGroup;
 			children = (
 				95ACB5AB25E03A7D00A3CCC8 /* themes.json */,
+				95F045FA25E96A58006A5A17 /* newsLanguages.json */,
 			);
 			path = "Local data";
 			sourceTree = "<group>";
@@ -187,6 +214,7 @@
 				95ACB5AE25E03AA100A3CCC8 /* ThemeModel.swift */,
 				95ABDD3725E167E500310776 /* NewsModel.swift */,
 				95BFAE5325E2C52300A70EC3 /* HistoricalPriceModel.swift */,
+				95F045FD25E96AA1006A5A17 /* NewsLanguageModel.swift */,
 			);
 			path = Models;
 			sourceTree = "<group>";
@@ -199,6 +227,9 @@
 				958A734825E010F900FD7ECA /* Search.swift */,
 				958A734B25E010FF00FD7ECA /* SearchBar.swift */,
 				958A735E25E0311B00FD7ECA /* Settings.swift */,
+				95F0460725E9704F006A5A17 /* ThemePicker.swift */,
+				95F0460A25E970DB006A5A17 /* NewsLanguagePicker.swift */,
+				95F0460F25E976B5006A5A17 /* SettingRow.swift */,
 				95ABDD3025E1602D00310776 /* PriceView.swift */,
 				95ACB5A825E0397B00A3CCC8 /* CompanyView.swift */,
 				95ABDD3425E166BA00310776 /* NewsView.swift */,
@@ -209,6 +240,19 @@
 			path = UI;
 			sourceTree = "<group>";
 		};
+		95F0463425E98788006A5A17 /* Icons */ = {
+			isa = PBXGroup;
+			children = (
+				95F0462725E98376006A5A17 /* Icon-1@x2.png */,
+				95F0462625E98376006A5A17 /* Icon-1@x3.png */,
+				95F0461B25E98015006A5A17 /* Icon-2@x3.png */,
+				95F0461C25E98015006A5A17 /* Icon-2@x2.png */,
+				95F0462C25E98461006A5A17 /* Icon-3@x2.png */,
+				95F0462D25E98461006A5A17 /* Icon-3@x3.png */,
+			);
+			path = Icons;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -274,8 +318,15 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				95F0462925E98376006A5A17 /* Icon-1@x2.png in Resources */,
 				95672B9625DDA54700DCBE4A /* Preview Assets.xcassets in Resources */,
+				95F0462F25E98461006A5A17 /* Icon-3@x3.png in Resources */,
+				95F0461F25E98015006A5A17 /* Icon-2@x3.png in Resources */,
+				95F0462825E98376006A5A17 /* Icon-1@x3.png in Resources */,
+				95F0462E25E98461006A5A17 /* Icon-3@x2.png in Resources */,
+				95F0462025E98015006A5A17 /* Icon-2@x2.png in Resources */,
 				95ACB5AC25E03A7D00A3CCC8 /* themes.json in Resources */,
+				95F045FB25E96A58006A5A17 /* newsLanguages.json in Resources */,
 				95672B9325DDA54700DCBE4A /* Assets.xcassets in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -292,24 +343,29 @@
 				958A735725E01F9E00FD7ECA /* ReadJson.swift in Sources */,
 				958A734925E010F900FD7ECA /* Search.swift in Sources */,
 				958A735F25E0311B00FD7ECA /* Settings.swift in Sources */,
+				95F0461025E976B5006A5A17 /* SettingRow.swift in Sources */,
+				95F0460825E9704F006A5A17 /* ThemePicker.swift in Sources */,
 				95672B9825DDA54700DCBE4A /* Persistence.swift in Sources */,
 				958A735B25E0264E00FD7ECA /* CompanyModel.swift in Sources */,
 				95B3E09F25E127D7007EFDE3 /* Request.swift in Sources */,
+				95F045FE25E96AA1006A5A17 /* NewsLanguageModel.swift in Sources */,
 				95BFAE5425E2C52300A70EC3 /* HistoricalPriceModel.swift in Sources */,
 				95BFAE5825E2C5A700A70EC3 /* HistoricalPriceView.swift in Sources */,
 				9549D63625E191520085C3CD /* Normalize.swift in Sources */,
 				95672B9125DDA54700DCBE4A /* ContentView.swift in Sources */,
+				9564E66A25E989EC00A54D7D /* TestAlternative.swift in Sources */,
+				95F0460425E96DBB006A5A17 /* UserSettings+CoreDataClass.swift in Sources */,
 				958A733B25E00C3100FD7ECA /* Company+CoreDataProperties.swift in Sources */,
-				95BFAE6125E2D89700A70EC3 /* UserSettings+CoreDataClass.swift in Sources */,
 				95ACB5AF25E03AA100A3CCC8 /* ThemeModel.swift in Sources */,
 				95672B8F25DDA54700DCBE4A /* LazyBearApp.swift in Sources */,
 				958A734525E00D3D00FD7ECA /* CompanyRow.swift in Sources */,
 				95ABDD3525E166BA00310776 /* NewsView.swift in Sources */,
 				95672B9B25DDA54800DCBE4A /* LazyBear.xcdatamodeld in Sources */,
 				958A734C25E010FF00FD7ECA /* SearchBar.swift in Sources */,
+				95F0460B25E970DB006A5A17 /* NewsLanguagePicker.swift in Sources */,
 				95ABDD3125E1602D00310776 /* PriceView.swift in Sources */,
 				95BFAE4B25E2AEA000A70EC3 /* HUD.swift in Sources */,
-				95BFAE6225E2D89700A70EC3 /* UserSettings+CoreDataProperties.swift in Sources */,
+				95F0460525E96DBB006A5A17 /* UserSettings+CoreDataProperties.swift in Sources */,
 				958A733A25E00C3100FD7ECA /* Company+CoreDataClass.swift in Sources */,
 				95ACB5A925E0397B00A3CCC8 /* CompanyView.swift in Sources */,
 				958A734225E00C9900FD7ECA /* Watchlist.swift in Sources */,
@@ -445,7 +501,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = LazyBear/LazyBear.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 9;
+				CURRENT_PROJECT_VERSION = 11;
 				DEVELOPMENT_ASSET_PATHS = "\"LazyBear/Preview Content\"";
 				DEVELOPMENT_TEAM = MTX83R5H8X;
 				ENABLE_PREVIEWS = YES;
@@ -470,7 +526,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = LazyBear/LazyBear.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 9;
+				CURRENT_PROJECT_VERSION = 11;
 				DEVELOPMENT_ASSET_PATHS = "\"LazyBear/Preview Content\"";
 				DEVELOPMENT_TEAM = MTX83R5H8X;
 				ENABLE_PREVIEWS = YES;
Binary file LazyBear.xcodeproj/project.xcworkspace/xcuserdata/dennis.xcuserdatad/UserInterfaceState.xcuserstate has changed
--- a/LazyBear/LazyBear.xcdatamodeld/LazyBear.xcdatamodel/contents	Fri Feb 26 20:00:20 2021 +0000
+++ b/LazyBear/LazyBear.xcdatamodeld/LazyBear.xcdatamodel/contents	Fri Feb 26 20:00:29 2021 +0000
@@ -12,10 +12,11 @@
     <entity name="UserSettings" representedClassName="UserSettings" syncable="YES">
         <attribute name="appIcon" optional="YES" attributeType="String"/>
         <attribute name="changedAt" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="newsLanguage" optional="YES" attributeType="String"/>
         <attribute name="theme" optional="YES" attributeType="String"/>
     </entity>
     <elements>
         <element name="Company" positionX="-63" positionY="-9" width="128" height="134"/>
-        <element name="UserSettings" positionX="-63" positionY="45" width="128" height="74"/>
+        <element name="UserSettings" positionX="-63" positionY="45" width="128" height="89"/>
     </elements>
 </model>
\ No newline at end of file