From 335c4157ff1a00a2db12ecee6487bab2e7f67311 Mon Sep 17 00:00:00 2001
From: Alex Zolotarev <alex@maps.me>
Date: Mon, 18 Jan 2016 14:52:28 +0300
Subject: [PATCH] [android] Rebase compilation fixes. @TODO yunikk

---
 android/res/color/color_timepicker_tab.xml       | 10 +++++-----
 android/res/color/timepicker_title.xml           | 10 +++++-----
 .../res/color/timetable_add_complement_text.xml  |  4 ++--
 .../res/drawable/timetable_add_complement.xml    | 10 +++++-----
 android/res/layout/fragment_timetable.xml        |  8 ++++----
 .../res/layout/fragment_timetable_advanced.xml   |  8 ++++----
 android/res/layout/fragment_timetable_picker.xml |  2 +-
 android/res/layout/item_timetable.xml            | 16 ++++++++--------
 .../res/layout/item_timetable_closed_hours.xml   |  4 ++--
 android/res/layout/place_page_editor.xml         |  2 +-
 android/res/layout/tab.xml                       |  2 +-
 android/res/layout/tab_timepicker.xml            |  2 +-
 android/res/values/styles-text.xml               |  1 -
 android/res/values/styles.xml                    |  3 ---
 android/res/values/themes.xml                    |  3 ---
 15 files changed, 39 insertions(+), 46 deletions(-)

diff --git a/android/res/color/color_timepicker_tab.xml b/android/res/color/color_timepicker_tab.xml
index 99ec5ba9ba..ae9a2de678 100644
--- a/android/res/color/color_timepicker_tab.xml
+++ b/android/res/color/color_timepicker_tab.xml
@@ -2,10 +2,10 @@
 <selector
   xmlns:android="http://schemas.android.com/apk/res/android">
 
-  <item
-    android:color="@color/base_blue_light"
-    android:state_selected="true"/>
+  <!--<item-->
+    <!--android:color="@color/base_blue_light"-->
+    <!--android:state_selected="true"/>-->
 
-  <item
-    android:color="@color/text_dark_subtitle"/>
+  <!--<item-->
+    <!--android:color="@color/text_dark_subtitle"/>-->
 </selector>
\ No newline at end of file
diff --git a/android/res/color/timepicker_title.xml b/android/res/color/timepicker_title.xml
index f6289d9321..dc683baefe 100644
--- a/android/res/color/timepicker_title.xml
+++ b/android/res/color/timepicker_title.xml
@@ -2,10 +2,10 @@
 <selector
   xmlns:android="http://schemas.android.com/apk/res/android">
 
-  <item
-    android:color="@color/base_blue_light"
-    android:state_selected="true"/>
+  <!--<item-->
+    <!--android:color="@color/base_blue_light"-->
+    <!--android:state_selected="true"/>-->
 
-  <item
-    android:color="@color/base_blue_lightest"/>
+  <!--<item-->
+    <!--android:color="@color/base_blue_lightest"/>-->
 </selector>
\ No newline at end of file
diff --git a/android/res/color/timetable_add_complement_text.xml b/android/res/color/timetable_add_complement_text.xml
index 3c35f35008..58b7d3471f 100644
--- a/android/res/color/timetable_add_complement_text.xml
+++ b/android/res/color/timetable_add_complement_text.xml
@@ -6,6 +6,6 @@
     android:color="@android:color/white"
     android:state_enabled="true"/>
 
-  <item
-    android:color="@color/editor_complement_text_disabled"/>
+  <!--<item-->
+    <!--android:color="@color/editor_complement_text_disabled"/>-->
 </selector>
\ No newline at end of file
diff --git a/android/res/drawable/timetable_add_complement.xml b/android/res/drawable/timetable_add_complement.xml
index 0aff36ff7a..491062fdf6 100644
--- a/android/res/drawable/timetable_add_complement.xml
+++ b/android/res/drawable/timetable_add_complement.xml
@@ -2,10 +2,10 @@
 <selector
   xmlns:android="http://schemas.android.com/apk/res/android">
 
-  <item
-    android:drawable="@color/base_blue_light"
-    android:state_enabled="true"/>
+  <!--<item-->
+    <!--android:drawable="@color/base_blue_light"-->
+    <!--android:state_enabled="true"/>-->
 
-  <item
-    android:drawable="@color/editor_complement_disabled"/>
+  <!--<item-->
+    <!--android:drawable="@color/editor_complement_disabled"/>-->
 </selector>
