Merge branch 'not_working2' into random_but_working

develop
LEdoian 4 years ago
commit 74608c6502

@ -2,6 +2,5 @@
<configuration> <configuration>
<packageSources> <packageSources>
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" /> <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
<add key="Local (Sundew)" value="C:\Users\Me\AppData\Local\Sundew.Packaging.Publish.m\packages" />
</packageSources> </packageSources>
</configuration> </configuration>

@ -113,6 +113,9 @@
<Folder Include="Resources\drawable\" /> <Folder Include="Resources\drawable\" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Xamarin.Android.Support.Design">
<Version>28.0.0.3</Version>
</PackageReference>
<PackageReference Include="Xamarin.Android.Support.v7.AppCompat"> <PackageReference Include="Xamarin.Android.Support.v7.AppCompat">
<Version>28.0.0.3</Version> <Version>28.0.0.3</Version>
</PackageReference> </PackageReference>

File diff suppressed because it is too large Load Diff

@ -13,19 +13,24 @@
android:layout_height="@dimen/abc_action_bar_content_inset_with_nav"> android:layout_height="@dimen/abc_action_bar_content_inset_with_nav">
--> -->
<!-- TODO: Use Coordinator layout --> <!-- TODO: Use Coordinator layout -->
<CoordinatorLayout <android.support.design.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_height="wrap_content" xmlns:tools="http://schemas.android.com/tools"
android:layout_height="fill_parent"
android:layout_width="fill_parent" android:layout_width="fill_parent"
> >
<android.support.design.widget.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
>
<android.support.v7.widget.Toolbar <android.support.v7.widget.Toolbar
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:id="@+id/toolbar" android:id="@+id/toolbar"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
> >
<!-- <LinearLayout <LinearLayout
android:orientation="vertical" android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
@ -44,10 +49,9 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/playerNameText" /> android:id="@+id/playerNameText" />
</LinearLayout> </LinearLayout>
-->
</android.support.v7.widget.Toolbar> </android.support.v7.widget.Toolbar>
<!-- </android.support.design.widget.AppBarLayout> </android.support.design.widget.AppBarLayout>
-->
<include layout="@layout/content_main" /> <include layout="@layout/content_main" />
<!--<LinearLayout <!--<LinearLayout
@ -58,7 +62,4 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:id="@+id/linearLayout1" /> android:id="@+id/linearLayout1" />
--> -->
</CoordinatorLayout> </android.support.design.widget.CoordinatorLayout>
<!--
</android.support.design.widget.CoordinatorLayout>
-->
Loading…
Cancel
Save