Skip to content

Commit dad1120

Browse files
committed
Make Android and iOS samples prettier
1 parent 3e24cba commit dad1120

Some content is hidden

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

53 files changed

+1812
-1664
lines changed

Art/ZXing.Net.Mobile-Icon-iOS.png

179 KB
Loading
187 KB
Loading

Art/ZXing.Net.Mobile.Forms-Icon.png

163 KB
Loading

Samples/Android/Sample.Android/Resources/Resource.designer.cs

+10-10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Samples/Forms/Droid/FormsSample.Droid.csproj

+7-6
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,6 @@
9191
<Folder Include="Resources\layout\" />
9292
<Folder Include="Resources\values\" />
9393
</ItemGroup>
94-
<ItemGroup>
95-
<AndroidResource Include="Resources\drawable\icon.png" />
96-
<AndroidResource Include="Resources\drawable-hdpi\icon.png" />
97-
<AndroidResource Include="Resources\drawable-xhdpi\icon.png" />
98-
<AndroidResource Include="Resources\drawable-xxhdpi\icon.png" />
99-
</ItemGroup>
10094
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
10195
<ItemGroup>
10296
<ProjectReference Include="..\..\..\Source\ZXing.Net.Mobile.Core\ZXing.Net.Mobile.Core.csproj">
@@ -131,4 +125,11 @@
131125
</PropertyGroup>
132126
<Error Condition="!Exists('..\packages\Xamarin.Forms.2.0.0.6490\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Forms.2.0.0.6490\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets'))" />
133127
</Target>
128+
<ItemGroup>
129+
<AndroidResource Include="Resources\mipmap-hdpi\ic_launcher.png" />
130+
<AndroidResource Include="Resources\mipmap-mdpi\ic_launcher.png" />
131+
<AndroidResource Include="Resources\mipmap-xhdpi\ic_launcher.png" />
132+
<AndroidResource Include="Resources\mipmap-xxhdpi\ic_launcher.png" />
133+
<AndroidResource Include="Resources\mipmap-xxxhdpi\ic_launcher.png" />
134+
</ItemGroup>
134135
</Project>

Samples/Forms/Droid/MainActivity.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
namespace FormsSample.Droid
1212
{
13-
[Activity (Label = "FormsSample.Droid", Icon = "@drawable/icon", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
13+
[Activity (Label = "ZXing Forms", Icon = "@mipmap/ic_launcher", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
1414
public class MainActivity : global::Xamarin.Forms.Platform.Android.FormsApplicationActivity
1515
{
1616
protected override void OnCreate (Bundle bundle)

Samples/Forms/Droid/Properties/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
<uses-permission android:name="android.permission.CAMERA" />
55
<uses-permission android:name="android.permission.FLASHLIGHT" />
66
<uses-permission android:name="android.permission.INTERNET" />
7-
<application android:label="FormsSample"></application>
7+
<application android:label="ZXing Forms" android:icon="@mipmap/ic_launcher"></application>
88
</manifest>

0 commit comments

Comments
 (0)