diff --git a/Foodify/app/build.gradle b/Foodify/app/build.gradle index a064719..8b2ca18 100644 --- a/Foodify/app/build.gradle +++ b/Foodify/app/build.gradle @@ -66,6 +66,9 @@ dependencies { implementation 'com.github.rey5137:material:1.2.4' implementation 'com.squareup.okhttp3:okhttp:4.9.2' + + implementation 'io.github.inflationx:calligraphy3:3.1.1' + implementation 'io.github.inflationx:viewpump:2.0.3' } apply plugin: 'com.google.gms.google-services' \ No newline at end of file diff --git a/Foodify/app/src/main/assets/fonts/font.ttf b/Foodify/app/src/main/assets/fonts/font.ttf new file mode 100644 index 0000000..22d6180 Binary files /dev/null and b/Foodify/app/src/main/assets/fonts/font.ttf 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 e69d192..cf8ee3a 100644 --- a/Foodify/app/src/main/java/com/waterbase/foodify/Cart.java +++ b/Foodify/app/src/main/java/com/waterbase/foodify/Cart.java @@ -1,5 +1,15 @@ package com.waterbase.foodify; +import android.content.Context; +import android.content.DialogInterface; +import android.os.Bundle; +import android.util.Log; +import android.view.LayoutInflater; +import android.view.MenuItem; +import android.view.View; +import android.widget.TextView; +import android.widget.Toast; + import androidx.annotation.NonNull; import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.AlertDialog; @@ -7,17 +17,6 @@ import androidx.appcompat.app.AppCompatActivity; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import android.content.DialogInterface; -import android.os.Bundle; -import android.util.Log; -import android.view.LayoutInflater; -import android.view.MenuItem; -import android.view.View; -import android.widget.EditText; -import android.widget.LinearLayout; -import android.widget.TextView; -import android.widget.Toast; - import com.google.firebase.database.DataSnapshot; import com.google.firebase.database.DatabaseError; import com.google.firebase.database.DatabaseReference; @@ -42,6 +41,10 @@ import java.util.List; import java.util.Locale; import info.hoang8f.widget.FButton; +import io.github.inflationx.calligraphy3.CalligraphyConfig; +import io.github.inflationx.calligraphy3.CalligraphyInterceptor; +import io.github.inflationx.viewpump.ViewPump; +import io.github.inflationx.viewpump.ViewPumpContextWrapper; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; @@ -62,9 +65,23 @@ public class Cart extends AppCompatActivity { APIService mService; + @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.ttf") + .setFontAttrId(io.github.inflationx.calligraphy3.R.attr.fontPath) + .build())) + .build()); + setContentView(R.layout.activity_cart); //Init 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 7f6bd19..8ca9ce8 100644 --- a/Foodify/app/src/main/java/com/waterbase/foodify/ChangePassword.java +++ b/Foodify/app/src/main/java/com/waterbase/foodify/ChangePassword.java @@ -1,7 +1,6 @@ package com.waterbase.foodify; -import androidx.appcompat.app.AppCompatActivity; - +import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.view.View; @@ -9,16 +8,20 @@ import android.widget.Button; import android.widget.EditText; import android.widget.Toast; -import com.google.firebase.database.DataSnapshot; -import com.google.firebase.database.DatabaseError; +import androidx.appcompat.app.AppCompatActivity; + import com.google.firebase.database.DatabaseReference; import com.google.firebase.database.FirebaseDatabase; -import com.google.firebase.database.ValueEventListener; import com.waterbase.foodify.Model.User; import java.util.regex.Matcher; import java.util.regex.Pattern; +import io.github.inflationx.calligraphy3.CalligraphyConfig; +import io.github.inflationx.calligraphy3.CalligraphyInterceptor; +import io.github.inflationx.viewpump.ViewPump; +import io.github.inflationx.viewpump.ViewPumpContextWrapper; + public class ChangePassword extends AppCompatActivity { User user; @@ -27,9 +30,24 @@ 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.ttf") + .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/FoodDetail.java b/Foodify/app/src/main/java/com/waterbase/foodify/FoodDetail.java index 8d9b754..03e2dab 100644 --- a/Foodify/app/src/main/java/com/waterbase/foodify/FoodDetail.java +++ b/Foodify/app/src/main/java/com/waterbase/foodify/FoodDetail.java @@ -1,9 +1,6 @@ package com.waterbase.foodify; -import androidx.annotation.NonNull; -import androidx.appcompat.app.ActionBar; -import androidx.appcompat.app.AppCompatActivity; - +import android.content.Context; import android.os.Bundle; import android.view.MenuItem; import android.view.View; @@ -12,6 +9,10 @@ import android.widget.RatingBar; import android.widget.TextView; import android.widget.Toast; +import androidx.annotation.NonNull; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; + import com.cepheuen.elegantnumberbutton.view.ElegantNumberButton; import com.google.android.material.appbar.CollapsingToolbarLayout; import com.google.android.material.floatingactionbutton.FloatingActionButton; @@ -32,6 +33,11 @@ import com.waterbase.foodify.Model.Rating; import java.util.Arrays; +import io.github.inflationx.calligraphy3.CalligraphyConfig; +import io.github.inflationx.calligraphy3.CalligraphyInterceptor; +import io.github.inflationx.viewpump.ViewPump; +import io.github.inflationx.viewpump.ViewPumpContextWrapper; + public class FoodDetail extends AppCompatActivity implements RatingDialogListener { @@ -50,9 +56,24 @@ 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.ttf") + .setFontAttrId(io.github.inflationx.calligraphy3.R.attr.fontPath) + .build())) + .build()); + setContentView(R.layout.activity_food_detail); //Firebase 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 e96cdf8..9172049 100644 --- a/Foodify/app/src/main/java/com/waterbase/foodify/FoodList.java +++ b/Foodify/app/src/main/java/com/waterbase/foodify/FoodList.java @@ -7,6 +7,7 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; +import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.text.Editable; @@ -32,6 +33,11 @@ import com.waterbase.foodify.ViewHolder.FoodViewHolder; import java.util.ArrayList; import java.util.List; +import io.github.inflationx.calligraphy3.CalligraphyConfig; +import io.github.inflationx.calligraphy3.CalligraphyInterceptor; +import io.github.inflationx.viewpump.ViewPump; +import io.github.inflationx.viewpump.ViewPumpContextWrapper; + public class FoodList extends AppCompatActivity { RecyclerView recyclerView; @@ -54,9 +60,24 @@ 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.ttf") + .setFontAttrId(io.github.inflationx.calligraphy3.R.attr.fontPath) + .build())) + .build()); + setContentView(R.layout.activity_food_list); //Firebase @@ -224,6 +245,7 @@ public class FoodList extends AppCompatActivity { @Override protected void populateViewHolder(FoodViewHolder viewHolder, Food model, int position) { viewHolder.food_name.setText(model.getName()); + viewHolder.food_price.setText(String.format("%s đ", model.getPrice())); Picasso.with(getBaseContext()).load(model.getImage()).into(viewHolder.food_image); //Add Favorites 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 48838dd..89303de 100644 --- a/Foodify/app/src/main/java/com/waterbase/foodify/ForgotPassword.java +++ b/Foodify/app/src/main/java/com/waterbase/foodify/ForgotPassword.java @@ -1,7 +1,6 @@ package com.waterbase.foodify; -import androidx.appcompat.app.AppCompatActivity; - +import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.text.TextUtils; @@ -11,6 +10,8 @@ import android.widget.EditText; import android.widget.ProgressBar; import android.widget.Toast; +import androidx.appcompat.app.AppCompatActivity; + import com.google.firebase.FirebaseException; import com.google.firebase.auth.PhoneAuthCredential; import com.google.firebase.auth.PhoneAuthProvider; @@ -20,12 +21,16 @@ import com.google.firebase.database.DatabaseReference; import com.google.firebase.database.FirebaseDatabase; import com.google.firebase.database.ValueEventListener; import com.waterbase.foodify.Common.Common; -import com.waterbase.foodify.Model.User; import java.util.concurrent.TimeUnit; import java.util.regex.Matcher; import java.util.regex.Pattern; +import io.github.inflationx.calligraphy3.CalligraphyConfig; +import io.github.inflationx.calligraphy3.CalligraphyInterceptor; +import io.github.inflationx.viewpump.ViewPump; +import io.github.inflationx.viewpump.ViewPumpContextWrapper; + public class ForgotPassword extends AppCompatActivity { EditText edtPhone; @@ -34,9 +39,25 @@ 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.ttf") + .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 35128f6..a4b6c32 100644 --- a/Foodify/app/src/main/java/com/waterbase/foodify/Home.java +++ b/Foodify/app/src/main/java/com/waterbase/foodify/Home.java @@ -1,5 +1,6 @@ package com.waterbase.foodify; +import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; @@ -17,8 +18,7 @@ import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.Toolbar; import androidx.core.view.GravityCompat; import androidx.drawerlayout.widget.DrawerLayout; -import androidx.navigation.ui.AppBarConfiguration; -import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; @@ -42,6 +42,10 @@ import java.util.HashMap; import java.util.Map; import dmax.dialog.SpotsDialog; +import io.github.inflationx.calligraphy3.CalligraphyConfig; +import io.github.inflationx.calligraphy3.CalligraphyInterceptor; +import io.github.inflationx.viewpump.ViewPump; +import io.github.inflationx.viewpump.ViewPumpContextWrapper; import io.paperdb.Paper; @@ -56,10 +60,25 @@ public class Home extends AppCompatActivity implements NavigationView.OnNavigati 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.ttf") + .setFontAttrId(io.github.inflationx.calligraphy3.R.attr.fontPath) + .build())) + .build()); + setContentView(R.layout.activity_home); Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); @@ -115,8 +134,9 @@ public class Home extends AppCompatActivity implements NavigationView.OnNavigati //Load menu recyler_menu = (RecyclerView) findViewById(R.id.recyler_menu); recyler_menu.setHasFixedSize(true); - layoutManager = new LinearLayoutManager(this); - recyler_menu.setLayoutManager(layoutManager); +// layoutManager = new LinearLayoutManager(this); +// recyler_menu.setLayoutManager(layoutManager); + recyler_menu.setLayoutManager(new GridLayoutManager(this, 2)); //Set name for user View headerView = navigationView.getHeaderView(0); 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 ae349d6..0b77a30 100644 --- a/Foodify/app/src/main/java/com/waterbase/foodify/OrderStatus.java +++ b/Foodify/app/src/main/java/com/waterbase/foodify/OrderStatus.java @@ -1,14 +1,15 @@ package com.waterbase.foodify; +import android.content.Context; +import android.os.Bundle; +import android.view.MenuItem; + import androidx.annotation.NonNull; import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.AppCompatActivity; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import android.os.Bundle; -import android.view.MenuItem; - import com.firebase.ui.database.FirebaseRecyclerAdapter; import com.google.firebase.database.DatabaseReference; import com.google.firebase.database.FirebaseDatabase; @@ -16,6 +17,11 @@ import com.waterbase.foodify.Common.Common; import com.waterbase.foodify.Model.Request; import com.waterbase.foodify.ViewHolder.OrderViewHolder; +import io.github.inflationx.calligraphy3.CalligraphyConfig; +import io.github.inflationx.calligraphy3.CalligraphyInterceptor; +import io.github.inflationx.viewpump.ViewPump; +import io.github.inflationx.viewpump.ViewPumpContextWrapper; + public class OrderStatus extends AppCompatActivity { public RecyclerView recyclerView; @@ -26,9 +32,24 @@ 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.ttf") + .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/SignIn.java b/Foodify/app/src/main/java/com/waterbase/foodify/SignIn.java index cc120d8..ca32399 100644 --- a/Foodify/app/src/main/java/com/waterbase/foodify/SignIn.java +++ b/Foodify/app/src/main/java/com/waterbase/foodify/SignIn.java @@ -1,6 +1,7 @@ package com.waterbase.foodify; import android.app.ProgressDialog; +import android.content.Context; import android.content.Intent; import android.graphics.Typeface; import android.os.Bundle; @@ -21,6 +22,10 @@ import com.rey.material.widget.CheckBox; import com.waterbase.foodify.Common.Common; import com.waterbase.foodify.Model.User; +import io.github.inflationx.calligraphy3.CalligraphyConfig; +import io.github.inflationx.calligraphy3.CalligraphyInterceptor; +import io.github.inflationx.viewpump.ViewPump; +import io.github.inflationx.viewpump.ViewPumpContextWrapper; import io.paperdb.Paper; public class SignIn extends AppCompatActivity { @@ -30,9 +35,25 @@ 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.ttf") + .setFontAttrId(io.github.inflationx.calligraphy3.R.attr.fontPath) + .build())) + .build()); + setContentView(R.layout.activity_sign_in); edtPassword = (EditText) findViewById(R.id.edtPassword); 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 5ca9eec..834abda 100644 --- a/Foodify/app/src/main/java/com/waterbase/foodify/SignUp.java +++ b/Foodify/app/src/main/java/com/waterbase/foodify/SignUp.java @@ -1,6 +1,6 @@ package com.waterbase.foodify; -import android.app.ProgressDialog; +import android.content.Context; import android.content.Intent; import android.graphics.Typeface; import android.os.Bundle; @@ -12,13 +12,9 @@ import android.widget.ProgressBar; import android.widget.TextView; import android.widget.Toast; -import androidx.annotation.NonNull; import androidx.appcompat.app.AppCompatActivity; -import com.google.android.gms.tasks.OnCompleteListener; -import com.google.android.gms.tasks.Task; import com.google.firebase.FirebaseException; -import com.google.firebase.auth.FirebaseAuth; import com.google.firebase.auth.PhoneAuthCredential; import com.google.firebase.auth.PhoneAuthProvider; import com.google.firebase.database.DataSnapshot; @@ -33,6 +29,11 @@ import java.util.concurrent.TimeUnit; import java.util.regex.Matcher; import java.util.regex.Pattern; +import io.github.inflationx.calligraphy3.CalligraphyConfig; +import io.github.inflationx.calligraphy3.CalligraphyInterceptor; +import io.github.inflationx.viewpump.ViewPump; +import io.github.inflationx.viewpump.ViewPumpContextWrapper; + public class SignUp extends AppCompatActivity { EditText edtPhone, edtName, edtPassword, edtPasswordVerify; @@ -42,9 +43,25 @@ 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.ttf") + .setFontAttrId(io.github.inflationx.calligraphy3.R.attr.fontPath) + .build())) + .build()); + setContentView(R.layout.activity_sign_up); edtName = (EditText) findViewById(R.id.txtFullName); 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 6f75638..a27be16 100644 --- a/Foodify/app/src/main/java/com/waterbase/foodify/VerifyPhone.java +++ b/Foodify/app/src/main/java/com/waterbase/foodify/VerifyPhone.java @@ -1,8 +1,6 @@ package com.waterbase.foodify; -import androidx.annotation.NonNull; -import androidx.appcompat.app.AppCompatActivity; - +import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.os.CountDownTimer; @@ -15,7 +13,9 @@ import android.widget.ProgressBar; import android.widget.TextView; import android.widget.Toast; -import com.firebase.ui.database.ChangeEventListener; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; + import com.google.android.gms.tasks.OnCompleteListener; import com.google.android.gms.tasks.Task; import com.google.firebase.FirebaseException; @@ -32,6 +32,11 @@ import com.waterbase.foodify.Model.User; import java.util.concurrent.TimeUnit; +import io.github.inflationx.calligraphy3.CalligraphyConfig; +import io.github.inflationx.calligraphy3.CalligraphyInterceptor; +import io.github.inflationx.viewpump.ViewPump; +import io.github.inflationx.viewpump.ViewPumpContextWrapper; + public class VerifyPhone extends AppCompatActivity { private EditText inputCode1, inputCode2, inputCode3, inputCode4, inputCode5, inputCode6; @@ -39,9 +44,25 @@ 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.ttf") + .setFontAttrId(io.github.inflationx.calligraphy3.R.attr.fontPath) + .build())) + .build()); + setContentView(R.layout.activity_verify_phone); user = (User) getIntent().getSerializableExtra("user"); diff --git a/Foodify/app/src/main/java/com/waterbase/foodify/ViewHolder/FoodViewHolder.java b/Foodify/app/src/main/java/com/waterbase/foodify/ViewHolder/FoodViewHolder.java index f0e0551..bd1ccb2 100644 --- a/Foodify/app/src/main/java/com/waterbase/foodify/ViewHolder/FoodViewHolder.java +++ b/Foodify/app/src/main/java/com/waterbase/foodify/ViewHolder/FoodViewHolder.java @@ -12,7 +12,7 @@ import com.waterbase.foodify.R; public class FoodViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener { - public TextView food_name; + public TextView food_name, food_price; public ImageView food_image, fav_image; private ItemClickListener itemClickListener; @@ -27,6 +27,7 @@ public class FoodViewHolder extends RecyclerView.ViewHolder implements View.OnCl food_name = (TextView) itemView.findViewById(R.id.food_name); food_image = (ImageView) itemView.findViewById(R.id.food_image); fav_image = (ImageView) itemView.findViewById(R.id.fav); + food_price = (TextView) itemView.findViewById(R.id.food_price); itemView.setOnClickListener(this); } 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 24f9b3c..a3ae824 100644 --- a/Foodify/app/src/main/java/com/waterbase/foodify/Welcome.java +++ b/Foodify/app/src/main/java/com/waterbase/foodify/Welcome.java @@ -1,6 +1,7 @@ package com.waterbase.foodify; import android.app.ProgressDialog; +import android.content.Context; import android.content.Intent; import android.graphics.Typeface; import android.os.Bundle; @@ -19,6 +20,10 @@ import com.google.firebase.database.ValueEventListener; import com.waterbase.foodify.Common.Common; import com.waterbase.foodify.Model.User; +import io.github.inflationx.calligraphy3.CalligraphyConfig; +import io.github.inflationx.calligraphy3.CalligraphyInterceptor; +import io.github.inflationx.viewpump.ViewPump; +import io.github.inflationx.viewpump.ViewPumpContextWrapper; import io.paperdb.Paper; public class Welcome extends AppCompatActivity { @@ -26,9 +31,21 @@ 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.ttf") + .setFontAttrId(io.github.inflationx.calligraphy3.R.attr.fontPath) + .build())) + .build()); setContentView(R.layout.activity_welcome); btnSignIn = (Button) findViewById(R.id.btnSignIn); diff --git a/Foodify/app/src/main/res/layout/food_item.xml b/Foodify/app/src/main/res/layout/food_item.xml index c803d4a..6d60c3e 100644 --- a/Foodify/app/src/main/res/layout/food_item.xml +++ b/Foodify/app/src/main/res/layout/food_item.xml @@ -3,19 +3,24 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" - android:layout_height="200dp" - app:cardElevation="4dp" + android:layout_height="wrap_content" + app:cardElevation="10dp" + app:cardCornerRadius="0dp" android:layout_marginBottom="8dp" > - @@ -23,9 +28,9 @@ android:weightSum="10" android:orientation="horizontal" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:background="#4f0e0d0e" + android:gravity="center_vertical" + android:layout_height="0dp" + android:layout_weight="1" > - + + + \ No newline at end of file diff --git a/Foodify/app/src/main/res/layout/menu_item.xml b/Foodify/app/src/main/res/layout/menu_item.xml index 0210b8c..e3e73d9 100644 --- a/Foodify/app/src/main/res/layout/menu_item.xml +++ b/Foodify/app/src/main/res/layout/menu_item.xml @@ -2,8 +2,10 @@