From 343631f749990281af0fbdfc71d3d20f921a1a6c Mon Sep 17 00:00:00 2001 From: phanhuuloi27 <73208452+Nezumi2711@users.noreply.github.com> Date: Wed, 20 Jul 2022 16:24:06 +0700 Subject: [PATCH] Fix UI --- Foodify/app/build.gradle | 2 +- .../com/waterbase/foodify/FoodDetail.java | 7 ++++++- .../java/com/waterbase/foodify/FoodList.java | 14 +++++++++++--- app-debug.apk | Bin 27118978 -> 27066532 bytes 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/Foodify/app/build.gradle b/Foodify/app/build.gradle index 5fb0c22..76d6149 100644 --- a/Foodify/app/build.gradle +++ b/Foodify/app/build.gradle @@ -10,7 +10,7 @@ android { minSdk 23 targetSdk 30 versionCode 1 - versionName "93.0" + versionName "94.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } 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 bda46ee..d0570f8 100644 --- a/Foodify/app/src/main/java/com/waterbase/foodify/FoodDetail.java +++ b/Foodify/app/src/main/java/com/waterbase/foodify/FoodDetail.java @@ -38,7 +38,9 @@ import com.waterbase.foodify.Model.Food; import com.waterbase.foodify.Model.Order; import com.waterbase.foodify.Model.Rating; +import java.text.NumberFormat; import java.util.Arrays; +import java.util.Locale; import info.hoang8f.widget.FButton; import io.github.inflationx.calligraphy3.CalligraphyConfig; @@ -201,6 +203,9 @@ public class FoodDetail extends AppCompatActivity implements RatingDialogListene } private void getDetailFood(String foodId) { + Locale locale = new Locale("vi", "VN"); + NumberFormat fmt = NumberFormat.getCurrencyInstance(locale); + foods.child(foodId).addValueEventListener(new ValueEventListener() { @Override public void onDataChange(DataSnapshot dataSnapshot) { @@ -211,7 +216,7 @@ public class FoodDetail extends AppCompatActivity implements RatingDialogListene collapsingToolbarLayout.setTitle(currentFood.getName()); - food_price.setText(currentFood.getPrice()); + food_price.setText(fmt.format(Long.parseLong(currentFood.getPrice()))); food_name.setText(currentFood.getName()); 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 c51aa7e..e37999f 100644 --- a/Foodify/app/src/main/java/com/waterbase/foodify/FoodList.java +++ b/Foodify/app/src/main/java/com/waterbase/foodify/FoodList.java @@ -41,8 +41,10 @@ import com.waterbase.foodify.Model.Food; import com.waterbase.foodify.Model.Order; import com.waterbase.foodify.ViewHolder.FoodViewHolder; +import java.text.NumberFormat; import java.util.ArrayList; import java.util.List; +import java.util.Locale; import io.github.inflationx.calligraphy3.CalligraphyConfig; import io.github.inflationx.calligraphy3.CalligraphyInterceptor; @@ -271,6 +273,10 @@ public class FoodList extends AppCompatActivity { } private void loadListFood(String categoryId) { + + Locale locale = new Locale("vi", "VN"); + NumberFormat fmt = NumberFormat.getCurrencyInstance(locale); + //Create query by category Id Query searchByName = foodList.orderByChild("menuId").equalTo(categoryId); //Create Options with query @@ -284,16 +290,18 @@ public class FoodList extends AppCompatActivity { viewHolder.food_name.setText(model.getName()); if (Integer.parseInt(model.getDiscount()) > 0) { - String foodPrice = model.getPrice() + "đ"; + + + String foodPrice = fmt.format(Long.parseLong(model.getPrice())); long newFoodPrice = Long.parseLong(model.getPrice()) - Long.parseLong(model.getPrice()) * Long.parseLong(model.getDiscount()) / 100; SpannableStringBuilder spnBuilder = new SpannableStringBuilder(foodPrice); StrikethroughSpan strikethroughSpan = new StrikethroughSpan(); spnBuilder.setSpan(strikethroughSpan, 0, foodPrice.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); viewHolder.food_price.setText(spnBuilder); - viewHolder.newPrice.setText(newFoodPrice + "đ"); + viewHolder.newPrice.setText(fmt.format(newFoodPrice)); viewHolder.discount.setText("- " + model.getDiscount() + "%"); } else { - viewHolder.food_price.setText(String.format("%s đ", model.getPrice())); + viewHolder.food_price.setText(fmt.format(Long.parseLong(model.getPrice()))); viewHolder.discount.setVisibility(View.GONE); viewHolder.newPrice.setVisibility(View.GONE); } diff --git a/app-debug.apk b/app-debug.apk index 658af6c58feb1a2f8ff171aca1bcc964fdf8cc8d..29dda56325e3c4f5cd3e7026cb079eec9346e58e 100644 GIT binary patch delta 223308 zcmZ5mWl$VVw8dQ#2(E!3K?1>DLU0Q#?!n#N1`7m-V8PuzKyX;xU4t&}ZVN2%_
q zSFh?;&-6_7)a`RmpL?r&g3|A>3IeaO0z%;H5v
OAK
z5NHq@{W1~jD6=hCGvMDe&fg;jziDJ|LrfM `Vx_36jNCA;g^Q2eFP)tCK 3}d7CORnkchb{2NXi_
zGnLZak4Tyw2EhGW{73BB@hyYC=dVdM+&G7HCJk>@2P6qzY0UQ@#`C+hn=`Ga<@NjD
zdM0l9a!K;nGu*w(dT-GlQOIx4au+$5^!2op2di9!8fr_RzT5i&gw1SQ8f>b=NQM?G
z`ewGbOH=m#!0c*njBziH@Q%rnb(Qh3-V-L$fHkqt%aZZ7>q^hOTxL&N_I;OVDvc-Y
zgBC>-T9%t^qyB4PyZtozXkTtCdVe;Z438O6e|#jOCNU1@cAFLZzM)6|C@zJwwdeLW
zvv%&U3PFou%X=l?);vapj=nthcNuw?>Nn8YQ{;ID97dT0B-ga?n`-DSC2z^@uSA;+
z-}4a)DHb{cKh`QL1wM4fTF-XEzR!<*7ut<9o=ozPa#VQis0KtLUJqhhHU*9dW<*y9
z4&!NDxSChVe0!;Tz_Z^W|L6lUzG!kptf$GpkQ)%SN;_ABD`{j^FFI7b+SwHFO?^1C
z-1mhZXfFMtnblcoydXN#rn7$Ju)M8!1SlSry%}9_xNDQQSf#+}&$XX+RZ#Oqppfg+
zvXu+WW_j8fX1>gl+v2+1>SEQ&X5ZJq7rTEH=vy`&0lx0ab^ktL>gXMw?>Y77B$VYi
zO5tx&x_=~_XSG`1(S-Qdr?!>BcF)*Ov1Y&Wr9_5IQJ1+g6wky`AFXdQ0Bb3MrsFt&f(oh
zj1c?0kNFVzYy?M)h7ySP4I?xl*NB)HCkB}oEW?hG82H(Ug&4Iz7(Itv0qHY4y25LI
zQ2Pd76e!0|F$%}o#llWD3h&Y-5*k)A7?%&PdsL}KBc&H`SVoX-07!vx{BL8w8S5D@B@O~@6g46<9uiy#-a
zQ0$|ZB}!aNo83zFrhiYU+oE49Szw~
`LQBUIgD#
z3Lwb6v7}+=RY@f
xa=j&proO)7^x?&4Aa0Q#`_qR*`@0~GW1nHS
z8I