|
|
@ -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>
|
|
|
|
|
|
|
|
-->
|
|
|
|
|