Skip to content

Commit 8a408d2

Browse files
authored
Merge pull request #721 from Syn-McJ/feat/settings-ui
feat: setting UI redesign
2 parents e970fcb + e95bdcc commit 8a408d2

182 files changed

Lines changed: 3572 additions & 4041 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

DashWallet.xcodeproj/project.pbxproj

Lines changed: 62 additions & 126 deletions
Large diffs are not rendered by default.
Binary file not shown.

DashWallet/Resources/AppAssets.xcassets/CoinJoin/image.coinjoin.menu.imageset/Contents.json renamed to DashWallet/Resources/AppAssets.xcassets/Menu/Image.face.id.imageset/Contents.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
{
22
"images" : [
33
{
4-
"filename" : "image.coinjoin.menu.png",
4+
"filename" : "Layer 1.png",
55
"idiom" : "universal",
66
"scale" : "1x"
77
},
88
{
9-
"filename" : "image.coinjoin.menu@2x.png",
9+
"filename" : "Layer 1@2x.png",
1010
"idiom" : "universal",
1111
"scale" : "2x"
1212
},
1313
{
14-
"filename" : "image.coinjoin.menu@3x.png",
14+
"filename" : "Layer 1@3x.png",
1515
"idiom" : "universal",
1616
"scale" : "3x"
1717
}
565 Bytes
1.02 KB
1.61 KB

DashWallet/Resources/AppAssets.xcassets/icon_filter_horizontal.imageset/Contents.json renamed to DashWallet/Resources/AppAssets.xcassets/Menu/image.about.imageset/Contents.json

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,23 @@
11
{
22
"images" : [
33
{
4-
"filename" : "filters.png",
4+
"filename" : "dash.logo.circle.png",
55
"idiom" : "universal",
66
"scale" : "1x"
77
},
88
{
9-
"filename" : "filters@2x.png",
9+
"filename" : "dash.logo.circle@2x.png",
1010
"idiom" : "universal",
1111
"scale" : "2x"
1212
},
1313
{
14-
"filename" : "filters@3x.png",
14+
"filename" : "dash.logo.circle@3x.png",
1515
"idiom" : "universal",
1616
"scale" : "3x"
1717
}
1818
],
1919
"info" : {
2020
"author" : "xcode",
2121
"version" : 1
22-
},
23-
"properties" : {
24-
"template-rendering-intent" : "template"
2522
}
2623
}
723 Bytes

0 commit comments

Comments
 (0)