drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-29 17:23:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

[android] Use material properties in styles and themes

Browse Source 
Signed-off-by: Jean-Baptiste Charron <jeanbaptiste.charron@outlook.fr>
This commit is contained in:
Jean-Baptiste
2025-08-10 07:44:15 +02:00
committed by Konstantin Pastbin
parent 2492e8bda4
commit 826ddba26f
66 changed files with 97 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/app/src/main/java/app/organicmaps/editor/AdvancedTimetableFragment.java
View File

@@ -87,8 +87,8 @@ public class AdvancedTimetableFragment extends BaseMwmFragment implements View.O
private void setExampleDrawables(@DrawableRes int left, @DrawableRes int right)
{
mExamplesTitle.setCompoundDrawablesRelativeWithIntrinsicBounds(
Graphics.tint(requireActivity(), left, androidx.appcompat.R.attr.colorAccent), null,
Graphics.tint(requireActivity(), right, androidx.appcompat.R.attr.colorAccent), null);
Graphics.tint(requireActivity(), left, com.google.android.material.R.attr.colorSecondary), null,
Graphics.tint(requireActivity(), right, com.google.android.material.R.attr.colorSecondary), null);
}
@Override

2
android/app/src/main/java/app/organicmaps/maplayer/SearchWheel.java
View File

@@ -215,7 +215,7 @@ public class SearchWheel implements View.OnClickListener
final SearchOption searchOption = mMapButtonsViewModel.getSearchOption().getValue();
mSearchButton.setImageDrawable(Graphics.tint(
mSearchButton.getContext(), searchOption == null ? R.drawable.ic_routing_search_off : searchOption.mDrawableOff,
androidx.appcompat.R.attr.colorAccent));
com.google.android.material.R.attr.colorSecondary));
}
@Override

6
android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java
View File

@@ -261,9 +261,9 @@ final class RoutingBottomMenuController implements View.OnClickListener
{
UiUtils.show(mActionButton);
Drawable icon = ContextCompat.getDrawable(mContext, R.drawable.ic_location_crosshair);
int colorAccent = ContextCompat.getColor(
mContext, UiUtils.getStyledResourceId(mContext, androidx.appcompat.R.attr.colorAccent));
mActionIcon.setImageDrawable(Graphics.tint(icon, colorAccent));
int colorSecondary = ContextCompat.getColor(
mContext, UiUtils.getStyledResourceId(mContext, com.google.android.material.R.attr.colorSecondary));
mActionIcon.setImageDrawable(Graphics.tint(icon, colorSecondary));
}
else
{

2
android/app/src/main/java/app/organicmaps/search/SearchAdapter.java
View File

@@ -65,7 +65,7 @@ class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.SearchDataViewHol
@AttrRes
int getTintAttr()
{
return androidx.appcompat.R.attr.colorAccent;
return com.google.android.material.R.attr.colorSecondary;
}
abstract TextView getTitleView();

2
android/app/src/main/java/app/organicmaps/search/TabAdapter.java
View File

@@ -92,7 +92,7 @@ class TabAdapter extends FragmentPagerAdapter
editor.putInt(Config.KEY_PREF_LAST_SEARCHED_TAB, tab.getPosition());
editor.apply();
super.onTabSelected(tab);
Graphics.tint(mContext, tab.getIcon(), androidx.appcompat.R.attr.colorAccent);
Graphics.tint(mContext, tab.getIcon(), com.google.android.material.R.attr.colorSecondary);
}
@Override

2
android/app/src/main/java/app/organicmaps/settings/VoiceInstructionsSettingsFragment.java
View File

@@ -328,7 +328,7 @@ public class VoiceInstructionsSettingsFragment extends BaseXmlSettingsFragment
// Set link color.
link.setSpan(
new ForegroundColorSpan(ContextCompat.getColor(
requireContext(), UiUtils.getStyledResourceId(requireContext(), androidx.appcompat.R.attr.colorAccent))),
requireContext(), UiUtils.getStyledResourceId(requireContext(), com.google.android.material.R.attr.colorSecondary))),
0, ttsLinkText.length(), 0);
ttsLangInfoLink.setSummary(link);

2
android/app/src/main/java/app/organicmaps/widget/menu/MyPositionButton.java
View File

@@ -52,7 +52,7 @@ public class MyPositionButton
if (mode == LocationState.FOLLOW || mode == LocationState.FOLLOW_AND_ROTATE
|| mode == LocationState.PENDING_POSITION)
{
colorAttr = androidx.appcompat.R.attr.colorAccent;
colorAttr = com.google.android.material.R.attr.colorSecondary;
if (mode == LocationState.PENDING_POSITION)
sizeDimen = R.dimen.map_button_size;
else

2
android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java
View File

@@ -167,7 +167,7 @@ public class NavMenu
public void refreshTts()
{
mTts.setImageDrawable(TtsPlayer.isEnabled()
? Graphics.tint(mActivity, R.drawable.ic_voice_on, androidx.appcompat.R.attr.colorAccent)
? Graphics.tint(mActivity, R.drawable.ic_voice_on, com.google.android.material.R.attr.colorSecondary)
: Graphics.tint(mActivity, R.drawable.ic_voice_off));
}

2
android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
View File

@@ -478,7 +478,7 @@ public class PlacePageView extends Fragment
final int editPlaceButtonColor =
Editor.nativeShouldEnableEditPlace()
? ContextCompat.getColor(getContext(),
UiUtils.getStyledResourceId(getContext(), androidx.appcompat.R.attr.colorAccent))
UiUtils.getStyledResourceId(getContext(), com.google.android.material.R.attr.colorSecondary))
: getResources().getColor(R.color.button_accent_text_disabled);
mTvEditPlace.setTextColor(editPlaceButtonColor);
mTvAddBusiness.setTextColor(editPlaceButtonColor);

