Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions app/src/main/res/drawable/bg_pill_container.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<solid android:color="@android:color/black" />
<corners android:radius="36dp" />
</shape>
5 changes: 5 additions & 0 deletions app/src/main/res/drawable/bg_pill_highlight.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<solid android:color="@color/pill_bg_color" />
<corners android:radius="36dp" />
</shape>
15 changes: 15 additions & 0 deletions app/src/main/res/drawable/bg_pill_transparent.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true">
<shape android:shape="rectangle">
<solid android:color="@android:color/transparent" />
<corners android:radius="36dp" />
</shape>
</item>
<item>
<shape android:shape="rectangle">
<solid android:color="@android:color/transparent" />
<corners android:radius="36dp" />
</shape>
</item>
</selector>
10 changes: 0 additions & 10 deletions app/src/main/res/drawable/ic_kindness_outline.xml

This file was deleted.

5 changes: 0 additions & 5 deletions app/src/main/res/drawable/ic_kindness_selector.xml

This file was deleted.

24 changes: 5 additions & 19 deletions app/src/main/res/drawable/ic_more.xml
Original file line number Diff line number Diff line change
@@ -1,24 +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="M4.5,10.5H2.25L1.5,11.25V13.5L2.25,14.25H4.5L5.25,13.5V11.25L4.5,10.5Z"
android:strokeAlpha="0.4"
android:strokeColor="@android:color/white"
android:fillColor="#ffffff"
android:fillAlpha="0.4"/>
<path
android:pathData="M13.125,10.5H10.875L10.125,11.25V13.5L10.875,14.25H13.125L13.875,13.5V11.25L13.125,10.5Z"
android:strokeColor="@android:color/white"
android:strokeAlpha="0.4"
android:fillColor="#ffffff"
android:fillAlpha="0.4"/>
<path
android:pathData="M21.75,10.5H19.5L18.75,11.25V13.5L19.5,14.25H21.75L22.5,13.5V11.25L21.75,10.5Z"
android:strokeColor="@android:color/white"
android:strokeAlpha="0.4"
android:fillColor="#ffffff"
android:fillAlpha="0.4"/>
android:fillColor="@android:color/white"
android:pathData="M240,560Q207,560 183.5,536.5Q160,513 160,480Q160,447 183.5,423.5Q207,400 240,400Q273,400 296.5,423.5Q320,447 320,480Q320,513 296.5,536.5Q273,560 240,560ZM480,560Q447,560 423.5,536.5Q400,513 400,480Q400,447 423.5,423.5Q447,400 480,400Q513,400 536.5,423.5Q560,447 560,480Q560,513 536.5,536.5Q513,560 480,560ZM720,560Q687,560 663.5,536.5Q640,513 640,480Q640,447 663.5,423.5Q687,400 720,400Q753,400 776.5,423.5Q800,447 800,480Q800,513 776.5,536.5Q753,560 720,560Z"/>
</vector>
2 changes: 1 addition & 1 deletion app/src/main/res/layout/floating_bottom_nav.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
android:clipToPadding="false"
android:clipChildren="false"
app:cardBackgroundColor="@android:color/black"
app:cardCornerRadius="32dp"
app:cardCornerRadius="36dp"
app:cardElevation="0dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/fragment_kindness.xml
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/ic_heart"
android:src="@drawable/ic_heart_outline"
android:contentDescription="@null" />

<TextView
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/layout_apps_item.xml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
android:layout_marginStart="6dp"
app:layout_constraintStart_toEndOf="@id/itemcheck"
app:layout_constraintTop_toTopOf="parent"
tools:src="@drawable/ic_heart" />
tools:src="@drawable/ic_heart_outline" />

<TextView
android:id="@+id/itemtext"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/menu/main_bottom_nav.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
android:title="@string/connect"/>
<item
android:id="@+id/kindnessFragment"
android:icon="@drawable/ic_kindness_selector"
android:icon="@drawable/ic_heart_filled"
android:title="@string/menu_kindness"/>
<item
android:id="@+id/moreFragment"
Expand Down
3 changes: 3 additions & 0 deletions app/src/main/res/values/colors.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,7 @@
<color name="bg_gradient_center">@color/bg_gradient_start</color>
<color name="bg_gradient_end">#33c3fe37</color>

<color name="pill_bg_color">#8100B8</color>
<color name="pill_icon_color">#EFEFEF</color>
<color name="pill_text_color">#FFFFFF</color>
</resources>