From 9d2d794c8b350225dd6b74a6be85f3e59c56d465 Mon Sep 17 00:00:00 2001 From: JaredAyala Date: Sat, 23 May 2026 02:39:24 -0600 Subject: [PATCH] Ya estuvo --- .../example/basurapp/views/TruckProgressView.kt | 14 ++++++++++++-- .../res/drawable/outline_account_circle_24.xml | 5 +++++ app/src/main/res/layout/activity_login.xml | 3 +-- app/src/main/res/layout/item_address.xml | 4 ++-- 4 files changed, 20 insertions(+), 6 deletions(-) create mode 100644 app/src/main/res/drawable/outline_account_circle_24.xml diff --git a/app/src/main/java/com/example/basurapp/views/TruckProgressView.kt b/app/src/main/java/com/example/basurapp/views/TruckProgressView.kt index 3cc3061..33ddfb5 100644 --- a/app/src/main/java/com/example/basurapp/views/TruckProgressView.kt +++ b/app/src/main/java/com/example/basurapp/views/TruckProgressView.kt @@ -18,12 +18,12 @@ class TruckProgressView @JvmOverloads constructor( private var truckPosition: Int = 0 private val linePaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { - color = Color.BLACK + color = resolveOnSurfaceColor(context) strokeWidth = 6f } private val stopPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { - color = Color.BLACK + color = resolveOnSurfaceColor(context) style = Paint.Style.FILL } @@ -80,4 +80,14 @@ class TruckProgressView @JvmOverloads constructor( canvas.drawCircle(x - 20f, y + 12f, 6f, wheelPaint) canvas.drawCircle(x + 20f, y + 12f, 6f, wheelPaint) } + + private fun resolveOnSurfaceColor(context: Context): Int { + val typedValue = android.util.TypedValue() + context.theme.resolveAttribute( + com.google.android.material.R.attr.colorOnSurface, + typedValue, + true + ) + return typedValue.data + } } \ No newline at end of file diff --git a/app/src/main/res/drawable/outline_account_circle_24.xml b/app/src/main/res/drawable/outline_account_circle_24.xml new file mode 100644 index 0000000..a5521e7 --- /dev/null +++ b/app/src/main/res/drawable/outline_account_circle_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index a414bdc..dfea523 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -29,9 +29,8 @@ android:layout_width="120dp" android:layout_height="120dp" android:layout_marginTop="32dp" - android:background="@color/gray_300" android:contentDescription="@string/app_name" - android:src="@mipmap/ic_launcher_round" + android:src="@drawable/outline_account_circle_24" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tvTitle" /> diff --git a/app/src/main/res/layout/item_address.xml b/app/src/main/res/layout/item_address.xml index c5c7110..719dc92 100644 --- a/app/src/main/res/layout/item_address.xml +++ b/app/src/main/res/layout/item_address.xml @@ -17,7 +17,7 @@ android:id="@+id/tvStreet" android:layout_width="0dp" android:layout_height="wrap_content" - android:textColor="@color/gray_900" + android:textColor="?attr/colorOnSurface" android:textSize="14sp" android:textStyle="bold" app:layout_constraintEnd_toStartOf="@id/btnDelete" @@ -40,7 +40,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="2dp" - android:textColor="@color/gray_500" + android:textColor="?attr/colorOnSurfaceVariant" android:textSize="12sp" android:visibility="gone" app:layout_constraintEnd_toStartOf="@id/btnDelete"