diff --git a/src/Calculator.Droid/Calculator.Droid.csproj b/src/Calculator.Droid/Calculator.Droid.csproj index 982c288c..3f59560c 100644 --- a/src/Calculator.Droid/Calculator.Droid.csproj +++ b/src/Calculator.Droid/Calculator.Droid.csproj @@ -21,7 +21,7 @@ True ..\Calculator.Shared\Strings 7.3 - true + false calc-prod.keystore calc-prod @@ -104,6 +104,87 @@ x86 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Calculator.Droid/Properties/AndroidManifest.xml b/src/Calculator.Droid/Properties/AndroidManifest.xml index fea1a8be..83c5e994 100644 --- a/src/Calculator.Droid/Properties/AndroidManifest.xml +++ b/src/Calculator.Droid/Properties/AndroidManifest.xml @@ -1,5 +1,5 @@  - - \ No newline at end of file + + diff --git a/src/Calculator.Droid/Resources/drawable-hdpi/splashscreen_icon.png b/src/Calculator.Droid/Resources/drawable-hdpi/splashscreen_icon.png new file mode 100644 index 00000000..e16ac1b5 Binary files /dev/null and b/src/Calculator.Droid/Resources/drawable-hdpi/splashscreen_icon.png differ diff --git a/src/Calculator.Droid/Resources/drawable-hdpi/uno.png b/src/Calculator.Droid/Resources/drawable-hdpi/uno.png new file mode 100644 index 00000000..6ebd410d Binary files /dev/null and b/src/Calculator.Droid/Resources/drawable-hdpi/uno.png differ diff --git a/src/Calculator.Droid/Resources/drawable-xhdpi/splashscreen_icon.png b/src/Calculator.Droid/Resources/drawable-xhdpi/splashscreen_icon.png new file mode 100644 index 00000000..3e53b06f Binary files /dev/null and b/src/Calculator.Droid/Resources/drawable-xhdpi/splashscreen_icon.png differ diff --git a/src/Calculator.Droid/Resources/drawable-xhdpi/uno.png b/src/Calculator.Droid/Resources/drawable-xhdpi/uno.png new file mode 100644 index 00000000..50dca2ae Binary files /dev/null and b/src/Calculator.Droid/Resources/drawable-xhdpi/uno.png differ diff --git a/src/Calculator.Droid/Resources/drawable-xxhdpi/splashscreen_icon.png b/src/Calculator.Droid/Resources/drawable-xxhdpi/splashscreen_icon.png new file mode 100644 index 00000000..96075ff7 Binary files /dev/null and b/src/Calculator.Droid/Resources/drawable-xxhdpi/splashscreen_icon.png differ diff --git a/src/Calculator.Droid/Resources/drawable-xxhdpi/uno.png b/src/Calculator.Droid/Resources/drawable-xxhdpi/uno.png new file mode 100644 index 00000000..3a5e705b Binary files /dev/null and b/src/Calculator.Droid/Resources/drawable-xxhdpi/uno.png differ diff --git a/src/Calculator.Droid/Resources/drawable-xxxhdpi/splashscreen_icon.png b/src/Calculator.Droid/Resources/drawable-xxxhdpi/splashscreen_icon.png new file mode 100644 index 00000000..0ed7e191 Binary files /dev/null and b/src/Calculator.Droid/Resources/drawable-xxxhdpi/splashscreen_icon.png differ diff --git a/src/Calculator.Droid/Resources/drawable-xxxhdpi/uno.png b/src/Calculator.Droid/Resources/drawable-xxxhdpi/uno.png new file mode 100644 index 00000000..5f06daef Binary files /dev/null and b/src/Calculator.Droid/Resources/drawable-xxxhdpi/uno.png differ diff --git a/src/Calculator.Droid/Resources/drawable/ic_launcher_round.xml b/src/Calculator.Droid/Resources/drawable/ic_launcher_round.xml new file mode 100644 index 00000000..d7fc54bb --- /dev/null +++ b/src/Calculator.Droid/Resources/drawable/ic_launcher_round.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/Calculator.Droid/Resources/drawable/splash.xml b/src/Calculator.Droid/Resources/drawable/splash.xml new file mode 100644 index 00000000..e119f507 --- /dev/null +++ b/src/Calculator.Droid/Resources/drawable/splash.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/src/Calculator.Droid/Resources/mipmap-hdpi/ic_launcher.png b/src/Calculator.Droid/Resources/mipmap-hdpi/ic_launcher.png new file mode 100644 index 00000000..88709f7d Binary files /dev/null and b/src/Calculator.Droid/Resources/mipmap-hdpi/ic_launcher.png differ diff --git a/src/Calculator.Droid/Resources/mipmap-hdpi/ic_launcher_background.png b/src/Calculator.Droid/Resources/mipmap-hdpi/ic_launcher_background.png new file mode 100644 index 00000000..7c7c614e Binary files /dev/null and b/src/Calculator.Droid/Resources/mipmap-hdpi/ic_launcher_background.png differ diff --git a/src/Calculator.Droid/Resources/mipmap-hdpi/ic_launcher_foreground.png b/src/Calculator.Droid/Resources/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 00000000..18b54f05 Binary files /dev/null and b/src/Calculator.Droid/Resources/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/src/Calculator.Droid/Resources/mipmap-mdpi/ic_launcher.png b/src/Calculator.Droid/Resources/mipmap-mdpi/ic_launcher.png new file mode 100644 index 00000000..8ec4a0e7 Binary files /dev/null and b/src/Calculator.Droid/Resources/mipmap-mdpi/ic_launcher.png differ diff --git a/src/Calculator.Droid/Resources/mipmap-mdpi/ic_launcher_background.png b/src/Calculator.Droid/Resources/mipmap-mdpi/ic_launcher_background.png new file mode 100644 index 00000000..79f66cdd Binary files /dev/null and b/src/Calculator.Droid/Resources/mipmap-mdpi/ic_launcher_background.png differ diff --git a/src/Calculator.Droid/Resources/mipmap-mdpi/ic_launcher_foreground.png b/src/Calculator.Droid/Resources/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 00000000..3b82f851 Binary files /dev/null and b/src/Calculator.Droid/Resources/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/src/Calculator.Droid/Resources/mipmap-v26/ic_launcher.xml b/src/Calculator.Droid/Resources/mipmap-v26/ic_launcher.xml new file mode 100644 index 00000000..d7fc54bb --- /dev/null +++ b/src/Calculator.Droid/Resources/mipmap-v26/ic_launcher.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/Calculator.Droid/Resources/mipmap-xhdpi/ic_launcher.png b/src/Calculator.Droid/Resources/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 00000000..efd5608a Binary files /dev/null and b/src/Calculator.Droid/Resources/mipmap-xhdpi/ic_launcher.png differ diff --git a/src/Calculator.Droid/Resources/mipmap-xhdpi/ic_launcher_background.png b/src/Calculator.Droid/Resources/mipmap-xhdpi/ic_launcher_background.png new file mode 100644 index 00000000..6f3ff2d4 Binary files /dev/null and b/src/Calculator.Droid/Resources/mipmap-xhdpi/ic_launcher_background.png differ diff --git a/src/Calculator.Droid/Resources/mipmap-xhdpi/ic_launcher_foreground.png b/src/Calculator.Droid/Resources/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 00000000..8be4dbc2 Binary files /dev/null and b/src/Calculator.Droid/Resources/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/src/Calculator.Droid/Resources/mipmap-xxhdpi/ic_launcher.png b/src/Calculator.Droid/Resources/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 00000000..6f399402 Binary files /dev/null and b/src/Calculator.Droid/Resources/mipmap-xxhdpi/ic_launcher.png differ diff --git a/src/Calculator.Droid/Resources/mipmap-xxhdpi/ic_launcher_background.png b/src/Calculator.Droid/Resources/mipmap-xxhdpi/ic_launcher_background.png new file mode 100644 index 00000000..de968a3a Binary files /dev/null and b/src/Calculator.Droid/Resources/mipmap-xxhdpi/ic_launcher_background.png differ diff --git a/src/Calculator.Droid/Resources/mipmap-xxhdpi/ic_launcher_foreground.png b/src/Calculator.Droid/Resources/mipmap-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 00000000..92198e1a Binary files /dev/null and b/src/Calculator.Droid/Resources/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/src/Calculator.Droid/Resources/mipmap-xxxhdpi/ic_launcher.png b/src/Calculator.Droid/Resources/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 00000000..d23a1d91 Binary files /dev/null and b/src/Calculator.Droid/Resources/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/src/Calculator.Droid/Resources/mipmap-xxxhdpi/ic_launcher_background.png b/src/Calculator.Droid/Resources/mipmap-xxxhdpi/ic_launcher_background.png new file mode 100644 index 00000000..5619b055 Binary files /dev/null and b/src/Calculator.Droid/Resources/mipmap-xxxhdpi/ic_launcher_background.png differ diff --git a/src/Calculator.Droid/Resources/mipmap-xxxhdpi/ic_launcher_foreground.png b/src/Calculator.Droid/Resources/mipmap-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 00000000..3fcf0b41 Binary files /dev/null and b/src/Calculator.Droid/Resources/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/src/Calculator.Droid/Resources/values/Colors.xml b/src/Calculator.Droid/Resources/values/Colors.xml new file mode 100644 index 00000000..188de970 --- /dev/null +++ b/src/Calculator.Droid/Resources/values/Colors.xml @@ -0,0 +1,9 @@ + + + #FF000000 + #FF000000 + #FFFFFFFF + + + #FF0078D7 + diff --git a/src/Calculator.Droid/Resources/values/Strings.xml b/src/Calculator.Droid/Resources/values/Strings.xml index d4c27901..fc2eed15 100644 --- a/src/Calculator.Droid/Resources/values/Strings.xml +++ b/src/Calculator.Droid/Resources/values/Strings.xml @@ -1,5 +1,5 @@ Hello World, Click Me! - UnoQuickStart.Droid + Calculator diff --git a/src/Calculator.Droid/Resources/values/Styles.xml b/src/Calculator.Droid/Resources/values/Styles.xml index d668a8e0..af88df4c 100644 --- a/src/Calculator.Droid/Resources/values/Styles.xml +++ b/src/Calculator.Droid/Resources/values/Styles.xml @@ -7,6 +7,8 @@ false true true - + + + @drawable/splash - \ No newline at end of file + diff --git a/src/Calculator.Shared/Assets/CalculatorAppList.targetsize-96.png b/src/Calculator.Shared/Assets/CalculatorAppList.png similarity index 100% rename from src/Calculator.Shared/Assets/CalculatorAppList.targetsize-96.png rename to src/Calculator.Shared/Assets/CalculatorAppList.png diff --git a/src/Calculator.Shared/Assets/CalculatorLargeTile.contrast-white_scale-400.png b/src/Calculator.Shared/Assets/CalculatorLargeTile.png similarity index 100% rename from src/Calculator.Shared/Assets/CalculatorLargeTile.contrast-white_scale-400.png rename to src/Calculator.Shared/Assets/CalculatorLargeTile.png diff --git a/src/Calculator.Shared/Assets/CalculatorMedTile.contrast-white_scale-400.png b/src/Calculator.Shared/Assets/CalculatorMedTile.png similarity index 100% rename from src/Calculator.Shared/Assets/CalculatorMedTile.contrast-white_scale-400.png rename to src/Calculator.Shared/Assets/CalculatorMedTile.png diff --git a/src/Calculator.Shared/Assets/CalculatorSmallTile.contrast-white_scale-400.png b/src/Calculator.Shared/Assets/CalculatorSmallTile.png similarity index 100% rename from src/Calculator.Shared/Assets/CalculatorSmallTile.contrast-white_scale-400.png rename to src/Calculator.Shared/Assets/CalculatorSmallTile.png diff --git a/src/Calculator.Shared/Assets/CalculatorSplashScreen.contrast-white_scale-400.png b/src/Calculator.Shared/Assets/CalculatorSplashScreen.png similarity index 100% rename from src/Calculator.Shared/Assets/CalculatorSplashScreen.contrast-white_scale-400.png rename to src/Calculator.Shared/Assets/CalculatorSplashScreen.png diff --git a/src/Calculator.Shared/Assets/CalculatorStoreLogo.contrast-white_scale-200.png b/src/Calculator.Shared/Assets/CalculatorStoreLogo.png similarity index 100% rename from src/Calculator.Shared/Assets/CalculatorStoreLogo.contrast-white_scale-200.png rename to src/Calculator.Shared/Assets/CalculatorStoreLogo.png diff --git a/src/Calculator.Shared/Assets/CalculatorWideTile.contrast-white_scale-400.png b/src/Calculator.Shared/Assets/CalculatorWideTile.png similarity index 100% rename from src/Calculator.Shared/Assets/CalculatorWideTile.contrast-white_scale-400.png rename to src/Calculator.Shared/Assets/CalculatorWideTile.png diff --git a/src/Calculator.Shared/Assets/Date.targetsize-64_contrast-white.png b/src/Calculator.Shared/Assets/Date.png similarity index 100% rename from src/Calculator.Shared/Assets/Date.targetsize-64_contrast-white.png rename to src/Calculator.Shared/Assets/Date.png diff --git a/src/Calculator.Shared/Assets/LockScreenLogo.scale-200.png b/src/Calculator.Shared/Assets/LockScreenLogo.scale-200.png deleted file mode 100644 index 735f57ad..00000000 Binary files a/src/Calculator.Shared/Assets/LockScreenLogo.scale-200.png and /dev/null differ diff --git a/src/Calculator.Shared/Assets/Programmer.targetsize-64_contrast-white.png b/src/Calculator.Shared/Assets/Programmer.png similarity index 100% rename from src/Calculator.Shared/Assets/Programmer.targetsize-64_contrast-white.png rename to src/Calculator.Shared/Assets/Programmer.png diff --git a/src/Calculator.Shared/Assets/Scientific.targetsize-64_contrast-white.png b/src/Calculator.Shared/Assets/Scientific.png similarity index 100% rename from src/Calculator.Shared/Assets/Scientific.targetsize-64_contrast-white.png rename to src/Calculator.Shared/Assets/Scientific.png diff --git a/src/Calculator.Shared/Assets/SplashScreen.scale-200.png b/src/Calculator.Shared/Assets/SplashScreen.scale-200.png deleted file mode 100644 index 023e7f1f..00000000 Binary files a/src/Calculator.Shared/Assets/SplashScreen.scale-200.png and /dev/null differ diff --git a/src/Calculator.Shared/Assets/Square150x150Logo.scale-200.png b/src/Calculator.Shared/Assets/Square150x150Logo.scale-200.png deleted file mode 100644 index af49fec1..00000000 Binary files a/src/Calculator.Shared/Assets/Square150x150Logo.scale-200.png and /dev/null differ diff --git a/src/Calculator.Shared/Assets/Square44x44Logo.scale-200.png b/src/Calculator.Shared/Assets/Square44x44Logo.scale-200.png deleted file mode 100644 index ce342a2e..00000000 Binary files a/src/Calculator.Shared/Assets/Square44x44Logo.scale-200.png and /dev/null differ diff --git a/src/Calculator.Shared/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/src/Calculator.Shared/Assets/Square44x44Logo.targetsize-24_altform-unplated.png deleted file mode 100644 index f6c02ce9..00000000 Binary files a/src/Calculator.Shared/Assets/Square44x44Logo.targetsize-24_altform-unplated.png and /dev/null differ diff --git a/src/Calculator.Shared/Assets/Standard.targetsize-64_contrast-white.png b/src/Calculator.Shared/Assets/Standard.png similarity index 100% rename from src/Calculator.Shared/Assets/Standard.targetsize-64_contrast-white.png rename to src/Calculator.Shared/Assets/Standard.png diff --git a/src/Calculator.Shared/Assets/StoreLogo.png b/src/Calculator.Shared/Assets/StoreLogo.png deleted file mode 100644 index 7385b56c..00000000 Binary files a/src/Calculator.Shared/Assets/StoreLogo.png and /dev/null differ diff --git a/src/Calculator.Shared/Assets/Wide310x150Logo.scale-200.png b/src/Calculator.Shared/Assets/Wide310x150Logo.scale-200.png deleted file mode 100644 index 288995b3..00000000 Binary files a/src/Calculator.Shared/Assets/Wide310x150Logo.scale-200.png and /dev/null differ diff --git a/src/Calculator.Shared/Calculator.Shared.projitems b/src/Calculator.Shared/Calculator.Shared.projitems index ecef1078..db54c9de 100644 --- a/src/Calculator.Shared/Calculator.Shared.projitems +++ b/src/Calculator.Shared/Calculator.Shared.projitems @@ -240,24 +240,17 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + diff --git a/src/Calculator.Shared/Views/MainPage.xaml b/src/Calculator.Shared/Views/MainPage.xaml index cd09f658..0936d725 100644 --- a/src/Calculator.Shared/Views/MainPage.xaml +++ b/src/Calculator.Shared/Views/MainPage.xaml @@ -12,7 +12,8 @@ x:Name="pageRoot" Background="{ThemeResource AppChromeAcrylicHostBackdropMediumLowBrush}" Loaded="OnPageLoaded" - mc:Ignorable=""> + xmlns:android="http://nventive.com/android" + mc:Ignorable="android"> @@ -61,7 +62,8 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Contents.json b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Contents.json index 2d852d03..3ae49b95 100644 --- a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Contents.json +++ b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Contents.json @@ -4,109 +4,109 @@ "scale": "2x", "size": "20x20", "idiom": "iphone", - "filename": "Icon-20@2x.png" + "filename": "icon_20pt@2x.png" }, { "scale": "3x", "size": "20x20", "idiom": "iphone", - "filename": "Icon-20@3x.png" + "filename": "icon_20pt@3x.png" }, { "scale": "1x", "size": "20x20", "idiom": "ipad", - "filename": "Icon-20.png" + "filename": "icon_20pt.png" }, { "scale": "2x", "size": "20x20", "idiom": "ipad", - "filename": "Icon-20@2x.png" + "filename": "icon_20pt@2x.png" }, { "scale": "1x", "size": "1024x1024", "idiom": "ios-marketing", - "filename": "Icon-1024.png" + "filename": "Icon.png" }, { "scale": "2x", "size": "29x29", "idiom": "iphone", - "filename": "Icon-29@2x.png" + "filename": "icon_29pt@2x.png" }, { "scale": "3x", "size": "29x29", "idiom": "iphone", - "filename": "Icon-29@3x.png" + "filename": "icon_29pt@3x.png" }, { "scale": "2x", "size": "40x40", "idiom": "iphone", - "filename": "Icon-40@2x.png" + "filename": "icon_40pt@2x.png" }, { "scale": "3x", "size": "40x40", "idiom": "iphone", - "filename": "Icon-40@3x.png" + "filename": "icon_40pt@3x.png" }, { "scale": "2x", "size": "60x60", "idiom": "iphone", - "filename": "Icon-60@2x.png" + "filename": "icon_60pt@2x.png" }, { "scale": "3x", "size": "60x60", "idiom": "iphone", - "filename": "Icon-60@3x.png" + "filename": "icon_60pt@3x.png" }, { "scale": "1x", "size": "29x29", "idiom": "ipad", - "filename": "Icon-29.png" + "filename": "icon_29pt.png" }, { "scale": "2x", "size": "29x29", "idiom": "ipad", - "filename": "Icon-29@2x.png" + "filename": "icon_29pt@2x.png" }, { "scale": "1x", "size": "40x40", "idiom": "ipad", - "filename": "Icon-40.png" + "filename": "icon_40pt.png" }, { "scale": "2x", "size": "40x40", "idiom": "ipad", - "filename": "Icon-40@2x.png" + "filename": "icon_40pt@2x.png" }, { "scale": "1x", "size": "76x76", "idiom": "ipad", - "filename": "Icon-76.png" + "filename": "icon_76pt.png" }, { "scale": "2x", "size": "76x76", "idiom": "ipad", - "filename": "Icon-76@2x.png" + "filename": "icon_76pt@2x.png" }, { "scale": "2x", "size": "83.5x83.5", "idiom": "ipad", - "filename": "Icon-83.5@2x.png" + "filename": "icon_83.5@2x.png" } ], "properties": { diff --git a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-1024.png b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-1024.png deleted file mode 100644 index 96cdc3fa..00000000 Binary files a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-1024.png and /dev/null differ diff --git a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-20.png b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-20.png deleted file mode 100644 index bc0c13e2..00000000 Binary files a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-20.png and /dev/null differ diff --git a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-20@2x.png b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-20@2x.png deleted file mode 100644 index 309b7c8a..00000000 Binary files a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-20@2x.png and /dev/null differ diff --git a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-20@3x.png b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-20@3x.png deleted file mode 100644 index 53ae1b40..00000000 Binary files a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-20@3x.png and /dev/null differ diff --git a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-29.png b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-29.png deleted file mode 100644 index 835697b9..00000000 Binary files a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-29.png and /dev/null differ diff --git a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-29@2x.png b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-29@2x.png deleted file mode 100644 index c16b942c..00000000 Binary files a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-29@2x.png and /dev/null differ diff --git a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-29@3x.png b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-29@3x.png deleted file mode 100644 index 9476b491..00000000 Binary files a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-29@3x.png and /dev/null differ diff --git a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-40.png b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-40.png deleted file mode 100644 index 309b7c8a..00000000 Binary files a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-40.png and /dev/null differ diff --git a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-40@2x.png b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-40@2x.png deleted file mode 100644 index c736c93c..00000000 Binary files a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-40@2x.png and /dev/null differ diff --git a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-40@3x.png b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-40@3x.png deleted file mode 100644 index 178a1b98..00000000 Binary files a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-40@3x.png and /dev/null differ diff --git a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-60@2x.png b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-60@2x.png deleted file mode 100644 index 178a1b98..00000000 Binary files a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-60@2x.png and /dev/null differ diff --git a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-60@3x.png b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-60@3x.png deleted file mode 100644 index cf4d6301..00000000 Binary files a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-60@3x.png and /dev/null differ diff --git a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-76.png b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-76.png deleted file mode 100644 index b5e86a46..00000000 Binary files a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-76.png and /dev/null differ diff --git a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-76@2x.png b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-76@2x.png deleted file mode 100644 index 4b7e4fc7..00000000 Binary files a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-76@2x.png and /dev/null differ diff --git a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-83.5@2x.png b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-83.5@2x.png deleted file mode 100644 index 57845314..00000000 Binary files a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-83.5@2x.png and /dev/null differ diff --git a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon.png b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon.png new file mode 100644 index 00000000..faf3c31d Binary files /dev/null and b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon.png differ diff --git a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/icon_20pt.png b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/icon_20pt.png new file mode 100644 index 00000000..c46394a1 Binary files /dev/null and b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/icon_20pt.png differ diff --git a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/icon_20pt@2x.png b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/icon_20pt@2x.png new file mode 100644 index 00000000..7f9d9926 Binary files /dev/null and b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/icon_20pt@2x.png differ diff --git a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/icon_20pt@2x1.png b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/icon_20pt@2x1.png new file mode 100644 index 00000000..7f9d9926 Binary files /dev/null and b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/icon_20pt@2x1.png differ diff --git a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/icon_20pt@2x2.png b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/icon_20pt@2x2.png new file mode 100644 index 00000000..7f9d9926 Binary files /dev/null and b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/icon_20pt@2x2.png differ diff --git a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/icon_20pt@3x.png b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/icon_20pt@3x.png new file mode 100644 index 00000000..f73329fb Binary files /dev/null and b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/icon_20pt@3x.png differ diff --git a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/icon_29pt.png b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/icon_29pt.png new file mode 100644 index 00000000..66828a93 Binary files /dev/null and b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/icon_29pt.png differ diff --git a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/icon_29pt@2x.png b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/icon_29pt@2x.png new file mode 100644 index 00000000..c73ec844 Binary files /dev/null and b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/icon_29pt@2x.png differ diff --git a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/icon_29pt@2x1.png b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/icon_29pt@2x1.png new file mode 100644 index 00000000..c73ec844 Binary files /dev/null and b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/icon_29pt@2x1.png differ diff --git a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/icon_29pt@3x.png b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/icon_29pt@3x.png new file mode 100644 index 00000000..577cfc2a Binary files /dev/null and b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/icon_29pt@3x.png differ diff --git a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/icon_40pt1.png b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/icon_40pt1.png new file mode 100644 index 00000000..3dd5945e Binary files /dev/null and b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/icon_40pt1.png differ diff --git a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/icon_40pt@2x.png b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/icon_40pt@2x.png new file mode 100644 index 00000000..d0a77882 Binary files /dev/null and b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/icon_40pt@2x.png differ diff --git a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/icon_40pt@2x1.png b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/icon_40pt@2x1.png new file mode 100644 index 00000000..d0a77882 Binary files /dev/null and b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/icon_40pt@2x1.png differ diff --git a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/icon_40pt@3x.png b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/icon_40pt@3x.png new file mode 100644 index 00000000..74bc90b3 Binary files /dev/null and b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/icon_40pt@3x.png differ diff --git a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/icon_60pt@2x.png b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/icon_60pt@2x.png new file mode 100644 index 00000000..563489e1 Binary files /dev/null and b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/icon_60pt@2x.png differ diff --git a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/icon_60pt@3x.png b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/icon_60pt@3x.png new file mode 100644 index 00000000..28563fab Binary files /dev/null and b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/icon_60pt@3x.png differ diff --git a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/icon_76pt.png b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/icon_76pt.png new file mode 100644 index 00000000..daf330d9 Binary files /dev/null and b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/icon_76pt.png differ diff --git a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/icon_76pt@2x.png b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/icon_76pt@2x.png new file mode 100644 index 00000000..a42c4123 Binary files /dev/null and b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/icon_76pt@2x.png differ diff --git a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/icon_83.5@2x.png b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/icon_83.5@2x.png new file mode 100644 index 00000000..791f22f7 Binary files /dev/null and b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/icon_83.5@2x.png differ diff --git a/src/Calculator.iOS/Media.xcassets/LaunchImages.launchimage/Contents.json b/src/Calculator.iOS/Media.xcassets/LaunchImages.launchimage/Contents.json index d808521a..69555e44 100644 --- a/src/Calculator.iOS/Media.xcassets/LaunchImages.launchimage/Contents.json +++ b/src/Calculator.iOS/Media.xcassets/LaunchImages.launchimage/Contents.json @@ -5,7 +5,7 @@ "extent": "full-screen", "minimum-system-version": "7.0", "scale": "2x", - "size": "0x0", + "size": "640x960", "idiom": "iphone" }, { @@ -14,7 +14,7 @@ "minimum-system-version": "7.0", "subtype": "retina4", "scale": "2x", - "size": "0x0", + "size": "640x1136", "idiom": "iphone" }, { @@ -22,7 +22,7 @@ "extent": "full-screen", "minimum-system-version": "7.0", "scale": "1x", - "size": "0x0", + "size": "768x1024", "idiom": "ipad" }, { @@ -30,7 +30,7 @@ "extent": "full-screen", "minimum-system-version": "7.0", "scale": "1x", - "size": "0x0", + "size": "1024x768", "idiom": "ipad" }, { @@ -38,7 +38,7 @@ "extent": "full-screen", "minimum-system-version": "7.0", "scale": "2x", - "size": "0x0", + "size": "1536x2048", "idiom": "ipad" }, { @@ -46,7 +46,7 @@ "extent": "full-screen", "minimum-system-version": "7.0", "scale": "2x", - "size": "0x0", + "size": "2048x1536", "idiom": "ipad" } ], diff --git a/src/Calculator.iOS/Properties/AssemblyInfo.cs b/src/Calculator.iOS/Properties/AssemblyInfo.cs index 9bcc596e..38f59668 100644 --- a/src/Calculator.iOS/Properties/AssemblyInfo.cs +++ b/src/Calculator.iOS/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("Uno Calculator")] +[assembly: AssemblyTitle("Calculator")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] diff --git a/src/Calculator.iOS/Resources/splashscreen_icon.png b/src/Calculator.iOS/Resources/splashscreen_icon.png new file mode 100644 index 00000000..96075ff7 Binary files /dev/null and b/src/Calculator.iOS/Resources/splashscreen_icon.png differ diff --git a/src/Calculator.iOS/Resources/splashscreen_icon@2x.png b/src/Calculator.iOS/Resources/splashscreen_icon@2x.png new file mode 100644 index 00000000..3e53b06f Binary files /dev/null and b/src/Calculator.iOS/Resources/splashscreen_icon@2x.png differ diff --git a/src/Calculator.iOS/Resources/splashscreen_icon@3x.png b/src/Calculator.iOS/Resources/splashscreen_icon@3x.png new file mode 100644 index 00000000..3af1cd4d Binary files /dev/null and b/src/Calculator.iOS/Resources/splashscreen_icon@3x.png differ diff --git a/src/Calculator.iOS/Resources/uno.png b/src/Calculator.iOS/Resources/uno.png new file mode 100644 index 00000000..8c3755fa Binary files /dev/null and b/src/Calculator.iOS/Resources/uno.png differ diff --git a/src/Calculator.iOS/Resources/uno@2x.png b/src/Calculator.iOS/Resources/uno@2x.png new file mode 100644 index 00000000..50dca2ae Binary files /dev/null and b/src/Calculator.iOS/Resources/uno@2x.png differ diff --git a/src/Calculator.iOS/Resources/uno@3x.png b/src/Calculator.iOS/Resources/uno@3x.png new file mode 100644 index 00000000..3a5e705b Binary files /dev/null and b/src/Calculator.iOS/Resources/uno@3x.png differ diff --git a/src/Calculator.iOS/SplashScreen@2x.png b/src/Calculator.iOS/SplashScreen@2x.png deleted file mode 100644 index f8e793d9..00000000 Binary files a/src/Calculator.iOS/SplashScreen@2x.png and /dev/null differ diff --git a/src/Calculator.iOS/SplashScreen@3x.png b/src/Calculator.iOS/SplashScreen@3x.png deleted file mode 100644 index 8c5f3984..00000000 Binary files a/src/Calculator.iOS/SplashScreen@3x.png and /dev/null differ