diff --git a/app/build.gradle b/app/build.gradle index e6ac9ac..bd61afd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -26,7 +26,7 @@ android { minSdk 26 targetSdk 32 versionCode 1 - versionName "0.4.0" + versionName "0.5.2" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" signingConfig signingConfigs.release @@ -92,7 +92,6 @@ dependencies { implementation 'com.squareup.picasso:picasso:2.71828' implementation 'com.github.ome450901:SimpleRatingBar:1.5.1' implementation 'com.cepheuen.elegant-number-button:lib:1.0.2' - implementation 'com.saadahmedev.popup-dialog:popup-dialog:1.0.2' implementation 'com.github.techinessoverloaded:progress-dialog:1.5.1' implementation 'androidx.browser:browser:1.5.0' @@ -109,5 +108,6 @@ dependencies { implementation(project(':aestheticdialogs')) implementation(project(':SJDialog')) + implementation(project(':popupDialog')) } diff --git a/app/release/app-release.apk b/app/release/app-release.apk index 5f2b1e9..8b7bc24 100644 Binary files a/app/release/app-release.apk and b/app/release/app-release.apk differ diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index 86510ca..35b386e 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -12,7 +12,7 @@ "filters": [], "attributes": [], "versionCode": 1, - "versionName": "0.3.4", + "versionName": "0.5.2", "outputFile": "app-release.apk" } ], diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6dff26a..1290b26 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -50,7 +50,7 @@ android:name="com.google.firebase.messaging.default_notification_channel_id" android:value="foodify-notification"/> - @@ -139,7 +139,7 @@ diff --git a/app/src/main/java/com/capstone/foodify/API/FoodApi.java b/app/src/main/java/com/capstone/foodify/API/FoodApi.java index 491ec81..3b91577 100644 --- a/app/src/main/java/com/capstone/foodify/API/FoodApi.java +++ b/app/src/main/java/com/capstone/foodify/API/FoodApi.java @@ -48,7 +48,7 @@ public interface FoodApi { @GET("products/search/enable") Call searchFoodByName(@Query("productName") String name, @Query("pageNo") int pageNo, @Query("pageSize") int pageSize, @Query("sortBy") String sortBy, @Query("sortDir") String sortDir); - @GET("products") + @GET("products/random") Call listFood(@Query("pageNo") int pageNo, @Query("pageSize") int pageSize, @Query("sortBy") String sortBy, @Query("sortDir") String sortDir); @GET("categories/randoms?pageNo=0&pageSize=7") diff --git a/app/src/main/java/com/capstone/foodify/Activity/AddressManagerActivity.java b/app/src/main/java/com/capstone/foodify/Activity/AddressManagerActivity.java index f92d54d..40d41bd 100644 --- a/app/src/main/java/com/capstone/foodify/Activity/AddressManagerActivity.java +++ b/app/src/main/java/com/capstone/foodify/Activity/AddressManagerActivity.java @@ -58,7 +58,7 @@ public class AddressManagerActivity extends AppCompatActivity { private Button add_address_button; private TextInputLayout textInput_address; private ImageView back_image, edit_btn; - private TextView txt_Address, errorTextDistrictWard; + private TextView txt_Address, errorTextDistrict, errorTextWard; private List
listAddress = new ArrayList<>(); private Spinner wardSpinner, districtSpinner; private EditText edt_address; @@ -490,7 +490,8 @@ public class AddressManagerActivity extends AppCompatActivity { wardSpinner = view.findViewById(R.id.ward); districtSpinner = view.findViewById(R.id.district); edt_address = view.findViewById(R.id.edt_address); - errorTextDistrictWard = view.findViewById(R.id.errorTextDistrictWard); + errorTextDistrict = view.findViewById(R.id.errorTextDistrict); + errorTextWard = view.findViewById(R.id.errorTextWard); progressLayoutDialog = view.findViewById(R.id.progress_layout); default_address_checkbox = view.findViewById(R.id.checkbox_default_address); } @@ -507,18 +508,22 @@ public class AddressManagerActivity extends AppCompatActivity { textInput_address.setErrorEnabled(false); } - //Check district and ward - if(district.equals("---Quận") || ward.equals("---Phường")){ - - if(!district.equals("Huyện Hoàng Sa")){ - errorTextDistrictWard.setVisibility(View.VISIBLE); - dataHasValidate = false; - } else{ - errorTextDistrictWard.setVisibility(View.GONE); - } + //Check ward + if(ward.equals("---Phường")){ + errorTextWard.setVisibility(View.VISIBLE); + dataHasValidate = false; } else { - errorTextDistrictWard.setVisibility(View.GONE); + errorTextWard.setVisibility(View.GONE); + } + + //Check district + if(district.equals("---Quận")){ + errorTextDistrict.setVisibility(View.VISIBLE); + + dataHasValidate = false; + } else { + errorTextDistrict.setVisibility(View.GONE); } return dataHasValidate; @@ -589,7 +594,7 @@ public class AddressManagerActivity extends AppCompatActivity { } private void setAdapter(ArrayList data, String defaultItem, Spinner dataSpinner){ - MySpinnerAdapter adapterWard = new MySpinnerAdapter(getApplicationContext(), android.R.layout.simple_spinner_item, data); + MySpinnerAdapter adapterWard = new MySpinnerAdapter(getApplicationContext(), R.layout.spinner_text_view, data); dataSpinner.setAdapter(adapterWard); // this will set list of values to spinner dataSpinner.setSelection(data.indexOf(defaultItem));//set selected value in spinner } diff --git a/app/src/main/java/com/capstone/foodify/Activity/FoodDetailActivity.java b/app/src/main/java/com/capstone/foodify/Activity/FoodDetailActivity.java index 57d2e11..7e6608c 100644 --- a/app/src/main/java/com/capstone/foodify/Activity/FoodDetailActivity.java +++ b/app/src/main/java/com/capstone/foodify/Activity/FoodDetailActivity.java @@ -49,11 +49,13 @@ import com.denzcoskun.imageslider.constants.ScaleTypes; import com.denzcoskun.imageslider.models.SlideModel; import com.google.android.material.chip.Chip; import com.google.android.material.chip.ChipGroup; +import com.makeramen.roundedimageview.RoundedImageView; import com.mcdev.quantitizerlibrary.AnimationStyle; import com.mcdev.quantitizerlibrary.HorizontalQuantitizer; import com.mcdev.quantitizerlibrary.QuantitizerListener; import com.sjapps.library.customdialog.BasicDialog; import com.sjapps.library.customdialog.DialogButtonEvents; +import com.squareup.picasso.Picasso; import com.thecode.aestheticdialogs.DialogStyle; import com.thecode.aestheticdialogs.DialogType; import com.willy.ratingbar.RotationRatingBar; @@ -83,6 +85,7 @@ public class FoodDetailActivity extends AppCompatActivity { private Food food; private TextView foodName_txt, shopName_txt, discount_txt, price_txt, countRating_txt, description_content_txt, endOfListText, userNameComment, contentComment, count_sold_txt; + private RoundedImageView profile_avatar; private ConstraintLayout content_view; private Button add_to_basket_button; private float totalPrice, price; @@ -147,6 +150,7 @@ public class FoodDetailActivity extends AppCompatActivity { list_category = findViewById(R.id.list_category); count_sold_txt = findViewById(R.id.count_sold); swipeRefreshLayout = findViewById(R.id.swipe_refresh); + profile_avatar = findViewById(R.id.profile_avatar); } @Override protected void onCreate(Bundle savedInstanceState) { @@ -537,6 +541,13 @@ public class FoodDetailActivity extends AppCompatActivity { description_content_txt.setText(food.getDescription()); ratingBar.setRating(food.getAverageRating()); + //Set image for user + if(Common.CURRENT_USER.getImageUrl().isEmpty()){ + profile_avatar.setImageResource(R.drawable.profile_avatar); + } else { + Picasso.get().load(Common.CURRENT_USER.getImageUrl()).into(profile_avatar); + } + if(food.getReviewCount() == null || Integer.parseInt(food.getReviewCount()) == 0){ countRating_txt.setText("Chưa có bình luận nào!"); } else { diff --git a/app/src/main/java/com/capstone/foodify/Activity/MainActivity.java b/app/src/main/java/com/capstone/foodify/Activity/MainActivity.java index e4402fb..128f5c8 100644 --- a/app/src/main/java/com/capstone/foodify/Activity/MainActivity.java +++ b/app/src/main/java/com/capstone/foodify/Activity/MainActivity.java @@ -44,8 +44,8 @@ import com.capstone.foodify.Fragment.HomeFragment; import com.capstone.foodify.Model.Response.CustomResponse; import com.capstone.foodify.Model.User; import com.capstone.foodify.R; -import com.capstone.foodify.RefreshTokenService; -import com.capstone.foodify.ViewPagerAdapter; +import com.capstone.foodify.Service.RefreshTokenService; +import com.capstone.foodify.Fragment.ViewPagerAdapter; import com.google.android.gms.common.api.ApiException; import com.google.android.gms.common.api.ResolvableApiException; import com.google.android.gms.location.FusedLocationProviderClient; @@ -230,6 +230,17 @@ public class MainActivity extends AppCompatActivity { getLocation(); + + + final Handler handler = new Handler(); + handler.postDelayed(new Runnable() { + @Override + public void run() { + if(!slider || !shop || !recentFood || !recommendFood){ + Common.showErrorServerNotification(MainActivity.this, "Đã có lỗi từ hệ thống, vui lòng thử lại sau!"); + } + } + }, 10000); } private void startRefreshTokenService() { diff --git a/app/src/main/java/com/capstone/foodify/Activity/OrderCheckOutActivity.java b/app/src/main/java/com/capstone/foodify/Activity/OrderCheckOutActivity.java index 66b2f5c..e5f132d 100644 --- a/app/src/main/java/com/capstone/foodify/Activity/OrderCheckOutActivity.java +++ b/app/src/main/java/com/capstone/foodify/Activity/OrderCheckOutActivity.java @@ -86,7 +86,7 @@ public class OrderCheckOutActivity extends AppCompatActivity { private ImageView back_image; private OrderDetailAdapter adapter; private RecyclerView recyclerView; - private TextView txt_userName, txt_phone, edt_address_detect, errorTextDistrictWard, txt_total, txt_distance, txt_ship_cost; + private TextView txt_userName, txt_phone, edt_address_detect, errorTextDistrict, errorTextWard, txt_total, txt_distance, txt_ship_cost; private TextInputLayout textInput_address; private EditText edt_address; private Spinner spn_list_address, spn_district, spn_ward; @@ -117,7 +117,8 @@ public class OrderCheckOutActivity extends AppCompatActivity { manual_input_address = findViewById(R.id.manual_input_address); edt_address = findViewById(R.id.edt_address); address_option = findViewById(R.id.address_option); - errorTextDistrictWard = findViewById(R.id.errorTextDistrictWard); + errorTextDistrict = findViewById(R.id.errorTextDistrict); + errorTextWard = findViewById(R.id.errorTextWard); textInput_address = findViewById(R.id.textInput_address); txt_total = findViewById(R.id.txt_total); take_food_from_shop = findViewById(R.id.take_food_from_shop); @@ -607,18 +608,22 @@ public class OrderCheckOutActivity extends AppCompatActivity { textInput_address.setErrorEnabled(false); } - //Check district and ward - if(spn_district.getSelectedItem().toString().equals("---Quận") || spn_ward.getSelectedItem().toString().equals("---Phường")){ - - if(!spn_district.getSelectedItem().toString().equals("Huyện Hoàng Sa")){ - errorTextDistrictWard.setVisibility(View.VISIBLE); - dataHasValidate = false; - } else{ - errorTextDistrictWard.setVisibility(View.GONE); - } + //Check ward + if(spn_ward.getSelectedItem().toString().equals("---Phường")){ + errorTextWard.setVisibility(View.VISIBLE); + dataHasValidate = false; } else { - errorTextDistrictWard.setVisibility(View.GONE); + errorTextWard.setVisibility(View.GONE); + } + + //Check district + if(spn_district.getSelectedItem().toString().equals("---Quận")){ + errorTextDistrict.setVisibility(View.VISIBLE); + + dataHasValidate = false; + } else { + errorTextDistrict.setVisibility(View.GONE); } return dataHasValidate; @@ -832,7 +837,7 @@ public class OrderCheckOutActivity extends AppCompatActivity { } private void setAdapter(ArrayList data, String defaultItem, Spinner dataSpinner){ - OrderCheckOutActivity.MySpinnerAdapter adapterWard = new OrderCheckOutActivity.MySpinnerAdapter(getApplicationContext(), android.R.layout.simple_spinner_item, data); + OrderCheckOutActivity.MySpinnerAdapter adapterWard = new OrderCheckOutActivity.MySpinnerAdapter(getApplicationContext(), R.layout.spinner_text_view, data); dataSpinner.setAdapter(adapterWard); // this will set list of values to spinner dataSpinner.setSelection(data.indexOf(defaultItem));//set selected value in spinner } diff --git a/app/src/main/java/com/capstone/foodify/Activity/SignUpActivity.java b/app/src/main/java/com/capstone/foodify/Activity/SignUpActivity.java index 448801c..0639691 100644 --- a/app/src/main/java/com/capstone/foodify/Activity/SignUpActivity.java +++ b/app/src/main/java/com/capstone/foodify/Activity/SignUpActivity.java @@ -66,7 +66,7 @@ public class SignUpActivity extends AppCompatActivity { textInput_address, textInput_confirmPassword, textInput_fullName, textInput_birthDay; final Calendar myCalendar= Calendar.getInstance(); private EditText edt_birthday, edt_phone, edt_passWord, edt_confirmPassword, edt_fullName, edt_address, edt_email, edt_id_card; - private TextView signIn_textView, errorText, errorTextDistrictWard; + private TextView signIn_textView, errorText, errorTextDistrict, errorTextWard; private Spinner wardSpinner, districtSpinner; private ImageView back_image; private MaterialButton signUpButton; @@ -102,7 +102,8 @@ public class SignUpActivity extends AppCompatActivity { signIn_textView = (TextView) findViewById(R.id.signIn_textView); errorText = findViewById(R.id.errorText); - errorTextDistrictWard = findViewById(R.id.errorTextDistrictWard); + errorTextDistrict = findViewById(R.id.errorTextDistrict); + errorTextWard = findViewById(R.id.errorTextWard); back_image = (ImageView) findViewById(R.id.back_image); @@ -383,15 +384,23 @@ public class SignUpActivity extends AppCompatActivity { textInput_address.setErrorEnabled(false); } - //Check district and ward - if(district.equals("---Quận") || ward.equals("---Phường")){ - errorTextDistrictWard.setVisibility(View.VISIBLE); + //Check ward + if(ward.equals("---Phường")){ + errorTextWard.setVisibility(View.VISIBLE); dataHasValidate = false; } else { - errorTextDistrictWard.setVisibility(View.GONE); + errorTextWard.setVisibility(View.GONE); } + //Check district + if(district.equals("---Quận")){ + errorTextDistrict.setVisibility(View.VISIBLE); + + dataHasValidate = false; + } else { + errorTextDistrict.setVisibility(View.GONE); + } //Check password @@ -560,7 +569,7 @@ public class SignUpActivity extends AppCompatActivity { } private void setAdapter(ArrayList data, String defaultItem, Spinner dataSpinner){ - MySpinnerAdapter adapterWard = new MySpinnerAdapter(getApplicationContext(), android.R.layout.simple_spinner_item, data); + MySpinnerAdapter adapterWard = new MySpinnerAdapter(getApplicationContext(), R.layout.spinner_text_view, data); dataSpinner.setAdapter(adapterWard); // this will set list of values to spinner dataSpinner.setSelection(data.indexOf(defaultItem));//set selected value in spinner } diff --git a/app/src/main/java/com/capstone/foodify/Activity/VerifyAccountActivity.java b/app/src/main/java/com/capstone/foodify/Activity/VerifyAccountActivity.java index 840baa5..9121bef 100644 --- a/app/src/main/java/com/capstone/foodify/Activity/VerifyAccountActivity.java +++ b/app/src/main/java/com/capstone/foodify/Activity/VerifyAccountActivity.java @@ -13,7 +13,6 @@ import android.os.CountDownTimer; import android.text.Editable; import android.text.TextWatcher; import android.util.Log; -import android.view.KeyEvent; import android.view.View; import android.widget.EditText; import android.widget.ImageView; @@ -35,7 +34,7 @@ import com.capstone.foodify.API.FoodApi; import com.capstone.foodify.Common; import com.capstone.foodify.Model.User; import com.capstone.foodify.R; -import com.capstone.foodify.SmsBroadcastReceiver; +import com.capstone.foodify.Service.SmsBroadcastReceiver; import com.google.android.gms.auth.api.phone.SmsRetriever; import com.google.android.gms.auth.api.phone.SmsRetrieverClient; import com.google.android.gms.tasks.OnCompleteListener; diff --git a/app/src/main/java/com/capstone/foodify/Adapter/CommentAdapter.java b/app/src/main/java/com/capstone/foodify/Adapter/CommentAdapter.java index 61e5216..0d52a29 100644 --- a/app/src/main/java/com/capstone/foodify/Adapter/CommentAdapter.java +++ b/app/src/main/java/com/capstone/foodify/Adapter/CommentAdapter.java @@ -9,8 +9,11 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; +import com.capstone.foodify.Common; import com.capstone.foodify.Model.Comment; import com.capstone.foodify.R; +import com.makeramen.roundedimageview.RoundedImageView; +import com.squareup.picasso.Picasso; import com.willy.ratingbar.ScaleRatingBar; import java.util.List; @@ -43,6 +46,13 @@ public class CommentAdapter extends RecyclerView.Adapter() { @Override public void onResponse(Call call, Response response) { - Toast.makeText(context, "Đã xoá " + food.getName() + " khỏi danh sách yêu thích!", Toast.LENGTH_SHORT).show(); + if(response.code() != 200){ + Log.e("Food favorite", "Error remove favorite food. Error code: " + response.code()); + } } @Override diff --git a/app/src/main/java/com/capstone/foodify/ViewPagerAdapter.java b/app/src/main/java/com/capstone/foodify/Fragment/ViewPagerAdapter.java similarity index 96% rename from app/src/main/java/com/capstone/foodify/ViewPagerAdapter.java rename to app/src/main/java/com/capstone/foodify/Fragment/ViewPagerAdapter.java index dc23658..9253fe8 100644 --- a/app/src/main/java/com/capstone/foodify/ViewPagerAdapter.java +++ b/app/src/main/java/com/capstone/foodify/Fragment/ViewPagerAdapter.java @@ -1,4 +1,4 @@ -package com.capstone.foodify; +package com.capstone.foodify.Fragment; import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; diff --git a/app/src/main/java/com/capstone/foodify/NotificationService.java b/app/src/main/java/com/capstone/foodify/Service/NotificationService.java similarity index 97% rename from app/src/main/java/com/capstone/foodify/NotificationService.java rename to app/src/main/java/com/capstone/foodify/Service/NotificationService.java index 413c968..3c76c9b 100644 --- a/app/src/main/java/com/capstone/foodify/NotificationService.java +++ b/app/src/main/java/com/capstone/foodify/Service/NotificationService.java @@ -1,4 +1,4 @@ -package com.capstone.foodify; +package com.capstone.foodify.Service; import android.app.NotificationChannel; import android.app.NotificationManager; @@ -17,7 +17,9 @@ import androidx.core.app.NotificationCompat; import com.capstone.foodify.API.FoodApiToken; import com.capstone.foodify.Activity.MainActivity; +import com.capstone.foodify.Common; import com.capstone.foodify.Model.Response.CustomResponse; +import com.capstone.foodify.R; import com.google.firebase.messaging.FirebaseMessagingService; import com.google.firebase.messaging.RemoteMessage; diff --git a/app/src/main/java/com/capstone/foodify/RefreshTokenService.java b/app/src/main/java/com/capstone/foodify/Service/RefreshTokenService.java similarity index 95% rename from app/src/main/java/com/capstone/foodify/RefreshTokenService.java rename to app/src/main/java/com/capstone/foodify/Service/RefreshTokenService.java index 11d37f8..8d2386a 100644 --- a/app/src/main/java/com/capstone/foodify/RefreshTokenService.java +++ b/app/src/main/java/com/capstone/foodify/Service/RefreshTokenService.java @@ -1,4 +1,4 @@ -package com.capstone.foodify; +package com.capstone.foodify.Service; import android.app.job.JobParameters; import android.app.job.JobService; @@ -6,6 +6,7 @@ import android.util.Log; import androidx.annotation.NonNull; +import com.capstone.foodify.Common; import com.google.android.gms.tasks.OnCompleteListener; import com.google.android.gms.tasks.Task; import com.google.firebase.auth.GetTokenResult; diff --git a/app/src/main/java/com/capstone/foodify/SmsBroadcastReceiver.java b/app/src/main/java/com/capstone/foodify/Service/SmsBroadcastReceiver.java similarity index 97% rename from app/src/main/java/com/capstone/foodify/SmsBroadcastReceiver.java rename to app/src/main/java/com/capstone/foodify/Service/SmsBroadcastReceiver.java index 8967785..15934aa 100644 --- a/app/src/main/java/com/capstone/foodify/SmsBroadcastReceiver.java +++ b/app/src/main/java/com/capstone/foodify/Service/SmsBroadcastReceiver.java @@ -1,4 +1,4 @@ -package com.capstone.foodify; +package com.capstone.foodify.Service; import android.content.BroadcastReceiver; import android.content.Context; diff --git a/app/src/main/java/com/capstone/foodify/ZaloPay/Helper/Helpers.java b/app/src/main/java/com/capstone/foodify/ZaloPay/Helper/Helpers.java index 0b03a5b..21a12fd 100644 --- a/app/src/main/java/com/capstone/foodify/ZaloPay/Helper/Helpers.java +++ b/app/src/main/java/com/capstone/foodify/ZaloPay/Helper/Helpers.java @@ -31,5 +31,5 @@ public class Helpers { @NotNull public static String getMac(@NotNull String key, @NotNull String data) throws NoSuchAlgorithmException, InvalidKeyException { return Objects.requireNonNull(HMacUtil.HMacHexStringEncode(HMacUtil.HMACSHA256, key, data)); - } + } } diff --git a/app/src/main/res/layout/activity_food_detail.xml b/app/src/main/res/layout/activity_food_detail.xml index f50213f..0922ac0 100644 --- a/app/src/main/res/layout/activity_food_detail.xml +++ b/app/src/main/res/layout/activity_food_detail.xml @@ -356,7 +356,7 @@ app:layout_constraintTop_toBottomOf="@id/linear_layout_2" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" - android:visibility="gone" + android:visibility="visible" android:id="@+id/user_comment_layout" > @@ -365,70 +365,93 @@ android:layout_height="match_parent" android:layout_margin="10dp" > - + android:id="@+id/layout1" + > - + + + + + + + + diff --git a/app/src/main/res/layout/activity_order_check_out.xml b/app/src/main/res/layout/activity_order_check_out.xml index 1623e5e..4831d29 100644 --- a/app/src/main/res/layout/activity_order_check_out.xml +++ b/app/src/main/res/layout/activity_order_check_out.xml @@ -242,49 +242,59 @@ - - - - - - - + android:gravity="end" + android:paddingEnd="25dp" + android:contentDescription="ward" + android:layout_marginRight="10dp" + android:layout_marginLeft="10dp" + android:layout_marginTop="20dp" + app:layout_constraintTop_toBottomOf="@id/textInput_address" + /> + + + + - + + + + - - - - - - + app:layout_constraintTop_toBottomOf="@+id/ward" + /> - - - - - - - + android:gravity="end" + android:paddingEnd="25dp" + android:contentDescription="ward" + android:layout_marginRight="10dp" + android:layout_marginLeft="10dp" + android:layout_marginTop="20dp" + app:layout_constraintTop_toBottomOf="@id/textInput_address" + /> + + + + diff --git a/app/src/main/res/layout/chip_item.xml b/app/src/main/res/layout/chip_item.xml index 83828e9..08db3d3 100644 --- a/app/src/main/res/layout/chip_item.xml +++ b/app/src/main/res/layout/chip_item.xml @@ -5,6 +5,8 @@ android:id="@+id/chip_item" style="@style/Widget.MaterialComponents.Chip.Choice" android:layout_width="wrap_content" - android:layout_height="wrap_content"> + android:layout_height="wrap_content" + android:textAppearance="@style/chipText" + > \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml index 37fd367..63cfb07 100644 --- a/app/src/main/res/layout/fragment_profile.xml +++ b/app/src/main/res/layout/fragment_profile.xml @@ -19,8 +19,8 @@ android:id="@+id/profile_avatar" android:src="@drawable/profile_avatar" app:riv_corner_radius="180dp" - android:layout_width="100dp" - android:layout_height="100dp" + android:layout_width="120dp" + android:layout_height="120dp" android:scaleType="centerCrop" app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -48,7 +48,7 @@ android:id="@+id/account_and_profile" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="90dp" + android:layout_marginTop="70dp" android:layout_marginStart="20dp" android:layout_marginEnd="20dp" app:layout_constraintTop_toBottomOf="@id/user_name" diff --git a/app/src/main/res/layout/item_comment.xml b/app/src/main/res/layout/item_comment.xml index 3b96297..317128d 100644 --- a/app/src/main/res/layout/item_comment.xml +++ b/app/src/main/res/layout/item_comment.xml @@ -20,32 +20,58 @@ android:layout_height="match_parent" android:layout_margin="10dp" > - + android:id="@+id/layout1" + > - + + + + + + + + diff --git a/app/src/main/res/layout/item_order.xml b/app/src/main/res/layout/item_order.xml index fb2c0f9..48a6195 100644 --- a/app/src/main/res/layout/item_order.xml +++ b/app/src/main/res/layout/item_order.xml @@ -22,7 +22,7 @@ android:text="Order #123456789" android:fontFamily="@font/koho_bold" android:textColor="@color/primaryColor" - android:textSize="25sp" + android:textSize="20sp" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintTop_toTopOf="parent" diff --git a/app/src/main/res/layout/spinner_text_view.xml b/app/src/main/res/layout/spinner_text_view.xml new file mode 100644 index 0000000..1712be2 --- /dev/null +++ b/app/src/main/res/layout/spinner_text_view.xml @@ -0,0 +1,7 @@ + + \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 89b3ad9..a4f2885 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -67,4 +67,9 @@ @font/koho + + \ No newline at end of file