Style changes

This commit is contained in:
serso
2016-03-19 18:33:20 +01:00
parent b9432db42a
commit 9f542099fd
21 changed files with 130 additions and 182 deletions

View File

@@ -40,22 +40,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
style="?cpp_toolbar_style"
android:layout_width="match_parent"
android:layout_height="?actionBarSize"
app:layout_scrollFlags="scroll|enterAlways" />
<android.support.design.widget.TabLayout
android:id="@+id/tabs"
style="?cpp_toolbar_style"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:overScrollMode="never"
app:tabGravity="fill"
app:tabMaxWidth="0dp"
app:tabMode="fixed" />
<include layout="@layout/activity_tabs_tablayout"/>
</android.support.design.widget.AppBarLayout>

View File

@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<merge xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
style="?cpp_toolbar_style"
android:layout_width="match_parent"
android:layout_height="?actionBarSize"
app:layout_scrollFlags="scroll|snap" />
<android.support.design.widget.TabLayout
android:id="@+id/tabs"
style="?cpp_toolbar_style"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:overScrollMode="never"
app:tabGravity="fill"
app:tabMaxWidth="0dp"
app:tabMode="fixed" />
</merge>

View File

@@ -53,7 +53,7 @@
a:layout_width="wrap_content"
a:layout_height="wrap_content"
a:layout_marginBottom="10dp"
a:background="?attr/cpp_main_bg"
a:background="?attr/cpp_editor_bg"
a:padding="3dp">
<org.solovyev.android.views.dragbutton.DirectionDragButton

View File

@@ -26,7 +26,7 @@
xmlns:tools="http://schemas.android.com/tools"
a:layout_width="wrap_content"
a:layout_height="wrap_content"
a:background="?attr/cpp_main_bg"
a:background="?attr/cpp_editor_bg"
a:minWidth="200dp"
a:orientation="vertical"
a:padding="3dp"