Merge branch '6010-truncated_string_settings' into 'main' (d2f12144) · Commits · e / os / App Lounge

app/src/main/res/layout/layout_source_settings.xml

0 → 100644

+79 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?><!--
		~ Copyright (C) 2022 ECORP
		~
		~ This program is free software: you can redistribute it and/or modify
		~ it under the terms of the GNU General Public License as published by
		~ the Free Software Foundation, either version 3 of the License, or
		~ (at your option) any later version.
		~
		~ This program is distributed in the hope that it will be useful,
		~ but WITHOUT ANY WARRANTY; without even the implied warranty of
		~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		~ GNU General Public License for more details.
		~
		~ You should have received a copy of the GNU General Public License
		~ along with this program. If not, see <https://www.gnu.org/licenses/>.
		-->

		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent" android:layout_height="wrap_content"
		android:minHeight="?android:attr/listPreferredItemHeight"
		android:gravity="center_vertical" android:paddingRight="?android:attr/scrollbarSize">

		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:minHeight="?android:attr/listPreferredItemHeight"
		android:gravity="center_vertical"
		android:paddingRight="?android:attr/scrollbarSize">
		<LinearLayout
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		android:gravity="center"
		android:minWidth="@dimen/preference_icon_minWidth"
		android:orientation="horizontal">
		<ImageView
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center"
		android:minWidth="48dp"
		/>
		</LinearLayout>
		<RelativeLayout
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginLeft="22dp"
		android:layout_marginRight="8dip"
		android:layout_marginTop="6dip"
		android:layout_marginBottom="6dip"
		android:layout_weight="1">

		<TextView android:id="@android:id/title"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:singleLine="false"
		android:textColor="@android:color/black"
		android:textAppearance="?android:attr/textAppearanceMediumInverse"
		android:textSize="16sp"
		android:layout_marginTop="12dp"
		android:fadingEdge="horizontal" />

		<TextView android:id="@+id/summary"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_below="@android:id/title"
		android:layout_alignLeft="@android:id/title"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:textColor="?android:attr/textColorSecondary"
		android:maxLines="4" />
		</RelativeLayout>
		<!-- Preference should place its actual preference widget here. -->
		<LinearLayout android:id="@android:id/widget_frame"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		android:gravity="center"
		android:orientation="vertical" />

		</LinearLayout>

		</LinearLayout>
		No newline at end of file

app/src/main/res/xml/settings_preferences.xml

+10 −11

Original line number	Diff line number	Diff line
		@@ -16,13 +16,11 @@
		~ along with this program. If not, see <https://www.gnu.org/licenses/>.
		-->

		<PreferenceScreen
		xmlns:android="http://schemas.android.com/apk/res/android"
		<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:tools="http://schemas.android.com/tools"
		android:layout_width="match_parent"
		android:layout_height="match_parent">
		<PreferenceCategory
		android:title="@string/preference_updates_title">
		<PreferenceCategory android:title="@string/preference_updates_title">
		<ListPreference
		android:defaultValue="@string/preference_update_interval_default"
		android:dialogTitle="@string/preference_update_interval_title"
		@@ -51,33 +49,34 @@
		android:title="@string/preference_update_wifi_only_title" />
		</PreferenceCategory>

		<PreferenceCategory
		android:title="@string/Show_applications">
		<PreferenceCategory android:title="@string/Show_applications">

		<CheckBoxPreference
		android:defaultValue="true"
		android:key="showFOSSApplications"
		android:layout="@layout/layout_source_settings"
		android:title="@string/show_only_open_source_apps" />

		<CheckBoxPreference
		android:defaultValue="true"
		android:key="showPWAApplications"
		android:layout="@layout/layout_source_settings"
		android:title="@string/show_only_pwa_apps" />

		<CheckBoxPreference
		android:defaultValue="true"
		android:key="showAllApplications"
		android:layout="@layout/layout_source_settings"
		android:title="@string/Show_commercial_apps" />

		</PreferenceCategory>

		<PreferenceCategory
		android:title="@string/about">
		<PreferenceCategory android:title="@string/about">

		<foundation.e.apps.settings.LongPressPreference
		android:key="versionInfo"
		android:title="@string/app_version_label"
		tools:summary="2.2.1"
		/>
		tools:summary="2.2.1" />

		</PreferenceCategory>