Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
1
1weather
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Dmitriy Stepanets
1weather
Commits
73c6822c
Commit
73c6822c
authored
May 25, 2021
by
Dmitriy Stepanets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Finished all Medium UI changes
parent
a20a4e11
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
27 additions
and
5 deletions
+27
-5
1Weather-Icons.sketch
+0
-0
1Weather.xcodeproj/xcuserdata/dstepanets.xcuserdatad/xcschemes/xcschememanagement.plist
+1
-1
1Weather/Resources/Assets.xcassets/location_disabled_arrow.imageset/Contents.json
+16
-0
1Weather/Resources/Assets.xcassets/location_disabled_arrow.imageset/location_disabled_arrow.pdf
+0
-0
1Weather/UI/View controllers/Radar/Controls/MapLegendSevereView.swift
+4
-4
1Weather/UI/View controllers/Radar/RadarViewController.swift
+6
-0
No files found.
1Weather-Icons.sketch
View file @
73c6822c
No preview for this file type
1Weather.xcodeproj/xcuserdata/dstepanets.xcuserdatad/xcschemes/xcschememanagement.plist
View file @
73c6822c
...
...
@@ -12,7 +12,7 @@
<
k
e
y
>
OneWeatherNotificationServiceExtension.xcscheme_
^#
shared
#^
_
<
/k
e
y
>
<
d
i
c
t
>
<
k
e
y
>
orderHint
<
/k
e
y
>
<
int
e
g
e
r
>
49
<
/int
e
g
e
r
>
<
int
e
g
e
r
>
54
<
/int
e
g
e
r
>
<
/
d
i
c
t
>
<
k
e
y
>
PG
(
Playground
)
1.xcscheme
<
/k
e
y
>
<
d
i
c
t
>
...
...
1Weather/Resources/Assets.xcassets/location_disabled_arrow.imageset/Contents.json
0 → 100644
View file @
73c6822c
{
"images"
:
[
{
"filename"
:
"location_disabled_arrow.pdf"
,
"idiom"
:
"universal"
}
],
"info"
:
{
"author"
:
"xcode"
,
"version"
:
1
},
"properties"
:
{
"preserves-vector-representation"
:
true
,
"template-rendering-intent"
:
"template"
}
}
1Weather/Resources/Assets.xcassets/location_disabled_arrow.imageset/location_disabled_arrow.pdf
0 → 100644
View file @
73c6822c
File added
1Weather/UI/View controllers/Radar/Controls/MapLegendSevereView.swift
View file @
73c6822c
...
...
@@ -98,7 +98,7 @@ private class SevereLegendElement:UIView {
addSubview
(
imageView
)
imageView
.
snp
.
makeConstraints
{
(
make
)
in
make
.
top
.
equalToSuperview
()
.
inset
(
3
)
make
.
top
.
equalToSuperview
()
.
inset
(
10
)
make
.
width
.
equalTo
(
30
)
make
.
height
.
equalTo
(
imageView
.
image
==
nil
?
10
:
15
)
make
.
centerX
.
equalToSuperview
()
...
...
@@ -111,9 +111,9 @@ private class SevereLegendElement:UIView {
addSubview
(
textLabel
)
textLabel
.
snp
.
makeConstraints
{
(
make
)
in
make
.
left
.
right
.
equalToSuperview
()
.
inset
(
4
)
make
.
top
.
equalTo
(
imageView
.
snp
.
bottom
)
.
offset
(
2
)
.
priority
(
999
)
make
.
bottom
.
equalToSuperview
()
.
inset
(
2
)
make
.
left
.
right
.
equalToSuperview
()
make
.
top
.
equalTo
(
imageView
.
snp
.
bottom
)
.
offset
(
4
)
.
priority
(
999
)
make
.
bottom
.
equalToSuperview
()
.
inset
(
7
)
}
}
...
...
1Weather/UI/View controllers/Radar/RadarViewController.swift
View file @
73c6822c
...
...
@@ -376,6 +376,12 @@ extension RadarViewController: RadarViewModelDelegate {
func
viewModelDidChange
<
P
>
(
model
:
P
)
where
P
:
ViewModelProtocol
{
self
.
centerMap
()
cityButton
.
configure
(
with
:
radarViewModel
.
location
)
if
radarViewModel
.
location
?
.
deviceLocation
==
true
{
self
.
locationButton
.
setImage
(
UIImage
(
named
:
"location_arrow"
),
for
:
.
normal
)
}
else
{
self
.
locationButton
.
setImage
(
UIImage
(
named
:
"location_disabled_arrow"
),
for
:
.
normal
)
}
}
func
viewModel
(
model
:
RadarViewModel
,
didSelectLayer
layer
:
RadarLayer
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment