Skip to content

1
1weather
Commit 0f1eb2fe by Dmitriy Stepanets
Options

Added fonts back to application

parent 589f5120
Showing with 40 additions and 28 deletions
1Weather.xcodeproj/project.pbxproj
......@@ -47,6 +47,14 @@
CD32CE0E260C770E00235081 /* MenuHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD32CE0D260C770E00235081 /* MenuHeaderView.swift */; };
CD32CE12260C77B400235081 /* MenuBuyButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD32CE11260C77B400235081 /* MenuBuyButton.swift */; };
CD32CE16260C77C600235081 /* MenuHeaderButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD32CE15260C77C600235081 /* MenuHeaderButton.swift */; };
CD3302A626C2B504007BBB12 /* SF-Pro-Display-Light.otf in Resources */ = {isa = PBXBuildFile; fileRef = CD3302A226C2B503007BBB12 /* SF-Pro-Display-Light.otf */; };
CD3302A726C2B504007BBB12 /* SF-Pro-Display-Light.otf in Resources */ = {isa = PBXBuildFile; fileRef = CD3302A226C2B503007BBB12 /* SF-Pro-Display-Light.otf */; };
CD3302A826C2B504007BBB12 /* SF-Pro-Display-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = CD3302A326C2B503007BBB12 /* SF-Pro-Display-Regular.otf */; };
CD3302A926C2B504007BBB12 /* SF-Pro-Display-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = CD3302A326C2B503007BBB12 /* SF-Pro-Display-Regular.otf */; };
CD3302AA26C2B504007BBB12 /* SF-Pro-Display-Thin.otf in Resources */ = {isa = PBXBuildFile; fileRef = CD3302A426C2B504007BBB12 /* SF-Pro-Display-Thin.otf */; };
CD3302AB26C2B504007BBB12 /* SF-Pro-Display-Thin.otf in Resources */ = {isa = PBXBuildFile; fileRef = CD3302A426C2B504007BBB12 /* SF-Pro-Display-Thin.otf */; };
CD3302AC26C2B504007BBB12 /* SF-Pro-Display-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = CD3302A526C2B504007BBB12 /* SF-Pro-Display-Bold.otf */; };
CD3302AD26C2B504007BBB12 /* SF-Pro-Display-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = CD3302A526C2B504007BBB12 /* SF-Pro-Display-Bold.otf */; };
CD35DFD0260344A500F2138F /* ForecastConditionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD35DFCF260344A500F2138F /* ForecastConditionView.swift */; };
CD37D3D6260C93B3002669D6 /* MenuCellFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD37D3D5260C93B3002669D6 /* MenuCellFactory.swift */; };
CD37D3DE260C9E37002669D6 /* MenuCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD37D3DD260C9E37002669D6 /* MenuCell.swift */; };
......@@ -382,6 +390,10 @@
CD32CE0D260C770E00235081 /* MenuHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuHeaderView.swift; sourceTree = "<group>"; };
CD32CE11260C77B400235081 /* MenuBuyButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuBuyButton.swift; sourceTree = "<group>"; };
CD32CE15260C77C600235081 /* MenuHeaderButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuHeaderButton.swift; sourceTree = "<group>"; };
CD3302A226C2B503007BBB12 /* SF-Pro-Display-Light.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "SF-Pro-Display-Light.otf"; path = "OneWeatherUI/OneWeatherUI/Fonts/SF-Pro-Display-Light.otf"; sourceTree = SOURCE_ROOT; };
CD3302A326C2B503007BBB12 /* SF-Pro-Display-Regular.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "SF-Pro-Display-Regular.otf"; path = "OneWeatherUI/OneWeatherUI/Fonts/SF-Pro-Display-Regular.otf"; sourceTree = SOURCE_ROOT; };
CD3302A426C2B504007BBB12 /* SF-Pro-Display-Thin.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "SF-Pro-Display-Thin.otf"; path = "OneWeatherUI/OneWeatherUI/Fonts/SF-Pro-Display-Thin.otf"; sourceTree = SOURCE_ROOT; };
CD3302A526C2B504007BBB12 /* SF-Pro-Display-Bold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "SF-Pro-Display-Bold.otf"; path = "OneWeatherUI/OneWeatherUI/Fonts/SF-Pro-Display-Bold.otf"; sourceTree = SOURCE_ROOT; };
CD35DFCF260344A500F2138F /* ForecastConditionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ForecastConditionView.swift; sourceTree = "<group>"; };
CD37D3D5260C93B3002669D6 /* MenuCellFactory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuCellFactory.swift; sourceTree = "<group>"; };
CD37D3DD260C9E37002669D6 /* MenuCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuCell.swift; sourceTree = "<group>"; };
......@@ -1262,6 +1274,10 @@
CDD0F1E3257240F300CF5017 /* Fonts */ = {
isa = PBXGroup;
children = (
CD3302A526C2B504007BBB12 /* SF-Pro-Display-Bold.otf */,
CD3302A226C2B503007BBB12 /* SF-Pro-Display-Light.otf */,
CD3302A326C2B503007BBB12 /* SF-Pro-Display-Regular.otf */,
CD3302A426C2B504007BBB12 /* SF-Pro-Display-Thin.otf */,
87B66BF02667AF1900B9A59A /* SF-Compact-Display-Light.otf */,
87B66BEB2667A44F00B9A59A /* SF-Compact-Display-Regular.otf */,
87B66BEA2667A44F00B9A59A /* SF-Compact-Display-Semibold.otf */,
......@@ -1632,6 +1648,8 @@
buildActionMask = 2147483647;
files = (
CDD0F1E52572425200CF5017 /* SF-Pro.ttf in Resources */,
CD3302A626C2B504007BBB12 /* SF-Pro-Display-Light.otf in Resources */,
CD3302AC26C2B504007BBB12 /* SF-Pro-Display-Bold.otf in Resources */,
CD5692B62653D56700A3CDBE /* splash.json in Resources */,
CDD75F0D25DE68B10099ACDB /* Localizable.strings in Resources */,
87C171ED25FF79CC00DA3464 /* LocalConfig.plist in Resources */,
......@@ -1640,10 +1658,12 @@
87B66BEC2667A45800B9A59A /* SF-Compact-Display-Semibold.otf in Resources */,
CE13B88F26248A77007CBD4D /* GoogleService-Info-Staging.plist in Resources */,
87B66BF12667AF1C00B9A59A /* SF-Compact-Display-Light.otf in Resources */,
CD3302A826C2B504007BBB12 /* SF-Pro-Display-Regular.otf in Resources */,
87B66BED2667A45B00B9A59A /* SF-Compact-Display-Regular.otf in Resources */,
CE9C0780266A4768004197FC /* NativeMRECView.xib in Resources */,
CE13B88E26248A77007CBD4D /* GoogleService-Info-Production.plist in Resources */,
CD1237CC255D5C5C00C98139 /* Assets.xcassets in Resources */,
CD3302AA26C2B504007BBB12 /* SF-Pro-Display-Thin.otf in Resources */,
CD822FFA25D6890900A05501 /* OneWeatherColorsAsset.xcassets in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
......@@ -1652,9 +1672,13 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
CD3302AB26C2B504007BBB12 /* SF-Pro-Display-Thin.otf in Resources */,
CD483A942664D64A00CA53AB /* Assets.xcassets in Resources */,
CD3302A726C2B504007BBB12 /* SF-Pro-Display-Light.otf in Resources */,
CD5293E9266A562F009547C8 /* OneWeatherColorsAsset.xcassets in Resources */,
CD5293E0266A30EE009547C8 /* Localizable.strings in Resources */,
CD3302A926C2B504007BBB12 /* SF-Pro-Display-Regular.otf in Resources */,
CD3302AD26C2B504007BBB12 /* SF-Pro-Display-Bold.otf in Resources */,
CD483A952664D77700CA53AB /* SF-Pro.ttf in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
......@@ -2246,7 +2270,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 5.3.0;
MARKETING_VERSION = 5.3;
PRODUCT_BUNDLE_IDENTIFIER = com.onelouder.oneweather;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
......@@ -2276,7 +2300,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 5.3.0;
MARKETING_VERSION = 5.3;
PRODUCT_BUNDLE_IDENTIFIER = com.onelouder.oneweather;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
......@@ -2300,7 +2324,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 5.3.0;
MARKETING_VERSION = 5.3;
PRODUCT_BUNDLE_IDENTIFIER = com.onelouder.oneweather.OneWeatherWidget;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
......@@ -2325,7 +2349,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 5.3.0;
MARKETING_VERSION = 5.3;
PRODUCT_BUNDLE_IDENTIFIER = com.onelouder.oneweather.OneWeatherWidget;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
......@@ -2349,7 +2373,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 5.3.0;
MARKETING_VERSION = 5.3;
PRODUCT_BUNDLE_IDENTIFIER = com.onelouder.oneweather.OneWeatherNotificationServiceExtension;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
......@@ -2373,7 +2397,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 5.3.0;
MARKETING_VERSION = 5.3;
PRODUCT_BUNDLE_IDENTIFIER = com.onelouder.oneweather.OneWeatherNotificationServiceExtension;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
......
1Weather.xcodeproj/xcshareddata/xcschemes/OneWeatherWidgetExtension.xcscheme
......@@ -80,7 +80,7 @@
<EnvironmentVariables>
<EnvironmentVariable
key = "_XCWidgetKind"
value = "com.onelouder.oneweather.widget.radar"
value = "com.onelouder.oneweather.widget.temperature"
isEnabled = "YES">
</EnvironmentVariable>
<EnvironmentVariable
......@@ -90,7 +90,7 @@
</EnvironmentVariable>
<EnvironmentVariable
key = "_XCWidgetFamily"
value = "large"
value = "small"
isEnabled = "YES">
</EnvironmentVariable>
</EnvironmentVariables>
......
1Weather.xcworkspace/xcuserdata/dstepanets.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
......@@ -3,22 +3,4 @@
uuid = "55281C35-FE9F-4CED-865E-FBED0E7393F6"
type = "0"
version = "2.0">
<Breakpoints>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "A9B8B751-5C25-4473-82EC-7DA4EEF9BFB2"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Pods/Swarm/Swarm/SwarmTileOverlayRenderer.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "108"
endingLineNumber = "108"
landmarkName = "getTilesImage(_:zoomLevel:completion:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>
1Weather/AppDelegate.swift
......@@ -17,6 +17,7 @@ import OneWeatherCore
import AppsFlyerLib
import OneWeatherAnalytics
import NukeWebPPlugin
import OneWeatherUI
import WDTWeatherSource
import BlendHealthSource
......
1Weather/Info.plist
......@@ -407,6 +407,10 @@
<key>UIAppFonts</key>
<array>
<string>SF-Pro.ttf</string>
<string>SF-Pro-Display-Bold.otf</string>
<string>SF-Pro-Display-Light.otf</string>
<string>SF-Pro-Display-Regular.otf</string>
<string>SF-Pro-Display-Thin.otf</string>
<string>SF-Compact-Display-Light.otf</string>
<string>SF-Compact-Display-Regular.otf</string>
<string>SF-Compact-Display-Semibold.otf</string>
......
OneWeatherUI/OneWeatherUI/Extensions/OneWeatherUI+Global.swift
......@@ -7,12 +7,12 @@
import UIKit
struct OneWeatherUI {}
public struct OneWeatherUI {}
extension OneWeatherUI {
private class OneWeatherUIClass {}
static let frameworkBundle = Bundle(for: OneWeatherUIClass.self)
static let loadFonts: () = {
public static let loadFonts: () = {
loadFontWith(name: "SF-Pro-Display-Regular", fileExtension: "otf")
loadFontWith(name: "SF-Pro-Display-Light", fileExtension: "otf")
loadFontWith(name: "SF-Pro-Display-Bold", fileExtension: "otf")
......
OneWeatherWidget/Data/WeatherProvider.swift
......@@ -14,6 +14,7 @@ import BlendFIPSSource
import DelayedSaveStorage
import CoreDataStorage
import OneWeatherAnalytics
import OneWeatherUI
class WeatherProvider: TimelineProvider {
typealias Entry = WeatherEntry
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment