Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Size for side widgets #21941

Merged
merged 3 commits into from
Feb 25, 2025
Merged

Size for side widgets #21941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5506d2e
size for side widgets
0xRe1nk0 Feb 19, 2025
ceaa3a7
side sizes fix
0xRe1nk0 Feb 21, 2025
051b6a8
code review fix
0xRe1nk0 Feb 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
151 changes: 82 additions & 69 deletions OsmAnd/res/layout-v26/simple_map_widget_large.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,91 +1,104 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout 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"
android:id="@+id/widget_bg"
android:layout_width="match_parent"
android:layout_height="@dimen/simple_widget_large_height"
android:orientation="vertical"
android:paddingHorizontal="16dp"
android:paddingTop="6dp"
android:paddingBottom="3dp">
android:layout_height="@dimen/simple_widget_large_height">

<LinearLayout
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
android:orientation="vertical"
android:paddingHorizontal="16dp"
android:paddingTop="6dp"
android:paddingBottom="3dp">

<LinearLayout
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="17dp"
android:gravity="bottom"
android:layoutDirection="rtl"
android:orientation="horizontal">
android:layout_height="match_parent"
android:orientation="vertical">

<TextView
android:id="@+id/widget_text_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="bottom|end"
android:includeFontPadding="false"
android:letterSpacing="0.06"
android:lineSpacingExtra="-2sp"
android:maxLines="1"
android:textAllCaps="true"
android:textColor="@color/text_color_secondary_light"
android:textSize="@dimen/simple_widget_description_text_size"
tools:text="Unit" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="17dp"
android:gravity="bottom"
android:layoutDirection="rtl"
android:orientation="horizontal">

<TextView
android:id="@+id/widget_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="bottom|start"
android:layout_marginStart="3dp"
android:layout_weight="1"
android:ellipsize="end"
android:includeFontPadding="false"
android:letterSpacing="0.06"
android:lineSpacingExtra="-2sp"
android:maxLines="1"
android:textAllCaps="true"
android:textColor="@color/text_color_secondary_light"
android:textSize="@dimen/simple_widget_description_text_size"
tools:text="Widget name" />
<TextView
android:id="@+id/widget_text_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="bottom|end"
android:includeFontPadding="false"
android:letterSpacing="0.06"
android:lineSpacingExtra="-2sp"
android:maxLines="1"
android:textAllCaps="true"
android:textColor="@color/text_color_secondary_light"
android:textSize="@dimen/simple_widget_description_text_size"
tools:text="Unit" />

</LinearLayout>
<TextView
android:id="@+id/widget_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="3dp"
android:layout_weight="1"
android:ellipsize="end"
android:gravity="bottom|start"
android:includeFontPadding="false"
android:letterSpacing="0.06"
android:lineSpacingExtra="-2sp"
android:maxLines="1"
android:textAllCaps="true"
android:textColor="@color/text_color_secondary_light"
android:textSize="@dimen/simple_widget_description_text_size"
tools:text="Widget name" />

<FrameLayout
android:layout_width="match_parent"
android:layout_height="70dp">
</LinearLayout>

<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/widget_icon"
android:layout_width="@dimen/map_widget_icon"
android:layout_height="@dimen/map_widget_icon"
android:layout_gravity="start|center_vertical"
android:gravity="center"
app:srcCompat="@drawable/ic_action_remove_dark" />

<TextView
android:id="@+id/widget_text"
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:autoSizeMaxTextSize="@dimen/simple_widget_value_large_size"
android:autoSizeMinTextSize="@dimen/simple_widget_value_minimum_size"
android:autoSizeStepGranularity="2sp"
android:autoSizeTextType="uniform"
android:ellipsize="none"
android:gravity="center_vertical|start"
android:includeFontPadding="false"
android:letterSpacing="0.04"
android:maxLines="1"
android:textColor="@color/text_color_primary_light"
android:textSize="@dimen/simple_widget_value_large_size" />
android:layout_height="70dp">

<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/widget_icon"
android:layout_width="@dimen/map_widget_icon"
android:layout_height="@dimen/map_widget_icon"
android:layout_gravity="start|center_vertical"
android:gravity="center"
app:srcCompat="@drawable/ic_action_remove_dark" />

</FrameLayout>
<TextView
android:id="@+id/widget_text"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:autoSizeMaxTextSize="@dimen/simple_widget_value_large_size"
android:autoSizeMinTextSize="@dimen/simple_widget_value_minimum_size"
android:autoSizeStepGranularity="2sp"
android:autoSizeTextType="uniform"
android:ellipsize="none"
android:gravity="center_vertical|start"
android:includeFontPadding="false"
android:letterSpacing="0.04"
android:maxLines="1"
android:textColor="@color/text_color_primary_light"
android:textSize="@dimen/simple_widget_value_large_size" />

</FrameLayout>

</LinearLayout>

</LinearLayout>

