Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix colors

Browse source
This commit is contained in:
crimean 2019-07-04 21:49:32 +03:00
parent 474154dadd
commit ec19746529
22 changed files with 128 additions and 128 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
OsmAnd/res/drawable/preference_activity_action_bar_shadow.xml
View file

@ -1,21 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:bottom="8dp">
<shape android:shape="rectangle" >
<size android:height="1dp" />
<solid android:color="#43000000" />
</shape>
</item>
<item android:top="1dp">
<item>
<shape
android:dither="true"
android:shape="rectangle" >
android:dither="true"
android:shape="rectangle">
<gradient
android:angle="270"
android:endColor="#00000000"
android:startColor="#10000000" />
android:angle="270"
android:endColor="#00000000"
android:startColor="#10000000" />
<size android:height="8dp" />
</shape>

133
OsmAnd/res/layout/bottom_sheet_item_with_descr_and_radio_btn.xml
View file

@ -1,81 +1,78 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="@dimen/bottom_sheet_large_list_item_height"
android:background="?attr/selectableItemBackground"
android:orientation="vertical">
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="@dimen/bottom_sheet_large_list_item_height"
android:background="?attr/selectableItemBackground"
android:orientation="vertical"
>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="63dp"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingStart="@dimen/list_content_padding"
android:paddingLeft="@dimen/list_content_padding"
android:paddingEnd="@dimen/list_content_padding"
android:paddingRight="@dimen/list_content_padding">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="63dp"
android:paddingStart="@dimen/list_content_padding"
android:paddingEnd="@dimen/list_content_padding"
android:paddingLeft="@dimen/list_content_padding"
android:paddingRight="@dimen/list_content_padding"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/bottom_sheet_icon_margin"
android:layout_marginRight="@dimen/bottom_sheet_icon_margin"
tools:src="@drawable/ic_action_coordinates_latitude"
tools:tint="?attr/default_icon_color" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/content_padding"
android:layout_marginRight="@dimen/content_padding"
android:layout_weight="1"
android:gravity="center_vertical"
android:orientation="vertical">
<ImageView
android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/bottom_sheet_icon_margin"
android:layout_marginRight="@dimen/bottom_sheet_icon_margin"
tools:tint="?attr/default_icon_color"
tools:src="@drawable/ic_action_coordinates_latitude"/>
<TextView
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="2"
android:textAppearance="@style/TextAppearance.ListItemTitle"
android:textColor="?android:textColorPrimary"
tools:text="Item Title" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginEnd="@dimen/content_padding"
android:layout_marginRight="@dimen/content_padding"
android:gravity="center_vertical"
android:orientation="vertical">
<TextView
android:id="@+id/description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"
android:textColor="?android:textColorSecondary"
tools:text="Item additional desription" />
</LinearLayout>
<TextView
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="2"
android:textAppearance="@style/TextAppearance.ListItemTitle"
android:textColor="?attr/main_font_color_basic"
tools:text="Item Title"/>
<RadioButton
android:id="@+id/compound_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@null"
android:clickable="false"
android:focusable="false"
android:saveEnabled="false" />
<TextView
android:id="@+id/description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"
tools:text="Item additional desription"/>
</LinearLayout>
</LinearLayout>
<RadioButton
android:id="@+id/compound_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@null"
android:clickable="false"
android:focusable="false"
android:saveEnabled="false"/>
</LinearLayout>
<View
android:id="@+id/divider_bottom"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginStart="64dp"
android:layout_marginLeft="64dp"
android:background="@color/divider_color_light"/>
<View
android:id="@+id/divider_bottom"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginStart="64dp"
android:layout_marginLeft="64dp"
android:background="?attr/divider_color" />
</LinearLayout>

2
OsmAnd/res/layout/download_item_list_section.xml
View file

@ -20,6 +20,7 @@
android:layout_marginRight="12dp"
android:layout_weight="1"
android:maxLines="1"
android:textColor="?android:textColorSecondary"
android:textSize="@dimen/default_desc_text_size"
osmand:typeface="@string/font_roboto_medium"
tools:text="World Regions"/>
@ -33,6 +34,7 @@
android:maxLines="1"
android:textSize="@dimen/default_desc_text_size"
android:visibility="gone"
android:textColor="?android:textColorSecondary"
osmand:typeface="@string/font_roboto_medium"
tools:text="600Mb"
tools:visibility="visible"/>

