nezumi/PRM392
1
0
Fork 0
mirror of https://github.com/Nezumi-2711/PRM392.git synced 2026-09-22 13:48:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve Layout

Browse Source
This commit is contained in:
phanhuuloi27
2022-07-05 10:24:27 +07:00
parent ce2deb91bc
commit 0bcbbbfca5
9 changed files with 86 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Foodify/app/src/main/java/com/waterbase/foodify/Common/Common.java
+7
View File
@@ -46,6 +46,13 @@ public class Common {
return "Giao thành công";
}
public static String convertCodePaymentToStatus(String status) {
if(status.equals("0"))
return "CHƯA THANH TOÁN";
else
return "ĐÃ THANH TOÁN";
}
public static boolean isConnectedToInternet(Context context) {
ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
Foodify/app/src/main/java/com/waterbase/foodify/OrderStatus.java
+1 -1
View File
@@ -99,7 +99,7 @@ public class OrderStatus extends AppCompatActivity {
orderViewHolder.txtOrderStatus.setText("Tình trạng đơn: " + Common.convertCodeToStatus(model.getStatus()));
orderViewHolder.txtOrderAddress.setText("Địa chỉ: " + model.getAddress());
orderViewHolder.txtOrderDate.setText("Ngày đặt: " + Common.getDate(Long.parseLong(adapter.getRef(i).getKey())));
orderViewHolder.txtOrderPayment.setText("Tình trạng thanh toán: " + model.getPaymentStatus());
orderViewHolder.txtOrderPayment.setText("Tình trạng thanh toán: " + Common.convertCodePaymentToStatus(model.getPaymentStatus()));
orderViewHolder.btn_delete.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Foodify/app/src/main/res/drawable/avatar.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 18 KiB

Foodify/app/src/main/res/layout/activity_home.xml
+3 -3
View File
@@ -20,12 +20,12 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="start"
android:background="@color/overlayBackground"
android:background="@color/white"
android:fitsSystemWindows="true"
app:headerLayout="@layout/nav_header_home"
app:itemIconTint="@color/white"
app:itemTextColor="@color/white"
app:itemIconTint="@color/black"
app:itemTextColor="@color/black"
app:menu="@menu/activity_main_drawer" />
</androidx.drawerlayout.widget.DrawerLayout>
Foodify/app/src/main/res/layout/nav_header_home.xml
+4 -4
View File
@@ -3,7 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="@dimen/nav_header_height"
android:background="@color/fbutton_color_transparent"
android:background="@color/purple_500"
android:gravity="bottom"
android:orientation="vertical"
android:paddingLeft="@dimen/activity_horizontal_margin"
@@ -14,11 +14,11 @@
<ImageView
android:id="@+id/imageView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="80dp"
android:layout_height="80dp"
android:contentDescription="@string/nav_header_desc"
android:paddingTop="@dimen/nav_header_vertical_spacing"
app:srcCompat="@mipmap/ic_launcher_round" />
app:srcCompat="@drawable/avatar" />
<TextView
android:id="@+id/txtFullName"