diff --git a/Foodify/app/src/main/AndroidManifest.xml b/Foodify/app/src/main/AndroidManifest.xml index 6d6a496..1eb9e31 100644 --- a/Foodify/app/src/main/AndroidManifest.xml +++ b/Foodify/app/src/main/AndroidManifest.xml @@ -3,7 +3,6 @@ xmlns:tools="http://schemas.android.com/tools" package="com.waterbase.foodify"> - diff --git a/Foodify/app/src/main/assets/fonts/regular.ttf b/Foodify/app/src/main/assets/fonts/regular.ttf new file mode 100644 index 0000000..cfd8bfc Binary files /dev/null and b/Foodify/app/src/main/assets/fonts/regular.ttf differ diff --git a/Foodify/app/src/main/ic_launcher-playstore.png b/Foodify/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..ee70d62 Binary files /dev/null and b/Foodify/app/src/main/ic_launcher-playstore.png differ diff --git a/Foodify/app/src/main/java/com/waterbase/foodify/Cart.java b/Foodify/app/src/main/java/com/waterbase/foodify/Cart.java index 833cb5e..419d270 100644 --- a/Foodify/app/src/main/java/com/waterbase/foodify/Cart.java +++ b/Foodify/app/src/main/java/com/waterbase/foodify/Cart.java @@ -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 ); diff --git a/Foodify/app/src/main/java/com/waterbase/foodify/ChangePassword.java b/Foodify/app/src/main/java/com/waterbase/foodify/ChangePassword.java index b7110d6..d63d137 100644 --- a/Foodify/app/src/main/java/com/waterbase/foodify/ChangePassword.java +++ b/Foodify/app/src/main/java/com/waterbase/foodify/ChangePassword.java @@ -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); diff --git a/Foodify/app/src/main/java/com/waterbase/foodify/FavoritesActivity.java b/Foodify/app/src/main/java/com/waterbase/foodify/FavoritesActivity.java index c12a6b6..4bd62c3 100644 --- a/Foodify/app/src/main/java/com/waterbase/foodify/FavoritesActivity.java +++ b/Foodify/app/src/main/java/com/waterbase/foodify/FavoritesActivity.java @@ -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); + } } \ No newline at end of file diff --git a/Foodify/app/src/main/java/com/waterbase/foodify/FoodDetail.java b/Foodify/app/src/main/java/com/waterbase/foodify/FoodDetail.java index 2da5e2c..8be6aeb 100644 --- a/Foodify/app/src/main/java/com/waterbase/foodify/FoodDetail.java +++ b/Foodify/app/src/main/java/com/waterbase/foodify/FoodDetail.java @@ -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); diff --git a/Foodify/app/src/main/java/com/waterbase/foodify/FoodList.java b/Foodify/app/src/main/java/com/waterbase/foodify/FoodList.java index 1901ff7..8293322 100644 --- a/Foodify/app/src/main/java/com/waterbase/foodify/FoodList.java +++ b/Foodify/app/src/main/java/com/waterbase/foodify/FoodList.java @@ -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 diff --git a/Foodify/app/src/main/java/com/waterbase/foodify/ForgotPassword.java b/Foodify/app/src/main/java/com/waterbase/foodify/ForgotPassword.java index 804b544..297ad2b 100644 --- a/Foodify/app/src/main/java/com/waterbase/foodify/ForgotPassword.java +++ b/Foodify/app/src/main/java/com/waterbase/foodify/ForgotPassword.java @@ -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); diff --git a/Foodify/app/src/main/java/com/waterbase/foodify/Home.java b/Foodify/app/src/main/java/com/waterbase/foodify/Home.java index 50818a2..a1bfd77 100644 --- a/Foodify/app/src/main/java/com/waterbase/foodify/Home.java +++ b/Foodify/app/src/main/java/com/waterbase/foodify/Home.java @@ -86,25 +86,11 @@ public class Home extends AppCompatActivity implements NavigationView.OnNavigati HashMap 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); diff --git a/Foodify/app/src/main/java/com/waterbase/foodify/OrderDetail.java b/Foodify/app/src/main/java/com/waterbase/foodify/OrderDetail.java index d91bf8b..f92f7c2 100644 --- a/Foodify/app/src/main/java/com/waterbase/foodify/OrderDetail.java +++ b/Foodify/app/src/main/java/com/waterbase/foodify/OrderDetail.java @@ -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); diff --git a/Foodify/app/src/main/java/com/waterbase/foodify/OrderStatus.java b/Foodify/app/src/main/java/com/waterbase/foodify/OrderStatus.java index 7d989f4..61ffaef 100644 --- a/Foodify/app/src/main/java/com/waterbase/foodify/OrderStatus.java +++ b/Foodify/app/src/main/java/com/waterbase/foodify/OrderStatus.java @@ -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 diff --git a/Foodify/app/src/main/java/com/waterbase/foodify/SearchActivity.java b/Foodify/app/src/main/java/com/waterbase/foodify/SearchActivity.java index 7ce4d04..54d1a36 100644 --- a/Foodify/app/src/main/java/com/waterbase/foodify/SearchActivity.java +++ b/Foodify/app/src/main/java/com/waterbase/foodify/SearchActivity.java @@ -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()); diff --git a/Foodify/app/src/main/java/com/waterbase/foodify/ShowComment.java b/Foodify/app/src/main/java/com/waterbase/foodify/ShowComment.java index 6573b44..1c85ad4 100644 --- a/Foodify/app/src/main/java/com/waterbase/foodify/ShowComment.java +++ b/Foodify/app/src/main/java/com/waterbase/foodify/ShowComment.java @@ -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 diff --git a/Foodify/app/src/main/java/com/waterbase/foodify/SignIn.java b/Foodify/app/src/main/java/com/waterbase/foodify/SignIn.java index 14538e6..116cd67 100644 --- a/Foodify/app/src/main/java/com/waterbase/foodify/SignIn.java +++ b/Foodify/app/src/main/java/com/waterbase/foodify/SignIn.java @@ -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"); diff --git a/Foodify/app/src/main/java/com/waterbase/foodify/SignUp.java b/Foodify/app/src/main/java/com/waterbase/foodify/SignUp.java index b628c82..a599e3f 100644 --- a/Foodify/app/src/main/java/com/waterbase/foodify/SignUp.java +++ b/Foodify/app/src/main/java/com/waterbase/foodify/SignUp.java @@ -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(); diff --git a/Foodify/app/src/main/java/com/waterbase/foodify/VerifyPhone.java b/Foodify/app/src/main/java/com/waterbase/foodify/VerifyPhone.java index 7c3ac0f..70b0e1d 100644 --- a/Foodify/app/src/main/java/com/waterbase/foodify/VerifyPhone.java +++ b/Foodify/app/src/main/java/com/waterbase/foodify/VerifyPhone.java @@ -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); diff --git a/Foodify/app/src/main/java/com/waterbase/foodify/Welcome.java b/Foodify/app/src/main/java/com/waterbase/foodify/Welcome.java index ae61358..19ac6f4 100644 --- a/Foodify/app/src/main/java/com/waterbase/foodify/Welcome.java +++ b/Foodify/app/src/main/java/com/waterbase/foodify/Welcome.java @@ -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); diff --git a/Foodify/app/src/main/res/drawable/avatar.png b/Foodify/app/src/main/res/drawable/avatar.png index d713c6f..0776238 100644 Binary files a/Foodify/app/src/main/res/drawable/avatar.png and b/Foodify/app/src/main/res/drawable/avatar.png differ diff --git a/Foodify/app/src/main/res/drawable/ic_launcher.png b/Foodify/app/src/main/res/drawable/ic_launcher.png new file mode 100644 index 0000000..ed86149 Binary files /dev/null and b/Foodify/app/src/main/res/drawable/ic_launcher.png differ diff --git a/Foodify/app/src/main/res/font/bold.ttf b/Foodify/app/src/main/res/font/bold.ttf new file mode 100644 index 0000000..0caaf4d Binary files /dev/null and b/Foodify/app/src/main/res/font/bold.ttf differ diff --git a/Foodify/app/src/main/res/font/italic.ttf b/Foodify/app/src/main/res/font/italic.ttf new file mode 100644 index 0000000..74676b7 Binary files /dev/null and b/Foodify/app/src/main/res/font/italic.ttf differ diff --git a/Foodify/app/src/main/res/font/nabila.ttf b/Foodify/app/src/main/res/font/nabila.ttf new file mode 100644 index 0000000..4f74aff Binary files /dev/null and b/Foodify/app/src/main/res/font/nabila.ttf differ diff --git a/Foodify/app/src/main/res/font/regular.ttf b/Foodify/app/src/main/res/font/regular.ttf new file mode 100644 index 0000000..cfd8bfc Binary files /dev/null and b/Foodify/app/src/main/res/font/regular.ttf differ diff --git a/Foodify/app/src/main/res/layout/activity_cart.xml b/Foodify/app/src/main/res/layout/activity_cart.xml index 29f1c9f..9358ebb 100644 --- a/Foodify/app/src/main/res/layout/activity_cart.xml +++ b/Foodify/app/src/main/res/layout/activity_cart.xml @@ -47,6 +47,7 @@ @@ -54,6 +55,7 @@ @@ -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" /> diff --git a/Foodify/app/src/main/res/layout/activity_food_detail.xml b/Foodify/app/src/main/res/layout/activity_food_detail.xml index 9e497c1..53583fa 100644 --- a/Foodify/app/src/main/res/layout/activity_food_detail.xml +++ b/Foodify/app/src/main/res/layout/activity_food_detail.xml @@ -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" /> - - @@ -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 @@ @@ -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" /> diff --git a/Foodify/app/src/main/res/layout/activity_order_detail.xml b/Foodify/app/src/main/res/layout/activity_order_detail.xml index c99eec6..522342a 100644 --- a/Foodify/app/src/main/res/layout/activity_order_detail.xml +++ b/Foodify/app/src/main/res/layout/activity_order_detail.xml @@ -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" /> diff --git a/Foodify/app/src/main/res/layout/activity_sign_in.xml b/Foodify/app/src/main/res/layout/activity_sign_in.xml index 7845ba7..ff2f726 100644 --- a/Foodify/app/src/main/res/layout/activity_sign_in.xml +++ b/Foodify/app/src/main/res/layout/activity_sign_in.xml @@ -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" diff --git a/Foodify/app/src/main/res/layout/activity_sign_up.xml b/Foodify/app/src/main/res/layout/activity_sign_up.xml index 263f4e8..fb6ae57 100644 --- a/Foodify/app/src/main/res/layout/activity_sign_up.xml +++ b/Foodify/app/src/main/res/layout/activity_sign_up.xml @@ -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" diff --git a/Foodify/app/src/main/res/layout/activity_verify_phone.xml b/Foodify/app/src/main/res/layout/activity_verify_phone.xml index 2524202..387c7f1 100644 --- a/Foodify/app/src/main/res/layout/activity_verify_phone.xml +++ b/Foodify/app/src/main/res/layout/activity_verify_phone.xml @@ -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"/> @@ -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" /> @@ -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" /> diff --git a/Foodify/app/src/main/res/layout/activity_welcome.xml b/Foodify/app/src/main/res/layout/activity_welcome.xml index 83caab2..2c15356 100644 --- a/Foodify/app/src/main/res/layout/activity_welcome.xml +++ b/Foodify/app/src/main/res/layout/activity_welcome.xml @@ -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" diff --git a/Foodify/app/src/main/res/layout/cart_layout.xml b/Foodify/app/src/main/res/layout/cart_layout.xml index bc35636..3e7372b 100644 --- a/Foodify/app/src/main/res/layout/cart_layout.xml +++ b/Foodify/app/src/main/res/layout/cart_layout.xml @@ -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" diff --git a/Foodify/app/src/main/res/layout/change_password_layout.xml b/Foodify/app/src/main/res/layout/change_password_layout.xml index 3f9370c..f70ba57 100644 --- a/Foodify/app/src/main/res/layout/change_password_layout.xml +++ b/Foodify/app/src/main/res/layout/change_password_layout.xml @@ -16,6 +16,7 @@ @@ -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" /> diff --git a/Foodify/app/src/main/res/layout/food_item.xml b/Foodify/app/src/main/res/layout/food_item.xml index 9abf578..2f1e4d9 100644 --- a/Foodify/app/src/main/res/layout/food_item.xml +++ b/Foodify/app/src/main/res/layout/food_item.xml @@ -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" /> @@ -59,6 +60,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="$100" + android:fontFamily="@font/regular" android:textSize="20sp" /> @@ -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" /> diff --git a/Foodify/app/src/main/res/layout/home_address_layout.xml b/Foodify/app/src/main/res/layout/home_address_layout.xml index 1a83c2e..d8652a0 100644 --- a/Foodify/app/src/main/res/layout/home_address_layout.xml +++ b/Foodify/app/src/main/res/layout/home_address_layout.xml @@ -15,6 +15,7 @@ \ No newline at end of file diff --git a/Foodify/app/src/main/res/layout/order_address_comment.xml b/Foodify/app/src/main/res/layout/order_address_comment.xml index 5006397..e7ca64b 100644 --- a/Foodify/app/src/main/res/layout/order_address_comment.xml +++ b/Foodify/app/src/main/res/layout/order_address_comment.xml @@ -19,6 +19,7 @@ @@ -71,6 +75,7 @@ diff --git a/Foodify/app/src/main/res/layout/order_detail_layout.xml b/Foodify/app/src/main/res/layout/order_detail_layout.xml index 0a195bc..e476739 100644 --- a/Foodify/app/src/main/res/layout/order_detail_layout.xml +++ b/Foodify/app/src/main/res/layout/order_detail_layout.xml @@ -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" /> diff --git a/Foodify/app/src/main/res/layout/order_layout.xml b/Foodify/app/src/main/res/layout/order_layout.xml index 905d84e..5884f15 100644 --- a/Foodify/app/src/main/res/layout/order_layout.xml +++ b/Foodify/app/src/main/res/layout/order_layout.xml @@ -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"/> @@ -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" /> diff --git a/Foodify/app/src/main/res/layout/setting_layout.xml b/Foodify/app/src/main/res/layout/setting_layout.xml index 80af50d..a66701e 100644 --- a/Foodify/app/src/main/res/layout/setting_layout.xml +++ b/Foodify/app/src/main/res/layout/setting_layout.xml @@ -19,6 +19,7 @@ diff --git a/Foodify/app/src/main/res/layout/show_comment_layout.xml b/Foodify/app/src/main/res/layout/show_comment_layout.xml index 9504f59..3207057 100644 --- a/Foodify/app/src/main/res/layout/show_comment_layout.xml +++ b/Foodify/app/src/main/res/layout/show_comment_layout.xml @@ -23,8 +23,8 @@ @@ -43,8 +43,8 @@ diff --git a/Foodify/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/Foodify/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index eca70cf..0000000 --- a/Foodify/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/Foodify/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/Foodify/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index eca70cf..0000000 --- a/Foodify/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/Foodify/app/src/main/res/mipmap-hdpi/ic_launcher.png b/Foodify/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..6df5d2e Binary files /dev/null and b/Foodify/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/Foodify/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/Foodify/app/src/main/res/mipmap-hdpi/ic_launcher.webp deleted file mode 100644 index c209e78..0000000 Binary files a/Foodify/app/src/main/res/mipmap-hdpi/ic_launcher.webp and /dev/null differ diff --git a/Foodify/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/Foodify/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..b735508 Binary files /dev/null and b/Foodify/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/Foodify/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/Foodify/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..0f8ec3d Binary files /dev/null and b/Foodify/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/Foodify/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/Foodify/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp deleted file mode 100644 index b2dfe3d..0000000 Binary files a/Foodify/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp and /dev/null differ diff --git a/Foodify/app/src/main/res/mipmap-mdpi/ic_launcher.png b/Foodify/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..fed8f5e Binary files /dev/null and b/Foodify/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/Foodify/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/Foodify/app/src/main/res/mipmap-mdpi/ic_launcher.webp deleted file mode 100644 index 4f0f1d6..0000000 Binary files a/Foodify/app/src/main/res/mipmap-mdpi/ic_launcher.webp and /dev/null differ diff --git a/Foodify/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/Foodify/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..1cf2e61 Binary files /dev/null and b/Foodify/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/Foodify/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/Foodify/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..8e815b8 Binary files /dev/null and b/Foodify/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/Foodify/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/Foodify/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp deleted file mode 100644 index 62b611d..0000000 Binary files a/Foodify/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp and /dev/null differ diff --git a/Foodify/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/Foodify/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..8cb64aa Binary files /dev/null and b/Foodify/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/Foodify/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/Foodify/app/src/main/res/mipmap-xhdpi/ic_launcher.webp deleted file mode 100644 index 948a307..0000000 Binary files a/Foodify/app/src/main/res/mipmap-xhdpi/ic_launcher.webp and /dev/null differ diff --git a/Foodify/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/Foodify/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..b796713 Binary files /dev/null and b/Foodify/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/Foodify/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/Foodify/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..ea468a8 Binary files /dev/null and b/Foodify/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/Foodify/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/Foodify/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp deleted file mode 100644 index 1b9a695..0000000 Binary files a/Foodify/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/Foodify/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/Foodify/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..b934946 Binary files /dev/null and b/Foodify/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/Foodify/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/Foodify/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp deleted file mode 100644 index 28d4b77..0000000 Binary files a/Foodify/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp and /dev/null differ diff --git a/Foodify/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/Foodify/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..e66c000 Binary files /dev/null and b/Foodify/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/Foodify/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/Foodify/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..a56e75e Binary files /dev/null and b/Foodify/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/Foodify/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/Foodify/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp deleted file mode 100644 index 9287f50..0000000 Binary files a/Foodify/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/Foodify/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/Foodify/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..8887b5b Binary files /dev/null and b/Foodify/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/Foodify/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/Foodify/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp deleted file mode 100644 index aa7d642..0000000 Binary files a/Foodify/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp and /dev/null differ diff --git a/Foodify/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/Foodify/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..2ba0db5 Binary files /dev/null and b/Foodify/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/Foodify/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/Foodify/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..e2ab124 Binary files /dev/null and b/Foodify/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/Foodify/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/Foodify/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp deleted file mode 100644 index 9126ae3..0000000 Binary files a/Foodify/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/Foodify/app/src/main/res/values/ic_launcher_background.xml b/Foodify/app/src/main/res/values/ic_launcher_background.xml new file mode 100644 index 0000000..141661f --- /dev/null +++ b/Foodify/app/src/main/res/values/ic_launcher_background.xml @@ -0,0 +1,4 @@ + + + #EB1C25 + \ No newline at end of file diff --git a/FoodifyServer/app/src/main/java/com/waterbase/foodifyServer/Home.java b/FoodifyServer/app/src/main/java/com/waterbase/foodifyServer/Home.java index 306522a..83a5c27 100644 --- a/FoodifyServer/app/src/main/java/com/waterbase/foodifyServer/Home.java +++ b/FoodifyServer/app/src/main/java/com/waterbase/foodifyServer/Home.java @@ -110,7 +110,7 @@ public class Home extends AppCompatActivity implements NavigationView.OnNavigati //Set Name for user View headerView = navigationView.getHeaderView(0); txtFullName = (TextView) headerView.findViewById(R.id.txtFullName); - txtFullName.setText(Common.currentUser.getName()); + txtFullName.setText("Xin chào " + Common.currentUser.getName() + "!"); //Init View recycler_menu = (RecyclerView) findViewById(R.id.recyler_menu); diff --git a/FoodifyServer/app/src/main/res/drawable/avatar.png b/FoodifyServer/app/src/main/res/drawable/avatar.png index d713c6f..0776238 100644 Binary files a/FoodifyServer/app/src/main/res/drawable/avatar.png and b/FoodifyServer/app/src/main/res/drawable/avatar.png differ