unoplatform
/
Uno.MvvmCross
зеркало из https://github.com/unoplatform/Uno.MvvmCross.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge pull request #2852 from tbalcom/2736 

Fixes #2736
This commit is contained in:
Martijn van Dijk 2018-05-07 14:02:47 +02:00 коммит произвёл GitHub
Родитель 59809878c6 7e2da5d222
Коммит 1fd979f9ab
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
6 изменённых файлов: 110 добавлений и 66 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
Projects/Playground/Playground.Droid/Playground.Droid.csproj
Просмотреть файл

@ -58,6 +58,7 @@
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="SplashScreen.cs" />
<Compile Include="Setup.cs" />
<Compile Include="Views\Base\BaseSplitDetailView.cs" />
<Compile Include="Views\CollectionView.cs" />
<Compile Include="Views\DictionaryBindingView.cs" />
<Compile Include="Views\RootView.cs" />
@ -109,6 +110,9 @@
<AndroidResource Include="Resources\layout\ItemListSharedElementsTemplate.axml">
<SubType>Designer</SubType>
</AndroidResource>
<AndroidResource Include="Resources\layout\SplitDetailNavView.axml">
<SubType>Designer</SubType>
</AndroidResource>
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\layout\RootView.axml">

34
Projects/Playground/Playground.Droid/Resources/layout/SplitDetailNavView.axml Normal file
Просмотреть файл

@ -0,0 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:local="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#880000">
<android.support.design.widget.AppBarLayout
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
local:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
</android.support.design.widget.AppBarLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="I'm a detail navigation page" />
<Button
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:text="Main Menu"
local:MvxBind="Click MainMenuCommand" />
<Button
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:text="Close"
local:MvxBind="Click CloseCommand" />
</LinearLayout>

1
Projects/Playground/Playground.Droid/Resources/values/styles.xml
Просмотреть файл

@ -35,5 +35,6 @@
parent="AppTheme.Base">
<item name="android:statusBarColor">@color/colorPrimaryDark</item>
<item name="android:windowNoTitle">true</item>
<item name="android:windowBackground">@color/colorAccent</item>
</style>
</resources>

64
Projects/Playground/Playground.Droid/Views/Base/BaseSplitDetailView.cs Normal file
Просмотреть файл

@ -0,0 +1,64 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MS-PL license.
// See the LICENSE file in the project root for more information.
using Android.Content.Res;
using Android.OS;
using Android.Support.V7.Widget;
using Android.Views;
using MvvmCross.Droid.Support.V4;
using MvvmCross.Droid.Support.V7.AppCompat;
using MvvmCross.Platforms.Android.Binding.BindingContext;
using MvvmCross.ViewModels;
namespace Playground.Droid.Views.Base
{
public abstract class BaseSplitDetailView<TViewModel> : MvxFragment<TViewModel> where TViewModel : class, IMvxViewModel
{
protected SplitRootView BaseActivity => (SplitRootView)Activity;
protected Toolbar _toolbar;
protected MvxActionBarDrawerToggle _drawerToggle;
protected abstract int FragmentLayoutId { get; }
public override View OnCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
{
base.OnCreateView(inflater, container, savedInstanceState);
var view = this.BindingInflate(FragmentLayoutId, null);
_toolbar = view.FindViewById<Toolbar>(Resource.Id.toolbar);
if (_toolbar != null)
{
BaseActivity.SetSupportActionBar(_toolbar);
BaseActivity.SupportActionBar.SetDisplayHomeAsUpEnabled(true);
_drawerToggle = new MvxActionBarDrawerToggle(
Activity, // host Activity
BaseActivity.DrawerLayout, // DrawerLayout object
_toolbar, // nav drawer icon to replace 'Up' caret
Resource.String.drawer_open, // "open drawer" description
Resource.String.drawer_close // "close drawer" description
);
BaseActivity.DrawerLayout.AddDrawerListener(_drawerToggle);
_drawerToggle.DrawerIndicatorEnabled = true;
}
return view;
}
public override void OnConfigurationChanged(Configuration newConfig)
{
base.OnConfigurationChanged(newConfig);
if (_toolbar != null)
_drawerToggle.OnConfigurationChanged(newConfig);
}
public override void OnActivityCreated(Bundle savedInstanceState)
{
base.OnActivityCreated(savedInstanceState);
if (_toolbar != null)
_drawerToggle.SyncState();
}
}
}

