Skip to content

Commit b8d3e2d

Browse files
author
Javier Suárez Ruiz
committed
Changes in CustomTabbedPageRenderer (Droid)
1 parent 6ee3659 commit b8d3e2d

22 files changed

Lines changed: 221 additions & 82 deletions

‎src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Navigation/NavigationService.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ public Task NavigateToAsync(Type viewModelType, object parameter)
5454

5555
public async Task NavigateBackAsync()
5656
{
57-
if (CurrentApplication.MainPage is HomeView)
57+
if (CurrentApplication.MainPage is CatalogView)
5858
{
59-
var mainPage = CurrentApplication.MainPage as HomeView;
59+
var mainPage = CurrentApplication.MainPage as CatalogView;
6060
await mainPage.Navigation.PopAsync();
6161
}
6262
else if (CurrentApplication.MainPage != null)
@@ -148,7 +148,7 @@ protected Page CreateAndBindPage(Type viewModelType, object parameter)
148148
private void CreatePageViewModelMappings()
149149
{
150150
_mappings.Add(typeof(CartViewModel), typeof(CartView));
151-
_mappings.Add(typeof(ProductsViewModel), typeof(HomeView));
151+
_mappings.Add(typeof(CatalogViewModel), typeof(CatalogView));
152152
_mappings.Add(typeof(LoginViewModel), typeof(LoginView));
153153
_mappings.Add(typeof(MainViewModel), typeof(MainView));
154154
_mappings.Add(typeof(OrderDetailViewModel), typeof(OrderDetailView));

‎src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/Base/ViewModelLocator.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ protected ViewModelLocator()
3333

3434
// view models
3535
_unityContainer.RegisterType<CartViewModel>();
36-
_unityContainer.RegisterType<ProductsViewModel>();
36+
_unityContainer.RegisterType<CatalogViewModel>();
3737
_unityContainer.RegisterType<LoginViewModel>();
3838
_unityContainer.RegisterType<MainViewModel>();
3939
_unityContainer.RegisterType<OrderDetailViewModel>();

‎src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CartViewModel.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public Order Order
4141

4242
public override async Task InitializeAsync(object navigationData)
4343
{
44-
MessagingCenter.Subscribe<ProductsViewModel>(this, MessengerKeys.AddProduct, (sender) =>
44+
MessagingCenter.Subscribe<CatalogViewModel>(this, MessengerKeys.AddProduct, (sender) =>
4545
{
4646
BadgeCount++;
4747
});

src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/pRODUCTSViewModel.cs renamed to src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CatalogViewModel.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88

99
namespace eShopOnContainers.Core.ViewModels
1010
{
11-
public class ProductsViewModel : ViewModelBase
11+
public class CatalogViewModel : ViewModelBase
1212
{
1313
private ObservableCollection<CatalogItem> _products;
1414
private CatalogItem _product;
1515

1616
private ICatalogService _productsService;
1717

18-
public ProductsViewModel(ICatalogService productsService)
18+
public CatalogViewModel(ICatalogService productsService)
1919
{
2020
_productsService = productsService;
2121
}

src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/HomeView.xaml renamed to src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/CatalogView.xaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0" encoding="utf-8" ?>
22
<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
33
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
4-
x:Class="eShopOnContainers.Core.Views.HomeView"
4+
x:Class="eShopOnContainers.Core.Views.CatalogView"
55
xmlns:templates="clr-namespace:eShopOnContainers.Core.Views.Templates;assembly=eShopOnContainers.Core"
66
xmlns:views="clr-namespace:eShopOnContainers.Core.Views;assembly=eShopOnContainers.Core"
77
xmlns:animations="clr-namespace:eShopOnContainers.Core.Animations;assembly=eShopOnContainers.Core"
88
xmlns:triggers="clr-namespace:eShopOnContainers.Core.Triggers;assembly=eShopOnContainers.Core"
9-
Title="Products">
9+
Title="Catalog">
1010
<ContentPage.Resources>
1111
<ResourceDictionary>
1212

@@ -68,7 +68,7 @@
6868
NumberOfTapsRequired="1" />
6969
</Grid.GestureRecognizers>
7070
</Grid>
71-
<!-- PRODUCTS -->
71+
<!-- CATALOG -->
7272
<ListView
7373
x:Name="Products"
7474
Grid.Row="1"

src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/HomeView.xaml.cs renamed to src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/CatalogView.xaml.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
namespace eShopOnContainers.Core.Views
66
{
7-
public partial class HomeView : ContentPage, IMenuContainerPage
7+
public partial class CatalogView : ContentPage, IMenuContainerPage
88
{
9-
public HomeView()
9+
public CatalogView()
1010
{
1111
InitializeComponent();
1212

‎src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/MainView.xaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,35 +7,35 @@
77
BarBackgroundColor="{StaticResource DarkGreenColor}"
88
BackgroundColor="{StaticResource BackgroundColor}"
99
Title="eShop on Containers">
10-
<views:HomeView
10+
<views:CatalogView
1111
x:Name="HomeView">
12-
<views:HomeView.Icon>
12+
<views:CatalogView.Icon>
1313
<OnPlatform
1414
x:TypeArguments="FileImageSource"
1515
Android="menu_filter"
1616
iOS="menu_filter"
1717
WinPhone="Assets\menu_filter.png"/>
18-
</views:HomeView.Icon>
19-
</views:HomeView>
18+
</views:CatalogView.Icon>
19+
</views:CatalogView>
2020
<views:ProfileView
2121
x:Name="ProfileView">
22-
<views:HomeView.Icon>
22+
<views:ProfileView.Icon>
2323
<OnPlatform
2424
x:TypeArguments="FileImageSource"
2525
Android="menu_profile"
2626
iOS="menu_profile"
2727
WinPhone="Assets\menu_profile.png"/>
28-
</views:HomeView.Icon>
28+
</views:ProfileView.Icon>
2929
</views:ProfileView>
3030
<views:CartView
3131
x:Name="CartView"
3232
controls:CustomTabbedPage.BadgeText="{Binding BadgeCount}">
33-
<views:HomeView.Icon>
33+
<views:CartView.Icon>
3434
<OnPlatform
3535
x:TypeArguments="FileImageSource"
3636
Android="menu_cart"
3737
iOS="menu_cart"
3838
WinPhone="Assets\menu_cart.png"/>
39-
</views:HomeView.Icon>
39+
</views:CartView.Icon>
4040
</views:CartView>
4141
</TabbedPage>

‎src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/MainView.xaml.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ protected override async void OnAppearing()
1515
{
1616
base.OnAppearing();
1717

18-
var homeViewModel = ViewModelLocator.Instance.Resolve<ProductsViewModel>();
18+
var homeViewModel = ViewModelLocator.Instance.Resolve<CatalogViewModel>();
1919
await homeViewModel.InitializeAsync(null);
2020
HomeView.BindingContext = homeViewModel;
2121

‎src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
<Compile Include="ViewModels\Base\ViewModelBase.cs" />
7777
<Compile Include="ViewModels\Base\ViewModelLocator.cs" />
7878
<Compile Include="ViewModels\CartViewModel.cs" />
79-
<Compile Include="ViewModels\ProductsViewModel.cs" />
79+
<Compile Include="ViewModels\CatalogViewModel.cs" />
8080
<Compile Include="ViewModels\LoginViewModel.cs" />
8181
<Compile Include="ViewModels\MainViewModel.cs" />
8282
<Compile Include="ViewModels\OrderDetailViewModel.cs" />
@@ -90,8 +90,8 @@
9090
<Compile Include="Views\FiltersView.xaml.cs">
9191
<DependentUpon>FiltersView.xaml</DependentUpon>
9292
</Compile>
93-
<Compile Include="Views\HomeView.xaml.cs">
94-
<DependentUpon>HomeView.xaml</DependentUpon>
93+
<Compile Include="Views\CatalogView.xaml.cs">
94+
<DependentUpon>CatalogView.xaml</DependentUpon>
9595
</Compile>
9696
<Compile Include="Views\LoginView.xaml.cs">
9797
<DependentUpon>LoginView.xaml</DependentUpon>
@@ -190,7 +190,7 @@
190190
<None Include="packages.config" />
191191
</ItemGroup>
192192
<ItemGroup>
193-
<EmbeddedResource Include="Views\HomeView.xaml">
193+
<EmbeddedResource Include="Views\CatalogView.xaml">
194194
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
195195
<SubType>Designer</SubType>
196196
</EmbeddedResource>

‎src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Activities/MainActivity.cs‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
21
using Android.App;
32
using Android.OS;
43
using Android.Content.PM;
54
using Android.Views;
5+
using Xamarin.Forms.Platform.Android;
66

77
namespace eShopOnContainers.Droid.Activities
88
{
@@ -12,15 +12,20 @@ namespace eShopOnContainers.Droid.Activities
1212
Theme = "@style/MainTheme",
1313
MainLauncher = true,
1414
ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
15-
public class MainActivity : global::Xamarin.Forms.Platform.Android.FormsAppCompatActivity
15+
public class MainActivity : FormsAppCompatActivity
1616
{
1717
protected override void OnCreate(Bundle bundle)
1818
{
19-
TabLayoutResource = Resource.Layout.Tabbar;
20-
ToolbarResource = Resource.Layout.Toolbar;
19+
FormsAppCompatActivity.ToolbarResource = Resource.Layout.Toolbar;
20+
FormsAppCompatActivity.TabLayoutResource = Resource.Layout.Tabs;
2121

2222
base.OnCreate(bundle);
2323

24+
SupportActionBar.SetDisplayShowHomeEnabled(true); // Show or hide the default home button
25+
SupportActionBar.SetDisplayHomeAsUpEnabled(true);
26+
SupportActionBar.SetDisplayShowCustomEnabled(true); // Enable overriding the default toolbar layout
27+
SupportActionBar.SetDisplayShowTitleEnabled(false);
28+
2429
global::Xamarin.Forms.Forms.Init(this, bundle);
2530
LoadApplication(new App());
2631

0 commit comments

Comments
 (0)