</LinearLayout>
<View
android:id="@+id/bottom_divider"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_gravity="bottom"
android:visibility="invisible" />

</FrameLayout>
151 changes: 82 additions & 69 deletions OsmAnd/res/layout-v26/simple_map_widget_medium.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,92 +1,105 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout 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"
android:id="@+id/widget_bg"
android:layout_width="match_parent"
android:layout_height="@dimen/simple_widget_medium_height"
android:orientation="vertical"
android:paddingHorizontal="16dp"
android:paddingTop="6dp"
android:paddingBottom="3dp">
android:layout_height="@dimen/simple_widget_medium_height">

<LinearLayout
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:ignore="UselessParent">
android:paddingHorizontal="16dp"
android:paddingTop="6dp"
android:paddingBottom="3dp">

<LinearLayout
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="17dp"
android:layoutDirection="rtl"
android:orientation="horizontal">
android:layout_height="match_parent"
android:orientation="vertical"
tools:ignore="UselessParent">

<TextView
android:id="@+id/widget_text_small"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginEnd="3dp"
android:gravity="bottom|end"
android:includeFontPadding="false"
android:letterSpacing="0.06"
android:lineSpacingExtra="-2sp"
android:maxLines="1"
android:textAllCaps="true"
android:textColor="@color/text_color_secondary_light"
android:textSize="@dimen/simple_widget_description_text_size"
tools:text="Unit" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="17dp"
android:layoutDirection="rtl"
android:orientation="horizontal">

<TextView
android:id="@+id/widget_name"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:ellipsize="end"
android:gravity="bottom|start"
android:includeFontPadding="false"
android:letterSpacing="0.06"
android:lineSpacingExtra="-2sp"
android:maxLines="1"
android:textAllCaps="true"
android:textColor="@color/text_color_secondary_light"
android:textSize="@dimen/simple_widget_description_text_size"
tools:text="Widget name" />
<TextView
android:id="@+id/widget_text_small"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginEnd="3dp"
android:gravity="bottom|end"
android:includeFontPadding="false"
android:letterSpacing="0.06"
android:lineSpacingExtra="-2sp"
android:maxLines="1"
android:textAllCaps="true"
android:textColor="@color/text_color_secondary_light"
android:textSize="@dimen/simple_widget_description_text_size"
tools:text="Unit" />

</LinearLayout>
<TextView
android:id="@+id/widget_name"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:ellipsize="end"
android:gravity="bottom|start"
android:includeFontPadding="false"
android:letterSpacing="0.06"
android:lineSpacingExtra="-2sp"
android:maxLines="1"
android:textAllCaps="true"
android:textColor="@color/text_color_secondary_light"
android:textSize="@dimen/simple_widget_description_text_size"
tools:text="Widget name" />

<FrameLayout
android:layout_width="match_parent"
android:layout_height="46dp"
android:orientation="horizontal">
</LinearLayout>

<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/widget_icon"
android:layout_width="@dimen/map_widget_icon"
android:layout_height="@dimen/map_widget_icon"
android:layout_gravity="start|center_vertical"
app:srcCompat="@drawable/ic_action_remove_dark" />

<TextView
android:id="@+id/widget_text"
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="12dp"
android:autoSizeMaxTextSize="@dimen/simple_widget_value_medium_size"
android:autoSizeMinTextSize="@dimen/simple_widget_value_minimum_size"
android:autoSizeStepGranularity="2sp"
android:autoSizeTextType="uniform"
android:ellipsize="none"
android:gravity="center_vertical|start"
android:includeFontPadding="false"
android:letterSpacing="0.04"
android:maxLines="1"
android:textColor="@color/text_color_primary_light"
android:textSize="@dimen/simple_widget_value_medium_size" />
android:layout_height="46dp"
android:orientation="horizontal">

<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/widget_icon"
android:layout_width="@dimen/map_widget_icon"
android:layout_height="@dimen/map_widget_icon"
android:layout_gravity="start|center_vertical"
app:srcCompat="@drawable/ic_action_remove_dark" />

</FrameLayout>
<TextView
android:id="@+id/widget_text"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="12dp"
android:autoSizeMaxTextSize="@dimen/simple_widget_value_medium_size"
android:autoSizeMinTextSize="@dimen/simple_widget_value_minimum_size"
android:autoSizeStepGranularity="2sp"
android:autoSizeTextType="uniform"
android:ellipsize="none"
android:gravity="center_vertical|start"
android:includeFontPadding="false"
android:letterSpacing="0.04"
android:maxLines="1"
android:textColor="@color/text_color_primary_light"
android:textSize="@dimen/simple_widget_value_medium_size" />

</FrameLayout>

</LinearLayout>

</LinearLayout>

</LinearLayout>
<View
android:id="@+id/bottom_divider"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_gravity="bottom"
android:visibility="invisible" />

</FrameLayout>
Loading
Loading