RedAuburn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Rebase compilation fixes. @TODO yunikk

Browse source
This commit is contained in:
Alex Zolotarev 2016-01-18 14:52:28 +03:00 • committed by Sergey Yershov
parent 267e866bba
commit 335c4157ff
15 changed files with 39 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
android/res/color/color_timepicker_tab.xml
View file

@ -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>

10
android/res/color/timepicker_title.xml
View file

@ -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>

4
android/res/color/timetable_add_complement_text.xml
View file

@ -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>

10
android/res/drawable/timetable_add_complement.xml
View file

@ -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>

8
android/res/layout/fragment_timetable.xml
View file

@ -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"

8
android/res/layout/fragment_timetable_advanced.xml
View file

@ -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"

2
android/res/layout/fragment_timetable_picker.xml
View file

@ -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"

16
android/res/layout/item_timetable.xml
View file

@ -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>

4
android/res/layout/item_timetable_closed_hours.xml
View file

@ -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>

2
android/res/layout/place_page_editor.xml
View file

@ -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>

2
android/res/layout/tab.xml
View file

@ -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"-->

2
android/res/layout/tab_timepicker.xml
View file

@ -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"-->

1
android/res/values/styles-text.xml
View file

@ -107,7 +107,6 @@
</style>
<style name="MwmTextAppearance.Editor">
<item name="android:textColor">@color/base_blue_light</item>
</style>
<style name="MwmTextAppearance.Editor.TimePicker">

3
android/res/values/styles.xml
View file

@ -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>

3
android/res/values/themes.xml
View file

@ -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">