First Release Modify

thanhENC · Dec 6, 2022 · b40a602 · b40a602
1 parent f60ea09
commit b40a602
Show file tree

Hide file tree

Showing 21 changed files with 304 additions and 227 deletions.
diff --git a/home/app/src/main/AndroidManifest.xml b/home/app/src/main/AndroidManifest.xml
@@ -64,6 +64,13 @@
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
+        <activity
+            android:name=".Filter"
+            android:exported="true">
+            <meta-data
+                android:name="android.app.lib_name"
+                android:value="" />
+        </activity>
         <activity
             android:name=".FlashSaleScreen"
             android:exported="true">
@@ -93,98 +100,98 @@
                 />
         </activity>
         <activity
-            android:name=".MainMenu"
+            android:name=".MacDinhMember"
             android:exported="true">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
-            android:name=".member1"
+            android:name=".MainActivity"
             android:exported="true">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
-            android:name=".member2"
+            android:name=".MainMenu"
             android:exported="true">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
-            android:name=".ProductCollection"
+            android:name=".member1"
             android:exported="true">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
-            android:name=".ProductDetails"
+            android:name=".member2"
             android:exported="true">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
-            android:name=".scan1"
+            android:name=".ProductCollection"
             android:exported="true">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
-            android:name=".Sort"
+            android:name=".ProductDetails"
             android:exported="true">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
-            android:name=".ThanhToan"
+            android:name=".scan1"
             android:exported="true">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
-            android:name=".ThanhToanPre"
+            android:name=".ThanhToan"
             android:exported="true">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
-            android:name=".ThongBao"
+            android:name=".ThanhToanPre"
             android:exported="true">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
-            android:name=".TrangChu"
+            android:name=".ThongBao"
             android:exported="true">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
-            android:name=".voucher_main"
+            android:name=".TrangChu"
             android:exported="true">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
-            android:name=".Wishlist"
+            android:name=".voucher_main"
             android:exported="true">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
-            android:name=".MainActivity"
+            android:name=".Wishlist"
             android:exported="true">
             <meta-data
                 android:name="android.app.lib_name"

diff --git a/home/app/src/main/java/com/k20411group03/adapters/ItemRecyclerAdapter.java b/home/app/src/main/java/com/k20411group03/adapters/ItemRecyclerAdapter.java
@@ -14,6 +14,7 @@
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.k20411group03.DisplayHelper;
 import com.k20411group03.home.ProductDetails;
 import com.k20411group03.home.R;
 import com.k20411group03.models.Item;