\ No newline at end of file
diff --git a/android/res/layout/fragment_timetable.xml b/android/res/layout/fragment_timetable.xml
index 5ed0db3495..1a04d51c7d 100644
--- a/android/res/layout/fragment_timetable.xml
+++ b/android/res/layout/fragment_timetable.xml
@@ -30,8 +30,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_above="@+id/tv__mode_switch"
-    android:layout_below="@id/toolbar"
-    android:background="@color/editor_background"/>
+    android:layout_below="@id/toolbar"/>
+    <!--android:background="@color/editor_background"/>-->
 
   <TextView
     android:id="@+id/tv__mode_switch"
@@ -43,8 +43,8 @@
     android:padding="@dimen/margin_base"
     android:text="@string/editor_time_advanced"
     android:textAllCaps="true"
-    android:textAppearance="@style/MwmTextAppearance.Body3"
-    android:textColor="@color/base_blue_light"/>
+    android:textAppearance="@style/MwmTextAppearance.Body3"/>
+    <!--android:textColor="@color/base_blue_light"/>-->
 
   <include
     layout="@layout/shadow_bottom"
diff --git a/android/res/layout/fragment_timetable_advanced.xml b/android/res/layout/fragment_timetable_advanced.xml
index be493889d7..ff6cf02ef9 100644
--- a/android/res/layout/fragment_timetable_advanced.xml
+++ b/android/res/layout/fragment_timetable_advanced.xml
@@ -61,8 +61,8 @@
           android:gravity="center_vertical"
           android:padding="@dimen/margin_base"
           android:text="Example values"
-          android:textAppearance="@style/MwmTextAppearance.Body3"
-          android:textColor="@color/base_blue_light"/>
+          android:textAppearance="@style/MwmTextAppearance.Body3"/>
+          <!--android:textColor="@color/base_blue_light"/>-->
 
         <ImageView
           android:id="@+id/iv__indicator"
@@ -77,8 +77,8 @@
         <View
           android:layout_width="match_parent"
           android:layout_height="1dp"
-          android:layout_below="@id/tv__examples_title"
-          android:background="@color/divider_standard"/>
+          android:layout_below="@id/tv__examples_title"/>
+          <!--android:background="@color/divider_standard"/>-->
 
         <TextView
           android:id="@+id/tv__examples"
diff --git a/android/res/layout/fragment_timetable_picker.xml b/android/res/layout/fragment_timetable_picker.xml
index d5a4852704..f591448a7f 100644
--- a/android/res/layout/fragment_timetable_picker.xml
+++ b/android/res/layout/fragment_timetable_picker.xml
@@ -14,9 +14,9 @@
     android:elevation="@dimen/appbar_elevation"
     android:background="@android:color/white"
     app:tabGravity="fill"
-    app:tabIndicatorColor="@color/base_blue_light"
     app:tabMode="fixed"
     tools:ignore="UnusedAttribute"/>
+  <!--app:tabIndicatorColor="@color/base_blue_light"-->
 
   <TimePicker
     android:id="@+id/picker"
diff --git a/android/res/layout/item_timetable.xml b/android/res/layout/item_timetable.xml
index 29cc119cb5..74d07b9b7b 100644
--- a/android/res/layout/item_timetable.xml
+++ b/android/res/layout/item_timetable.xml
@@ -150,8 +150,8 @@
 
     <View
       android:layout_width="match_parent"
-      android:layout_height="1dp"
-      android:background="@color/divider_standard"/>
+      android:layout_height="1dp"/>
+      <!--android:background="@color/divider_standard"/>-->
 
     <LinearLayout
       android:id="@+id/allday"
@@ -187,8 +187,8 @@
 
       <View
         android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="@color/divider_standard"/>
+        android:layout_height="1dp"/>
+        <!--android:background="@color/divider_standard"/>-->
 
       <LinearLayout
         android:id="@+id/time_open_close"
@@ -252,8 +252,8 @@
 
       <View
         android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="@color/divider_standard"/>
+        android:layout_height="1dp"/>
+        <!--android:background="@color/divider_standard"/>-->
 
       <LinearLayout
         android:id="@+id/closed_host"
@@ -269,8 +269,8 @@
         android:padding="@dimen/margin_half_plus"
         android:text="@string/editor_time_add_closed"
         android:textAllCaps="true"
-        android:textAppearance="@style/MwmTextAppearance.Body1"
-        android:textColor="@color/base_blue_light"/>
+        android:textAppearance="@style/MwmTextAppearance.Body1"/>
+        <!--android:textColor="@color/base_blue_light"/>-->
 
     </LinearLayout>
 
diff --git a/android/res/layout/item_timetable_closed_hours.xml b/android/res/layout/item_timetable_closed_hours.xml
index c3898b40f5..d4c0721761 100644
--- a/android/res/layout/item_timetable_closed_hours.xml
+++ b/android/res/layout/item_timetable_closed_hours.xml
@@ -44,7 +44,7 @@
   <View
     android:layout_width="match_parent"
     android:layout_height="1dp"