2
android/app/src/main/res/layout-land/altitude_chart_panel.xml
View File

@@ -40,7 +40,7 @@
android:layout_gravity="center_horizontal"
android:textAppearance="@style/MwmTextAppearance.Body3"
android:fontFamily="@string/robotoMedium"
android:textColor="?colorAccent"
android:textColor="?colorSecondary"
android:gravity="center"
tools:text="↗ 43 m ↘ 88 m"
tools:visibility="visible" />

2
android/app/src/main/res/layout-land/layout_nav_top.xml
View File

@@ -118,7 +118,7 @@
app:layout_constraintTop_toBottomOf="@id/street_frame"
app:lanesActiveLaneTintColor="?navLaneArrowActiveColor"
app:lanesInactiveLaneTintColor="?navLaneArrowInactiveColor"
app:lanesBackgroundColor="?colorAccent"
app:lanesBackgroundColor="?colorSecondary"
app:lanesCornerRadius="@dimen/margin_quarter"
app:lanesEditModeLanesCount="10"
tools:visibility="visible" />

2
android/app/src/main/res/layout-land/onmap_downloader.xml
View File

@@ -70,7 +70,7 @@
android:layout_width="@dimen/downloader_status_size"
android:layout_height="@dimen/downloader_status_size"
android:layout_gravity="center"
app:wheelProgressColor="?colorAccent"
app:wheelProgressColor="?colorSecondary"
app:wheelSecondaryColor="?dividerHorizontal"
app:wheelThickness="@dimen/margin_eighth"
android:visibility="visible"

2
android/app/src/main/res/layout-land/routing_details.xml
View File

@@ -19,7 +19,7 @@
android:layout_height="@dimen/altitude_chart_time_distance_height"
android:textAppearance="@style/MwmTextAppearance.Body3"
android:fontFamily="@string/robotoMedium"
android:textColor="?colorAccent"
android:textColor="?colorSecondary"
android:visibility="gone"
tools:text="43 m"
tools:visibility="visible"/>

2
android/app/src/main/res/layout-w1020dp-land/altitude_chart_panel.xml
View File

@@ -40,7 +40,7 @@
android:layout_gravity="center_horizontal"
android:textAppearance="@style/MwmTextAppearance.Body3"
android:fontFamily="@string/robotoMedium"
android:textColor="?colorAccent"
android:textColor="?colorSecondary"
android:gravity="center"
tools:text="↗ 43 m ↘ 88 m"
tools:visibility="visible" />

2
android/app/src/main/res/layout-w1020dp-land/routing_details.xml
View File

@@ -30,7 +30,7 @@
android:layout_alignParentEnd="true"
android:textAppearance="@style/MwmTextAppearance.Body3"
android:fontFamily="@string/robotoMedium"
android:textColor="?colorAccent"
android:textColor="?colorSecondary"
android:visibility="gone"
tools:text="43 m"
tools:visibility="visible"/>

2
android/app/src/main/res/layout/activity_download_resources.xml
View File

@@ -23,7 +23,7 @@
android:layout_width="90dp"
android:layout_height="90dp"
app:srcCompat="@drawable/ic_download"
app:tint="?android:colorAccent"/>
app:tint="?colorSecondary"/>
<com.google.android.material.textview.MaterialTextView
android:id="@+id/head_message"
style="?fontHeadline6"

2
android/app/src/main/res/layout/altitude_chart_panel.xml
View File

@@ -37,7 +37,7 @@
android:layout_height="@dimen/altitude_chart_time_distance_height"
android:textAppearance="@style/MwmTextAppearance.Body3"
android:fontFamily="@string/robotoMedium"
android:textColor="?colorAccent"
android:textColor="?colorSecondary"
android:layout_gravity="end"
android:gravity="center"
android:visibility="gone"

4
android/app/src/main/res/layout/button_with_progress.xml
View File

@@ -13,7 +13,7 @@
android:layout_marginStart="@dimen/margin_base"
android:text="@string/download_country_ask"
android:textAppearance="?fontBody2"
app:buttonTint="?colorAccent"
app:buttonTint="?colorSecondary"
android:visibility="gone"
tools:visibility="visible"/>
<com.google.android.material.progressindicator.LinearProgressIndicator
@@ -26,7 +26,7 @@
android:layout_marginEnd="@dimen/margin_base_plus"
android:layout_marginBottom="@dimen/margin_base"
android:indeterminate="false"
app:indicatorColor="?android:colorAccent"
app:indicatorColor="?colorSecondary"
app:trackColor="@color/bg_routing_progress"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_download_resources"

