1Weather/Resources/Assets.xcassets · 589f512062f19de6d4b603fb4cf244818c8ba9eb · Dmitriy Stepanets / 1weather

Merge branch 'release/5.3' into develop · 589f5120

# Conflicts:
#	1Weather-Icons.sketch
#	1Weather.xcodeproj/project.pbxproj
#	1Weather.xcodeproj/xcuserdata/dstepanets.xcuserdatad/xcschemes/xcschememanagement.plist
#	1Weather.xcworkspace/contents.xcworkspacedata
#	1Weather.xcworkspace/xcuserdata/dstepanets.xcuserdatad/xcschemes/xcschememanagement.plist
#	1Weather/AppDelegate.swift
#	1Weather/Resources/en.lproj/Localizable.strings
#	1Weather/UI/Helpers/AppFont.swift
#	OneWeatherAnalytics/OneWeatherAnalytics/AnalyticsEvent.swift
#	OneWeatherAnalytics/OneWeatherAnalytics/AnalyticsParameter.swift
#	OneWeatherCore/OneWeatherCore.xcodeproj/project.pbxproj
#	OneWeatherCore/OneWeatherCore/Model/LocationManager.swift
#	PG.playground/Contents.swift
#	Podfile.lock
#	Pods/AmazonPublisherServicesSDK/APS_iOS_SDK-4.1.0/DTBiOSSDK.xcframework/ios-arm64_armv7/DTBiOSSDK.framework/Headers/DTBAdBannerDispatcher.h
#	Pods/AmazonPublisherServicesSDK/APS_iOS_SDK-4.1.0/DTBiOSSDK.xcframework/ios-arm64_armv7/DTBiOSSDK.framework/Headers/DTBAdInterstitialViewController.h
#	Pods/AmazonPublisherServicesSDK/APS_iOS_SDK-4.1.0/DTBiOSSDK.xcframework/ios-arm64_armv7/DTBiOSSDK.framework/Headers/DTBAdLoader.h
#	Pods/AmazonPublisherServicesSDK/APS_iOS_SDK-4.1.0/DTBiOSSDK.xcframework/ios-arm64_armv7/DTBiOSSDK.framework/Headers/DTBAdResponse+Mediation.h
#	Pods/AmazonPublisherServicesSDK/APS_iOS_SDK-4.1.0/DTBiOSSDK.xcframework/ios-arm64_armv7/DTBiOSSDK.framework/Headers/DTBAdResponse.h
#	Pods/AmazonPublisherServicesSDK/APS_iOS_SDK-4.1.0/DTBiOSSDK.xcframework/ios-arm64_armv7/DTBiOSSDK.framework/Headers/DTBAdView.h
#	Pods/AmazonPublisherServicesSDK/APS_iOS_SDK-4.1.0/DTBiOSSDK.xcframework/ios-arm64_armv7/DTBiOSSDK.framework/Headers/DTBDebugProperties.h
#	Pods/AmazonPublisherServicesSDK/APS_iOS_SDK-4.1.0/DTBiOSSDK.xcframework/ios-arm64_armv7/DTBiOSSDK.framework/Headers/DTBErrorCodes.h
#	Pods/AmazonPublisherServicesSDK/APS_iOS_SDK-4.1.0/DTBiOSSDK.xcframework/ios-arm64_armv7/DTBiOSSDK.framework/Headers/DTBExpectedSize.h
#	Pods/AmazonPublisherServicesSDK/APS_iOS_SDK-4.1.0/DTBiOSSDK.xcframework/ios-arm64_armv7/DTBiOSSDK.framework/Headers/DTBLog.h
#	Pods/AmazonPublisherServicesSDK/APS_iOS_SDK-4.1.0/DTBiOSSDK.xcframework/ios-arm64_armv7/DTBiOSSDK.framework/Headers/DTBMediationConstants.h
#	Pods/AmazonPublisherServicesSDK/APS_iOS_SDK-4.1.0/DTBiOSSDK.xcframework/ios-arm64_armv7/DTBiOSSDK.framework/Headers/UIView+DTB.h
#	Pods/AmazonPublisherServicesSDK/APS_iOS_SDK-4.1.0/DTBiOSSDK.xcframework/ios-arm64_armv7/DTBiOSSDK.framework/aps_mobile_client_config.json
#	Pods/AmazonPublisherServicesSDK/APS_iOS_SDK-4.1.0/DTBiOSSDK.xcframework/ios-arm64_i386_x86_64-simulator/DTBiOSSDK.framework/Headers/DTBAdBannerDispatcher.h
#	Pods/AmazonPublisherServicesSDK/APS_iOS_SDK-4.1.0/DTBiOSSDK.xcframework/ios-arm64_i386_x86_64-simulator/DTBiOSSDK.framework/Headers/DTBAdInterstitialViewController.h
#	Pods/AmazonPublisherServicesSDK/APS_iOS_SDK-4.1.0/DTBiOSSDK.xcframework/ios-arm64_i386_x86_64-simulator/DTBiOSSDK.framework/Headers/DTBAdLoader.h
#	Pods/AmazonPublisherServicesSDK/APS_iOS_SDK-4.1.0/DTBiOSSDK.xcframework/ios-arm64_i386_x86_64-simulator/DTBiOSSDK.framework/Headers/DTBAdResponse+Mediation.h
#	Pods/AmazonPublisherServicesSDK/APS_iOS_SDK-4.1.0/DTBiOSSDK.xcframework/ios-arm64_i386_x86_64-simulator/DTBiOSSDK.framework/Headers/DTBAdResponse.h
#	Pods/AmazonPublisherServicesSDK/APS_iOS_SDK-4.1.0/DTBiOSSDK.xcframework/ios-arm64_i386_x86_64-simulator/DTBiOSSDK.framework/Headers/DTBAdView.h
#	Pods/AmazonPublisherServicesSDK/APS_iOS_SDK-4.1.0/DTBiOSSDK.xcframework/ios-arm64_i386_x86_64-simulator/DTBiOSSDK.framework/Headers/DTBDebugProperties.h
#	Pods/AmazonPublisherServicesSDK/APS_iOS_SDK-4.1.0/DTBiOSSDK.xcframework/ios-arm64_i386_x86_64-simulator/DTBiOSSDK.framework/Headers/DTBErrorCodes.h
#	Pods/AmazonPublisherServicesSDK/APS_iOS_SDK-4.1.0/DTBiOSSDK.xcframework/ios-arm64_i386_x86_64-simulator/DTBiOSSDK.framework/Headers/DTBExpectedSize.h
#	Pods/AmazonPublisherServicesSDK/APS_iOS_SDK-4.1.0/DTBiOSSDK.xcframework/ios-arm64_i386_x86_64-simulator/DTBiOSSDK.framework/Headers/DTBLog.h
#	Pods/AmazonPublisherServicesSDK/APS_iOS_SDK-4.1.0/DTBiOSSDK.xcframework/ios-arm64_i386_x86_64-simulator/DTBiOSSDK.framework/Headers/DTBMediationConstants.h
#	Pods/AmazonPublisherServicesSDK/APS_iOS_SDK-4.1.0/DTBiOSSDK.xcframework/ios-arm64_i386_x86_64-simulator/DTBiOSSDK.framework/Headers/UIView+DTB.h
#	Pods/AmazonPublisherServicesSDK/APS_iOS_SDK-4.1.0/DTBiOSSDK.xcframework/ios-arm64_i386_x86_64-simulator/DTBiOSSDK.framework/aps_mobile_client_config.json
#	Pods/Manifest.lock
#	Pods/Pods.xcodeproj/project.pbxproj
#	Pods/Swarm/Swarm/SwarmTileOverlayRenderer.swift
#	Pods/Target Support Files/FBSDKCoreKit/FBSDKCoreKit-Info.plist
#	Pods/Target Support Files/Nuke-WebP-Plugin/Nuke-WebP-Plugin-Info.plist
#	Pods/Target Support Files/Pods-1Weather/Pods-1Weather.debug.xcconfig
#	Pods/Target Support Files/Pods-1Weather/Pods-1Weather.release.xcconfig
#	Pods/Target Support Files/Pods-OneWeatherWidgetExtension/Pods-OneWeatherWidgetExtension-Info.plist

