From dafd4389825a06a3d0f48a00ba335d6456cd9aab Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Sat, 18 Apr 2015 03:57:37 +0000
Subject: [PATCH] Common style for pager indicators

---
 .../layout/container_addressbook_onepane.xml  |  9 ++-----
 .../layout/container_addressbook_twopane.xml  | 10 +++-----
 .../res/layout/container_tunnels_twopane.xml  |  8 +-----
 .../res/layout/container_with_add_onepane.xml |  7 +-----
 app/src/main/res/values/colors.xml            |  4 +++
 app/src/main/res/values/dimens.xml            |  5 ++++
 app/src/main/res/values/styles.xml            | 25 +++++++++++++++++++
 7 files changed, 42 insertions(+), 26 deletions(-)

diff --git a/app/src/main/res/layout/container_addressbook_onepane.xml b/app/src/main/res/layout/container_addressbook_onepane.xml
index 6aa9d9653..9afe8d53e 100644
--- a/app/src/main/res/layout/container_addressbook_onepane.xml
+++ b/app/src/main/res/layout/container_addressbook_onepane.xml
@@ -7,18 +7,13 @@
 
     <com.viewpagerindicator.TitlePageIndicator
         android:id="@+id/page_indicator"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textColor="@color/primary_text_disabled_material_dark"
-        app:footerColor="@color/primary"
-        app:selectedBold="false"
-        app:selectedColor="@color/primary_text_default_material_dark" />
+        style="@style/PagerIndicator" />
 
     <!-- The main content view -->
     <android.support.v4.view.ViewPager
         android:id="@+id/pager"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_weight="1"/>
+        android:layout_weight="1" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/container_addressbook_twopane.xml b/app/src/main/res/layout/container_addressbook_twopane.xml
index 9345112d1..ba431fac0 100644
--- a/app/src/main/res/layout/container_addressbook_twopane.xml
+++ b/app/src/main/res/layout/container_addressbook_twopane.xml
@@ -12,11 +12,10 @@
         android:orientation="vertical">
 
         <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            style="@style/PagerIndicator.FixedTextView"
             android:text="@string/label_router" />
 
-        <View style="@style/Divider.Horizontal" />
+        <View style="@style/PagerIndicator.FixedFooter" />
 
         <FrameLayout
             android:id="@+id/left_fragment"
@@ -31,11 +30,10 @@
         android:orientation="vertical">
 
         <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            style="@style/PagerIndicator.FixedTextView"
             android:text="@string/label_private" />
 
-        <View style="@style/Divider.Horizontal" />
+        <View style="@style/PagerIndicator.FixedFooter" />
 
         <FrameLayout
             android:id="@+id/right_fragment"
diff --git a/app/src/main/res/layout/container_tunnels_twopane.xml b/app/src/main/res/layout/container_tunnels_twopane.xml
index 4ef7986b4..9765a24ee 100644
--- a/app/src/main/res/layout/container_tunnels_twopane.xml
+++ b/app/src/main/res/layout/container_tunnels_twopane.xml
@@ -27,13 +27,7 @@
 
             <com.viewpagerindicator.TitlePageIndicator
                 android:id="@+id/page_indicator"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="top"
-                android:textColor="@color/primary_text_disabled_material_dark"
-                app:footerColor="@color/primary"
-                app:selectedBold="false"
-                app:selectedColor="@color/primary_text_default_material_dark" />
+                style="@style/PagerIndicator" />
 
             <android.support.v4.view.ViewPager
                 android:id="@+id/pager"
diff --git a/app/src/main/res/layout/container_with_add_onepane.xml b/app/src/main/res/layout/container_with_add_onepane.xml
index 7a69348e4..3dc1e64af 100644
--- a/app/src/main/res/layout/container_with_add_onepane.xml
+++ b/app/src/main/res/layout/container_with_add_onepane.xml
@@ -6,12 +6,7 @@
 
     <com.viewpagerindicator.TitlePageIndicator
         android:id="@+id/page_indicator"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textColor="@color/primary_text_disabled_material_dark"
-        app:footerColor="@color/primary"
-        app:selectedBold="false"
-        app:selectedColor="@color/primary_text_default_material_dark" />
+        style="@style/PagerIndicator" />
 
     <!-- The main content view -->
     <android.support.v4.view.ViewPager
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index c1492c937..511aeacab 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -11,6 +11,10 @@
     <color name="menu_label_background">#b2000000</color>
     <color name="menu_label_text">#fafafa</color>
 
+    <color name="pager_indicator_footer_color">@color/primary</color>
+    <color name="pager_indicator_selected_color">@color/primary_text_default_material_dark</color>
+    <color name="pager_indicator_text_color">@color/primary_text_disabled_material_dark</color>
+
     <color name="step_pager_previous_tab_color">#4433b5e5</color>
     <color name="step_pager_selected_tab_color">#ff0099cc</color>
     <color name="step_pager_selected_last_tab_color">#ff669900</color>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index b3c7b228b..f40f0a012 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -9,6 +9,11 @@
     <dimen name="text_size_primary">16sp</dimen>
     <dimen name="text_size_secondary">14sp</dimen>
 
+    <dimen name="pager_indicator_footer_line_height">2dp</dimen>
+    <dimen name="pager_indicator_footer_padding">7dp</dimen>
+    <dimen name="pager_indicator_text_size">15dp</dimen>
+    <dimen name="pager_indicator_top_padding">7dp</dimen>
+
     <dimen name="list_vertical_padding">8dp</dimen>
     <dimen name="listitem_horizontal_margin">16dp</dimen>
     <dimen name="listitem_picture_size">40dp</dimen>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 37135fcf0..04572d613 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -73,6 +73,31 @@
         <item name="android:textColor">@color/menu_label_text</item>
     </style>
 
+    <style name="Base.PagerIndicator">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textSize">@dimen/pager_indicator_text_size</item>
+    </style>
+
+    <style name="PagerIndicator" parent="Base.PagerIndicator">
+        <item name="android:textColor">@color/pager_indicator_text_color</item>
+        <item name="footerColor">@color/pager_indicator_footer_color</item>
+        <item name="selectedBold">false</item>
+        <item name="selectedColor">@color/pager_indicator_selected_color</item>
+    </style>
+
+    <style name="PagerIndicator.FixedTextView" parent="Base.PagerIndicator">
+        <item name="android:layout_marginBottom">@dimen/pager_indicator_footer_padding</item>
+        <item name="android:layout_marginTop">@dimen/pager_indicator_top_padding</item>
+        <item name="android:gravity">center</item>
+        <item name="android:textColor">@color/pager_indicator_selected_color</item>
+    </style>
+
+    <style name="PagerIndicator.FixedFooter" parent="Base.PagerIndicator">
+        <item name="android:layout_height">@dimen/pager_indicator_footer_line_height</item>
+        <item name="android:background">@color/pager_indicator_footer_color</item>
+    </style>
+
     <style name="WizardPageContainer">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">match_parent</item>