Merge pull request #14140 from nextcloud/style/noid/improve-rtl

Improve RTL support
This commit is contained in:
Tobias Kaminsky 2024-12-11 08:39:17 +01:00 committed by GitHub
commit 32350da288
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 29 additions and 38 deletions

View file

@ -34,7 +34,7 @@
<TextView <TextView
android:id="@+id/subject" android:id="@+id/subject"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ellipsize="end" android:ellipsize="end"
android:paddingStart="@dimen/activity_icon_layout_right_end_margin" android:paddingStart="@dimen/activity_icon_layout_right_end_margin"

View file

@ -22,14 +22,14 @@
<RadioButton <RadioButton
android:id="@+id/storage_internal_radio" android:id="@+id/storage_internal_radio"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:enabled="false" android:enabled="false"
android:text="@string/storage_internal_storage" /> android:text="@string/storage_internal_storage" />
<RadioButton <RadioButton
android:id="@+id/storage_external_radio" android:id="@+id/storage_external_radio"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:enabled="false" android:enabled="false"
android:text="@string/storage_external_storage" /> android:text="@string/storage_external_storage" />

View file

@ -81,7 +81,6 @@
android:id="@+id/Filename" android:id="@+id/Filename"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:ellipsize="middle" android:ellipsize="middle"
android:singleLine="true" android:singleLine="true"
android:textColor="@color/text_color" android:textColor="@color/text_color"

View file

@ -8,7 +8,7 @@
~ SPDX-FileCopyrightText: 2018 Tobias Kaminsky <tobias@kaminsky.me> ~ SPDX-FileCopyrightText: 2018 Tobias Kaminsky <tobias@kaminsky.me>
~ SPDX-License-Identifier: GPL-3.0-or-later AND AGPL-3.0-or-later ~ SPDX-License-Identifier: GPL-3.0-or-later AND AGPL-3.0-or-later
--> -->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -23,46 +23,31 @@
android:id="@+id/icon" android:id="@+id/icon"
android:layout_width="@dimen/notification_icon_width" android:layout_width="@dimen/notification_icon_width"
android:layout_height="@dimen/notification_icon_height" android:layout_height="@dimen/notification_icon_height"
android:layout_alignParentTop="true"
android:layout_marginEnd="@dimen/notification_icon_layout_right_end_margin" android:layout_marginEnd="@dimen/notification_icon_layout_right_end_margin"
android:contentDescription="@string/notification_icon" android:contentDescription="@string/notification_icon"
android:src="@drawable/ic_notification" /> android:src="@drawable/ic_notification" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:id="@+id/notification_content"
android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignTop="@id/icon" android:layout_weight="1"
android:layout_toEndOf="@id/icon"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <TextView
android:layout_width="match_parent" android:id="@+id/subject"
android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="horizontal"> android:ellipsize="end"
android:paddingBottom="@dimen/standard_half_padding"
<TextView android:textAppearance="?android:attr/textAppearanceListItem"
android:id="@+id/subject" android:textColor="@color/text_color"
android:layout_width="0dp" android:textSize="@dimen/txt_size_16sp"
android:layout_height="wrap_content" tools:text="@string/placeholder_filename" />
android:layout_weight="1"
android:ellipsize="end"
android:textAppearance="?android:attr/textAppearanceListItem"
android:textColor="@color/text_color"
android:textSize="@dimen/txt_size_16sp"
android:paddingBottom="@dimen/standard_half_padding"
tools:text="@string/placeholder_filename" />
<ImageView
android:id="@+id/dismiss"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/dismiss_notification_description"
android:src="@drawable/ic_close" />
</LinearLayout>
<TextView <TextView
android:id="@+id/message" android:id="@+id/message"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ellipsize="end" android:ellipsize="end"
android:paddingBottom="@dimen/standard_quarter_padding" android:paddingBottom="@dimen/standard_quarter_padding"
@ -92,4 +77,11 @@
</LinearLayout> </LinearLayout>
</RelativeLayout> <ImageView
android:id="@+id/dismiss"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/dismiss_notification_description"
android:src="@drawable/ic_close" />
</LinearLayout>

View file

@ -45,9 +45,9 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ellipsize="middle" android:ellipsize="middle"
android:singleLine="true" android:singleLine="true"
tools:text="@string/placeholder_filename"
android:textColor="@color/text_color" android:textColor="@color/text_color"
android:textSize="@dimen/two_line_primary_text_size"/> android:textSize="@dimen/two_line_primary_text_size"
tools:text="@string/placeholder_filename" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"

View file

@ -33,7 +33,7 @@
<TextView <TextView
android:id="@+id/version_created" android:id="@+id/version_created"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ellipsize="end" android:ellipsize="end"
android:text="@string/new_version_was_created" android:text="@string/new_version_was_created"
@ -41,7 +41,7 @@
<TextView <TextView
android:id="@+id/size" android:id="@+id/size"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="1" android:layout_weight="1"
android:ellipsize="end" android:ellipsize="end"