committed Aug 10, 2021

589f5120

Name	Last commit	Last Update
..
AppIcon.appiconset		Loading commit data...
ads		Loading commit data...
alert.imageset		Loading commit data...
bell.imageset		Loading commit data...
checkmark.imageset		Loading commit data...
checkmark_selected.imageset		Loading commit data...
checkmark_unselected.imageset		Loading commit data...
city_pin.imageset		Loading commit data...
cross_icon.imageset		Loading commit data...
default_weather_images		Loading commit data...
dewPoint.imageset		Loading commit data...
down_arrow.imageset		Loading commit data...
earth.imageset		Loading commit data...
hot_indicator.imageset		Loading commit data...
humidity.imageset		Loading commit data...
launch_app_icon.imageset		Loading commit data...
like_filled.imageset		Loading commit data...
like_outline.imageset		Loading commit data...
location_arrow.imageset		Loading commit data...
location_disabled_arrow.imageset		Loading commit data...
map_fullscreen.imageset		Loading commit data...
map_layers.imageset		Loading commit data...
map_legend_close.imageset		Loading commit data...
map_precipitation.imageset		Loading commit data...
map_radar.imageset		Loading commit data...
map_time_bubble.imageset		Loading commit data...
menu		Loading commit data...
moon		Loading commit data...
notifications		Loading commit data...
ny_bridge.imageset		Loading commit data...
partly_cloudy.imageset		Loading commit data...
pause_icon.imageset		Loading commit data...
pin.imageset		Loading commit data...
play_icon.imageset		Loading commit data...
precipitation.imageset		Loading commit data...
premium.imageset		Loading commit data...
pressure.imageset		Loading commit data...
promotion_flag.imageset		Loading commit data...
radar_layer_pin.imageset		Loading commit data...
round_close.imageset		Loading commit data...
severe_forecastCone.imageset		Loading commit data...
severe_forecastTrack.imageset		Loading commit data...
severe_hurricane.imageset		Loading commit data...
severe_investArea.imageset		Loading commit data...
severe_low.imageset		Loading commit data...
severe_pastTrack.imageset		Loading commit data...
severe_tropicalStorm.imageset		Loading commit data...
shorts_swipe_down.imageset		Loading commit data...
splash_background.imageset		Loading commit data...
sun.imageset		Loading commit data...
sun_down_arrow.imageset		Loading commit data...
sun_up_arrow.imageset		Loading commit data...
tab_forecast.imageset		Loading commit data...
tab_forecast_selected.imageset		Loading commit data...
tab_menu.imageset		Loading commit data...
tab_menu_selected.imageset		Loading commit data...
tab_radar.imageset		Loading commit data...
tab_radar_selected.imageset		Loading commit data...
tab_shorts.imageset		Loading commit data...
tab_shorts_selected.imageset		Loading commit data...
tab_today.imageset		Loading commit data...
tab_today_selected.imageset		Loading commit data...
theme_sample_dark.imageset		Loading commit data...
theme_sample_light.imageset		Loading commit data...
uv_index.imageset		Loading commit data...
version_icon.imageset		Loading commit data...
visibility.imageset		Loading commit data...
weather_type		Loading commit data...
wind_direction.imageset		Loading commit data...
Contents.json		Loading commit data...