14
OsmAnd/res/layout/fragment_selected_profile.xml
View file

@ -74,7 +74,7 @@
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"
android:textColor="?attr/main_font_color_basic"
android:textColor="?android:textColorPrimary"
android:textSize="18sp"
tools:text="Item additional description"/>
@ -245,7 +245,7 @@
android:layout_weight="1"
android:textSize="@dimen/default_list_text_size"
android:text="@string/shared_string_icon"
android:textColor="?attr/main_font_color_basic"/>
android:textColor="?android:textColorPrimary"/>
<ImageView
android:id="@+id/profile_icon_img"
@ -281,7 +281,7 @@
android:gravity="center_vertical"
android:textSize="@dimen/default_list_text_size"
android:text="@string/shared_string_color"
android:textColor="?attr/main_font_color_basic"/>
android:textColor="?android:textColorPrimary"/>
<ImageView
android:id="@+id/color_sample_img"
@ -361,7 +361,7 @@
android:layout_marginLeft="@dimen/list_content_padding"
android:layout_marginRight="@dimen/list_content_padding"
android:text="@string/edit_profile_setup_title"
android:textColor="?attr/main_font_color_basic"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_list_text_size"/>
<TextView
@ -405,7 +405,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/configure_map"
android:textColor="?attr/main_font_color_basic"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_list_text_size"/>
<TextView
@ -453,7 +453,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/map_widget_config"
android:textColor="?attr/main_font_color_basic"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_list_text_size"/>
<TextView
@ -503,7 +503,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/routing_settings_2"
android:textColor="?attr/main_font_color_basic"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_list_text_size"/>
<TextView

2
OsmAnd/res/layout/history_card_item.xml
View file

@ -47,7 +47,7 @@
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"
android:textColor="?attr/main_font_color_basic"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_list_text_size"
tools:text="Amsterdam" />

4
OsmAnd/res/layout/home_work_card.xml
View file

@ -67,7 +67,7 @@
android:letterSpacing="@dimen/text_button_letter_spacing"
android:maxLines="1"
android:text="@string/home_button"
android:textColor="?attr/main_font_color_basic"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_list_text_size"
tools:ignore="UnusedAttribute" />
@ -133,7 +133,7 @@
android:letterSpacing="@dimen/text_button_letter_spacing"
android:maxLines="1"
android:text="@string/work_button"
android:textColor="?attr/main_font_color_basic"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_list_text_size"
tools:ignore="UnusedAttribute" />

1
OsmAnd/res/layout/list_item_icon_and_menu.xml
View file

@ -52,6 +52,7 @@
android:layout_height="wrap_content"
android:ellipsize="end"
android:lines="1"
android:textColor="?android:textColorSecondary"
android:textSize="@dimen/default_desc_text_size"
tools:text="Some very long subtitle text, that won't fit into one line"/>

13
OsmAnd/res/layout/list_menu_item_native.xml
View file

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
android:id="@+id/LinearLayout1"
<LinearLayout android:id="@+id/LinearLayout1"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
android:orientation="horizontal"
xmlns:app="http://schemas.android.com/apk/res-auto">
<android.support.v7.widget.AppCompatImageView
android:id="@+id/icon"
@ -27,6 +27,7 @@
android:layout_weight="1"
android:gravity="center_vertical"
android:text="@string/layer_poi"
android:textColor="?android:textColorSecondary"
android:textSize="@dimen/default_list_text_size"/>
<android.support.v7.widget.AppCompatImageView
@ -40,11 +41,13 @@
tools:visibility="visible"/>
<!-- android:button="@drawable/ic_btn_wocheckbox" -->
<CheckBox
<android.support.v7.widget.AppCompatCheckBox
android:id="@+id/toggle_item"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginRight="24dp"
android:focusable="false"/>
android:layout_marginEnd="24dp"
android:focusable="false"
app:buttonTint="?attr/active_color_basic" />
</LinearLayout>

