diff --git a/Adamant/Assets/Assets.xcassets/Adamant_Logo.imageset/Contents.json b/Adamant/Assets/Assets.xcassets/Adamant-logo.imageset/Contents.json similarity index 84% rename from Adamant/Assets/Assets.xcassets/Adamant_Logo.imageset/Contents.json rename to Adamant/Assets/Assets.xcassets/Adamant-logo.imageset/Contents.json index c27d073bf..5cb681d54 100644 --- a/Adamant/Assets/Assets.xcassets/Adamant_Logo.imageset/Contents.json +++ b/Adamant/Assets/Assets.xcassets/Adamant-logo.imageset/Contents.json @@ -2,7 +2,7 @@ "images" : [ { "idiom" : "universal", - "filename" : "adamant-logo-1024x1024.png", + "filename" : "adamant-logo-1024.png", "scale" : "1x" }, { diff --git a/Adamant/Assets/Assets.xcassets/Adamant-logo.imageset/adamant-logo-1024.png b/Adamant/Assets/Assets.xcassets/Adamant-logo.imageset/adamant-logo-1024.png new file mode 100644 index 000000000..4e4c4af81 Binary files /dev/null and b/Adamant/Assets/Assets.xcassets/Adamant-logo.imageset/adamant-logo-1024.png differ diff --git a/Adamant/Assets/Assets.xcassets/Adamant_Logo.imageset/adamant-logo-1024x1024.png b/Adamant/Assets/Assets.xcassets/Adamant_Logo.imageset/adamant-logo-1024x1024.png deleted file mode 100644 index 1726f07f6..000000000 Binary files a/Adamant/Assets/Assets.xcassets/Adamant_Logo.imageset/adamant-logo-1024x1024.png and /dev/null differ diff --git a/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/60@2x.png b/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/60@2x.png deleted file mode 100644 index 43ab373bc..000000000 Binary files a/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/60@2x.png and /dev/null differ diff --git a/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/60@3x.png b/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/60@3x.png deleted file mode 100644 index 9636c825e..000000000 Binary files a/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/60@3x.png and /dev/null differ diff --git a/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/76.png b/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/76.png deleted file mode 100644 index 9cebc4abb..000000000 Binary files a/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/76.png and /dev/null differ diff --git a/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/76@2x.png b/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/76@2x.png deleted file mode 100644 index 04df052fe..000000000 Binary files a/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/76@2x.png and /dev/null differ diff --git a/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/83@2x.png b/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/83@2x.png deleted file mode 100644 index f09ffaee0..000000000 Binary files a/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/83@2x.png and /dev/null differ diff --git a/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/Contents.json b/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/Contents.json index b1c585895..1f0404d29 100644 --- a/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -3,109 +3,109 @@ { "size" : "20x20", "idiom" : "iphone", - "filename" : "adamant-app-logo-20@2x.png", + "filename" : "icon-bold-20@2x.png", "scale" : "2x" }, { "size" : "20x20", "idiom" : "iphone", - "filename" : "adamant-app-logo-20@3x.png", + "filename" : "icon-bold-20@3x.png", "scale" : "3x" }, { "size" : "29x29", "idiom" : "iphone", - "filename" : "adamant-app-logo-29@2x.png", + "filename" : "adamant-icon-bold-29@2x.png", "scale" : "2x" }, { "size" : "29x29", "idiom" : "iphone", - "filename" : "adamant-app-logo-29@3x.png", + "filename" : "adamant-icon-bold-29@3x.png", "scale" : "3x" }, { "size" : "40x40", "idiom" : "iphone", - "filename" : "adamant-app-logo-40@2x.png", + "filename" : "adamant-icon-bold-40@2x.png", "scale" : "2x" }, { "size" : "40x40", "idiom" : "iphone", - "filename" : "adamant-app-logo-40@3x.png", + "filename" : "adamant-icon-bold-40@3x.png", "scale" : "3x" }, { "size" : "60x60", "idiom" : "iphone", - "filename" : "60@2x.png", + "filename" : "adamant-icon-bold-60@2x.png", "scale" : "2x" }, { "size" : "60x60", "idiom" : "iphone", - "filename" : "60@3x.png", + "filename" : "adamant-icon-bold-60@3x.png", "scale" : "3x" }, { "size" : "20x20", "idiom" : "ipad", - "filename" : "adamant-app-logo-20.png", + "filename" : "adamant-icon-bold-20.png", "scale" : "1x" }, { "size" : "20x20", "idiom" : "ipad", - "filename" : "adamant-app-logo-20@2x.png", + "filename" : "adamant-icon-bold-20@2x.png", "scale" : "2x" }, { "size" : "29x29", "idiom" : "ipad", - "filename" : "adamant-app-logo-29.png", + "filename" : "adamant-icon-bold-29.png", "scale" : "1x" }, { "size" : "29x29", "idiom" : "ipad", - "filename" : "adamant-app-logo-29@2x.png", + "filename" : "adamant-icon-bold-29@2x-1.png", "scale" : "2x" }, { "size" : "40x40", "idiom" : "ipad", - "filename" : "adamant-app-logo-40.png", + "filename" : "adamant-icon-bold-40.png", "scale" : "1x" }, { "size" : "40x40", "idiom" : "ipad", - "filename" : "adamant-app-logo-40@2x.png", + "filename" : "adamant-icon-bold-40@2x-1.png", "scale" : "2x" }, { "size" : "76x76", "idiom" : "ipad", - "filename" : "76.png", + "filename" : "adamant-icon-bold-76.png", "scale" : "1x" }, { "size" : "76x76", "idiom" : "ipad", - "filename" : "76@2x.png", + "filename" : "adamant-icon-bold-76@2x.png", "scale" : "2x" }, { "size" : "83.5x83.5", "idiom" : "ipad", - "filename" : "83@2x.png", + "filename" : "adamant-icon-bold-83.5@2x.png", "scale" : "2x" }, { "size" : "1024x1024", "idiom" : "ios-marketing", - "filename" : "adamant-1024.png", + "filename" : "adamant-icon-1024.png", "scale" : "1x" } ], diff --git a/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-1024.png b/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-1024.png deleted file mode 100644 index da53ead79..000000000 Binary files a/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-1024.png and /dev/null differ diff --git a/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-app-logo-20@2x.png b/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-app-logo-20@2x.png deleted file mode 100644 index 52ce06aa4..000000000 Binary files a/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-app-logo-20@2x.png and /dev/null differ diff --git a/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-app-logo-20@3x.png b/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-app-logo-20@3x.png deleted file mode 100644 index 82ea6dfda..000000000 Binary files a/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-app-logo-20@3x.png and /dev/null differ diff --git a/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-app-logo-29.png b/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-app-logo-29.png deleted file mode 100644 index 2ad5793cc..000000000 Binary files a/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-app-logo-29.png and /dev/null differ diff --git a/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-app-logo-29@2x.png b/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-app-logo-29@2x.png deleted file mode 100644 index f75b8bb1c..000000000 Binary files a/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-app-logo-29@2x.png and /dev/null differ diff --git a/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-app-logo-29@3x.png b/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-app-logo-29@3x.png deleted file mode 100644 index 4f51749d4..000000000 Binary files a/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-app-logo-29@3x.png and /dev/null differ diff --git a/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-app-logo-40.png b/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-app-logo-40.png deleted file mode 100644 index 52ce06aa4..000000000 Binary files a/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-app-logo-40.png and /dev/null differ diff --git a/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-app-logo-40@2x.png b/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-app-logo-40@2x.png deleted file mode 100644 index 5e7154a35..000000000 Binary files a/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-app-logo-40@2x.png and /dev/null differ diff --git a/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-app-logo-40@3x.png b/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-app-logo-40@3x.png deleted file mode 100644 index 3c3cb36f9..000000000 Binary files a/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-app-logo-40@3x.png and /dev/null differ diff --git a/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-icon-1024.png b/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-icon-1024.png new file mode 100644 index 000000000..94ec98329 Binary files /dev/null and b/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-icon-1024.png differ diff --git a/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-app-logo-20.png b/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-icon-bold-20.png similarity index 57% rename from Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-app-logo-20.png rename to Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-icon-bold-20.png index 3486c2d5f..ce5b18fd4 100644 Binary files a/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-app-logo-20.png and b/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-icon-bold-20.png differ diff --git a/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-icon-bold-20@2x.png b/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-icon-bold-20@2x.png new file mode 100644 index 000000000..dab170366 Binary files /dev/null and b/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-icon-bold-20@2x.png differ diff --git a/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-icon-bold-29.png b/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-icon-bold-29.png new file mode 100644 index 000000000..aa44cf243 Binary files /dev/null and b/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-icon-bold-29.png differ diff --git a/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-icon-bold-29@2x-1.png b/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-icon-bold-29@2x-1.png new file mode 100644 index 000000000..fcbed194f Binary files /dev/null and b/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-icon-bold-29@2x-1.png differ diff --git a/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-icon-bold-29@2x.png b/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-icon-bold-29@2x.png new file mode 100644 index 000000000..fcbed194f Binary files /dev/null and b/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-icon-bold-29@2x.png differ diff --git a/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-icon-bold-29@3x.png b/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-icon-bold-29@3x.png new file mode 100644 index 000000000..400396b5d Binary files /dev/null and b/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-icon-bold-29@3x.png differ diff --git a/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-icon-bold-40.png b/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-icon-bold-40.png new file mode 100644 index 000000000..dab170366 Binary files /dev/null and b/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-icon-bold-40.png differ diff --git a/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-icon-bold-40@2x-1.png b/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-icon-bold-40@2x-1.png new file mode 100644 index 000000000..d2ec0eaa7 Binary files /dev/null and b/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-icon-bold-40@2x-1.png differ diff --git a/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-icon-bold-40@2x.png b/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-icon-bold-40@2x.png new file mode 100644 index 000000000..d2ec0eaa7 Binary files /dev/null and b/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-icon-bold-40@2x.png differ diff --git a/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-icon-bold-40@3x.png b/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-icon-bold-40@3x.png new file mode 100644 index 000000000..fbc6fdab4 Binary files /dev/null and b/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-icon-bold-40@3x.png differ diff --git a/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-icon-bold-60@2x.png b/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-icon-bold-60@2x.png new file mode 100644 index 000000000..fbc6fdab4 Binary files /dev/null and b/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-icon-bold-60@2x.png differ diff --git a/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-icon-bold-60@3x.png b/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-icon-bold-60@3x.png new file mode 100644 index 000000000..380b5dd20 Binary files /dev/null and b/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-icon-bold-60@3x.png differ diff --git a/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-icon-bold-76.png b/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-icon-bold-76.png new file mode 100644 index 000000000..eba51fbce Binary files /dev/null and b/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-icon-bold-76.png differ diff --git a/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-icon-bold-76@2x.png b/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-icon-bold-76@2x.png new file mode 100644 index 000000000..89f36c13b Binary files /dev/null and b/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-icon-bold-76@2x.png differ diff --git a/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-icon-bold-83.5@2x.png b/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-icon-bold-83.5@2x.png new file mode 100644 index 000000000..9b35e407f Binary files /dev/null and b/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/adamant-icon-bold-83.5@2x.png differ diff --git a/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/icon-bold-20@2x.png b/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/icon-bold-20@2x.png new file mode 100644 index 000000000..dab170366 Binary files /dev/null and b/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/icon-bold-20@2x.png differ diff --git a/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/icon-bold-20@3x.png b/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/icon-bold-20@3x.png new file mode 100644 index 000000000..784e05992 Binary files /dev/null and b/Adamant/Assets/Assets.xcassets/AppIcon.appiconset/icon-bold-20@3x.png differ diff --git a/Adamant/Assets/LaunchScreen.storyboard b/Adamant/Assets/LaunchScreen.storyboard index 5aed9ea13..638f05663 100644 --- a/Adamant/Assets/LaunchScreen.storyboard +++ b/Adamant/Assets/LaunchScreen.storyboard @@ -1,11 +1,11 @@ - + - + @@ -20,14 +20,14 @@ - + - + @@ -42,6 +42,6 @@ - + diff --git a/Adamant/Info.plist b/Adamant/Info.plist index 40f76ae09..232710525 100644 --- a/Adamant/Info.plist +++ b/Adamant/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 0.3.12 CFBundleVersion - 31 + 32 LSRequiresIPhoneOS NSCameraUsageDescription diff --git a/Adamant/Stories/Login/LoginHeader.xib b/Adamant/Stories/Login/LoginHeader.xib index 37f10627f..27bf5e7fa 100644 --- a/Adamant/Stories/Login/LoginHeader.xib +++ b/Adamant/Stories/Login/LoginHeader.xib @@ -1,11 +1,11 @@ - + - + @@ -24,16 +24,16 @@ - + - - + +