@@ -51,8 +52,8 @@ public void onBindViewHolder(@NonNull ItemHolder holder, int position) {
 
         holder.imv_Thumb.setImageBitmap(convertByteArrayToBitmap(item.getProductImage()));
         holder.txt_ItemName.setText(item.getProductName());
-        holder.txt_price.setText(String.valueOf(item.getProductSalePrice()));
-        holder.txt_originalPrice.setText(String.valueOf(item.getProductPrice()));
+        holder.txt_price.setText(DisplayHelper.formatPrice(item.getProductPrice()));
+        holder.txt_originalPrice.setText(DisplayHelper.formatPrice(item.getProductPrice()));
         holder.layout_item.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {

diff --git a/home/app/src/main/java/com/k20411group03/home/ActivitySearch.java b/home/app/src/main/java/com/k20411group03/home/ActivitySearch.java
@@ -36,30 +36,49 @@ protected void onCreate(Bundle savedInstanceState) {
         addEvents();
     }
 
-//     //Thêm action
-//     @Override
-//     public boolean onCreateOptionsMenu(Menu menu) {
-
-//         getMenuInflater().inflate(R.menu.main, menu);
-//         return super.onCreateOptionsMenu(menu);
-//     }
-
-//     //Sự kiện action bar
-//     @Override
-//     public boolean onOptionsItemSelected(@NonNull MenuItem item) {
-//         switch (item.getItemId()) {
-//             case R.id.action_cart:
-//                 Intent intentCart = new Intent(ActivitySearch.this, MainActivity.class);
-//                 startActivity(intentCart);
-//                 break;
-//             case R.id.action_menu:
-//                 Intent intentMenu = new Intent(ActivitySearch.this, MainMenu.class);
-//                 startActivity(intentMenu);
-//                 break;
-//         }
-
-//         return super.onOptionsItemSelected(item);
-//     }
+    //Thêm action
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+
+        getMenuInflater().inflate(R.menu.main, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    //Sự kiện action bar
+    @Override
+    public boolean onOptionsItemSelected(@NonNull MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.action_search:
+                Intent intentSearch = new Intent(ActivitySearch.this, ActivitySearch.class);
+                startActivity(intentSearch);
+                break;
+            case R.id.action_cart:
+                Intent intentCart = new Intent(ActivitySearch.this, MainActivity.class);
+                startActivity(intentCart);
+                break;
+            case R.id.action_BoSuuTap:
+                Intent intentBoSuuTap = new Intent(ActivitySearch.this, ProductCollection.class);
+                intentBoSuuTap.putExtra("screenTitle", "Bộ sưu tập mới");
+                startActivity(intentBoSuuTap);
+                break;
+            case R.id.action_HangMoiVe:
+                Intent intentSanPhamMoi = new Intent(ActivitySearch.this, ProductCollection.class);
+                intentSanPhamMoi.putExtra("screenTitle", "Hàng mới về");
+                startActivity(intentSanPhamMoi);
+                break;
+            case R.id.action_Flashsale:
+                Intent intentFlashsale = new Intent(ActivitySearch.this, FlashSaleScreen.class);
+                startActivity(intentFlashsale);
+                break;
+            case R.id.action_SanPham:
+                Intent intentSanPham = new Intent(ActivitySearch.this, ProductCollection.class);
+                intentSanPham.putExtra("screenTitle", "Sản phẩm");
+                startActivity(intentSanPham);
+                break;
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
 
     private void addEvents() {
 

diff --git a/home/app/src/main/java/com/k20411group03/home/DieuKienVoucher.java b/home/app/src/main/java/com/k20411group03/home/DieuKienVoucher.java
@@ -25,13 +25,13 @@ protected void onCreate(Bundle savedInstanceState) {
         binding = ActivityDieuKienVoucherBinding.inflate(getLayoutInflater());
         //setContentView(R.layout.activity_chi_tiet_voucher);
 
-//         //Custom action bar
-//         ActionBar actionBar = getSupportActionBar();
-//         actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
-//         actionBar.setDisplayShowCustomEnabled(true);
-//         actionBar.setCustomView(R.layout.custom_action_bar);
-//         actionBar.setDisplayUseLogoEnabled(true);
-//         actionBar.setDisplayShowHomeEnabled(true);
+         //Custom action bar
+         ActionBar actionBar = getSupportActionBar();
+         actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
+         actionBar.setDisplayShowCustomEnabled(true);
+         actionBar.setCustomView(R.layout.custom_action_bar);
+         actionBar.setDisplayUseLogoEnabled(true);
+         actionBar.setDisplayShowHomeEnabled(true);
 
         setContentView(binding.getRoot());
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
@@ -40,34 +40,50 @@ protected void onCreate(Bundle savedInstanceState) {
         addEvent();
     }
 
-//     //Thêm action
-//     @Override
-//     public boolean onCreateOptionsMenu(Menu menu) {
-
-//         getMenuInflater().inflate(R.menu.main, menu);
-//         return super.onCreateOptionsMenu(menu);
-//     }
-
-//     //Sự kiện action bar
-//     @Override
-//     public boolean onOptionsItemSelected(@NonNull MenuItem item) {
-//         switch (item.getItemId()) {
-//             case R.id.action_search:
-//                 Intent intentSearch = new Intent(DieuKienVoucher.this, ActivitySearch.class);
-//                 startActivity(intentSearch);
-//                 break;
-//             case R.id.action_cart:
-//                 Intent intentCart = new Intent(DieuKienVoucher.this, MainActivity.class);
-//                 startActivity(intentCart);
-//                 break;
-//             case R.id.action_menu:
-//                 Intent intentMenu = new Intent(DieuKienVoucher.this, MainMenu.class);
-//                 startActivity(intentMenu);
-//                 break;
-//         }
-
-//         return super.onOptionsItemSelected(item);
-//     }
+    //Thêm action
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+
+        getMenuInflater().inflate(R.menu.main, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    //Sự kiện action bar
+    @Override
+    public boolean onOptionsItemSelected(@NonNull MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.action_search:
+                Intent intentSearch = new Intent(this, ActivitySearch.class);
+                startActivity(intentSearch);
+                break;
+            case R.id.action_cart:
+                Intent intentCart = new Intent(this, MainActivity.class);
+                startActivity(intentCart);
+                break;
+            case R.id.action_BoSuuTap:
+                Intent intentBoSuuTap = new Intent(this, ProductCollection.class);
+                intentBoSuuTap.putExtra("screenTitle", "Bộ sưu tập mới");
+                startActivity(intentBoSuuTap);
+                break;
+            case R.id.action_HangMoiVe:
+                Intent intentSanPhamMoi = new Intent(this, ProductCollection.class);
+                intentSanPhamMoi.putExtra("screenTitle", "Hàng mới về");
+                startActivity(intentSanPhamMoi);
+                break;
+            case R.id.action_Flashsale:
+                Intent intentFlashsale = new Intent(this, FlashSaleScreen.class);
+                startActivity(intentFlashsale);
+                break;
+            case R.id.action_SanPham:
+                Intent intentSanPham = new Intent(this, ProductCollection.class);
+                intentSanPham.putExtra("screenTitle", "Sản phẩm");
+                startActivity(intentSanPham);
+                break;
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+
 
     private void loadData() {
         //hinh voucher

diff --git a/home/app/src/main/java/com/k20411group03/home/Filter.java b/home/app/src/main/java/com/k20411group03/home/Filter.java
@@ -0,0 +1,39 @@
+package com.k20411group03.home;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+
+import com.k20411group03.home.databinding.ActivityFilterBinding;
+
+public class Filter extends AppCompatActivity {
+
+    ActivityFilterBinding binding;
+    Intent intent;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        //setContentView(R.layout.activity_sort);
+
+        binding = ActivityFilterBinding.inflate(getLayoutInflater());
+        setContentView(binding.getRoot());
+
+        addEvents();
+}
+
+    private void addEvents() {
+        binding.btnFilterConfirm.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                intent = new Intent(Filter.this, ProductCollection.class);
+                startActivity(intent);
+            }
+        });
+    }
+}
+
+
+
diff --git a/home/app/src/main/java/com/k20411group03/home/ProductCollection.java b/home/app/src/main/java/com/k20411group03/home/ProductCollection.java
@@ -19,15 +19,7 @@
 import com.k20411group03.home.databinding.ActivityProductCollectionBinding;
 import com.k20411group03.models.ProductModel;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.lang.reflect.Array;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
 
 public class ProductCollection extends AppCompatActivity {
 
@@ -116,6 +108,14 @@ public void onClick(View v) {
             }
         });
 
+        //Nút lọc
+        binding.imvSort.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent(ProductCollection.this, Filter.class);
+            }
+        });
+
         binding.lvProductCollection.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {