Merge branch 'user-stylable-title' into develop

DavidHamm · Jul 11, 2015 · 11aa251 · 11aa251
2 parents 98b8552 + 98f8cb6
commit 11aa251
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 27 deletions.
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-	<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar"/>
+	<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+		<item name="WizardPageTitle">@style/WizardPageTitle.Teal</item>
+	</style>
+
+	<style name="WizardPageTitle.Teal">
+		<item name="android:textColor">#00796B</item>
+	</style>
 </resources>
diff --git a/lib/src/main/res/layout/fragment_integer_page.xml b/lib/src/main/res/layout/fragment_integer_page.xml
@@ -1,12 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout
-	style="@style/WizardPageContainer"
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
 	tools:context="com.hammwerk.wizardpager.SingleFixedChoicePageFragment">
 
 	<TextView
-		style="@style/WizardPageTitle"
+		android:id="@android:id/title"
+		style="?attr/WizardPageTitle"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_margin="16dp"
+		android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
+		android:paddingRight="?android:attr/listPreferredItemPaddingLeft"
 		tools:text="Title"/>
 
 	<EditText

diff --git a/lib/src/main/res/layout/fragment_multi_fixed_choice_page.xml b/lib/src/main/res/layout/fragment_multi_fixed_choice_page.xml
@@ -1,12 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
-	style="@style/WizardPageContainer"
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:orientation="vertical"
 	tools:context="com.hammwerk.wizardpager.MultiFixedChoicePageFragment">
 
 	<TextView
-		style="@style/WizardPageTitle"
+		android:id="@android:id/title"
+		style="?attr/WizardPageTitle"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_margin="16dp"
+		android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
+		android:paddingRight="?android:attr/listPreferredItemPaddingLeft"
 		tools:text="Title"/>
 
 	<ListView

diff --git a/lib/src/main/res/layout/fragment_single_fixed_choice_branch_page.xml b/lib/src/main/res/layout/fragment_single_fixed_choice_branch_page.xml
@@ -1,12 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
-	style="@style/WizardPageContainer"
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:orientation="vertical"
 	tools:context="com.hammwerk.wizardpager.SingleFixedChoiceBranchPageFragment">
 
 	<TextView
-		style="@style/WizardPageTitle"
+		android:id="@android:id/title"
+		style="?attr/WizardPageTitle"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_margin="16dp"
+		android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
+		android:paddingRight="?android:attr/listPreferredItemPaddingLeft"
 		tools:text="Title"/>
 
 	<ListView

diff --git a/lib/src/main/res/layout/fragment_single_fixed_choice_page.xml b/lib/src/main/res/layout/fragment_single_fixed_choice_page.xml
@@ -1,12 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
-	style="@style/WizardPageContainer"
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:orientation="vertical"
 	tools:context="com.hammwerk.wizardpager.SingleFixedChoicePageFragment">
 
 	<TextView
-		style="@style/WizardPageTitle"
+		android:id="@android:id/title"
+		style="?attr/WizardPageTitle"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_margin="16dp"
+		android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
+		android:paddingRight="?android:attr/listPreferredItemPaddingLeft"
 		tools:text="Title"/>
 
 	<ListView

diff --git a/lib/src/main/res/values-v16/styles.xml b/lib/src/main/res/values-v16/styles.xml
@@ -2,13 +2,8 @@
 <resources>
 
 	<style name="WizardPageTitle">
-		<item name="android:id">@android:id/title</item>
-		<item name="android:layout_width">match_parent</item>
-		<item name="android:layout_height">wrap_content</item>
-		<item name="android:layout_margin">16dp</item>
-		<item name="android:paddingLeft">?android:attr/listPreferredItemPaddingLeft</item>
 		<item name="android:textSize">36sp</item>
-		<item name="android:textColor">#ff0099cc</item>
+		<item name="android:textColor">#2196F3</item>
 		<item name="android:fontFamily">sans-serif-thin</item>
 	</style>
 </resources>
diff --git a/lib/src/main/res/values/attrs.xml b/lib/src/main/res/values/attrs.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+	<attr name="WizardPageTitle" format="reference"/>
+</resources>
diff --git a/lib/src/main/res/values/styles.xml b/lib/src/main/res/values/styles.xml
@@ -3,19 +3,8 @@
 
 	<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar"/>
 
-	<style name="WizardPageContainer">
-		<item name="android:layout_width">match_parent</item>
-		<item name="android:layout_height">match_parent</item>
-		<item name="android:orientation">vertical</item>
-	</style>
-
 	<style name="WizardPageTitle">
-		<item name="android:id">@android:id/title</item>
-		<item name="android:layout_width">match_parent</item>
-		<item name="android:layout_height">wrap_content</item>
-		<item name="android:layout_margin">16dp</item>
-		<item name="android:paddingLeft">?android:attr/listPreferredItemPaddingLeft</item>
 		<item name="android:textSize">36sp</item>
-		<item name="android:textColor">#ff0099cc</item>
+		<item name="android:textColor">#1976D2</item>
 	</style>
 </resources>