2
android/app/src/main/res/layout/downloader_status.xml
View File

@@ -11,7 +11,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?clickableBackground"
wheel:wheelProgressColor="?colorAccent"
wheel:wheelProgressColor="?colorSecondary"
wheel:wheelSecondaryColor="?dividerHorizontal"
wheel:wheelThickness="@dimen/margin_eighth"/>

2
android/app/src/main/res/layout/fragment_editor.xml
View File

@@ -221,7 +221,7 @@
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:textAppearance="@style/MwmTextAppearance.Body1"
android:textColor="?colorAccent"/>
android:textColor="?colorSecondary"/>
</RelativeLayout>
<include

6
android/app/src/main/res/layout/fragment_osm_profile.xml
View File

@@ -107,7 +107,7 @@
android:paddingBottom="@dimen/margin_half"
android:text="@string/editor_osm_history"
android:textAppearance="@style/MwmTextAppearance.Body2"
android:textColor="?colorAccent"
android:textColor="?colorSecondary"
app:layout_constraintTop_toTopOf="parent" />
<com.google.android.material.textview.MaterialTextView
@@ -123,7 +123,7 @@
android:paddingBottom="@dimen/margin_half"
android:text="@string/editor_osm_notes"
android:textAppearance="@style/MwmTextAppearance.Body2"
android:textColor="?colorAccent"
android:textColor="?colorSecondary"
app:layout_constraintTop_toBottomOf="@id/osm_history" />
<com.google.android.material.textview.MaterialTextView
@@ -140,7 +140,7 @@
android:paddingBottom="@dimen/margin_half"
android:text="@string/editor_more_about_osm"
android:textAppearance="@style/MwmTextAppearance.Body3"
android:textColor="?colorAccent"
android:textColor="?colorSecondary"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@+id/osm_notes"
app:layout_constraintVertical_bias="1" />

2
android/app/src/main/res/layout/fragment_phone.xml
View File

@@ -31,7 +31,7 @@
android:text="@string/editor_add_phone"
android:textAllCaps="true"
android:textAppearance="@style/MwmTextAppearance.Body3"
android:textColor="?colorAccent"
android:textColor="?colorSecondary"
app:layout_constraintBottom_toBottomOf="@+id/frameLayout" />
<include

2
android/app/src/main/res/layout/fragment_suggest_country_download.xml
View File

@@ -122,7 +122,7 @@
android:layout_width="@dimen/downloader_status_size"
android:layout_height="@dimen/downloader_status_size"
android:background="?clickableBackground"
wheel:wheelProgressColor="?colorAccent"
wheel:wheelProgressColor="?colorSecondary"
wheel:wheelSecondaryColor="?dividerHorizontal"
wheel:wheelThickness="@dimen/margin_eighth"/>
</LinearLayout>

2
android/app/src/main/res/layout/fragment_timetable.xml
View File

@@ -32,7 +32,7 @@
android:text="@string/editor_time_advanced"
android:textAllCaps="true"
android:textAppearance="@style/MwmTextAppearance.Body3"
android:textColor="?colorAccent" />
android:textColor="?colorSecondary" />
<include
layout="@layout/shadow_bottom"

2
android/app/src/main/res/layout/fragment_timetable_advanced.xml
View File

@@ -60,7 +60,7 @@
android:padding="@dimen/margin_base"
android:text="@string/editor_example_values"
android:textAppearance="@style/MwmTextAppearance.Body3"
android:textColor="?colorAccent"/>
android:textColor="?colorSecondary"/>
<View
android:layout_width="match_parent"

2
android/app/src/main/res/layout/fragment_timetable_picker.xml
View File

@@ -14,7 +14,7 @@
android:elevation="@dimen/appbar_elevation"
android:background="?android:windowBackground"
app:tabGravity="fill"
app:tabIndicatorColor="?colorAccent"
app:tabIndicatorColor="?colorSecondary"
app:tabMode="fixed"
app:tabRippleColor="@android:color/transparent"
tools:ignore="UnusedAttribute"/>

4
android/app/src/main/res/layout/item_add_street.xml
View File

@@ -15,7 +15,7 @@
android:layout_marginEnd="@dimen/margin_double"
android:scaleType="centerCrop"
app:srcCompat="@drawable/ic_plus"
app:tint="?colorAccent" />
app:tint="?colorSecondary" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/street"
@@ -25,6 +25,6 @@
android:singleLine="true"
android:text="@string/add_street"
android:textAppearance="@style/MwmTextAppearance.Body1"
android:textColor="?colorAccent"/>
android:textColor="?colorSecondary"/>
</LinearLayout>

4
android/app/src/main/res/layout/item_bookmark_button.xml
View File

@@ -15,7 +15,7 @@
android:layout_width="@dimen/nav_icon_size"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
app:tint="?colorAccent"
app:tint="?colorSecondary"
tools:srcCompat="@drawable/ic_import" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/text"
@@ -26,5 +26,5 @@
tools:text="Some text should go here"
android:textAllCaps="true"
android:textAppearance="@style/MwmTextAppearance.Body3"
android:textColor="?colorAccent"/>
android:textColor="?colorSecondary"/>
</LinearLayout>

2
android/app/src/main/res/layout/item_bookmark_group_list_header.xml
View File

@@ -31,7 +31,7 @@
android:paddingTop="@dimen/margin_half_plus"
android:text="@string/bookmark_lists_hide_all"
android:textAllCaps="true"
android:textColor="?colorAccent"
android:textColor="?colorSecondary"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />

2
android/app/src/main/res/layout/item_category_description.xml
View File

@@ -36,7 +36,7 @@
android:clickable="true"
android:gravity="start|top"
android:text="@string/category_desc_more"
android:textColor="?attr/colorAccent"
android:textColor="?attr/colorSecondary"
android:layout_marginTop="2dp" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

2
android/app/src/main/res/layout/item_cuisine.xml
View File

@@ -14,7 +14,7 @@
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginEnd="@dimen/margin_double"
app:buttonTint="?colorAccent"/>
app:buttonTint="?colorSecondary"/>
<com.google.android.material.textview.MaterialTextView
android:id="@+id/cuisine"

2
android/app/src/main/res/layout/item_missed_map.xml
View File

@@ -17,7 +17,7 @@
android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/margin_half"
android:visibility="gone"
app:wheelProgressColor="?colorAccent"
app:wheelProgressColor="?colorSecondary"
app:wheelSecondaryColor="?dividerHorizontal"
app:wheelThickness="@dimen/margin_eighth"
app:centerDrawable="@android:color/transparent"

6
android/app/src/main/res/layout/item_missed_map_group.xml
View File

@@ -17,7 +17,7 @@
android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/margin_half"
android:visibility="gone"
app:wheelProgressColor="?colorAccent"
app:wheelProgressColor="?colorSecondary"
app:wheelSecondaryColor="?dividerHorizontal"
app:wheelThickness="@dimen/margin_eighth"
app:centerDrawable="@android:color/transparent"
@@ -32,7 +32,7 @@
android:layout_marginEnd="@dimen/margin_base_plus"
android:maxLines="1"
android:textAppearance="@style/MwmTextAppearance.Body1"
android:textColor="?colorAccent"
android:textColor="?colorSecondary"
tools:text="256 MB"/>
<com.google.android.material.textview.MaterialTextView
@@ -45,6 +45,6 @@
android:layout_alignWithParentIfMissing="true"
android:layout_marginEnd="@dimen/margin_half"
android:textAppearance="@style/MwmTextAppearance.Body1"
android:textColor="?colorAccent"
android:textColor="?colorSecondary"
tools:text="Country name"/>
</RelativeLayout>

2
android/app/src/main/res/layout/item_opening_hours.xml
View File

@@ -68,6 +68,6 @@
android:text="@string/edit_opening_hours"
android:textAllCaps="true"
android:textAppearance="@style/MwmTextAppearance.Body1"
android:textColor="?colorAccent"/>
android:textColor="?colorSecondary"/>
</RelativeLayout>

2
android/app/src/main/res/layout/item_search_result.xml
View File

@@ -68,6 +68,6 @@
android:layout_alignBaseline="@id/region"
android:layout_below="@id/description"
android:textAppearance="@style/MwmTextAppearance.Body3"
android:textColor="?colorAccent"
android:textColor="?colorSecondary"
tools:text="500 km"/>
</RelativeLayout>

2
android/app/src/main/res/layout/item_search_suggest.xml
View File

@@ -3,7 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
style="@style/MwmWidget.TextView.Search"
android:textColor="?colorAccent"
android:textColor="?colorSecondary"
android:textAlignment="viewStart"
app:drawableStartCompat="@drawable/ic_search"
tools:text="Some suggest title"/>

2
android/app/src/main/res/layout/item_timetable.xml
View File

@@ -276,7 +276,7 @@
android:text="@string/editor_time_add_closed"
android:textAllCaps="true"
android:textAppearance="@style/MwmTextAppearance.Body1"
android:textColor="?colorAccent"/>
android:textColor="?colorSecondary"/>
</LinearLayout>

2
android/app/src/main/res/layout/layout_nav_bottom.xml
View File

@@ -26,7 +26,7 @@
style="@style/Widget.MaterialComponents.LinearProgressIndicator"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:indicatorColor="?colorAccent"
app:indicatorColor="?colorSecondary"
app:trackCornerRadius="@dimen/nav_progress_head"
app:trackThickness="@dimen/nav_progress"
app:trackColor="@color/bg_routing_progress" />

2
android/app/src/main/res/layout/onmap_downloader.xml
View File

@@ -63,7 +63,7 @@
android:layout_width="@dimen/downloader_status_size"
android:layout_height="@dimen/downloader_status_size"
android:layout_gravity="center"
app:wheelProgressColor="?colorAccent"
app:wheelProgressColor="?colorSecondary"
app:wheelSecondaryColor="?dividerHorizontal"
app:wheelThickness="@dimen/margin_eighth"
android:visibility="visible"

2
android/app/src/main/res/layout/place_page_bluesky.xml
View File

@@ -13,7 +13,7 @@
android:id="@+id/iv__place_bluesky"
style="@style/PlacePageMetadataIcon"
app:srcCompat="@drawable/ic_bluesky_white"
app:tint="?colorAccent"/>
app:tint="?colorSecondary"/>
<com.google.android.material.textview.MaterialTextView
android:id="@+id/tv__place_bluesky_page"

2
android/app/src/main/res/layout/place_page_description_layout.xml
View File

@@ -34,7 +34,7 @@
android:layout_marginBottom="@dimen/margin_base"
android:textAppearance="?android:attr/textAppearance"
android:gravity="start|top"
android:textColor="?attr/colorAccent"
android:textColor="?attr/colorSecondary"
android:text="@string/category_desc_more"
android:background="@android:color/transparent"/>
<include

2
android/app/src/main/res/layout/place_page_email.xml
View File

@@ -12,7 +12,7 @@
android:id="@+id/iv__place_email"
style="@style/PlacePageMetadataIcon"
app:srcCompat="@drawable/ic_email"
app:tint="?colorAccent" />
app:tint="?colorSecondary" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/tv__place_email"

2
android/app/src/main/res/layout/place_page_facebook.xml
View File

@@ -11,7 +11,7 @@
android:id="@+id/iv__place_facebook"
style="@style/PlacePageMetadataIcon"
app:srcCompat="@drawable/ic_facebook_white"
app:tint="?colorAccent"/>
app:tint="?colorSecondary"/>
<com.google.android.material.textview.MaterialTextView
android:id="@+id/tv__place_facebook_page"

2
android/app/src/main/res/layout/place_page_fediverse.xml
View File

@@ -13,7 +13,7 @@
android:id="@+id/iv__place_fediverse"
style="@style/PlacePageMetadataIcon"
app:srcCompat="@drawable/ic_mastodon_white"
app:tint="?colorAccent"/>
app:tint="?colorSecondary"/>
<com.google.android.material.textview.MaterialTextView
android:id="@+id/tv__place_fediverse_page"

2
android/app/src/main/res/layout/place_page_instagram.xml
View File

@@ -12,7 +12,7 @@
android:id="@+id/iv__place_instagram"
style="@style/PlacePageMetadataIcon"
app:srcCompat="@drawable/ic_instagram_white"
app:tint="?colorAccent"/>
app:tint="?colorSecondary"/>
<com.google.android.material.textview.MaterialTextView
android:id="@+id/tv__place_instagram_page"

2
android/app/src/main/res/layout/place_page_line.xml
View File

@@ -11,7 +11,7 @@
android:id="@+id/iv__place_line"
style="@style/PlacePageMetadataIcon"
app:srcCompat="@drawable/ic_line_white"
app:tint="?colorAccent"/>
app:tint="?colorSecondary"/>
<com.google.android.material.textview.MaterialTextView
android:id="@+id/tv__place_line_page"

2
android/app/src/main/res/layout/place_page_open_in.xml
View File

@@ -12,7 +12,7 @@
android:id="@+id/iv__place_open_in"
style="@style/PlacePageMetadataIcon"
app:srcCompat="@drawable/ic_open_in"
app:tint="?colorAccent"/>
app:tint="?colorSecondary"/>
<com.google.android.material.textview.MaterialTextView
android:id="@+id/tv__place_open_in"

2
android/app/src/main/res/layout/place_page_panoramax.xml
View File

@@ -13,7 +13,7 @@
android:id="@+id/iv__place_panoramax"
style="@style/PlacePageMetadataIcon"
app:srcCompat="@drawable/ic_panoramax"
app:tint="?colorAccent"/>
app:tint="?colorSecondary"/>
<com.google.android.material.textview.MaterialTextView
android:id="@+id/tv__place_panoramax"

2
android/app/src/main/res/layout/place_page_phone_item.xml
View File

@@ -13,7 +13,7 @@
android:id="@+id/iv__place_phone"
style="@style/PlacePageMetadataIcon"
app:srcCompat="@drawable/ic_phone"
app:tint="?colorAccent"/>
app:tint="?colorSecondary"/>
<com.google.android.material.textview.MaterialTextView
android:id="@+id/tv__place_phone"

2
android/app/src/main/res/layout/place_page_preview.xml
View File

@@ -168,7 +168,7 @@
android:layout_gravity="center"
android:scaleType="center"
app:srcCompat="@drawable/ic_direction_pagepreview"
app:tint="?colorAccent" />
app:tint="?colorSecondary" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/tv__straight_distance"
android:layout_width="wrap_content"

2
android/app/src/main/res/layout/place_page_twitter.xml
View File

@@ -12,7 +12,7 @@
android:id="@+id/iv__place_twitter"
style="@style/PlacePageMetadataIcon"
app:srcCompat="@drawable/ic_twitterx_white"
app:tint="?colorAccent"/>
app:tint="?colorSecondary"/>
<com.google.android.material.textview.MaterialTextView
android:id="@+id/tv__place_twitter_page"

2
android/app/src/main/res/layout/place_page_vk.xml
View File

@@ -12,7 +12,7 @@
android:id="@+id/iv__place_vk"
style="@style/PlacePageMetadataIcon"
app:srcCompat="@drawable/ic_vk_white"
app:tint="?colorAccent"/>
app:tint="?colorSecondary"/>
<com.google.android.material.textview.MaterialTextView
android:id="@+id/tv__place_vk_page"

2
android/app/src/main/res/layout/place_page_website.xml
View File

@@ -12,7 +12,7 @@
android:id="@+id/iv__place_website"
style="@style/PlacePageMetadataIcon"
app:srcCompat="@drawable/ic_website"
app:tint="?colorAccent"/>
app:tint="?colorSecondary"/>
<com.google.android.material.textview.MaterialTextView
android:id="@+id/tv__place_website"

2
android/app/src/main/res/layout/place_page_website_menu.xml
View File

@@ -12,7 +12,7 @@
android:id="@+id/iv__place_website_menu"
style="@style/PlacePageMetadataIcon"
app:srcCompat="@drawable/ic_website_menu"
app:tint="?colorAccent"/>
app:tint="?colorSecondary"/>
<LinearLayout
android:layout_width="match_parent"

2
android/app/src/main/res/layout/place_page_wikimedia.xml
View File

@@ -11,7 +11,7 @@
android:id="@+id/iv__place_wikimedia"
style="@style/PlacePageMetadataIcon"
app:srcCompat="@drawable/ic_wikimedia_commons_white"
app:tint="?colorAccent" />
app:tint="?colorSecondary" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/tv__place_wikimedia"

2
android/app/src/main/res/layout/place_page_wikipedia_fragment.xml
View File

@@ -15,7 +15,7 @@
android:id="@+id/iv__place_wiki"
style="@style/PlacePageMetadataIcon"
app:srcCompat="@drawable/ic_wiki"
app:tint="?colorAccent" />
app:tint="?colorSecondary" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/tv__place_wiki"
android:layout_width="match_parent"

6
android/app/src/main/res/layout/routing_action_panel.xml
View File

@@ -19,7 +19,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/ic_search"
app:tint="?colorAccent"
app:tint="?colorSecondary"
android:layout_marginStart="@dimen/margin_base"
android:layout_marginEnd="@dimen/margin_base"/>
<com.google.android.material.textview.MaterialTextView
@@ -31,7 +31,7 @@
android:layout_marginEnd="@dimen/margin_base"
android:layout_marginTop="@dimen/routing_action_panel_margin_vert"
android:layout_marginBottom="@dimen/routing_action_panel_margin_vert"
android:textColor="?colorAccent"
android:textColor="?colorSecondary"
tools:text="Add start point to plan a route."/>
</LinearLayout>
<LinearLayout
@@ -55,6 +55,6 @@
android:layout_height="wrap_content"
android:layout_margin="@dimen/margin_base"
app:srcCompat="@drawable/ic_location_crosshair"
tools:tint="?colorAccent"/>
tools:tint="?colorSecondary"/>
</LinearLayout>
</LinearLayout>

2
android/app/src/main/res/layout/routing_details.xml
View File

@@ -12,7 +12,7 @@
android:layout_height="@dimen/altitude_chart_time_distance_height"
android:textAppearance="@style/MwmTextAppearance.Body3"
android:fontFamily="@string/robotoMedium"
android:textColor="?colorAccent"
android:textColor="?colorSecondary"
android:layout_gravity="end"
android:gravity="center"
android:layout_alignParentEnd="true"

2
android/app/src/main/res/layout/routing_plan.xml
View File

@@ -48,7 +48,7 @@
android:layout_marginStart="@dimen/routing_selector_wheel_margin"
android:contentDescription="@string/vehicle"
tools:button="@drawable/ic_car"
tools:buttonTint="?colorAccent" />
tools:buttonTint="?colorSecondary" />
<app.organicmaps.widget.RoutingToolbarButton
android:id="@+id/pedestrian"

2
android/app/src/main/res/values-night-v27/themes.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="MwmTheme.Night.MainActivity">
<item name="android:colorPrimaryDark">@android:color/black</item>
<item name="colorPrimaryVariant">@android:color/black</item>
<item name="android:windowBackground">@null</item>
<item name="android:windowTranslucentNavigation">false</item>
<!-- Allows to show the app behind the camera notch in landscape and when hiding the status bar -->

14
android/app/src/main/res/values-night/themes.xml
View File

