diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 85b8f3a86f6..e3534775eee 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -7,14 +7,24 @@ + + + + + + + android:windowSoftInputMode="adjustResize" + android:exported="true"> diff --git a/android/app/src/main/java/com/metamask/SplashActivity.java b/android/app/src/main/java/com/metamask/SplashActivity.java new file mode 100644 index 00000000000..ed47b64aa63 --- /dev/null +++ b/android/app/src/main/java/com/metamask/SplashActivity.java @@ -0,0 +1,16 @@ +package com.metamask; + +import android.content.Intent; +import android.os.Bundle; +import android.support.v7.app.AppCompatActivity; + +public class SplashActivity extends AppCompatActivity { + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + Intent intent = new Intent(this, MainActivity.class); + startActivity(intent); + finish(); + } +} diff --git a/android/app/src/main/res/drawable/background_splash.xml b/android/app/src/main/res/drawable/background_splash.xml new file mode 100644 index 00000000000..8054ee64fb6 --- /dev/null +++ b/android/app/src/main/res/drawable/background_splash.xml @@ -0,0 +1,13 @@ + + + + + + + + diff --git a/android/app/src/main/res/drawable/screen.png b/android/app/src/main/res/drawable/screen.png new file mode 100755 index 00000000000..1ec1164ac1f Binary files /dev/null and b/android/app/src/main/res/drawable/screen.png differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png old mode 100644 new mode 100755 index a2f5908281d..118f5a07e27 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png old mode 100644 new mode 100755 index 1b523998081..9d14cd04600 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-hdpi/splash.png b/android/app/src/main/res/mipmap-hdpi/splash.png new file mode 100644 index 00000000000..ad0a2949865 Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/splash.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png old mode 100644 new mode 100755 index ff10afd6e18..d7171259bfb Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png old mode 100644 new mode 100755 index 115a4c768a2..9f6799e4c40 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/splash.png b/android/app/src/main/res/mipmap-mdpi/splash.png new file mode 100644 index 00000000000..ad0a2949865 Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/splash.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png old mode 100644 new mode 100755 index dcd3cd80833..c8e75f13b98 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png old mode 100644 new mode 100755 index 459ca609d3a..2c9945310b0 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/splash.png b/android/app/src/main/res/mipmap-xhdpi/splash.png new file mode 100644 index 00000000000..ad0a2949865 Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/splash.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png old mode 100644 new mode 100755 index 8ca12fe024b..ebd0b31a197 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png old mode 100644 new mode 100755 index 8e19b410a1b..cede5d00d3d Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/splash.png b/android/app/src/main/res/mipmap-xxhdpi/splash.png new file mode 100644 index 00000000000..ad0a2949865 Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/splash.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png old mode 100644 new mode 100755 index b824ebdd48d..bb851f797ce Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png old mode 100644 new mode 100755 index 4c19a13c239..f9399770273 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/splash.png b/android/app/src/main/res/mipmap-xxxhdpi/splash.png new file mode 100644 index 00000000000..ad0a2949865 Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/splash.png differ diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml new file mode 100644 index 00000000000..dcf8049bb4e --- /dev/null +++ b/android/app/src/main/res/values/colors.xml @@ -0,0 +1,4 @@ + + + #FFFFFF + diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml index 319eb0ca100..35c7cf4ba96 100644 --- a/android/app/src/main/res/values/styles.xml +++ b/android/app/src/main/res/values/styles.xml @@ -5,4 +5,9 @@ + + diff --git a/ios/MetaMask.xcodeproj/project.pbxproj b/ios/MetaMask.xcodeproj/project.pbxproj index c4b5bcda6e7..d10e8061b20 100644 --- a/ios/MetaMask.xcodeproj/project.pbxproj +++ b/ios/MetaMask.xcodeproj/project.pbxproj @@ -150,6 +150,20 @@ remoteGlobalIDString = 0974579A1D2A440A000D9368; remoteInfo = RCTWKWebView; }; + 15D1586B210BAAFF006982B5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 500343D7D81046209C481A89 /* RNRandomBytes.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 73EEC9391BFE4B1D00D468EB; + remoteInfo = RNRandomBytes; + }; + 15D1586D210BAAFF006982B5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 500343D7D81046209C481A89 /* RNRandomBytes.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 163CDE4E2087CAD3001065FB; + remoteInfo = "RNRandomBytes-tvOS"; + }; 2D02E4911E0B4A5D006451C7 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */; @@ -642,6 +656,15 @@ name = Products; sourceTree = ""; }; + 15D1583F210BAAFF006982B5 /* Products */ = { + isa = PBXGroup; + children = ( + 15D1586C210BAAFF006982B5 /* libRNRandomBytes.a */, + 15D1586E210BAAFF006982B5 /* libRNRandomBytes-tvOS.a */, + ); + name = Products; + sourceTree = ""; + }; 2D16E6871FA4F8E400B85C8A /* Frameworks */ = { isa = PBXGroup; children = ( @@ -1034,6 +1057,20 @@ remoteRef = 15C1F6A12100D07200DEA29E /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + 15D1586C210BAAFF006982B5 /* libRNRandomBytes.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libRNRandomBytes.a; + remoteRef = 15D1586B210BAAFF006982B5 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15D1586E210BAAFF006982B5 /* libRNRandomBytes-tvOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libRNRandomBytes-tvOS.a"; + remoteRef = 15D1586D210BAAFF006982B5 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; 2D16E6721FA4F8DC00B85C8A /* libRCTBlob-tvOS.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; diff --git a/ios/MetaMask/Base.lproj/LaunchScreen.xib b/ios/MetaMask/Base.lproj/LaunchScreen.xib index 47f272f40e8..23cf3a00b9c 100644 --- a/ios/MetaMask/Base.lproj/LaunchScreen.xib +++ b/ios/MetaMask/Base.lproj/LaunchScreen.xib @@ -1,9 +1,12 @@ - - + + + + + - - + + @@ -12,31 +15,25 @@ - - + + + + + + + - + - - - - - - + + + + + diff --git a/ios/MetaMask/Images.xcassets/AppIcon.appiconset/Contents.json b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/Contents.json index 118c98f7461..061cc63554b 100644 --- a/ios/MetaMask/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/Contents.json @@ -1,34 +1,127 @@ { "images" : [ { + "size" : "20x20", "idiom" : "iphone", - "size" : "29x29", + "filename" : "Icon-App-20x20@2x.png", "scale" : "2x" }, { + "size" : "20x20", "idiom" : "iphone", - "size" : "29x29", + "filename" : "Icon-App-20x20@3x.png", "scale" : "3x" }, { + "size" : "29x29", "idiom" : "iphone", - "size" : "40x40", + "filename" : "Icon-App-29x29@1x.png", + "scale" : "1x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-App-29x29@2x.png", "scale" : "2x" }, { + "size" : "29x29", "idiom" : "iphone", + "filename" : "Icon-App-29x29@3x.png", + "scale" : "3x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "Icon-App-40x40@2x.png", + "scale" : "2x" + }, + { "size" : "40x40", + "idiom" : "iphone", + "filename" : "Icon-App-40x40@3x.png", "scale" : "3x" }, { + "size" : "57x57", "idiom" : "iphone", - "size" : "60x60", + "filename" : "Icon-App-57x57@1x.png", + "scale" : "1x" + }, + { + "size" : "57x57", + "idiom" : "iphone", + "filename" : "Icon-App-57x57@2x.png", "scale" : "2x" }, { + "size" : "60x60", "idiom" : "iphone", + "filename" : "Icon-App-60x60@2x.png", + "scale" : "2x" + }, + { "size" : "60x60", + "idiom" : "iphone", + "filename" : "Icon-App-60x60@3x.png", "scale" : "3x" + }, + { + "idiom" : "ipad", + "size" : "20x20", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "20x20", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "29x29", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "29x29", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "40x40", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "40x40", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "76x76", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "76x76", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "83.5x83.5", + "scale" : "2x" + }, + { + "size" : "1024x1024", + "idiom" : "ios-marketing", + "filename" : "iTunesArtwork@2x-1.png", + "scale" : "1x" + }, + { + "size" : "512x512", + "idiom" : "mac", + "filename" : "ItunesArtwork@2x.png", + "scale" : "2x" } ], "info" : { diff --git a/ios/MetaMask/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png new file mode 100644 index 00000000000..5954a32a7ee Binary files /dev/null and b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png differ diff --git a/ios/MetaMask/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png new file mode 100644 index 00000000000..cd734d3c296 Binary files /dev/null and b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png differ diff --git a/ios/MetaMask/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png new file mode 100644 index 00000000000..e0b9b7f46b5 Binary files /dev/null and b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png differ diff --git a/ios/MetaMask/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png new file mode 100644 index 00000000000..9e577d5c956 Binary files /dev/null and b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png differ diff --git a/ios/MetaMask/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png new file mode 100644 index 00000000000..6060e746dd0 Binary files /dev/null and b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png differ diff --git a/ios/MetaMask/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png new file mode 100644 index 00000000000..3ac963b6723 Binary files /dev/null and b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png differ diff --git a/ios/MetaMask/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png new file mode 100644 index 00000000000..19dd801aedf Binary files /dev/null and b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png differ diff --git a/ios/MetaMask/Images.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png new file mode 100644 index 00000000000..5cfde86d22a Binary files /dev/null and b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png differ diff --git a/ios/MetaMask/Images.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png new file mode 100644 index 00000000000..c377c4a3f24 Binary files /dev/null and b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png differ diff --git a/ios/MetaMask/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png new file mode 100644 index 00000000000..19dd801aedf Binary files /dev/null and b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png differ diff --git a/ios/MetaMask/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png new file mode 100644 index 00000000000..bd6dfa6c6e8 Binary files /dev/null and b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png differ diff --git a/ios/MetaMask/Images.xcassets/AppIcon.appiconset/ItunesArtwork@2x.png b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/ItunesArtwork@2x.png new file mode 100644 index 00000000000..b5c6c4c7213 Binary files /dev/null and b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/ItunesArtwork@2x.png differ diff --git a/ios/MetaMask/Images.xcassets/AppIcon.appiconset/iTunesArtwork@2x-1.png b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/iTunesArtwork@2x-1.png new file mode 100644 index 00000000000..b5c6c4c7213 Binary files /dev/null and b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/iTunesArtwork@2x-1.png differ diff --git a/ios/MetaMask/Images.xcassets/metamask-logo.imageset/Contents.json b/ios/MetaMask/Images.xcassets/metamask-logo.imageset/Contents.json new file mode 100644 index 00000000000..225c82ba40a --- /dev/null +++ b/ios/MetaMask/Images.xcassets/metamask-logo.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "metamask-logo.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/ios/MetaMask/Images.xcassets/metamask-logo.imageset/metamask-logo.png b/ios/MetaMask/Images.xcassets/metamask-logo.imageset/metamask-logo.png new file mode 100644 index 00000000000..5986470d4b4 Binary files /dev/null and b/ios/MetaMask/Images.xcassets/metamask-logo.imageset/metamask-logo.png differ