Skip to content
This repository was archived by the owner on Oct 12, 2025. It is now read-only.

Commit ea54390

Browse files
AdityaK2905AdityaK2905
committed
fixed color references
1 parent a986e15 commit ea54390

File tree

3 files changed

+39
-20
lines changed

3 files changed

+39
-20
lines changed

‎app/src/main/res/drawable/ic_profile.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
android:height="24dp"
44
android:viewportWidth="24"
55
android:viewportHeight="24"
6-
android:tint="@color/unselectedAppBarIcon">
6+
android:tint="@color/black">
77
<path
88
android:fillColor="@android:color/white"
99
android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>

‎app/src/main/res/drawable/ic_today.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
android:height="24dp"
44
android:viewportWidth="24"
55
android:viewportHeight="24"
6-
android:tint="@color/unselectedAppBarIcon">
6+
android:tint="@color/black">
77
<path
88
android:pathData="M19,3H18V2C18,1.45 17.55,1 17,1C16.45,1 16,1.45 16,2V3H8V2C8,1.45 7.55,1 7,1C6.45,1 6,1.45 6,2V3H5C3.89,3 3.01,3.9 3.01,5L3,19C3,20.1 3.89,21 5,21H19C20.1,21 21,20.1 21,19V5C21,3.9 20.1,3 19,3ZM18,19H6C5.45,19 5,18.55 5,18V8H19V18C19,18.55 18.55,19 18,19ZM8,10H11C11.55,10 12,10.45 12,11V14C12,14.55 11.55,15 11,15H8C7.45,15 7,14.55 7,14V11C7,10.45 7.45,10 8,10Z"
99
android:fillColor="#FFFFFF"/>

‎app/src/main/res/layout/activity_main.xml‎

Lines changed: 37 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22
<androidx.coordinatorlayout.widget.CoordinatorLayout
33
xmlns:android="http://schemas.android.com/apk/res/android"
44
xmlns:app="http://schemas.android.com/apk/res-auto"
5+
xmlns:tools="http://schemas.android.com/tools"
56
android:layout_width="match_parent"
6-
android:layout_height="match_parent">
7+
android:layout_height="match_parent"
8+
android:paddingBottom="0dp">
79

810
<androidx.fragment.app.FragmentContainerView
911
android:id="@+id/contentFrame"
@@ -15,39 +17,49 @@
1517
android:layout_width="match_parent"
1618
android:layout_height="wrap_content"
1719
android:layout_gravity="bottom"
18-
app:backgroundTint="@color/darkForest">
20+
app:backgroundTint="@color/cream">
1921

2022
<androidx.constraintlayout.widget.ConstraintLayout
2123
android:layout_width="match_parent"
2224
android:layout_height="wrap_content"
2325
android:orientation="horizontal">
2426

27+
2528
<androidx.appcompat.widget.AppCompatImageButton
2629
android:id="@+id/homeButton"
2730
android:layout_width="48dp"
2831
android:layout_height="48dp"
29-
android:background="@color/darkForest"
32+
android:layout_marginTop="4dp"
33+
android:layout_marginBottom="16dp"
34+
android:background="@color/cream"
35+
app:maxImageSize="30dp"
3036
app:layout_constraintBottom_toBottomOf="parent"
3137
app:layout_constraintEnd_toStartOf="@+id/scheduleButton"
3238
app:layout_constraintHorizontal_bias="0.5"
3339
app:layout_constraintStart_toStartOf="parent"
3440
app:layout_constraintTop_toTopOf="parent"
35-
app:srcCompat="@drawable/ic_home" />
41+
app:layout_constraintVertical_bias="0.0"
42+
app:layout_constraintHorizontal_chainStyle="spread"
43+
app:tint="@color/black"
44+
app:srcCompat="@drawable/battle_png" />
45+
3646

3747
<androidx.appcompat.widget.AppCompatImageButton
3848
android:id="@+id/scheduleButton"
3949
android:layout_width="48dp"
4050
android:layout_height="48dp"
41-
android:background="@color/darkForest"
51+
android:background="@color/cream"
52+
app:maxImageSize="30dp"
4253
app:layout_constraintBottom_toBottomOf="@id/homeButton"
4354
app:layout_constraintEnd_toStartOf="@+id/placeholder"
4455
app:layout_constraintHorizontal_bias="0.5"
4556
app:layout_constraintStart_toEndOf="@+id/homeButton"
46-
app:srcCompat="@drawable/ic_today" />
57+
app:srcCompat="@drawable/schedule_png" />
58+
4759

4860
<View
4961
android:id="@+id/placeholder"
50-
android:layout_width="70dp"
62+
android:layout_width="72dp"
5163
android:layout_height="0dp"
5264
android:visibility="invisible"
5365
app:layout_constraintBottom_toBottomOf="@id/homeButton"
@@ -61,39 +73,46 @@
6173
android:layout_width="48dp"
6274
android:layout_height="48dp"
6375
android:layout_marginEnd="16dp"
64-
android:background="@color/darkForest"
76+
android:background="@color/cream"
77+
app:maxImageSize="30dp"
6578
app:layout_constraintBottom_toBottomOf="@id/homeButton"
6679
app:layout_constraintEnd_toEndOf="parent"
6780
app:layout_constraintHorizontal_bias="0.5"
6881
app:layout_constraintStart_toEndOf="@+id/shopButton"
69-
app:srcCompat="@drawable/ic_profile" />
82+
app:srcCompat="@drawable/profile_png" />
83+
7084

7185
<androidx.appcompat.widget.AppCompatImageButton
7286
android:id="@+id/shopButton"
7387
android:layout_width="48dp"
7488
android:layout_height="48dp"
7589
android:layout_marginBottom="2dp"
76-
android:background="@color/darkForest"
90+
android:background="@color/cream"
91+
app:maxImageSize="30dp"
7792
app:layout_constraintBottom_toBottomOf="@id/homeButton"
7893
app:layout_constraintEnd_toStartOf="@+id/profileButton"
7994
app:layout_constraintHorizontal_bias="0.5"
8095
app:layout_constraintStart_toEndOf="@+id/placeholder"
8196
app:layout_constraintTop_toTopOf="@+id/homeButton"
82-
app:srcCompat="@drawable/ic_point_shop" />
97+
app:srcCompat="@drawable/shop_png" />
98+
8399
</androidx.constraintlayout.widget.ConstraintLayout>
84100

85101
</com.google.android.material.bottomappbar.BottomAppBar>
86102

87103
<com.google.android.material.floatingactionbutton.FloatingActionButton
88104
android:id="@+id/code_entry_fab"
89-
android:layout_width="wrap_content"
90-
android:layout_height="wrap_content"
91-
app:backgroundTint="@color/white"
92-
app:layout_anchor="@id/bottomAppBar"
93-
app:srcCompat="@drawable/qr_icon"
94-
app:tint="@color/selectedAppBarIcon"/>
105+
android:layout_width="72dp"
106+
android:layout_height="72dp"
107+
app:backgroundTint="@color/cream"
108+
android:layout_gravity="bottom|center"
109+
android:layout_marginBottom="30dp"
110+
android:layout_marginTop="20dp"
111+
app:fabCustomSize="72dp"
112+
app:maxImageSize="30dp"
113+
app:srcCompat="@drawable/camera_png" />
95114

96-
<!-- <FrameLayout-->
115+
<!-- <FrameLayout-->
97116
<!-- android:id="@+id/codeEntrySheet"-->
98117
<!-- android:layout_width="wrap_content"-->
99118
<!-- android:layout_height="wrap_content"-->

0 commit comments

Comments
 (0)