Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0819036a authored by Hasib Prince's avatar Hasib Prince
Browse files

Merge branch '6136-title_settings_page' into 'main' 

Merge branch '6093-button_text_truncated' into 'main'

See merge request !224
parents 9888866d 615d3257

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

+5 −3
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?><!--

<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Apps  Quickly and easily install Android apps onto your device!

  ~ Copyright (C) 2022  MURENA SAS

  ~ Copyright (C) 2021  E FOUNDATION

  ~

  ~ This program is free software: you can redistribute it and/or modify
@@ -52,7 +54,7 @@ 
                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginTop="25dp"

                android:layout_marginEnd="21dp"

                android:layout_marginEnd="16dp"

                android:gravity="end"

                android:text="@string/terms_services"

                android:textColor="@color/colorAccent"
@@ -102,7 +104,7 @@ 
                style="@style/Widget.MaterialComponents.Button.OutlinedButton"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginEnd="10dp"

                android:layout_marginEnd="16dp"

                android:text="@string/logout"

                android:textSize="14sp"

                app:layout_constraintBottom_toBottomOf="@id/avatar"

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

0 → 100644
+71 −0
Original line number Diff line number Diff line 
<!--

  ~ Apps  Quickly and easily install Android apps onto your device!

  ~ Copyright (C) 2022  MURENA SAS

  ~

  ~ 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:background="?android:attr/selectableItemBackground"

    android:gravity="center_vertical"

    android:minHeight="?android:attr/listPreferredItemHeight"

    android:paddingStart="16dp"

    android:paddingEnd="16dp"

    android:paddingBottom="24dp">



    <ImageView

        android:id="@android:id/icon"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center" />



    <RelativeLayout

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginStart="0dip"

        android:layout_marginTop="8dip"

        android:layout_marginBottom="8dip"

        android:layout_weight="1">



        <TextView

            android:id="@android:id/title"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:ellipsize="marquee"

            android:fadingEdge="horizontal"

            android:singleLine="true"

            android:textAppearance="?android:attr/textAppearanceSmall"

            android:textColor="@android:color/black"

            android:textSize="16sp" />



        <TextView

            android:id="@android:id/summary"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_below="@android:id/title"

            android:layout_alignStart="@android:id/title"

            android:maxLines="4"

            android:textAppearance="?android:attr/textAppearanceSmall"

            android:textColor="?android:attr/textColorSecondary" />

    </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_vertical"

        android:orientation="vertical" />

</LinearLayout>
 
 No newline at end of file

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

0 → 100644
+31 −0
Original line number Diff line number Diff line 
<!--

  ~ Apps  Quickly and easily install Android apps onto your device!

  ~ Copyright (C) 2022  MURENA SAS

  ~

  ~ 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/>.

  -->



<TextView xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:tools="http://schemas.android.com/tools"

    tools:ignore="UnusedResources"

    android:id="@android:id/title"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_marginBottom="0dip"

    android:textAppearance="@android:style/TextAppearance.Material.Body2"

    android:textColor="?android:attr/colorAccent"

    android:paddingStart="?attr/listPreferredItemPaddingStart"

    android:paddingEnd="?attr/listPreferredItemPaddingEnd"

    android:paddingTop="32dip"

    android:paddingBottom="16dip" />
 
 No newline at end of file

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

0 → 100644
+26 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?><!--

  ~  Copyright (C) 2022  MURENA SAS

  ~

  ~   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/>.

  -->



<CheckBox xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:tools="http://schemas.android.com/tools"

    tools:ignore="UnusedResources"

    android:id="@android:id/checkbox"

    android:layout_width="25dp"

    android:layout_height="25dp"

    android:focusable="false"

    android:clickable="false"

    android:background="@null" />
 
 No newline at end of file

app/src/main/res/values/themes.xml

+2 −0
Original line number Diff line number Diff line 
<!--

  ~ Apps  Quickly and easily install Android apps onto your device!

  ~ Copyright (C) 2022  MURENA SAS

  ~ Copyright (C) 2021  E FOUNDATION

  ~

  ~ This program is free software: you can redistribute it and/or modify
@@ -36,6 +37,7 @@ 


    <style name="CustomPreferenceThemeOverlay" parent="PreferenceThemeOverlay">

        <item name="android:layout">@layout/custom_preference</item>

        <item name="iconSpaceReserved">false</item>

    </style>



    <style name="AppTheme.ActionBarStyle" parent="Widget.MaterialComponents.ActionBar.Surface">