@@ -13,7 +13,7 @@
<item name="android:textColorPrimaryInverse">@color/text_dark</item>
<item name="android:textColorSecondary">@color/text_light_subtitle</item>
<item name="android:windowBackground">?windowBackgroundForced</item>
<item name="android:colorPrimaryDark">@color/bg_primary_dark_night</item>
<item name="colorPrimaryVariant">@color/bg_primary_dark_night</item>
<item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
<item name="android:fontFamily">@string/robotoRegular</item>
<item name="android:colorBackgroundCacheHint">@null</item>
@@ -30,7 +30,7 @@
<item name="fullscreenDialogTheme">@style/MwmTheme.DialogFragment.Fullscreen.Night</item>
<item name="colorPrimary">@color/bg_primary_night</item>
<item name="colorControlNormal">?secondary</item>
<item name="colorAccent">@color/base_accent_night</item>
<item name="colorSecondary">@color/base_accent_night</item>
<item name="colorAccentTransparent">@color/base_accent_transparent</item>
<item name="colorBtnHighlight">@color/white_24</item>
<item name="panel">@color/bg_panel_night</item>
@@ -132,7 +132,7 @@
<!-- Theme is overridden in v27 folder to handle cutouts -->
<style name="MwmTheme.Night.MainActivity">
<item name="android:colorPrimaryDark">@android:color/black</item>
<item name="colorPrimaryVariant">@android:color/black</item>
<item name="android:windowBackground">@null</item>
<item name="android:windowTranslucentNavigation">false</item>
</style>
@@ -147,7 +147,7 @@
</style>
<style name="MwmTheme.Night.AlertDialog" parent="Theme.MaterialComponents.Dialog.Alert">
<item name="colorAccent">?buttonDialogTextColor</item>
<item name="colorSecondary">?buttonDialogTextColor</item>
<item name="colorPrimary">?buttonDialogTextColor</item>
<item name="android:background">?cardBackground</item>
<!-- Used for the message in the dialog -->
@@ -163,8 +163,8 @@
<style name="MwmTheme.DialogFragment.Fullscreen.Night" parent="Theme.AppCompat">
<item name="colorPrimary">@color/bg_primary_night</item>
<item name="android:colorPrimaryDark">?statusBar</item>
<item name="colorAccent">@color/base_accent_night</item>
<item name="colorPrimaryVariant">?statusBar</item>
<item name="colorSecondary">@color/base_accent_night</item>
<item name="clickableBackground">?selectableItemBackground</item>
<item name="colorControlNormal">@color/text_dark_hint</item>
<item name="android:windowIsFloating">false</item>
@@ -182,7 +182,7 @@
</style>
<style name="MwmMain.DialogFragment.TimePicker.Night" parent="Theme.MaterialComponents.Dialog.Alert">
<item name="colorAccent">@color/base_accent_night</item>
<item name="colorSecondary">@color/base_accent_night</item>
<item name="colorPrimary">?buttonDialogTextColor</item>
<item name="android:fontFamily">@string/robotoMedium</item>
<item name="android:windowBackground">@color/bg_cards_night</item>

2
android/app/src/main/res/values-v27/themes.xml
View File

@@ -2,7 +2,7 @@
<!-- Cutouts API is available for API >= 27 -->
<resources>
<style name="MwmTheme.MainActivity">
<item name="android:colorPrimaryDark">@android:color/black</item>
<item name="colorPrimaryVariant">@android:color/black</item>
<item name="android:windowBackground">@null</item>
<item name="android:windowTranslucentNavigation">false</item>
<!-- Allows to show the app behind the camera notch in landscape and when hiding the status bar -->

2
android/app/src/main/res/values/styles-editor.xml
View File

@@ -38,7 +38,7 @@
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:checked">true</item>
<item name="buttonTint">?colorAccent</item>
<item name="buttonTint">?colorSecondary</item>
</style>
<style name="MwmWidget.Editor.DayText">

6
android/app/src/main/res/values/styles-text.xml
View File

@@ -95,7 +95,7 @@
<style name="MwmTextAppearance.Button">
<item name="android:textSize">@dimen/text_size_button</item>
<item name="android:textColor">?colorAccent</item>
<item name="android:textColor">?colorSecondary</item>
<item name="android:textAllCaps">true</item>
</style>
@@ -133,7 +133,7 @@
<style name="MwmTextAppearance.NavMenu.Time">
<item name="android:textSize">@dimen/text_size_nav_menu_number</item>
<item name="android:textColor">?colorAccent</item>
<item name="android:textColor">?colorSecondary</item>
</style>
<style name="MwmTextAppearance.NavMenu.Time.Dimension">
@@ -180,7 +180,7 @@
<style name="MwmTextAppearance.PlacePage" parent="MwmTextAppearance.Body1"/>
<style name="MwmTextAppearance.PlacePage.Accent">
<item name="android:textColor">?colorAccent</item>
<item name="android:textColor">?colorSecondary</item>
</style>
<style name="MwmTextAppearance.Tab" parent="MwmTextAppearance.Body3">

10
android/app/src/main/res/values/styles.xml
View File

