Skip to content

Commit 3377917

Browse files
committed
Added splash screen.
Optimized png resources.
1 parent 11d609a commit 3377917

35 files changed

+108
-17
lines changed

Data/SplashScreen.psd

383 KB
Binary file not shown.

TramUrWay.Android/Activities/LineActivity.cs

+4-2
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,11 @@ protected override void OnPause()
144144
}
145145
protected override void OnResume()
146146
{
147+
// Cancel refresh tasks
147148
refreshCancellationTokenSource?.Cancel();
148149
refreshCancellationTokenSource = new CancellationTokenSource();
149150

151+
// Run new refresh tasks
150152
Task.Run(() =>
151153
{
152154
while (!refreshCancellationTokenSource.IsCancellationRequested)
@@ -210,11 +212,11 @@ private void Snackbar_Retry(View v)
210212
Refresh();
211213
}
212214

213-
private void Refresh()
215+
private async void Refresh()
214216
{
215217
swipeRefresh.Post(() => swipeRefresh.Refreshing = true);
216218

217-
Task.Run(() =>
219+
await Task.Run(() =>
218220
{
219221
TimeStep[] timeSteps;
220222

TramUrWay.Android/Activities/MainActivity.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
namespace TramUrWay.Android
2424
{
25-
[Activity(Label = App.Name, MainLauncher = true, Icon = "@mipmap/ic_launcher", Theme = "@style/AppTheme.NoActionBar", LaunchMode = LaunchMode.SingleTask)]
25+
[Activity(Theme = "@style/AppTheme.NoActionBar", LaunchMode = LaunchMode.SingleTask)]
2626
public class MainActivity : AppCompatActivity, NavigationView.IOnNavigationItemSelectedListener
2727
{
2828
private int currentItem = 0;
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Linq;
4+
5+
using Android.App;
6+
using Android.Content;
7+
using Android.Content.PM;
8+
using Android.Database;
9+
using Android.Graphics;
10+
using Android.OS;
11+
using Android.Runtime;
12+
using Android.Support.Design.Widget;
13+
using Android.Support.V4.Widget;
14+
using Android.Support.V4.View;
15+
using Android.Support.V7.App;
16+
using Android.Support.V7.Widget;
17+
using Android.Utilities;
18+
using Android.Views;
19+
using Android.Widget;
20+
21+
using Toolbar = Android.Support.V7.Widget.Toolbar;
22+
using System.Threading.Tasks;
23+
24+
namespace TramUrWay.Android
25+
{
26+
[Activity(Label = App.Name, MainLauncher = true, Icon = "@mipmap/ic_launcher", Theme = "@style/AppTheme.SplashScreen", NoHistory = true)]
27+
public class SplashScreenActivity : AppCompatActivity
28+
{
29+
protected override void OnResume()
30+
{
31+
base.OnResume();
32+
33+
Task.Run(() =>
34+
{
35+
App.Initialize(this);
36+
}).ContinueWith(t =>
37+
{
38+
Intent intent = new Intent(this, typeof(MainActivity));
39+
StartActivity(intent);
40+
});
41+
}
42+
}
43+
}

TramUrWay.Android/Properties/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="net.thedju.TramUrWay" android:versionCode="8" android:versionName="0.1.0" android:installLocation="auto">
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="net.thedju.TramUrWay" android:versionCode="9" android:versionName="0.1.0" android:installLocation="auto">
33
<uses-sdk android:minSdkVersion="15" />
44
<uses-permission android:name="android.permission.INTERNET" />
55
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />

TramUrWay.Android/Resources/Resource.Designer.cs

+17-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
-14.3 KB
Loading
-14.6 KB
Loading
-14.6 KB
Loading
-14.7 KB
Loading
-14.9 KB
Loading
-14.5 KB
Loading
-14.9 KB
Loading
-14.7 KB
Loading
-14.6 KB
Loading
-14.6 KB
Loading
-14.4 KB
Loading
-14.4 KB
Loading
-14.4 KB
Loading
-14.6 KB
Loading
-14.5 KB
Loading
-14.7 KB
Loading
-14.7 KB
Loading
-14.1 KB
Loading
Loading
-7.6 KB
Loading
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
3+
<item>
4+
<color android:color="#e6f9ff"/>
5+
</item>
6+
<item>
7+
<bitmap
8+
android:src="@mipmap/splashscreen"
9+
android:gravity="center" />
10+
</item>
11+
</layer-list>
-15.2 KB
Loading
Loading
Loading
Loading
Loading
Loading

TramUrWay.Android/Resources/values/styles.xml

+6-5
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,13 @@
1212
<item name="windowActionBar">false</item>
1313
<item name="windowNoTitle">true</item>
1414
</style>
15+
16+
<style name="AppTheme.SplashScreen" parent="AppTheme.NoActionBar">
17+
<item name="android:windowBackground">@drawable/splashscreen</item>
18+
<item name="android:windowNoTitle">true</item>
19+
</style>
1520

1621
<style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
17-
18-
<style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light">
19-
20-
21-
</style>
22+
<style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
2223

2324
</resources>

TramUrWay.Android/TramUrWay.Android.csproj

+25
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@
106106
<ItemGroup>
107107
<Compile Include="Activities\FavoritesFragment.cs" />
108108
<Compile Include="Activities\AboutActivity.cs" />
109+
<Compile Include="Activities\SplashScreenActivity.cs" />
109110
<Compile Include="Activities\MapFragment.cs" />
110111
<Compile Include="Activities\RoutesFragment.cs" />
111112
<Compile Include="Activities\SettingsActivity.cs" />
@@ -473,6 +474,30 @@
473474
<ItemGroup>
474475
<AndroidResource Include="Resources\drawable-v21\ic_map.xml" />
475476
</ItemGroup>
477+
<ItemGroup>
478+
<AndroidResource Include="Resources\drawable\ic_directions.png" />
479+
</ItemGroup>
480+
<ItemGroup>
481+
<AndroidResource Include="Resources\drawable\ic_directions_subway.png" />
482+
</ItemGroup>
483+
<ItemGroup>
484+
<AndroidResource Include="Resources\drawable\ic_info.png" />
485+
</ItemGroup>
486+
<ItemGroup>
487+
<AndroidResource Include="Resources\drawable\ic_map.png" />
488+
</ItemGroup>
489+
<ItemGroup>
490+
<AndroidResource Include="Resources\drawable\ic_place.png" />
491+
</ItemGroup>
492+
<ItemGroup>
493+
<AndroidResource Include="Resources\drawable\ic_settings.png" />
494+
</ItemGroup>
495+
<ItemGroup>
496+
<AndroidResource Include="Resources\drawable\splashscreen.xml" />
497+
</ItemGroup>
498+
<ItemGroup>
499+
<AndroidResource Include="Resources\mipmap-xxxhdpi\splashscreen.png" />
500+
</ItemGroup>
476501
<Import Project="..\..\[Shared]\Android\Android.projitems" Label="Shared" />
477502
<Import Project="..\..\[Shared]\Utilities\Utilities.projitems" Label="Shared" />
478503
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />

0 commit comments

Comments
 (0)