6
OsmAnd/res/layout/plan_route_info.xml
View file

@ -138,7 +138,7 @@
android:layout_marginRight="@dimen/list_content_padding"
android:gravity="left"
android:singleLine="true"
android:textColor="?attr/main_font_color_basic"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_list_text_size"
tools:text="My position" />
@ -255,7 +255,7 @@
android:layout_marginRight="@dimen/list_content_padding"
android:gravity="left"
android:singleLine="true"
android:textColor="?attr/main_font_color_basic"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_list_text_size"
tools:text="Intermediate point" />
@ -368,7 +368,7 @@
android:layout_marginRight="@dimen/list_content_padding"
android:gravity="left"
android:singleLine="true"
android:textColor="?attr/main_font_color_basic"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_list_text_size"
tools:text="Destination" />

22
OsmAnd/res/layout/preference_activity.xml
View file

@ -79,7 +79,7 @@
android:ellipsize="end"
android:maxLines="1"
android:textAppearance="@style/TextAppearance.ListItemTitle"
android:textColor="?attr/main_font_color_basic"
android:textColor="?android:textColorPrimary"
tools:text="Item Title"/>
<TextView
@ -88,9 +88,11 @@
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"
android:textColor="?android:textColorSecondary"
tools:text="Item additional desription"/>
</LinearLayout>
<ImageView
android:id="@+id/type_down_arrow"
android:layout_width="wrap_content"
@ -105,26 +107,28 @@
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent" >
<ImageView
android:id="@+id/selector_shadow"
android:layout_width="match_parent"
android:layout_height="@dimen/abp__shadow_height"
android:src="@drawable/preference_activity_action_bar_shadow"
android:visibility="invisible"/>
android:layout_height="match_parent">
<ListView
android:id="@android:id/list"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<ImageView
android:id="@+id/selector_shadow"
android:layout_width="match_parent"
android:layout_height="@dimen/abp__shadow_height"
android:src="@drawable/preference_activity_action_bar_shadow"
android:visibility="gone"
tools:ignore="ContentDescription"/>
<ImageView
android:id="@+id/shadowView"
android:layout_width="match_parent"
android:layout_height="@dimen/abp__shadow_height"
android:src="@drawable/preference_activity_action_bar_shadow"
tools:ignore="ContentDescription" />
</FrameLayout>
</LinearLayout>

2
OsmAnd/res/layout/prev_route_card.xml
View file

@ -95,7 +95,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:textColor="?attr/main_font_color_basic"
android:textColor="?android:textColorPrimary"
android:ellipsize="end"
android:letterSpacing="@dimen/text_button_letter_spacing"
android:maxLines="1"

2
OsmAnd/res/layout/profile_list_item.xml
View file

@ -40,7 +40,7 @@
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="2"
android:textColor="?attr/main_font_color_basic"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_list_text_size"
tools:text="Bicycle" />

5
OsmAnd/res/layout/progress_with_two_texts.xml
View file

@ -1,6 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:tools="http://schemas.android.com/tools"
xmlns:android="http://schemas.android.com/apk/res/android"
@ -26,6 +24,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:textColor="?android:textColorSecondary"
tools:text="@string/device_memory"/>
<TextView
@ -33,6 +32,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:textColor="?android:textColorSecondary"
tools:text="@string/free"/>
</LinearLayout>
@ -44,7 +44,6 @@
android:progressDrawable="?attr/size_progress_bar"
tools:progress="50"/>
</LinearLayout>

2
OsmAnd/res/layout/route_details_legend.xml
View file

@ -28,7 +28,7 @@
android:layout_gravity="center_vertical"
android:ellipsize="end"
android:maxLines="2"
android:textColor="?attr/main_font_color_basic"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_list_text_size"
osmand:typeface="@string/font_roboto_regular"
tools:text="Unpaved 13.4 km" />

2
OsmAnd/res/layout/route_directions_card.xml
View file

@ -14,7 +14,7 @@
android:gravity="center_vertical"
android:padding="@dimen/content_padding"
android:text="@string/step_by_step"
android:textColor="?attr/main_font_color_basic"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/text_button_text_size"
osmand:typeface="@string/font_roboto_medium" />

