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

Commit adcba3c8 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Make search screen and update page icon and text have same color

parent a7f627e2

app/src/main/java/foundation/e/apps/ui/compose/components/SearchInitialState.kt

+8 −4
Original line number Diff line number Diff line
@@ -32,9 +32,11 @@ import androidx.compose.material3.Text 
import androidx.compose.runtime.Composable

import androidx.compose.ui.Alignment

import androidx.compose.ui.Modifier

import androidx.compose.ui.res.colorResource

import androidx.compose.ui.res.stringResource

import androidx.compose.ui.tooling.preview.Preview

import androidx.compose.ui.unit.dp

import androidx.compose.ui.unit.sp

import foundation.e.apps.R

import foundation.e.apps.ui.compose.theme.AppTheme
@@ -46,20 +48,22 @@ fun SearchInitialState(modifier: Modifier = Modifier) { 
    ) {

        Column(

            horizontalAlignment = Alignment.CenterHorizontally,

            verticalArrangement = Arrangement.spacedBy(12.dp),

            verticalArrangement = Arrangement.spacedBy(10.dp),

        ) {

            Icon(

                imageVector = Icons.Outlined.Search,

                contentDescription = null,

                tint = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.6f),

                tint = colorResource(R.color.e_disabled_color),

                modifier = Modifier

                    .padding(bottom = 4.dp)

                    .size(72.dp),

            )

            Text(

                text = stringResource(id = R.string.search_hint),

                style = MaterialTheme.typography.bodyMedium,

                color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.72f),

                style = MaterialTheme.typography.bodyLarge.copy(

                    fontSize = 18.sp

                ),

                color = colorResource(R.color.e_primary_text_color),

            )

        }

    }

app/src/main/java/foundation/e/apps/ui/compose/theme/AppTheme.kt

+1 −1
Original line number Diff line number Diff line
@@ -53,5 +53,5 @@ fun AppTheme(darkTheme: Boolean = isSystemInDarkTheme(), content: @Composable () 
        )

    }



    MaterialTheme(colorScheme = colorScheme, typography = Typography, content = content)

    MaterialTheme(colorScheme = colorScheme, content = content)

}

app/src/main/java/foundation/e/apps/ui/compose/theme/Typography.kt

+0 −9
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
 */

package foundation.e.apps.ui.compose.theme



import androidx.compose.material3.Typography

import androidx.compose.ui.text.TextStyle

import androidx.compose.ui.text.font.FontFamily

import androidx.compose.ui.text.font.FontWeight
@@ -26,14 +25,6 @@ import androidx.compose.ui.unit.em 
import androidx.compose.ui.unit.sp



// Set of Material typography styles to start with

val Typography = Typography(

    bodyLarge = TextStyle(

        fontFamily = FontFamily.Default,

        fontWeight = FontWeight.Normal,

        fontSize = 16.sp,

        lineHeight = 24.sp,

    )

)



val titleStyle = TextStyle(

    fontFamily = FontFamily.SansSerif,

app/src/main/res/drawable/ic_all_apps_updated.xml

+3 −3
Original line number Diff line number Diff line
@@ -16,11 +16,11 @@ 
  -->



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

    android:width="80dp"

    android:height="80dp"

    android:width="72dp"

    android:height="72dp"

    android:viewportWidth="512"

    android:viewportHeight="512">

    <path

        android:fillColor="@color/colorAccent"

        android:fillColor="@color/e_disabled_color"

        android:pathData="M435.848,83.466L172.804,346.51l-96.652,-96.652c-4.686,-4.686 -12.284,-4.686 -16.971,0l-28.284,28.284c-4.686,4.686 -4.686,12.284 0,16.971l133.421,133.421c4.686,4.686 12.284,4.686 16.971,0l299.813,-299.813c4.686,-4.686 4.686,-12.284 0,-16.971l-28.284,-28.284c-4.686,-4.686 -12.284,-4.686 -16.97,0z"/>

</vector>

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

+3 −0
Original line number Diff line number Diff line
@@ -92,9 +92,12 @@ 
        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:drawableTop="@drawable/ic_all_apps_updated"

        android:drawablePadding="10dp"

        android:text="@string/all_apps_updated"

        android:textAlignment="center"

        android:textColor="@color/e_primary_text_color"

        android:textSize="18sp"

        android:textAppearance="@style/TextAppearance.Material3.BodyLarge"

        android:visibility="gone"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintEnd_toEndOf="parent"