Skip to content

Redesign Kindness UI and simplify layouts #1673

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bitmold merged 1 commit into from
Apr 26, 2026
+110 −123
Merged

Redesign Kindness UI and simplify layouts #1673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions app/src/main/res/drawable/ic_heart.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
android:viewportWidth="960"
android:viewportHeight="960"
android:tint="?attr/colorControlNormal">
<path
android:pathData="M12,9C12,9 12,3 17.25,3C22.5,3 22.5,7.5 22.5,9C22.5,15.75 12,22.5 12,22.5V9Z"
android:fillColor="#7D7C80"/>
<path
android:pathData="M12,9C12,9 12,3 6.75,3C1.5,3 1.5,7.5 1.5,9C1.5,15.75 12,22.5 12,22.5L13.5,13.5L12,9Z"
android:fillColor="#7D7C80"/>
</vector>
android:fillColor="@android:color/white"
android:pathData="M480,840L422,788Q321,697 255,631Q189,565 150,512.5Q111,460 95.5,416Q80,372 80,326Q80,232 143,169Q206,106 300,106Q352,106 399,128Q446,150 480,190Q514,150 561,128Q608,106 660,106Q754,106 817,169Q880,232 880,326Q880,372 864.5,416Q849,460 810,512.5Q771,565 705,631Q639,697 538,788L480,840ZM480,732Q576,646 638,584.5Q700,523 736,477.5Q772,432 786,396.5Q800,361 800,326Q800,266 760,226Q720,186 660,186Q613,186 573,212.5Q533,239 518,280L518,280L442,280L442,280Q427,239 387,212.5Q347,186 300,186Q240,186 200,226Q160,266 160,326Q160,361 174,396.5Q188,432 224,477.5Q260,523 322,584.5Q384,646 480,732ZM480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459L480,459L480,459L480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Z"/>
</vector>
219 changes: 104 additions & 115 deletions app/src/main/res/layout/fragment_kindness.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,132 +125,121 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ivHeader" />

<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/rowVolunteerMode"
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginBottom="4dp"
android:background="@color/panel_widget_background"
android:padding="4dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tvTitleOn">

<ImageView
android:id="@+id/ivHeartOn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@null"
android:src="@drawable/ic_heart"
app:layout_constraintBottom_toBottomOf="@id/swVolunteerHeader"
app:layout_constraintEnd_toStartOf="@id/swVolunteerHeader"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/swVolunteerHeader" />

<TextView
android:id="@+id/swVolunteerHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="2dp"
android:text="@string/volunteer_mode"
android:textSize="18sp"
app:layout_constraintStart_toEndOf="@id/ivHeartOn"
app:layout_constraintTop_toTopOf="parent" />

<androidx.appcompat.widget.SwitchCompat
android:id="@+id/swVolunteerMode"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="2dp"
android:textSize="18sp"
android:checked="true"
app:layout_constraintBottom_toBottomOf="@id/swVolunteerHeader"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/swVolunteerHeader"
app:showText="false" />
android:layout_marginTop="20dp"
app:cardCornerRadius="16dp"
app:cardBackgroundColor="@color/panel_widget_background">

<ImageView
android:id="@+id/ivGear"
android:layout_width="wrap_content"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:contentDescription="@null"
android:src="@drawable/ic_settings_gear"
app:layout_constraintBottom_toBottomOf="@id/swVolunteerAdjust"
app:layout_constraintStart_toStartOf="@id/ivHeartOn"
app:layout_constraintTop_toTopOf="@id/swVolunteerAdjust" />
android:orientation="horizontal"
android:padding="16dp"
android:gravity="center_vertical">

<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/ic_heart"
android:contentDescription="@null" />

<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/volunteer_mode"
android:textSize="18sp"
android:layout_marginStart="12dp" />

<androidx.appcompat.widget.SwitchCompat
android:id="@+id/swVolunteerMode"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:checked="true" />
</LinearLayout>
</androidx.cardview.widget.CardView>

<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
app:cardCornerRadius="16dp"
app:cardBackgroundColor="@color/panel_widget_background">

<TextView
<LinearLayout
android:id="@+id/swVolunteerAdjust"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="2dp"
android:layout_marginTop="8dp"
android:text="@string/kindness_adjust_title"
android:textSize="18sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/ivGear"
app:layout_constraintTop_toBottomOf="@id/swVolunteerHeader" />
</androidx.constraintlayout.widget.ConstraintLayout>

<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/volunteer_display_weekly"
android:orientation="horizontal"
android:padding="16dp"
android:gravity="center_vertical"
android:clickable="true"
android:focusable="true">

<ImageView
android:id="@+id/ivGear"
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/ic_settings_gear"
android:contentDescription="@null" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/kindness_adjust_title"
android:textSize="18sp"
android:layout_marginStart="12dp" />
</LinearLayout>
</androidx.cardview.widget.CardView>

<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginBottom="4dp"
android:background="@color/panel_widget_background"
android:orientation="horizontal"
android:padding="4dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/rowVolunteerMode">

<TextView
android:id="@+id/tvWeeklyTotalHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/volunteer_mode_weekly_label"
android:textAllCaps="true"
android:textColor="@color/progress_bar_purple"
android:textSize="18sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<TextView
android:id="@+id/tvWeeklyTotal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="18sp"
app:layout_constraintBottom_toBottomOf="@id/tvWeeklyTotalHeader"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/tvWeeklyTotalHeader"
tools:text="#" />

android:layout_marginTop="16dp"
app:cardCornerRadius="16dp"
app:cardBackgroundColor="@color/panel_widget_background">

<TextView
android:id="@+id/tvAlltimeTotalHeader"
android:layout_width="wrap_content"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="1dp"
android:text="@string/volunteer_mode_alltime_label"
android:textAllCaps="true"
android:textColor="@color/progress_bar_purple"
android:textSize="18sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvWeeklyTotalHeader" />

<TextView
android:id="@+id/tvAlltimeTotal"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:textSize="18sp"
app:layout_constraintBottom_toBottomOf="@id/tvAlltimeTotalHeader"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/tvAlltimeTotalHeader"
tools:text="#" />

</androidx.constraintlayout.widget.ConstraintLayout>
android:orientation="vertical"
android:padding="20dp">

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/volunteer_mode_weekly_label"
android:textAllCaps="true"
android:textColor="@color/progress_bar_purple"
android:textSize="16sp" />

<TextView
android:id="@+id/tvWeeklyTotal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="28sp"
android:textStyle="bold"
android:layout_marginBottom="12dp" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/volunteer_mode_alltime_label"
android:textAllCaps="true"
android:textColor="@color/progress_bar_purple"
android:textSize="16sp" />

<TextView
android:id="@+id/tvAlltimeTotal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="28sp"
android:textStyle="bold" />

</LinearLayout>
</androidx.cardview.widget.CardView>
</LinearLayout>
</ScrollView>
</LinearLayout>