@@ -144,18 +144,18 @@
<style name="MwmWidget.ToolbarTheme" parent="ThemeOverlay.MaterialComponents.Dark.ActionBar">
<item name="android:gravity">center_vertical</item>
<item name="colorAccent">@android:color/white</item>
<item name="colorSecondary">@android:color/white</item>
<item name="iconTint">@color/white_primary</item>
</style>
<style name="MwmWidget.ToolbarTheme.Light" parent="MwmWidget.ToolbarTheme">
<item name="android:gravity">center_vertical</item>
<item name="colorAccent">@color/bg_window_night</item>
<item name="colorSecondary">@color/bg_window_night</item>
</style>
<style name="MwmWidget.ToolbarTheme.Transparent" parent="ThemeOverlay.MaterialComponents.Dark.ActionBar">
<item name="android:gravity">center_vertical</item>
<item name="colorAccent">@android:color/white</item>
<item name="colorSecondary">@android:color/white</item>
<item name="android:windowActionBarOverlay">true</item>
<item name="windowActionBarOverlay">true</item>
</style>
@@ -164,7 +164,7 @@
name="MwmWidget.ToolbarTheme.DownButton"
parent="ThemeOverlay.MaterialComponents.Dark.ActionBar">
<item name="android:gravity">center_vertical</item>
<item name="colorAccent">@android:color/white</item>
<item name="colorSecondary">@android:color/white</item>
<item name="android:homeAsUpIndicator">@drawable/ic_down</item>
</style>
@@ -364,7 +364,7 @@
<item name="iconSize">20dp</item>
<item name="iconTint">?accentButtonTextColor</item>
<item name="android:textColor">?accentButtonTextColor</item>
<item name="backgroundTint">?colorAccent</item>
<item name="backgroundTint">?colorSecondary</item>
<item name="android:textSize">14sp</item>
<item name="textAllCaps">false</item>
<item name="android:textAllCaps">false</item>

16
android/app/src/main/res/values/themes.xml
View File

@@ -13,7 +13,7 @@
<item name="android:textColorPrimaryInverse">@color/text_light</item>
<item name="android:textColorSecondary">@color/text_dark_subtitle</item>
<item name="android:windowBackground">?windowBackgroundForced</item>
<item name="android:colorPrimaryDark">@color/bg_primary_dark</item>
<item name="colorPrimaryVariant">@color/bg_primary_dark</item>
<item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
<item name="android:fontFamily">@string/robotoRegular</item>
<item name="android:colorBackgroundCacheHint">@null</item>
@@ -28,7 +28,7 @@
<item name="fullscreenDialogTheme">@style/MwmTheme.DialogFragment.Fullscreen</item>
<item name="colorPrimary">@color/bg_primary</item>
<item name="colorControlNormal">?secondary</item>
<item name="colorAccent">@color/base_accent</item>
<item name="colorSecondary">@color/base_accent</item>
<item name="colorAccentTransparent">@color/base_accent_transparent</item>
<item name="colorBtnHighlight">@color/white_38</item>
<item name="panel">@color/bg_panel</item>
@@ -146,7 +146,7 @@
<!-- Theme is overridden in v27 folder to handle cutouts -->
<style name="MwmTheme.MainActivity">
<item name="android:colorPrimaryDark">@android:color/black</item>
<item name="colorPrimaryVariant">@android:color/black</item>
<item name="android:windowBackground">@null</item>
<item name="android:windowTranslucentNavigation">false</item>
</style>
@@ -165,7 +165,7 @@
</style>
<style name="MwmTheme.AlertDialog" parent="Theme.MaterialComponents.Light.Dialog.Alert">
<item name="colorAccent">?buttonDialogTextColor</item>
<item name="colorSecondary">?buttonDialogTextColor</item>
<item name="colorPrimary">?buttonDialogTextColor</item>
<item name="android:background">?cardBackground</item>
<item name="android:textColorPrimary">?textDialogTheme</item>
@@ -184,8 +184,8 @@
<style name="MwmTheme.DialogFragment.Fullscreen" parent="Theme.AppCompat.Light">
<item name="colorPrimary">@color/bg_primary</item>
<item name="android:colorPrimaryDark">?statusBar</item>
<item name="colorAccent">@color/base_accent</item>
<item name="colorPrimaryVariant">?statusBar</item>
<item name="colorSecondary">@color/base_accent</item>
<item name="clickableBackground">?selectableItemBackground</item>
<item name="colorControlNormal">@color/text_light_hint</item>
<item name="android:windowIsFloating">false</item>
@@ -203,14 +203,14 @@
</style>
<style name="MwmTheme.DialogFragment.Fullscreen.Translucent">
<item name="android:colorPrimaryDark">@android:color/black</item>
<item name="colorPrimaryVariant">@android:color/black</item>
<item name="android:windowBackground">@color/bg_dialog_translucent</item>
<item name="android:windowIsTranslucent">true</item>
<item name="android:navigationBarColor">@android:color/transparent</item>
</style>
<style name="MwmMain.DialogFragment.TimePicker" parent="Theme.MaterialComponents.Light.Dialog.Alert">
<item name="colorAccent">@color/base_accent</item>
<item name="colorSecondary">@color/base_accent</item>
<item name="colorPrimary">?buttonDialogTextColor</item>
<item name="android:fontFamily">@string/robotoMedium</item>
<item name="android:windowBackground">@color/bg_cards</item>