18
Projects/Playground/Playground.Droid/Views/SplitDetailNavView.cs
Просмотреть файл

@ -2,27 +2,17 @@
// The .NET Foundation licenses this file to you under the MS-PL license.
// See the LICENSE file in the project root for more information.
using Android.OS;
using Android.Runtime;
using Android.Views;
using MvvmCross.Droid.Support.V4;
using MvvmCross.Platforms.Android.Binding.BindingContext;
using MvvmCross.Platforms.Android.Presenters.Attributes;
using Playground.Core.ViewModels;
using Playground.Droid.Views.Base;
namespace Playground.Droid.Views
{
[MvxFragmentPresentation(typeof(SplitRootViewModel), Resource.Id.split_content_frame)]
[MvxFragmentPresentation(typeof(SplitRootViewModel), Resource.Id.split_content_frame, AddToBackStack = true)]
[Register(nameof(SplitDetailNavView))]
public class SplitDetailNavView : MvxFragment<SplitDetailNavViewModel>
public class SplitDetailNavView : BaseSplitDetailView<SplitDetailNavViewModel>
{
public override View OnCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
{
base.OnCreateView(inflater, container, savedInstanceState);
var view = this.BindingInflate(Resource.Layout.SplitDetailView, null);
return view;
}
protected override int FragmentLayoutId => Resource.Layout.SplitDetailNavView;
}
}

55
Projects/Playground/Playground.Droid/Views/SplitDetailView.cs
Просмотреть файл

@ -2,66 +2,17 @@
// The .NET Foundation licenses this file to you under the MS-PL license.
// See the LICENSE file in the project root for more information.
using Android.Content.Res;
using Android.OS;
using Android.Runtime;
using Android.Support.V7.Widget;
using Android.Views;
using MvvmCross.Droid.Support.V4;
using MvvmCross.Droid.Support.V7.AppCompat;
using MvvmCross.Platforms.Android.Binding.BindingContext;
using MvvmCross.Platforms.Android.Presenters.Attributes;
using Playground.Core.ViewModels;
using Playground.Droid.Views.Base;
namespace Playground.Droid.Views
{
[MvxFragmentPresentation(typeof(SplitRootViewModel), Resource.Id.split_content_frame)]
[Register(nameof(SplitDetailView))]
public class SplitDetailView : MvxFragment<SplitDetailViewModel>
public class SplitDetailView : BaseSplitDetailView<SplitDetailViewModel>
{
public SplitRootView BaseActivity => (SplitRootView)Activity;
private Toolbar _toolbar;
private MvxActionBarDrawerToggle _drawerToggle;
public override View OnCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
{
base.OnCreateView(inflater, container, savedInstanceState);
var view = this.BindingInflate(Resource.Layout.SplitDetailView, null);
_toolbar = view.FindViewById<Toolbar>(Resource.Id.toolbar);
if (_toolbar != null)
{
BaseActivity.SetSupportActionBar(_toolbar);
BaseActivity.SupportActionBar.SetDisplayHomeAsUpEnabled(true);
_drawerToggle = new MvxActionBarDrawerToggle(
Activity, // host Activity
BaseActivity.DrawerLayout, // DrawerLayout object
_toolbar, // nav drawer icon to replace 'Up' caret
Resource.String.drawer_open, // "open drawer" description
Resource.String.drawer_close // "close drawer" description
);
BaseActivity.DrawerLayout.AddDrawerListener(_drawerToggle);
_drawerToggle.DrawerIndicatorEnabled = true;
}
return view;
}
public override void OnConfigurationChanged(Configuration newConfig)
{
base.OnConfigurationChanged(newConfig);
if (_toolbar != null)
_drawerToggle.OnConfigurationChanged(newConfig);
}
public override void OnActivityCreated(Bundle savedInstanceState)
{
base.OnActivityCreated(savedInstanceState);
if (_toolbar != null)
_drawerToggle.SyncState();
}
protected override int FragmentLayoutId => Resource.Layout.SplitDetailView;
}
}