2
OsmAnd/res/layout/route_info_card.xml
View file

@ -24,7 +24,7 @@
android:maxLines="1"
android:paddingLeft="@dimen/content_padding"
android:paddingRight="@dimen/content_padding"
android:textColor="?attr/main_font_color_basic"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_list_text_size"
osmand:typeface="@string/font_roboto_medium"
tools:ignore="UnusedAttribute"

8
OsmAnd/res/layout/route_info_header.xml
View file

@ -221,7 +221,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
android:textColor="?attr/main_font_color_basic"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_desc_text_size"
osmand:typeface="@string/font_roboto_medium"
tools:text="40 m" />
@ -266,7 +266,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
android:textColor="?attr/main_font_color_basic"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_desc_text_size"
osmand:typeface="@string/font_roboto_medium"
tools:text="30m - 53m" />
@ -367,7 +367,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
android:textColor="?attr/main_font_color_basic"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_desc_text_size"
osmand:typeface="@string/font_roboto_medium"
tools:text="174" />
@ -412,7 +412,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
android:textColor="?attr/main_font_color_basic"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_desc_text_size"
osmand:typeface="@string/font_roboto_medium"
tools:text="164" />

2
OsmAnd/res/layout/route_info_list_item.xml
View file

@ -88,7 +88,7 @@
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:textSize="@dimen/default_desc_text_size"
android:textColor="?attr/main_font_color_basic"
android:textColor="?android:textColorPrimary"
tools:text="Head Dmytrivska Street"
android:text=""/>

4
OsmAnd/res/layout/route_info_statistic.xml
View file

@ -66,7 +66,7 @@
android:layout_height="wrap_content"
android:gravity="left"
android:singleLine="true"
android:textColor="?attr/main_font_color_basic"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_list_text_size"
tools:text="10 km" />
@ -120,7 +120,7 @@
android:layout_height="wrap_content"
android:gravity="left"
android:singleLine="true"
android:textColor="?attr/main_font_color_basic"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_list_text_size"
tools:text="5 min" />

2
OsmAnd/res/layout/route_waypoints_fragment.xml
View file

@ -49,7 +49,7 @@
android:ellipsize="end"
android:maxLines="1"
android:text="@string/shared_string_target_points"
android:textColor="?attr/main_font_color_basic"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_list_text_size"
osmand:typeface="@string/font_roboto_medium"/>

2
OsmAnd/src/net/osmand/plus/activities/HelpActivity.java
View file

@ -58,7 +58,7 @@ public class HelpActivity extends OsmandActionBarActivity implements AdapterView
ListView listView = (ListView) findViewById(android.R.id.list);
listView.setAdapter(mAdapter);
listView.setOnItemClickListener(this);
int dividerColor = lightContent ? R.color.icon_color_default_dark : R.color.icon_color_default_light;
int dividerColor = lightContent ? R.color.divider_color_light : R.color.divider_color_dark;
Drawable dividerDrawable = new ColorDrawable(ContextCompat.getColor(this, dividerColor));
listView.setDivider(dividerDrawable);
listView.setDividerHeight(AndroidUtils.dpToPx(this, 1f));

5
OsmAnd/src/net/osmand/plus/profiles/AppProfileArrayAdapter.java
View file

@ -64,10 +64,11 @@ public class AppProfileArrayAdapter extends ArrayAdapter<ProfileDataObject> {
ProfileDataObject mode = modes.get(position);
Drawable iconDrawable;
boolean lightContent = app.getSettings().isLightContent();
if (mode.isSelected()) {
iconDrawable = app.getUIUtilities().getIcon(mode.getIconRes(), mode.getIconColor(!app.getSettings().isLightContent()));
iconDrawable = app.getUIUtilities().getIcon(mode.getIconRes(), mode.getIconColor(!lightContent));
} else {
iconDrawable = app.getUIUtilities().getIcon(mode.getIconRes(), R.color.profile_icon_color_inactive);
iconDrawable = app.getUIUtilities().getIcon(mode.getIconRes(), lightContent);
}
viewHolder.title.setText(mode.getName());