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, Fix bug

Browse Source
This commit is contained in:
phanhuuloi27
2022-07-06 12:24:20 +07:00
parent 57df99f584
commit ca8ee3b4f1
75 changed files with 136 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Foodify/app/src/main/AndroidManifest.xml
-1
View File
@@ -3,7 +3,6 @@
xmlns:tools="http://schemas.android.com/tools"
package="com.waterbase.foodify">
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
Foodify/app/src/main/assets/fonts/regular.ttf
BIN
View File
Binary file not shown.
Foodify/app/src/main/ic_launcher-playstore.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.9 KiB

Foodify/app/src/main/java/com/waterbase/foodify/Cart.java
+1 -14
View File
@@ -104,23 +104,10 @@ public class Cart extends AppCompatActivity implements GoogleApiClient.Connectio
//Declare Google Map API Retrofit
IGoogleService mGoogleMapService;
@Override
protected void attachBaseContext(Context newBase) {
super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
ViewPump.init(ViewPump.builder()
.addInterceptor(new CalligraphyInterceptor(
new CalligraphyConfig.Builder()
.setDefaultFontPath("fonts/font.otf")
.setFontAttrId(io.github.inflationx.calligraphy3.R.attr.fontPath)
.build()))
.build());
setContentView(R.layout.activity_cart);
//Runtime permission
@@ -321,7 +308,7 @@ public class Cart extends AppCompatActivity implements GoogleApiClient.Connectio
txtTotalPrice.getText().toString(),
"0",
edtComment.getText().toString(),
"Chưa thanh toán!",
"0",
cart
);
Foodify/app/src/main/java/com/waterbase/foodify/ChangePassword.java
-14
View File
@@ -30,24 +30,10 @@ public class ChangePassword extends AppCompatActivity {
Button btnChangePass;
final String PASSWORD_PATTERN = "^(?=.*[0-9])(?=.*[A-Z])(?=.*[@#$%^&+=!])(?=\\S+$).{4,}$";
@Override
protected void attachBaseContext(Context newBase) {
super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
//Set font all activity
ViewPump.init(ViewPump.builder()
.addInterceptor(new CalligraphyInterceptor(
new CalligraphyConfig.Builder()
.setDefaultFontPath("fonts/font.otf")
.setFontAttrId(io.github.inflationx.calligraphy3.R.attr.fontPath)
.build()))
.build());
setContentView(R.layout.activity_change_password);
edtPassword = findViewById(R.id.edtPassword);
Foodify/app/src/main/java/com/waterbase/foodify/FavoritesActivity.java
+21 -14
View File
@@ -3,9 +3,12 @@ package com.waterbase.foodify;
import android.content.Context;
import android.graphics.Color;
import android.os.Bundle;
import android.view.MenuItem;
import android.view.View;
import android.widget.RelativeLayout;
import androidx.annotation.NonNull;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.app.AppCompatActivity;
import androidx.recyclerview.widget.ItemTouchHelper;
import androidx.recyclerview.widget.LinearLayoutManager;
@@ -34,26 +37,14 @@ public class FavoritesActivity extends AppCompatActivity implements RecyclerItem
RelativeLayout rootLayout;
@Override
protected void attachBaseContext(Context newBase) {
super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
//Set font all activity
ViewPump.init(ViewPump.builder()
.addInterceptor(new CalligraphyInterceptor(
new CalligraphyConfig.Builder()
.setDefaultFontPath("fonts/font.otf")
.setFontAttrId(io.github.inflationx.calligraphy3.R.attr.fontPath)
.build()))
.build());
setContentView(R.layout.activity_favorites);
setTitle("Danh sách yêu thích");
rootLayout = findViewById(R.id.rootLayout);
recyclerView = findViewById(R.id.recycler_fav);
@@ -65,6 +56,12 @@ public class FavoritesActivity extends AppCompatActivity implements RecyclerItem
new ItemTouchHelper(itemTouchHelperCallback).attachToRecyclerView(recyclerView);
loadFavorites();
// calling the action bar
ActionBar actionBar = getSupportActionBar();
// showing the back button in action bar
actionBar.setDisplayHomeAsUpEnabled(true);
}
private void loadFavorites() {
@@ -99,4 +96,14 @@ public class FavoritesActivity extends AppCompatActivity implements RecyclerItem
snackbar.show();
}
}
@Override
public boolean onOptionsItemSelected(@NonNull MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home:
this.finish();
return true;
}
return super.onOptionsItemSelected(item);
}
}
Foodify/app/src/main/java/com/waterbase/foodify/FoodDetail.java
-14
View File
@@ -64,24 +64,10 @@ public class FoodDetail extends AppCompatActivity implements RatingDialogListene
Food currentFood;
@Override
protected void attachBaseContext(Context newBase) {
super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
//Set font all activity
ViewPump.init(ViewPump.builder()
.addInterceptor(new CalligraphyInterceptor(
new CalligraphyConfig.Builder()
.setDefaultFontPath("fonts/font.otf")
.setFontAttrId(io.github.inflationx.calligraphy3.R.attr.fontPath)
.build()))
.build());
setContentView(R.layout.activity_food_detail);
btnShowComment = findViewById(R.id.btnShowComment);
Foodify/app/src/main/java/com/waterbase/foodify/FoodList.java
-14
View File
@@ -69,24 +69,10 @@ public class FoodList extends AppCompatActivity {
SwipeRefreshLayout swipeRefreshLayout;
@Override
protected void attachBaseContext(Context newBase) {
super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
//Set font all activity
ViewPump.init(ViewPump.builder()
.addInterceptor(new CalligraphyInterceptor(
new CalligraphyConfig.Builder()
.setDefaultFontPath("fonts/font.otf")
.setFontAttrId(io.github.inflationx.calligraphy3.R.attr.fontPath)
.build()))
.build());
setContentView(R.layout.activity_food_list);
//Firebase
Foodify/app/src/main/java/com/waterbase/foodify/ForgotPassword.java
-15
View File
@@ -39,25 +39,10 @@ public class ForgotPassword extends AppCompatActivity {
final String PHONE_PATTERN = "^0[98753]{1}\\d{8}$";
@Override
protected void attachBaseContext(Context newBase) {
super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
//Set font all activity
ViewPump.init(ViewPump.builder()
.addInterceptor(new CalligraphyInterceptor(
new CalligraphyConfig.Builder()
.setDefaultFontPath("fonts/font.otf")
.setFontAttrId(io.github.inflationx.calligraphy3.R.attr.fontPath)
.build()))
.build());
setContentView(R.layout.activity_forgot_password);
btnSendOTP = findViewById(R.id.btnSendOTP);
Foodify/app/src/main/java/com/waterbase/foodify/Home.java
+2 -16
View File
@@ -86,25 +86,11 @@ public class Home extends AppCompatActivity implements NavigationView.OnNavigati
HashMap<String, String> image_list;
SliderLayout mSlider;
@Override
protected void attachBaseContext(Context newBase) {
super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
//Set font all activity
ViewPump.init(ViewPump.builder()
.addInterceptor(new CalligraphyInterceptor(
new CalligraphyConfig.Builder()
.setDefaultFontPath("fonts/font.otf")
.setFontAttrId(io.github.inflationx.calligraphy3.R.attr.fontPath)
.build()))
.build());
setContentView(R.layout.activity_home);
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
@@ -229,7 +215,7 @@ public class Home extends AppCompatActivity implements NavigationView.OnNavigati
//Set name for user
View headerView = navigationView.getHeaderView(0);
TextView navUserName = (TextView) headerView.findViewById(R.id.txtFullName);
navUserName.setText(Common.currentUser.getName());
navUserName.setText("Xin chào " + Common.currentUser.getName() + "!");
updateToken(FirebaseInstanceId.getInstance().getToken());
@@ -239,7 +225,7 @@ public class Home extends AppCompatActivity implements NavigationView.OnNavigati
}
private void applyFontToMenuItem(MenuItem mi) {
Typeface font = Typeface.createFromAsset(getAssets(), "fonts/font.otf");
Typeface font = Typeface.createFromAsset(getAssets(), "fonts/regular.ttf");
SpannableString mNewTitle = new SpannableString(mi.getTitle());
mNewTitle.setSpan(new CustomTypefaceSpan("" , font), 0 , mNewTitle.length(), Spannable.SPAN_INCLUSIVE_INCLUSIVE);
mi.setTitle(mNewTitle);
Foodify/app/src/main/java/com/waterbase/foodify/OrderDetail.java
+1 -14
View File
@@ -67,24 +67,11 @@ public class OrderDetail extends AppCompatActivity {
APIService mService;
@Override
protected void attachBaseContext(Context newBase) {
super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
//Set font all activity
ViewPump.init(ViewPump.builder()
.addInterceptor(new CalligraphyInterceptor(
new CalligraphyConfig.Builder()
.setDefaultFontPath("fonts/font.otf")
.setFontAttrId(io.github.inflationx.calligraphy3.R.attr.fontPath)
.build()))
.build());
setContentView(R.layout.activity_order_detail);
String comment = "";
@@ -172,7 +159,7 @@ public class OrderDetail extends AppCompatActivity {
runOnUiThread(new Runnable() {
@Override
public void run() {
request.setPaymentStatus("Đã thanh toán!");
request.setPaymentStatus("1");
//Summit to Firebase
//We will using System.CurrentMilli to key
requests.child(order_number).setValue(request);
Foodify/app/src/main/java/com/waterbase/foodify/OrderStatus.java
-14
View File
@@ -39,24 +39,10 @@ public class OrderStatus extends AppCompatActivity {
FirebaseDatabase database;
DatabaseReference requests;
@Override
protected void attachBaseContext(Context newBase) {
super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
//Set font all activity
ViewPump.init(ViewPump.builder()
.addInterceptor(new CalligraphyInterceptor(
new CalligraphyConfig.Builder()
.setDefaultFontPath("fonts/font.otf")
.setFontAttrId(io.github.inflationx.calligraphy3.R.attr.fontPath)
.build()))
.build());
setContentView(R.layout.activity_order_status);
//Firebase
Foodify/app/src/main/java/com/waterbase/foodify/SearchActivity.java
+1 -1
View File
@@ -73,7 +73,7 @@ public class SearchActivity extends AppCompatActivity {
ViewPump.init(ViewPump.builder()
.addInterceptor(new CalligraphyInterceptor(
new CalligraphyConfig.Builder()
.setDefaultFontPath("fonts/font.otf")
.setDefaultFontPath("fonts/regular.ttf")
.setFontAttrId(io.github.inflationx.calligraphy3.R.attr.fontPath)
.build()))
.build());
Foodify/app/src/main/java/com/waterbase/foodify/ShowComment.java
+2 -16
View File
@@ -43,11 +43,6 @@ public class ShowComment extends AppCompatActivity {
String foodId = "";
@Override
protected void attachBaseContext(Context newBase) {
super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
}
@Override
protected void onStop() {
super.onStop();
@@ -59,15 +54,6 @@ public class ShowComment extends AppCompatActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
//Set font all activity
ViewPump.init(ViewPump.builder()
.addInterceptor(new CalligraphyInterceptor(
new CalligraphyConfig.Builder()
.setDefaultFontPath("fonts/font.otf")
.setFontAttrId(io.github.inflationx.calligraphy3.R.attr.fontPath)
.build()))
.build());
setContentView(R.layout.activity_show_comment);
setTitle("Bình luận");
@@ -100,7 +86,7 @@ public class ShowComment extends AppCompatActivity {
protected void onBindViewHolder(@NonNull ShowCommentViewHolder holder, int i, @NonNull Rating model) {
holder.ratingBar.setRating(Float.parseFloat(model.getRateValue()));
holder.txtComment.setText(model.getComment());
holder.txtUserPhone.setText(model.getUserPhone());
holder.txtUserPhone.setText(model.getUserPhone().replaceAll("\\d(?=(?:\\D*\\d){4})", "*"));
}
@NonNull
@@ -138,7 +124,7 @@ public class ShowComment extends AppCompatActivity {
protected void onBindViewHolder(@NonNull ShowCommentViewHolder holder, int i, @NonNull Rating model) {
holder.ratingBar.setRating(Float.parseFloat(model.getRateValue()));
holder.txtComment.setText(model.getComment());
holder.txtUserPhone.setText(model.getUserPhone());
holder.txtUserPhone.setText(model.getUserPhone().replaceAll("\\d(?=(?:\\D*\\d){4})", "*"));
}
@NonNull
Foodify/app/src/main/java/com/waterbase/foodify/SignIn.java
-19
View File
@@ -35,25 +35,9 @@ public class SignIn extends AppCompatActivity {
TextView txtAppName, edtForgotPassword;
CheckBox ckbRemember;
@Override
protected void attachBaseContext(Context newBase) {
super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
//Set font all activity
ViewPump.init(ViewPump.builder()
.addInterceptor(new CalligraphyInterceptor(
new CalligraphyConfig.Builder()
.setDefaultFontPath("fonts/font.otf")
.setFontAttrId(io.github.inflationx.calligraphy3.R.attr.fontPath)
.build()))
.build());
setContentView(R.layout.activity_sign_in);
edtPassword = (EditText) findViewById(R.id.edtPassword);
@@ -67,9 +51,6 @@ public class SignIn extends AppCompatActivity {
txtAppName = (TextView) findViewById(R.id.txtAppName);
Typeface face = Typeface.createFromAsset(getAssets(), "fonts/Nabila.ttf");
txtAppName.setTypeface(face);
//Init Firebase
FirebaseDatabase database = FirebaseDatabase.getInstance();
final DatabaseReference table_user = database.getReference("User");
Foodify/app/src/main/java/com/waterbase/foodify/SignUp.java
-16
View File
@@ -43,25 +43,11 @@ public class SignUp extends AppCompatActivity {
final String PASSWORD_PATTERN = "^(?=.*[0-9])(?=.*[A-Z])(?=.*[@#$%^&+=!])(?=\\S+$).{4,}$";
final String PHONE_PATTERN = "^0[98753]{1}\\d{8}$";
@Override
protected void attachBaseContext(Context newBase) {
super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
//Set font all activity
ViewPump.init(ViewPump.builder()
.addInterceptor(new CalligraphyInterceptor(
new CalligraphyConfig.Builder()
.setDefaultFontPath("fonts/font.otf")
.setFontAttrId(io.github.inflationx.calligraphy3.R.attr.fontPath)
.build()))
.build());
setContentView(R.layout.activity_sign_up);
edtName = (EditText) findViewById(R.id.txtFullName);
@@ -74,8 +60,6 @@ public class SignUp extends AppCompatActivity {
txtAppName = (TextView) findViewById(R.id.txtAppName);
Typeface face = Typeface.createFromAsset(getAssets(), "fonts/Nabila.ttf");
txtAppName.setTypeface(face);
//Init Firebase
FirebaseDatabase database = FirebaseDatabase.getInstance();
Foodify/app/src/main/java/com/waterbase/foodify/VerifyPhone.java
-14
View File
@@ -44,24 +44,10 @@ public class VerifyPhone extends AppCompatActivity {
String verificationId, phone, isForgotPassword = null;
TextView resendCode, countdown;
@Override
protected void attachBaseContext(Context newBase) {
super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
//Set font all activity
ViewPump.init(ViewPump.builder()
.addInterceptor(new CalligraphyInterceptor(
new CalligraphyConfig.Builder()
.setDefaultFontPath("fonts/font.otf")
.setFontAttrId(io.github.inflationx.calligraphy3.R.attr.fontPath)
.build()))
.build());
setContentView(R.layout.activity_verify_phone);
Foodify/app/src/main/java/com/waterbase/foodify/Welcome.java
-15
View File
@@ -31,21 +31,9 @@ public class Welcome extends AppCompatActivity {
Button btnSignIn, btnSignUp;
TextView txtSlogan, txtAppName;
@Override
protected void attachBaseContext(Context newBase) {
super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
ViewPump.init(ViewPump.builder()
.addInterceptor(new CalligraphyInterceptor(
new CalligraphyConfig.Builder()
.setDefaultFontPath("fonts/font.otf")
.setFontAttrId(io.github.inflationx.calligraphy3.R.attr.fontPath)
.build()))
.build());
setContentView(R.layout.activity_welcome);
btnSignIn = (Button) findViewById(R.id.btnSignIn);
@@ -53,9 +41,6 @@ public class Welcome extends AppCompatActivity {
txtSlogan = (TextView) findViewById(R.id.txtSlogan);
txtAppName = (TextView) findViewById(R.id.txtAppName);
Typeface face = Typeface.createFromAsset(getAssets(), "fonts/Nabila.ttf");
txtSlogan.setTypeface(face);
txtAppName.setTypeface(face);
//Init paper
Paper.init(this);
Foodify/app/src/main/res/drawable/avatar.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 5.8 KiB

Foodify/app/src/main/res/drawable/ic_launcher.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.0 KiB

Foodify/app/src/main/res/font/bold.ttf
BIN
View File
Binary file not shown.
Foodify/app/src/main/res/font/italic.ttf
BIN
View File
Binary file not shown.
Foodify/app/src/main/res/font/nabila.ttf
BIN
View File
Binary file not shown.
Foodify/app/src/main/res/font/regular.ttf
BIN
View File
Binary file not shown.
Foodify/app/src/main/res/layout/activity_cart.xml
+3
View File
@@ -47,6 +47,7 @@
<TextView
android:text="Tổng cộng: "
android:textSize="20sp"
android:fontFamily="@font/regular"
android:textColor="@android:color/white"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
@@ -54,6 +55,7 @@
<TextView
android:id="@+id/total"
android:text="$10,000"
android:fontFamily="@font/bold"
android:textSize="24sp"
android:textColor="@android:color/white"
android:layout_width="wrap_content"
@@ -73,6 +75,7 @@
android:layout_marginRight="8dp"
android:layout_marginBottom="8dp"
android:text="Đặt hàng"
android:fontFamily="@font/bold"
android:textColor="@android:color/white"
app:cornerRadius="4dp"
app:fButtonColor="@color/btnSignActive"
Foodify/app/src/main/res/layout/activity_change_password.xml
+6 -3
View File
@@ -21,6 +21,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/app_name"
android:fontFamily="@font/nabila"
android:textAlignment="center"
android:textColor="@color/white"
android:textSize="33sp"
@@ -36,10 +37,10 @@
android:layout_height="wrap_content"
android:layout_marginTop="30dp"
android:text="Đổi mật khẩu"
android:fontFamily="@font/bold"
android:textAlignment="center"
android:textColor="#FBFBFB"
android:textSize="19sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/txtAppName" />
@@ -49,10 +50,10 @@
android:layout_height="wrap_content"
android:layout_marginTop="80dp"
android:text="Vui lòng nhập mật khẩu mới cho tài khoản của bạn!"
android:fontFamily="@font/italic"
android:textAlignment="center"
android:textColor="#FBFBFB"
android:textSize="12sp"
android:textStyle="italic"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/txtAppName" />
@@ -66,6 +67,7 @@
android:drawableLeft="@drawable/ic_baseline_vpn_key_24"
android:drawablePadding="13dp"
android:hint="Mật khẩu"
android:fontFamily="@font/regular"
android:inputType="textPassword"
android:textColor="@color/white"
android:textColorHint="@color/white"
@@ -83,6 +85,7 @@
android:drawableLeft="@drawable/ic_baseline_vpn_key_24"
android:drawablePadding="13dp"
android:hint="Xác nhận mật khẩu"
android:fontFamily="@font/regular"
android:inputType="textPassword"
android:textColor="@color/white"
android:textColorHint="@color/white"
@@ -107,8 +110,8 @@
android:background="@drawable/btn_bg_design"
android:padding="10dp"
android:text="Đổi mật khẩu"
android:fontFamily="@font/bold"
android:textAllCaps="false"
android:textStyle="bold"
android:layout_marginStart="40dp"
android:layout_marginEnd="40dp"
/>
Foodify/app/src/main/res/layout/activity_food_detail.xml
+8 -11
View File
@@ -95,28 +95,23 @@
android:layout_marginTop="8dp"
android:padding="12dp"
android:text="Food Name"
android:fontFamily="@font/bold"
android:textColor="@color/purple_500"
android:textSize="20sp"
android:textStyle="bold" />
android:textSize="20sp" />
<LinearLayout
android:id="@+id/layout_price"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageView
android:src="@drawable/ic_baseline_attach_money_24"
android:layout_weight="1"
android:layout_width="0dp"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/food_price"
android:layout_marginLeft="12dp"
android:text="1,000"
android:textColor="@color/colorPrimary"
android:fontFamily="@font/regular"
android:textColor="@color/black"
android:textSize="18sp"
android:textStyle="bold"
android:layout_weight="9"
android:layout_width="0dp"
android:layout_height="wrap_content" />
@@ -132,7 +127,7 @@
android:layout_marginLeft="8dp"
android:layout_marginBottom="18dp"
app:textSize="8sp"
app:backGroundColor="@color/colorPrimary"
app:backGroundColor="@color/purple_500"
app:initialNumber="1"
app:finalNumber="20"
/>
@@ -168,6 +163,7 @@
android:lineSpacingMultiplier="1.5"
android:padding="12dp"
android:text="Description"
android:fontFamily="@font/regular"
android:textColor="@color/black"
android:textSize="14sp" />
@@ -178,6 +174,7 @@
<info.hoang8f.widget.FButton
android:id="@+id/btnShowComment"
android:text="Hiển thị bình luận"
android:fontFamily="@font/regular"
android:textColor="@color/white"
android:layout_marginRight="8dp"
android:layout_marginLeft="8dp"
Foodify/app/src/main/res/layout/activity_forgot_password.xml
+5 -3
View File
@@ -21,6 +21,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/app_name"
android:fontFamily="@font/nabila"
android:textAlignment="center"
android:textColor="@color/white"
android:textSize="33sp"
@@ -36,10 +37,10 @@
android:layout_height="wrap_content"
android:layout_marginTop="30dp"
android:text="Quên mật khẩu"
android:fontFamily="@font/bold"
android:textAlignment="center"
android:textColor="#FBFBFB"
android:textSize="19sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/txtAppName" />
@@ -49,10 +50,10 @@
android:layout_height="wrap_content"
android:layout_marginTop="80dp"
android:text="Vui lòng nhập số điện thoại bạn đã đăng ký"
android:fontFamily="@font/regular"
android:textAlignment="center"
android:textColor="#FBFBFB"
android:textSize="12sp"
android:textStyle="italic"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/txtAppName" />
@@ -66,6 +67,7 @@
android:drawableLeft="@drawable/ic_baseline_local_phone_24"
android:drawablePadding="13dp"
android:hint="Số điện thoại"
android:fontFamily="@font/regular"
android:inputType="phone"
android:textColor="@color/white"
android:textColorHint="@color/white"
@@ -90,8 +92,8 @@
android:background="@drawable/btn_bg_design"
android:padding="10dp"
android:text="Gửi mã OTP"
android:fontFamily="@font/bold"
android:textAllCaps="false"
android:textStyle="bold"
android:layout_marginStart="40dp"
android:layout_marginEnd="40dp"
/>
Foodify/app/src/main/res/layout/activity_order_detail.xml
+6 -5
View File
@@ -34,7 +34,7 @@
android:layout_marginLeft="10dp"
android:gravity="center_vertical|start"
android:textAllCaps="true"
android:textStyle="bold"
android:fontFamily="@font/bold"
android:text="100000 VND"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
@@ -44,7 +44,7 @@
android:layout_marginLeft="10dp"
android:gravity="center_vertical|start"
android:textAllCaps="true"
android:textStyle="italic"
android:fontFamily="@font/italic"
android:text="Address"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
@@ -54,7 +54,7 @@
android:layout_marginLeft="10dp"
android:gravity="center_vertical|start"
android:textAllCaps="true"
android:textStyle="italic"
android:fontFamily="@font/italic"
android:text="Comment"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
@@ -76,6 +76,7 @@
android:layout_marginLeft="8dp"
android:layout_marginBottom="20dp"
android:text="Chi tiết đơn:"
android:fontFamily="@font/regular"
android:textColor="@color/white"
android:textSize="20sp" />
@@ -101,7 +102,6 @@
android:layout_marginStart="8dp"
android:layout_marginLeft="8dp"
android:layout_gravity="center"
android:textStyle="bold"
app:icon="@drawable/zalopayfix"
app:iconTint="@null"
app:iconGravity="textStart"
@@ -111,6 +111,7 @@
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:layout_marginBottom="8dp"
android:fontFamily="@font/regular"
android:text="Thanh toán bằng ZaloPay"
android:textColor="#0068FF"
android:backgroundTint="@color/white"
@@ -126,7 +127,6 @@
android:layout_marginStart="8dp"
android:layout_marginLeft="8dp"
android:layout_gravity="center"
android:textStyle="bold"
app:iconTint="@null"
app:iconGravity="textStart"
app:iconPadding="10dp"
@@ -135,6 +135,7 @@
android:layout_marginRight="8dp"
android:layout_marginBottom="8dp"
android:text="Thanh toán khi nhận hàng"
android:fontFamily="@font/regular"
android:textColor="@color/white"
/>
Foodify/app/src/main/res/layout/activity_sign_in.xml
+9 -5
View File
@@ -22,6 +22,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/app_name"
android:fontFamily="@font/nabila"
android:textAlignment="center"
android:textColor="@color/white"
android:textSize="33sp"
@@ -37,10 +38,10 @@
android:layout_height="wrap_content"
android:layout_marginTop="30dp"
android:text="Đăng nhập"
android:fontFamily="@font/bold"
android:textAlignment="center"
android:textColor="#FBFBFB"
android:textSize="19sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/txtAppName" />
@@ -54,6 +55,7 @@
android:drawableLeft="@drawable/ic_baseline_local_phone_24"
android:drawablePadding="13dp"
android:hint="Số điện thoại"
android:fontFamily="@font/regular"
android:inputType="phone"
android:textColor="@color/white"
android:textColorHint="@color/white"
@@ -71,6 +73,7 @@
android:drawableLeft="@drawable/ic_baseline_vpn_key_24"
android:drawablePadding="13dp"
android:hint="Mật khẩu"
android:fontFamily="@font/regular"
android:inputType="textPassword"
android:textColor="@color/white"
android:textColorHint="@color/white"
@@ -87,6 +90,7 @@
android:layout_marginTop="8dp"
android:gravity="center"
android:text="Ghi nhớ đăng nhập"
android:fontFamily="@font/regular"
android:textColor="@color/white"
app:cbd_strokeColor="@color/white"
app:cbd_tickColor="@color/purple_500"
@@ -100,8 +104,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="14dp"
android:textStyle="italic"
android:text="Quên mật khẩu?"
android:fontFamily="@font/italic"
android:textColor="@color/white"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.85"
@@ -115,8 +119,8 @@
android:background="@drawable/btn_bg_design"
android:padding="10dp"
android:text="Đăng nhập"
android:fontFamily="@font/bold"
android:textAllCaps="false"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -129,9 +133,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Chưa có tài khoản Foodify?"
android:fontFamily="@font/regular"
android:textAlignment="center"
android:textColor="#FBFBFB"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias=".3"
@@ -143,9 +147,9 @@
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:text="Đăng ký tại đây!"
android:fontFamily="@font/bold"
android:textAlignment="center"
android:textColor="@color/purple_500"
android:textStyle="bold"
android:onClick="register"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
Foodify/app/src/main/res/layout/activity_sign_up.xml
+9 -4
View File
@@ -21,6 +21,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/app_name"
android:fontFamily="@font/nabila"
android:textAlignment="center"
android:textColor="@color/white"
android:textSize="33sp"
@@ -39,7 +40,7 @@
android:textAlignment="center"
android:textColor="#FBFBFB"
android:textSize="19sp"
android:textStyle="bold"
android:fontFamily="@font/bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/txtAppName" />
@@ -53,6 +54,7 @@
android:drawableLeft="@drawable/ic_baseline_account_circle_24"
android:drawablePadding="13dp"
android:hint="Họ và tên"
android:fontFamily="@font/regular"
android:textColor="@color/white"
android:textColorHint="@color/white"
app:layout_constraintEnd_toEndOf="parent"
@@ -69,6 +71,7 @@
android:drawablePadding="13dp"
android:layout_margin="10dp"
android:hint="Số điện thoại"
android:fontFamily="@font/regular"
android:maxLength="10"
android:inputType="phone"
android:textColor="@color/white"
@@ -86,6 +89,7 @@
android:drawableLeft="@drawable/ic_baseline_vpn_key_24"
android:drawablePadding="13dp"
android:hint="Mật khẩu"
android:fontFamily="@font/regular"
android:layout_margin="10dp"
android:inputType="textPassword"
android:textColor="@color/white"
@@ -103,6 +107,7 @@
android:drawableLeft="@drawable/ic_baseline_vpn_key_24"
android:drawablePadding="13dp"
android:hint="Xác nhận mật khẩu"
android:fontFamily="@font/regular"
android:layout_margin="10dp"
android:inputType="textPassword"
android:textColor="@color/white"
@@ -128,8 +133,8 @@
android:background="@drawable/btn_bg_design"
android:padding="10dp"
android:text="Đăng ký"
android:fontFamily="@font/bold"
android:textAllCaps="false"
android:textStyle="bold"
android:layout_marginStart="40dp"
android:layout_marginEnd="40dp"
/>
@@ -150,9 +155,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Đã tạo tài khoản?"
android:fontFamily="@font/regular"
android:textAlignment="center"
android:textColor="#FBFBFB"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias=".3"
@@ -164,10 +169,10 @@
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:text="Đăng nhập tại đây!"
android:fontFamily="@font/bold"
android:onClick="login"
android:textAlignment="center"
android:textColor="@color/purple_500"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0"
Foodify/app/src/main/res/layout/activity_verify_phone.xml
+13 -13
View File
@@ -26,7 +26,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="70dp"
android:text="Mã xác thực OTP"
android:textStyle="bold"
android:fontFamily="@font/bold"
android:textColor="@color/white"
android:textSize="20dp"
android:textAllCaps="true"
@@ -40,7 +40,7 @@
android:layout_marginEnd="30dp"
android:textAlignment="center"
android:text="Chúng tôi đã gửi mã xác thực cho bạn. Vui lòng nhập mã OTP khi nhận được tin nhắn!"
android:textStyle="bold"
android:fontFamily="@font/regular"
android:textColor="@color/common_google_signin_btn_text_dark"
android:textSize="12dp"
/>
@@ -53,7 +53,7 @@
android:layout_marginEnd="30dp"
android:textAlignment="center"
android:text="Nhập mã xác thực"
android:textStyle="bold"
android:fontFamily="@font/bold"
android:textColor="@color/common_google_signin_btn_text_dark"
android:textSize="12dp"
/>
@@ -73,18 +73,19 @@
android:gravity="center"
android:imeOptions="actionNext"
android:importantForAutofill="no"
android:fontFamily="@font/regular"
android:backgroundTint="#CCCCCC"
android:inputType="number"
android:maxLength="1"
android:textColor="@color/white"
android:textSize="24sp"
android:textStyle="bold"
tools:ignore="LabelFor"/>
<EditText
android:id="@+id/inputCode2"
android:layout_width="40dp"
android:layout_height="50dp"
android:gravity="center"
android:fontFamily="@font/regular"
android:imeOptions="actionNext"
android:importantForAutofill="no"
android:backgroundTint="#CCCCCC"
@@ -92,7 +93,6 @@
android:maxLength="1"
android:textColor="@color/white"
android:textSize="24sp"
android:textStyle="bold"
tools:ignore="LabelFor"/>
<EditText
android:id="@+id/inputCode3"
@@ -100,13 +100,13 @@
android:layout_height="50dp"
android:gravity="center"
android:imeOptions="actionNext"
android:fontFamily="@font/regular"
android:importantForAutofill="no"
android:backgroundTint="#CCCCCC"
android:inputType="number"
android:maxLength="1"
android:textColor="@color/white"
android:textSize="24sp"
android:textStyle="bold"
tools:ignore="LabelFor"/>
<EditText
android:id="@+id/inputCode4"
@@ -114,13 +114,13 @@
android:layout_height="50dp"
android:gravity="center"
android:imeOptions="actionNext"
android:fontFamily="@font/regular"
android:importantForAutofill="no"
android:backgroundTint="#CCCCCC"
android:inputType="number"
android:maxLength="1"
android:textColor="@color/white"
android:textSize="24sp"
android:textStyle="bold"
tools:ignore="LabelFor"/>
<EditText
android:id="@+id/inputCode5"
@@ -130,11 +130,11 @@
android:imeOptions="actionNext"
android:importantForAutofill="no"
android:backgroundTint="#CCCCCC"
android:fontFamily="@font/regular"
android:inputType="number"
android:maxLength="1"
android:textColor="@color/white"
android:textSize="24sp"
android:textStyle="bold"
tools:ignore="LabelFor"/>
<EditText
android:id="@+id/inputCode6"
@@ -144,11 +144,11 @@
android:imeOptions="actionNext"
android:importantForAutofill="no"
android:backgroundTint="#CCCCCC"
android:fontFamily="@font/regular"
android:inputType="number"
android:maxLength="1"
android:textColor="@color/white"
android:textSize="24sp"
android:textStyle="bold"
tools:ignore="LabelFor"/>
</LinearLayout>
@@ -164,9 +164,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Không nhận được mã OTP? Hãy thử lại sau "
android:fontFamily="@font/regular"
android:textSize="12dp"
android:textColor="@color/white"
android:textStyle="bold"
/>
<TextView
@@ -175,9 +175,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Gửi lại"
android:fontFamily="@font/bold"
android:textSize="12dp"
android:textColor="@color/purple_500"
android:textStyle="bold"
android:textAllCaps="true"
/>
@@ -187,9 +187,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Gửi lại"
android:fontFamily="@font/bold"
android:textSize="12dp"
android:textColor="@color/purple_500"
android:textStyle="bold"
android:textAllCaps="true"
/>
@@ -207,8 +207,8 @@
android:background="@drawable/btn_bg_design"
android:padding="10dp"
android:text="Xác thực"
android:fontFamily="@font/bold"
android:textAllCaps="true"
android:textStyle="bold"
android:layout_marginTop="80dp"
android:layout_marginStart="30dp"
android:layout_marginEnd="30dp" />
Foodify/app/src/main/res/layout/activity_welcome.xml
+6 -6
View File
@@ -20,11 +20,11 @@
android:id="@+id/txtAppName"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/app_name"
android:text="Foodify"
android:fontFamily="@font/nabila"
android:textAlignment="center"
android:textColor="@color/white"
android:textSize="33sp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/imageView2"
app:layout_constraintHorizontal_bias="0.0"
@@ -37,10 +37,10 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="2dp"
android:text="@string/slogan"
android:text="No matter where you are whether you are at home, or in the office, or on the beach - we will find you and we will feed you."
android:fontFamily="@font/bold"
android:textAlignment="center"
android:textColor="#FBFBFB"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/txtAppName" />
@@ -51,7 +51,7 @@
android:layout_height="wrap_content"
android:padding="10dp"
android:text="Đăng ký"
android:textStyle="bold"
android:fontFamily="@font/bold"
android:textAllCaps="false"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@@ -68,7 +68,7 @@
android:layout_height="wrap_content"
android:padding="10dp"
android:text="Đăng nhập"
android:textStyle="bold"
android:fontFamily="@font/bold"
android:textAllCaps="false"
android:textColor="@color/white"
app:layout_constraintBottom_toBottomOf="parent"
Foodify/app/src/main/res/layout/cart_layout.xml
+2 -3
View File
@@ -62,7 +62,7 @@
android:layout_marginLeft="10dp"
android:gravity="center_vertical|start"
android:textAllCaps="true"
android:textStyle="bold"
android:fontFamily="@font/bold"
android:text="Food 01"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
@@ -71,7 +71,7 @@
android:layout_marginLeft="10dp"
android:gravity="center_vertical|start"
android:textAllCaps="true"
android:textStyle="italic"
android:fontFamily="@font/italic"
android:text="100,000"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
@@ -80,7 +80,6 @@
android:id="@+id/txtDiscount"
android:layout_marginLeft="10dp"
android:textAllCaps="true"
android:textStyle="italic"
android:textSize="10sp"
android:visibility="gone"
android:textColor="@color/red"
Foodify/app/src/main/res/layout/change_password_layout.xml
+3
View File
@@ -16,6 +16,7 @@
<com.rengwuxian.materialedittext.MaterialEditText
android:id="@+id/edtPassword"
android:hint="Mật khẩu"
android:fontFamily="@font/regular"
android:inputType="textPassword"
android:text=""
android:textColor="@color/colorPrimary"
@@ -32,6 +33,7 @@
<com.rengwuxian.materialedittext.MaterialEditText
android:id="@+id/edtNewPassword"
android:hint="Mật khẩu mới"
android:fontFamily="@font/regular"
android:inputType="textPassword"
android:text=""
android:textColor="@color/colorPrimary"
@@ -49,6 +51,7 @@
android:id="@+id/edtRepeatPassword"
android:hint="Nhập lại mật khẩu"
android:inputType="textPassword"
android:fontFamily="@font/regular"
android:text=""
android:textColor="@color/colorPrimary"
android:textColorHint="@color/colorPrimary"
Foodify/app/src/main/res/layout/favorite_item.xml
+4 -1
View File
@@ -70,6 +70,7 @@
android:layout_weight="9"
android:layout_height="wrap_content"
android:text="Name of Food"
android:fontFamily="@font/regular"
android:textSize="20sp" />
@@ -83,6 +84,7 @@
android:id="@+id/food_price"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/regular"
android:text="$100"
android:textSize="20sp" />
@@ -94,6 +96,7 @@
android:layout_marginLeft="30dp"
android:layout_toEndOf="@+id/food_price"
android:text="$100"
android:fontFamily="@font/regular"
android:textColor="@color/red"
android:textSize="10sp" />
@@ -103,7 +106,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_toEndOf="@+id/discount"
android:textStyle="bold"
android:fontFamily="@font/bold"
android:text="$100"
android:textSize="25sp" />
Foodify/app/src/main/res/layout/food_item.xml
+5 -2
View File
@@ -37,6 +37,7 @@
android:layout_weight="9"
android:layout_height="wrap_content"
android:text="Name of Food"
android:fontFamily="@font/regular"
android:textSize="20sp" />
<ImageView
@@ -45,7 +46,7 @@
android:layout_weight="1"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:tint="@color/colorAccent"
app:tint="@color/purple_500"
/>
</LinearLayout>
@@ -59,6 +60,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="$100"
android:fontFamily="@font/regular"
android:textSize="20sp" />
<TextView
@@ -69,6 +71,7 @@
android:layout_marginLeft="30dp"
android:layout_toEndOf="@+id/food_price"
android:text="$100"
android:fontFamily="@font/regular"
android:textColor="@color/red"
android:textSize="10sp" />
@@ -78,7 +81,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_toEndOf="@+id/discount"
android:textStyle="bold"
android:fontFamily="@font/bold"
android:text="$100"
android:textSize="25sp" />
Foodify/app/src/main/res/layout/home_address_layout.xml
+1
View File
@@ -15,6 +15,7 @@
<com.rengwuxian.materialedittext.MaterialEditText
android:id="@+id/edtHomeAddress"
android:hint="Địa chỉ mặc định"
android:fontFamily="@font/regular"
android:inputType="textMultiLine"
android:textColor="@color/purple_500"
android:textColorHint="@color/purple_500"
Foodify/app/src/main/res/layout/menu_item.xml
+1
View File
@@ -21,6 +21,7 @@
<TextView
android:id="@+id/menu_name"
android:text="Name of Menu"
android:fontFamily="@font/bold"
android:textColor="@color/white"
android:background="#4f0e0d0e"
android:textSize="20sp"
Foodify/app/src/main/res/layout/nav_header_home.xml
+1
View File
@@ -26,6 +26,7 @@
android:layout_height="wrap_content"
android:paddingTop="@dimen/nav_header_vertical_spacing"
android:text="@string/nav_header_title"
android:fontFamily="@font/bold"
android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
</LinearLayout>
Foodify/app/src/main/res/layout/order_address_comment.xml
+5
View File
@@ -19,6 +19,7 @@
<com.rengwuxian.materialedittext.MaterialEditText
android:id="@+id/edtAddress"
android:hint="Địa chỉ"
android:fontFamily="@font/regular"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColorHint="@color/colorPrimary"
@@ -35,6 +36,7 @@
<com.rengwuxian.materialedittext.MaterialEditText
android:id="@+id/edtComment"
android:hint="Ghi chú"
android:fontFamily="@font/regular"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColorHint="@color/colorPrimary"
@@ -56,6 +58,7 @@
<RadioButton
android:id="@+id/rdiAddress"
android:text="Giao hàng đến địa chỉ trên"
android:fontFamily="@font/regular"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:checked="true"
@@ -64,6 +67,7 @@
<RadioButton
android:id="@+id/rdiShipToAddress"
android:text="Giao hàng đến vị trí của bạn"
android:fontFamily="@font/regular"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
@@ -71,6 +75,7 @@
<RadioButton
android:id="@+id/rdiHomeAddress"
android:text="Giao hàng đến địa chỉ mặc định"
android:fontFamily="@font/regular"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
Foodify/app/src/main/res/layout/order_detail_layout.xml
+4 -4
View File
@@ -33,8 +33,8 @@
android:layout_marginLeft="10dp"
android:gravity="center_vertical|start"
android:textAllCaps="true"
android:textStyle="bold"
android:text="Product Name"
android:fontFamily="@font/bold"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
@@ -43,8 +43,8 @@
android:layout_marginLeft="10dp"
android:gravity="center_vertical|start"
android:textAllCaps="true"
android:textStyle="italic"
android:text="Product Quantity"
android:fontFamily="@font/regular"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
@@ -53,8 +53,8 @@
android:layout_marginLeft="10dp"
android:gravity="center_vertical|start"
android:textAllCaps="true"
android:textStyle="italic"
android:text="Product Price"
android:fontFamily="@font/regular"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
@@ -63,8 +63,8 @@
android:layout_marginLeft="10dp"
android:gravity="center_vertical|start"
android:textAllCaps="true"
android:textStyle="italic"
android:text="Product Discount"
android:fontFamily="@font/regular"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
Foodify/app/src/main/res/layout/order_layout.xml
+9 -6
View File
@@ -28,17 +28,20 @@
android:layout_marginLeft="10dp"
android:gravity="center_vertical|start"
android:textAllCaps="true"
android:textStyle="bold"
android:fontFamily="@font/bold"
android:textSize="18sp"
android:text="#11111"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance"/>
<TextView
android:id="@+id/order_date"
android:layout_marginLeft="10dp"
android:gravity="center_vertical|start"
android:textAllCaps="true"
android:textStyle="italic"
android:fontFamily="@font/italic"
android:text="Order Date"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
@@ -48,7 +51,7 @@
android:layout_marginLeft="10dp"
android:gravity="center_vertical|start"
android:textAllCaps="true"
android:textStyle="italic"
android:fontFamily="@font/italic"
android:text="Status"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
@@ -58,7 +61,7 @@
android:layout_marginLeft="10dp"
android:gravity="center_vertical|start"
android:textAllCaps="true"
android:textStyle="italic"
android:fontFamily="@font/italic"
android:text="Address"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
@@ -68,7 +71,7 @@
android:layout_marginLeft="10dp"
android:gravity="center_vertical|start"
android:textAllCaps="true"
android:textStyle="italic"
android:fontFamily="@font/italic"
android:text="Order Payment"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
Foodify/app/src/main/res/layout/setting_layout.xml
+1
View File
@@ -19,6 +19,7 @@
<CheckBox
android:id="@+id/ckb_sub_new"
android:text="Nhận thông báo từ hệ thống"
android:fontFamily="@font/regular"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
/>
Foodify/app/src/main/res/layout/show_comment_layout.xml
+2 -2
View File
@@ -23,8 +23,8 @@
<TextView
android:id="@+id/txtUserPhone"
android:text="User Phone"
android:fontFamily="@font/bold"
android:textSize="20sp"
android:textStyle="bold"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
/>
@@ -43,8 +43,8 @@
<TextView
android:id="@+id/txtComment"
android:text="Comment"
android:fontFamily="@font/italic"
android:textSize="16sp"
android:textStyle="italic"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
/>
Foodify/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
-5
View File
@@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_background" />
<foreground android:drawable="@drawable/ic_launcher_foreground" />
</adaptive-icon>
Foodify/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
-5
View File
@@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_background" />
<foreground android:drawable="@drawable/ic_launcher_foreground" />
</adaptive-icon>
Foodify/app/src/main/res/mipmap-hdpi/ic_launcher.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

Foodify/app/src/main/res/mipmap-hdpi/ic_launcher.webp
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.4 KiB

Foodify/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

Foodify/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

Foodify/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.8 KiB

Foodify/app/src/main/res/mipmap-mdpi/ic_launcher.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 982 B

Foodify/app/src/main/res/mipmap-mdpi/ic_launcher.webp
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 982 B

Foodify/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 958 B

Foodify/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

Foodify/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.7 KiB

Foodify/app/src/main/res/mipmap-xhdpi/ic_launcher.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

Foodify/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.9 KiB

Foodify/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

Foodify/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.4 KiB

Foodify/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.8 KiB

Foodify/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.5 KiB

Foodify/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.8 KiB

Foodify/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

Foodify/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.9 KiB

Foodify/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.8 KiB

Foodify/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.6 KiB

Foodify/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.8 KiB

Foodify/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.7 KiB

Foodify/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

Foodify/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 7.6 KiB

Foodify/app/src/main/res/values/ic_launcher_background.xml
+4
View File
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="ic_launcher_background">#EB1C25</color>
</resources>