Compare commits

..

1 Commits

Author SHA1 Message Date
Jean-Baptiste
73321efbe0 [android] Update place page colors
Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
2026-01-11 20:23:28 +01:00
20 changed files with 25 additions and 65 deletions

View File

@@ -3,13 +3,12 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
style="@style/Widget.Material3.CardView.Elevated"
style="@style/Widget.Material3.CardView.Filled"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="@dimen/margin_half"
app:cardBackgroundColor="?attr/colorSurfaceContainerHigh"
app:cardCornerRadius="28dp"
app:cardElevation="@dimen/m3_sys_elevation_level3">
app:cardCornerRadius="28dp">
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"

View File

@@ -7,7 +7,7 @@
android:layout_height="wrap_content"
android:paddingTop="@dimen/margin_base"
android:paddingBottom="@dimen/margin_base"
android:background="?cardBackground"
android:background="?appBackground"
android:clickable="true"
android:focusable="true"
android:fillViewport="true"

View File

@@ -5,10 +5,9 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/Widget.Material3.CardView.Elevated"
style="@style/Widget.Material3.CardView.Filled"
app:cardBackgroundColor="?attr/colorSurfaceContainerHigh"
app:cardCornerRadius="28dp"
app:cardElevation="@dimen/m3_sys_elevation_level3">
app:cardCornerRadius="28dp">
<LinearLayout
android:orientation="vertical"
android:minWidth="@dimen/bookmark_purchase_img_width"

View File

@@ -2,15 +2,14 @@
<com.google.android.material.card.MaterialCardView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
style="@style/Widget.Material3.CardView.Elevated"
style="@style/Widget.Material3.CardView.Filled"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/margin_double_and_half"
android:minWidth="@dimen/dialog_min_width"
android:minHeight="@dimen/dialog_min_height"
app:cardBackgroundColor="?attr/colorSurfaceContainerHigh"
app:cardCornerRadius="28dp"
app:cardElevation="@dimen/m3_sys_elevation_level3">
app:cardCornerRadius="28dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"

View File

@@ -3,13 +3,12 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
style="@style/Widget.Material3.CardView.Elevated"
style="@style/Widget.Material3.CardView.Filled"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="@dimen/margin_half"
app:cardBackgroundColor="?attr/colorSurfaceContainerHigh"
app:cardCornerRadius="28dp"
app:cardElevation="@dimen/m3_sys_elevation_level3">
app:cardCornerRadius="28dp">
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"

View File

@@ -3,7 +3,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="@dimen/elevation_profile_content_height"
android:background="?cardBackground"
android:background="?appBackground"
android:orientation="vertical">
<app.organicmaps.widget.placepage.ElevationProfileChart
android:id="@+id/elevation_profile_chart"

View File

@@ -5,7 +5,7 @@
android:id="@+id/elevation_profile"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?cardBackground"
android:background="?appBackground"
android:clickable="true"
android:fillViewport="true"
android:focusable="true"

View File

@@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/margin_base_plus_quarter"
android:layout_marginTop="@dimen/margin_direction_big"
android:orientation="vertical">
<FrameLayout

View File

@@ -4,7 +4,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:descendantFocusability="blocksDescendants"
android:background="?cardBackground"
android:background="?appBackground"
android:orientation="vertical">
<include
android:id="@+id/pp__preview"

View File

@@ -12,7 +12,7 @@
style="@style/MwmWidget.M3.Button.Secondary"
android:layout_height="wrap_content"
android:layout_width="match_parent"
app:backgroundTint="?windowBackgroundForced"
android:backgroundTint="?windowBackgroundForced"
app:backgroundTint="?colorSurfaceContainerLow"
android:backgroundTint="?colorSurfaceContainerLow"
android:text="@string/placepage_add_place_button" />
</LinearLayout>

View File

@@ -9,7 +9,7 @@
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_gravity="center_horizontal|top"
android:background="?ppBackground"
android:background="?appBackground"
android:visibility="gone" />
<androidx.core.widget.NestedScrollView
android:id="@+id/placepage"

View File

@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?windowBackgroundForced"
android:background="?attr/colorSurfaceContainerLow"
android:orientation="vertical">
@@ -13,7 +13,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?ppBackground"
android:background="?appBackground"
android:orientation="vertical">
<androidx.fragment.app.FragmentContainerView

View File

@@ -11,7 +11,7 @@
style="@style/MwmWidget.M3.Button.Secondary"
android:layout_height="wrap_content"
android:layout_width="match_parent"
app:backgroundTint="?windowBackgroundForced"
android:backgroundTint="?windowBackgroundForced"
app:backgroundTint="?colorSurfaceContainerLow"
android:backgroundTint="?colorSurfaceContainerLow"
android:text="@string/edit_place"/>
</LinearLayout>

View File

@@ -9,7 +9,7 @@ android:layout_marginHorizontal="@dimen/margin_base"
android:layout_marginTop="@dimen/margin_half"
app:strokeWidth="1dp"
app:strokeColor="@color/base_accent"
app:cardBackgroundColor="?cardBackground">
app:cardBackgroundColor="?appBackground">
<LinearLayout
android:layout_width="match_parent"

View File

@@ -8,6 +8,6 @@
android:id="@+id/rw__phone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?cardBackground"
android:background="?appBackground"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
</LinearLayout>

View File

@@ -189,7 +189,7 @@
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?ppBackground"
android:background="?appBackground"
android:orientation="horizontal">
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/item_icon"

View File

@@ -3,7 +3,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?cardBackground"
android:background="?appBackground"
android:orientation="vertical">
<View
android:layout_width="match_parent"

View File

@@ -4,7 +4,7 @@
android:id="@+id/pp_buttons_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?windowBackgroundForced"
android:background="?colorSurfaceContainerLow"
android:orientation="horizontal"
android:layout_gravity="bottom">
<include layout="@layout/item_divider" />

View File

@@ -288,15 +288,5 @@
<item name="cornerFamily">rounded</item>
<item name="android:colorBackground">?attr/colorSurfaceContainerHigh</item>
<item name="android:layout">@layout/m3_alert_dialog</item>
<item name="buttonBarPositiveButtonStyle">@style/MwmTheme.M3.AlertDialog.Button</item>
<item name="buttonBarNegativeButtonStyle">@style/MwmTheme.M3.AlertDialog.Button</item>
<item name="buttonBarNeutralButtonStyle">@style/MwmTheme.M3.AlertDialog.Button.Neutral</item>
</style>
<style name="MwmTheme.M3.AlertDialog.Button" parent="@style/Widget.Material3.Button.TextButton.Dialog">
<item name="android:textColor">?colorSecondary</item>
</style>
<style name="MwmTheme.M3.AlertDialog.Button.Neutral" parent="@style/Widget.Material3.Button.TextButton.Dialog.Flush">
<item name="android:textColor">?colorSecondary</item>
</style>
</resources>

View File

@@ -2,38 +2,12 @@
<html>
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0" />
<style>
/* All langs are invisible by default. */
[lang] {
display: none;
}
/* Dark mode support. */
:root {
color-scheme: light dark;
--primary-color: black;
--secondary-color: #555555;
--link-color: #37653F;
--background-color: white;
--separator-color: #0e0e0e;
}
@media screen and (prefers-color-scheme: dark) {
:root {
--primary-color: #b5b5b5;
--secondary-color: #858585;
--link-color: #659464;
--background-color: black;
--separator-color: #0a0a0a;
}
}
html {
color: var(--secondary-color);
background-color: var(--background-color);
}
.example {
font-weight: bold;
font-family: monospace;