layout fixes

avalax · Jan 12, 2018 · 1b11ce8 · 1b11ce8
1 parent 2309abd
commit 1b11ce8
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 24 deletions.
diff --git a/src/main/res/drawable/navigation_colors.xml b/src/main/res/drawable/navigation_colors.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-    <selector xmlns:android="http://schemas.android.com/apk/res/android">
-        <item
-            android:state_enabled="true"
-            android:color="@color/primaryColor" />
-        <item
-            android:state_enabled="false"
-            android:color="@color/primaryDarkColor" />
-    </selector>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/primaryDarkColor" android:state_checked="false" android:state_enabled="true" />
+    <item android:color="@color/statusBarColor" android:state_enabled="false" />
+    <item android:color="@color/primaryLightColor" android:state_checked="true" />
+</selector>
diff --git a/src/main/res/layout/fragment_exercise.xml b/src/main/res/layout/fragment_exercise.xml
@@ -12,22 +12,6 @@
         android:layout_height="?attr/actionBarSize"
         android:theme="@style/AppTheme.ActionBar">
 
-        <TextView
-            android:id="@+id/exercises_bar_previous_exercise_name"
-            style="@style/TextAppearance.AppCompat.Widget.ActionBar.Title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentStart="true"
-            android:layout_centerInParent="true"
-            android:textColor="@color/primaryTextColor" />
-
-        <View
-            android:layout_width="120dp"
-            android:layout_height="wrap_content"
-            android:layout_alignParentStart="true"
-            android:layout_centerInParent="true"
-            android:background="@drawable/gradient_start" />
-
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -52,6 +36,22 @@
 
         </LinearLayout>
 
+        <TextView
+            android:id="@+id/exercises_bar_previous_exercise_name"
+            style="@style/TextAppearance.AppCompat.Widget.ActionBar.Title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentStart="true"
+            android:layout_centerInParent="true"
+            android:textColor="@color/primaryTextColor" />
+
+        <View
+            android:layout_width="120dp"
+            android:layout_height="wrap_content"
+            android:layout_alignParentStart="true"
+            android:layout_centerInParent="true"
+            android:background="@drawable/gradient_start" />
+
         <TextView
             android:id="@+id/exercises_bar_next_exercise_name"
             style="@style/TextAppearance.AppCompat.Widget.ActionBar.Title"