Skip to content

Commit 7acb0bd

Browse files
David BritchDavid Britch
David Britch
authored and
David Britch
committed
Updates to ensure app runs on Forms 2.5.
1 parent bee76a4 commit 7acb0bd

9 files changed

Lines changed: 232 additions & 247 deletions

File tree

‎src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Properties/AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto">
3-
<uses-sdk android:minSdkVersion="15" android:targetSdkVersion="23" />
3+
<uses-sdk android:minSdkVersion="15" />
44
<uses-permission android:name="android.permission.INTERNET" />
55
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
66
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />

‎src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Renderers/CustomTabbedPageRenderer.cs‎

Lines changed: 11 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -18,53 +18,37 @@ namespace eShopOnContainers.Droid.Renderers
1818
{
1919
public class CustomTabbedPageRenderer : TabbedPageRenderer
2020
{
21-
private const int DeleayBeforeTabAdded = 10;
21+
private const int DelayBeforeTabAdded = 10;
2222
protected readonly Dictionary<Element, BadgeView> BadgeViews = new Dictionary<Element, BadgeView>();
2323
private TabLayout _tabLayout;
24-
private TabLayout.SlidingTabStrip _tabStrip;
24+
private LinearLayout _tabStrip;
2525
private ViewPager _viewPager;
2626
private TabbedPage _tabbedPage;
2727
private bool _firstTime = true;
2828

2929
protected override void OnElementChanged(ElementChangedEventArgs<TabbedPage> e)
3030
{
3131
base.OnElementChanged(e);
32-
32+
3333
_tabLayout = ViewGroup.FindChildOfType<TabLayout>();
3434

3535
if (_tabLayout == null)
3636
{
3737
Console.WriteLine("No TabLayout found. Badge not added.");
3838
return;
3939
}
40-
40+
4141
_tabbedPage = e.NewElement as TabbedPage;
4242
_viewPager = (ViewPager)GetChildAt(0);
4343

44-
_tabLayout.TabSelected += (s, a) =>
44+
_tabLayout.TabSelected += (s, a) =>
4545
{
4646
var page = _tabbedPage.Children[a.Tab.Position];
47-
48-
if (page is TabbedPage)
49-
{
50-
var tabPage = (TabbedPage)page;
51-
SetTab(a.Tab, tabPage.Icon.File);
52-
}
53-
47+
SetTab(a.Tab, page.Icon.File);
5448
_viewPager.SetCurrentItem(a.Tab.Position, false);
5549
};
5650

57-
_tabLayout.TabUnselected += (s, a) =>
58-
{
59-
var page = _tabbedPage.Children[a.Tab.Position];
60-
61-
if (page is TabbedPage)
62-
{
63-
SetTab(a.Tab, page.Icon.File);
64-
}
65-
};
66-
67-
_tabStrip = _tabLayout.FindChildOfType<TabLayout.SlidingTabStrip>();
51+
_tabStrip = _tabLayout.FindChildOfType<LinearLayout>();
6852

6953
for (var i = 0; i < _tabLayout.TabCount; i++)
7054
{
@@ -81,15 +65,15 @@ private void SetTab(TabLayout.Tab tab, string name)
8165
{
8266
int id = Resources.GetIdentifier(name, "drawable", Context.PackageName);
8367
tab.SetIcon(null);
84-
68+
8569
LinearLayout.LayoutParams linearLayoutParams = new LinearLayout.LayoutParams(LayoutParams.MatchParent, LayoutParams.MatchParent);
8670
linearLayoutParams.SetMargins(0, -48, 0, 0);
8771

8872
ImageView img = new ImageView(Context);
8973
img.LayoutParameters = linearLayoutParams;
9074
img.SetPadding(0, 0, 0, 48);
9175
img.SetImageResource(id);
92-
76+
9377
tab.SetCustomView(img);
9478
}
9579
catch (Exception ex)
@@ -115,7 +99,6 @@ protected override void DispatchDraw(Canvas canvas)
11599
if (page is TabbedPage)
116100
{
117101
var tabbedPage = (TabbedPage)page;
118-
119102
SetTab(tab, tabbedPage.Icon.File);
120103
}
121104
else
@@ -164,7 +147,7 @@ private void AddTabBadge(int tabIndex)
164147
{
165148
badgeView.BadgeColor = tabColor.ToAndroid();
166149
}
167-
150+
168151
element.PropertyChanged += OnTabbedPagePropertyChanged;
169152
}
170153

@@ -200,7 +183,7 @@ private void OnTabRemoved(object sender, ElementEventArgs e)
200183

201184
private async void OnTabAdded(object sender, ElementEventArgs e)
202185
{
203-
await Task.Delay(DeleayBeforeTabAdded);
186+
await Task.Delay(DelayBeforeTabAdded);
204187

205188
var page = e.Element as Page;
206189

‎src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj‎

Lines changed: 84 additions & 58 deletions
Large diffs are not rendered by default.

‎src/Mobile/eShopOnContainers/eShopOnContainers.Droid/packages.config‎

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Acr.Support" version="2.1.0" targetFramework="monoandroid70" />
4-
<package id="Acr.UserDialogs" version="6.3.3" targetFramework="monoandroid70" />
4+
<package id="Acr.UserDialogs" version="6.3.8" targetFramework="monoandroid80" />
55
<package id="AndHUD" version="1.2.0" targetFramework="monoandroid70" />
66
<package id="Autofac" version="4.5.0" targetFramework="monoandroid60" />
77
<package id="IdentityModel" version="1.3.1" targetFramework="monoandroid60" />
@@ -71,15 +71,23 @@
7171
<package id="Validation" version="2.2.8" targetFramework="monoandroid60" />
7272
<package id="Xam.Plugin.Geolocator" version="3.0.4" targetFramework="monoandroid60" />
7373
<package id="Xam.Plugins.Settings" version="2.6.0.12-beta" targetFramework="monoandroid70" />
74-
<package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="23.3.0" targetFramework="monoandroid70" />
75-
<package id="Xamarin.Android.Support.Design" version="23.3.0" targetFramework="monoandroid70" />
76-
<package id="Xamarin.Android.Support.v4" version="23.3.0" targetFramework="monoandroid70" />
77-
<package id="Xamarin.Android.Support.v7.AppCompat" version="23.3.0" targetFramework="monoandroid70" />
78-
<package id="Xamarin.Android.Support.v7.CardView" version="23.3.0" targetFramework="monoandroid70" />
79-
<package id="Xamarin.Android.Support.v7.MediaRouter" version="23.3.0" targetFramework="monoandroid70" />
80-
<package id="Xamarin.Android.Support.v7.RecyclerView" version="23.3.0" targetFramework="monoandroid70" />
81-
<package id="Xamarin.Android.Support.Vector.Drawable" version="23.3.0" targetFramework="monoandroid70" />
74+
<package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="25.4.0.2" targetFramework="monoandroid80" />
75+
<package id="Xamarin.Android.Support.Annotations" version="25.4.0.2" targetFramework="monoandroid80" />
76+
<package id="Xamarin.Android.Support.Compat" version="25.4.0.2" targetFramework="monoandroid80" />
77+
<package id="Xamarin.Android.Support.Core.UI" version="25.4.0.2" targetFramework="monoandroid80" />
78+
<package id="Xamarin.Android.Support.Core.Utils" version="25.4.0.2" targetFramework="monoandroid80" />
79+
<package id="Xamarin.Android.Support.Design" version="25.4.0.2" targetFramework="monoandroid80" />
80+
<package id="Xamarin.Android.Support.Fragment" version="25.4.0.2" targetFramework="monoandroid80" />
81+
<package id="Xamarin.Android.Support.Media.Compat" version="25.4.0.2" targetFramework="monoandroid80" />
82+
<package id="Xamarin.Android.Support.Transition" version="25.4.0.2" targetFramework="monoandroid80" />
83+
<package id="Xamarin.Android.Support.v4" version="25.4.0.2" targetFramework="monoandroid80" />
84+
<package id="Xamarin.Android.Support.v7.AppCompat" version="25.4.0.2" targetFramework="monoandroid80" />
85+
<package id="Xamarin.Android.Support.v7.CardView" version="25.4.0.2" targetFramework="monoandroid80" />
86+
<package id="Xamarin.Android.Support.v7.MediaRouter" version="25.4.0.2" targetFramework="monoandroid80" />
87+
<package id="Xamarin.Android.Support.v7.Palette" version="25.4.0.2" targetFramework="monoandroid80" />
88+
<package id="Xamarin.Android.Support.v7.RecyclerView" version="25.4.0.2" targetFramework="monoandroid80" />
89+
<package id="Xamarin.Android.Support.Vector.Drawable" version="25.4.0.2" targetFramework="monoandroid80" />
8290
<package id="Xamarin.FFImageLoading" version="2.2.9" targetFramework="monoandroid60" />
83-
<package id="Xamarin.FFImageLoading.Forms" version="2.2.9" targetFramework="monoandroid60" />
84-
<package id="Xamarin.Forms" version="2.5.0.91635" targetFramework="monoandroid60" />
91+
<package id="Xamarin.FFImageLoading.Forms" version="2.2.9" targetFramework="monoandroid80" />
92+
<package id="Xamarin.Forms" version="2.5.0.91635" targetFramework="monoandroid80" />
8593
</packages>

0 commit comments

Comments
 (0)