Merge pull request #519 from jjoseba/issue-421

Fixing new design problems (#421)
DigitalCampus · Mar 8, 2016 · 26881d1 · 26881d1
2 parents 964066f + dde2c90
commit 26881d1
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 3 deletions.
diff --git a/res/drawable-xhdpi/drawer_header.png b/res/drawable-xhdpi/drawer_header.png
diff --git a/res/layout/activity_about.xml b/res/layout/activity_about.xml
@@ -24,6 +24,7 @@
         <android.support.design.widget.TabLayout
             android:id="@+id/tabs_toolbar"
             android:layout_width="match_parent"
+            app:tabMaxWidth="0dp"
             android:background="@color/highlight_label"
             android:layout_height="wrap_content"
             style="@style/Oppia.ToolbarTheme.AppTabLayout"

diff --git a/res/layout/activity_scorecard.xml b/res/layout/activity_scorecard.xml
@@ -26,8 +26,10 @@
             android:layout_width="match_parent"
             android:background="@color/highlight_label"
             android:layout_height="wrap_content"
+            app:tabMaxWidth="0dp"
             style="@style/Oppia.ToolbarTheme.AppTabLayout"
             app:tabGravity="fill"
+            app:tabMode="fixed"
             android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"/>
     </android.support.design.widget.AppBarLayout>
 

diff --git a/res/layout/tablayout_fixed_tab.xml b/res/layout/tablayout_fixed_tab.xml
@@ -4,7 +4,7 @@
               android:layout_width="wrap_content"
               android:layout_height="match_parent">
     <TextView
-        android:layout_width="130dp"
+        android:layout_width="@dimen/toolbar_tab_width"
         android:layout_height="match_parent"
         style="@style/Oppia.ToolbarTheme.AppTabTextAppearance"
         android:id="@+id/tabTitle"

diff --git a/res/values/dimens.xml b/res/values/dimens.xml
@@ -15,5 +15,6 @@
     <dimen name="domain_tick_label_font_size">15dp</dimen>
     <dimen name="legend_text_font_size">20dp</dimen>
     <dimen name="tool_bar_top_padding">0dp</dimen>
+    <dimen name="toolbar_tab_width">130dp</dimen>
 
 </resources>
diff --git a/res/values/styles_oppia.xml b/res/values/styles_oppia.xml
@@ -144,8 +144,7 @@
     </style>
 
     <style name="Oppia.ToolbarTheme.AppTabLayout" parent="Widget.Design.TabLayout">
-        <item name="tabMaxWidth">100dp</item>
-        <item name="tabMinWidth">60dp</item>
+        <item name="tabMinWidth">@dimen/toolbar_tab_width</item>
         <item name="tabIndicatorColor">@color/highlight_mid</item>
         <item name="tabIndicatorHeight">5dp</item>
         <item name="tabPaddingStart">6dp</item>