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

Unverified Commit 7b6e7d12 authored by Marvin W.'s avatar Marvin W. 🐿️
Browse files

Settings: Further adjust styling to match system settings / Google settings app

parent ccb2e1ed

play-services-base/core/src/main/kotlin/org/microg/gms/ui/FooterPreference.kt

0 → 100644
+29 −0
Original line number Diff line number Diff line 
/*

 * SPDX-FileCopyrightText: 2024 microG Project Team

 * SPDX-License-Identifier: Apache-2.0

 */



package org.microg.gms.ui



import android.content.Context

import android.util.AttributeSet

import android.util.TypedValue

import android.view.Gravity

import android.view.ViewGroup.LayoutParams.MATCH_PARENT

import android.widget.LinearLayout

import android.widget.TextView

import androidx.preference.Preference

import androidx.preference.PreferenceViewHolder

import org.microg.gms.base.core.R



class FooterPreference : Preference {

    constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int, defStyleRes: Int) : super(context, attrs, defStyleAttr, defStyleRes)

    constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr)

    constructor(context: Context, attrs: AttributeSet?) : super(context, attrs)

    constructor(context: Context) : super(context)



    init {

        layoutResource = R.layout.preference_footer

        if (icon == null) setIcon(R.drawable.ic_info_outline)

    }

}

play-services-base/core/src/main/res/drawable/ic_expand_apps.xml

+2 −2
Original line number Diff line number Diff line
@@ -10,10 +10,10 @@ 
    android:width="24dp"

    android:height="24dp"

    android:autoMirrored="true"

    android:tint="?attr/colorAccent"

    android:tint="?attr/colorControlNormal"

    android:viewportWidth="24.0"

    android:viewportHeight="24.0">

    <path

        android:fillColor="#FF000000"

        android:fillColor="#000"

        android:pathData="M9.71,18.71l-1.42,-1.42l5.3,-5.29l-5.3,-5.29l1.42,-1.42l6.7,6.71z" />

</vector>

play-services-base/core/src/main/res/drawable/ic_info_outline.xml

+2 −2
Original line number Diff line number Diff line
@@ -8,10 +8,10 @@ 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

    android:tint="?attr/colorAccent"

    android:tint="?attr/colorControlNormal"

    android:viewportWidth="24.0"

    android:viewportHeight="24.0">

    <path

        android:fillColor="#FF000000"

        android:fillColor="#000"

        android:pathData="M11,17h2v-6h-2v6zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2L13,7h-2v2z" />

</vector>

play-services-base/core/src/main/res/drawable/ic_open.xml

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

    android:tint="?attr/colorAccent"

    android:tint="?attr/colorControlNormal"

    android:viewportWidth="24"

    android:viewportHeight="24">

    <path

play-services-base/core/src/main/res/layout/preference_footer.xml

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

  ~ SPDX-FileCopyrightText: 2022 The Android Open Source Project

  ~ SPDX-FileCopyrightText: 2024 microG Project Team

  ~ SPDX-License-Identifier: Apache-2.0

  -->



<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:paddingStart="?android:attr/listPreferredItemPaddingStart"

    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

    android:background="?android:attr/selectableItemBackground"

    android:orientation="vertical"

    android:clipToPadding="false">



    <LinearLayout

        android:id="@+id/icon_frame"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:minWidth="56dp"

        android:gravity="start|top"

        android:orientation="horizontal"

        android:paddingEnd="12dp"

        android:paddingTop="16dp"

        android:paddingBottom="4dp">

        <ImageView

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

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"/>

    </LinearLayout>



    <LinearLayout

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:orientation="vertical">

        <TextView

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

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="start"

            android:textAlignment="viewStart"

            android:paddingTop="16dp"

            android:paddingBottom="8dp"

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

            android:hyphenationFrequency="normalFast"

            android:lineBreakWordStyle="phrase"

            android:ellipsize="marquee"/>

    </LinearLayout>



</LinearLayout>
 
 No newline at end of file