-    android:layout_alignParentBottom="true"
-    android:background="@color/base_black_divider"/>
+    android:layout_alignParentBottom="true"/>
+    <!--android:background="@color/base_black_divider"/>-->
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/android/res/layout/place_page_editor.xml b/android/res/layout/place_page_editor.xml
index f86887f7b9..469da748ca 100644
--- a/android/res/layout/place_page_editor.xml
+++ b/android/res/layout/place_page_editor.xml
@@ -20,7 +20,7 @@
     android:id="@+id/tv__editor"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:textColor="@color/text_place_page"
     android:textSize="@dimen/text_size_body_1"
     tools:text="@string/pp_place_add"/>
+  <!--android:textColor="@color/text_place_page"-->
 </LinearLayout>
\ No newline at end of file
diff --git a/android/res/layout/tab.xml b/android/res/layout/tab.xml
index 82c207f20f..21466d9b58 100644
--- a/android/res/layout/tab.xml
+++ b/android/res/layout/tab.xml
@@ -2,7 +2,7 @@
 <TextView
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
-  style="@style/MwmWidget.Tab"
   android:textAppearance="@style/MwmTextAppearance.Body4"
   tools:drawableLeft="@drawable/ic_menu_open"
   tools:text="Some tab"/>
+    <!--style="@style/MwmWidget.Tab"-->
diff --git a/android/res/layout/tab_timepicker.xml b/android/res/layout/tab_timepicker.xml
index 23da60db86..1df5d2a0f8 100644
--- a/android/res/layout/tab_timepicker.xml
+++ b/android/res/layout/tab_timepicker.xml
@@ -2,8 +2,8 @@
 <TextView
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
-  style="@style/MwmWidget.Tab"
   android:textAppearance="@style/MwmTextAppearance.Body3"
   android:textColor="@color/color_timepicker_tab"
   tools:drawableLeft="@drawable/ic_menu_open"
   tools:text="Some tab"/>
+    <!--style="@style/MwmWidget.Tab"-->
diff --git a/android/res/values/styles-text.xml b/android/res/values/styles-text.xml
index 1552a64edd..c284cac8c3 100644
--- a/android/res/values/styles-text.xml
+++ b/android/res/values/styles-text.xml
@@ -107,7 +107,6 @@
   </style>
 
   <style name="MwmTextAppearance.Editor">
-    <item name="android:textColor">@color/base_blue_light</item>
   </style>
 
   <style name="MwmTextAppearance.Editor.TimePicker">
diff --git a/android/res/values/styles.xml b/android/res/values/styles.xml
index e06baf3492..b17a6dc9c2 100644
--- a/android/res/values/styles.xml
+++ b/android/res/values/styles.xml
@@ -139,11 +139,8 @@
   </style>
 
   <style name="MwmWidget.Editor.TimePicker" parent="MwmWidget">
-    <item name="colorPrimary">@color/base_blue_light</item>
     <item name="android:headerBackground">@null</item>
     <item name="android:headerTimeTextAppearance" tools:targetApi="lollipop">@style/MwmTextAppearance.Editor.TimePicker</item>
-    <item name="android:numbersSelectorColor" tools:targetApi="lollipop">@color/base_blue</item>
-    <item name="android:numbersBackgroundColor" tools:targetApi="lollipop">@color/divider_standard</item>
     <item name="android:headerAmPmTextAppearance" tools:targetApi="lollipop">@style/MwmTextAppearance.Editor.Buttons</item>
     <item name="android:timePickerMode" tools:targetApi="lollipop">clock</item>
   </style>
diff --git a/android/res/values/themes.xml b/android/res/values/themes.xml
index 35403f7e79..eeeca1f162 100644
--- a/android/res/values/themes.xml
+++ b/android/res/values/themes.xml
@@ -56,7 +56,6 @@
   </style>
 
   <style name="MwmTheme.EditorActivity">
-    <item name="colorAccent">@color/base_blue_light</item>
     <item name="android:timePickerStyle" tools:targetApi="lollipop">@style/MwmWidget.Editor.TimePicker</item>
   </style>
 
@@ -94,8 +93,6 @@
   <style name="MwmMain.DialogFragment.TimePicker" parent="Theme.AppCompat.Light.Dialog.Alert">
     <item name="android:fontFamily" tools:targetApi="jelly_bean">@string/robotoMedium</item>
     <item name="android:background">@android:color/white</item>
-    <item name="colorPrimary">@color/base_blue_light</item>
-    <item name="colorAccent">@color/base_blue_light</item>
   </style>
 
   <style name="BottomSheet.Dialog.Dark">