mirror of
https://github.com/Nezumi-2711/Foodify.git
synced 2026-09-22 13:38:41 +00:00
Fix bug
This commit is contained in:
Binary file not shown.
@@ -96,7 +96,9 @@
|
|||||||
<activity
|
<activity
|
||||||
android:name=".Activity.AddressManagerActivity"
|
android:name=".Activity.AddressManagerActivity"
|
||||||
android:exported="false"
|
android:exported="false"
|
||||||
android:screenOrientation="portrait" />
|
android:screenOrientation="portrait"
|
||||||
|
android:noHistory="true"
|
||||||
|
/>
|
||||||
<activity
|
<activity
|
||||||
android:name=".Activity.ChangePasswordActivity"
|
android:name=".Activity.ChangePasswordActivity"
|
||||||
android:exported="false"
|
android:exported="false"
|
||||||
|
|||||||
@@ -99,4 +99,10 @@ public class OrderActivity extends AppCompatActivity {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onBackPressed() {
|
||||||
|
super.onBackPressed();
|
||||||
|
finish();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -140,7 +140,7 @@ public class HomeFragment extends Fragment {
|
|||||||
private List<Menu> getListMenu() {
|
private List<Menu> getListMenu() {
|
||||||
List<Menu> listMenu = new ArrayList<>();
|
List<Menu> listMenu = new ArrayList<>();
|
||||||
|
|
||||||
listMenu.add(new Menu("Món ăn khuyến nghị", listFood));
|
listMenu.add(new Menu("Ăn gì hôm nay?", listFood));
|
||||||
listMenu.add(new Menu("Món ăn được thêm gần đây", recentFood));
|
listMenu.add(new Menu("Món ăn được thêm gần đây", recentFood));
|
||||||
|
|
||||||
return listMenu;
|
return listMenu;
|
||||||
|
|||||||
@@ -60,6 +60,7 @@ public class CancelOrderFragment extends Fragment {
|
|||||||
//Init Component
|
//Init Component
|
||||||
initComponent(view);
|
initComponent(view);
|
||||||
|
|
||||||
|
CURRENT_PAGE = 0;
|
||||||
getOrderUser(CURRENT_PAGE);
|
getOrderUser(CURRENT_PAGE);
|
||||||
|
|
||||||
orderAdapter = new OrderAdapter(getContext());
|
orderAdapter = new OrderAdapter(getContext());
|
||||||
|
|||||||
@@ -57,6 +57,7 @@ public class CompleteOrderFragment extends Fragment {
|
|||||||
//Init Component
|
//Init Component
|
||||||
initComponent(view);
|
initComponent(view);
|
||||||
|
|
||||||
|
CURRENT_PAGE = 0;
|
||||||
getOrderUser(CURRENT_PAGE);
|
getOrderUser(CURRENT_PAGE);
|
||||||
|
|
||||||
orderAdapter = new OrderAdapter(getContext());
|
orderAdapter = new OrderAdapter(getContext());
|
||||||
|
|||||||
@@ -57,6 +57,7 @@ public class PreparingFragment extends Fragment {
|
|||||||
//Init Component
|
//Init Component
|
||||||
initComponent(view);
|
initComponent(view);
|
||||||
|
|
||||||
|
CURRENT_PAGE = 0;
|
||||||
getOrderUser(CURRENT_PAGE);
|
getOrderUser(CURRENT_PAGE);
|
||||||
|
|
||||||
orderAdapter = new OrderAdapter(getContext());
|
orderAdapter = new OrderAdapter(getContext());
|
||||||
|
|||||||
@@ -58,6 +58,7 @@ public class ProcessOderFragment extends Fragment {
|
|||||||
|
|
||||||
orderAdapter = new OrderAdapter(getContext());
|
orderAdapter = new OrderAdapter(getContext());
|
||||||
|
|
||||||
|
CURRENT_PAGE = 0;
|
||||||
getOrderUser(CURRENT_PAGE);
|
getOrderUser(CURRENT_PAGE);
|
||||||
|
|
||||||
LinearLayoutManager linearLayoutManager = new LinearLayoutManager(getContext(), RecyclerView.VERTICAL, false);
|
LinearLayoutManager linearLayoutManager = new LinearLayoutManager(getContext(), RecyclerView.VERTICAL, false);
|
||||||
|
|||||||
@@ -57,6 +57,7 @@ public class ShipOrderFragment extends Fragment {
|
|||||||
//Init Component
|
//Init Component
|
||||||
initComponent(view);
|
initComponent(view);
|
||||||
|
|
||||||
|
CURRENT_PAGE = 0;
|
||||||
getOrderUser(CURRENT_PAGE);
|
getOrderUser(CURRENT_PAGE);
|
||||||
|
|
||||||
orderAdapter = new OrderAdapter(getContext());
|
orderAdapter = new OrderAdapter(getContext());
|
||||||
|
|||||||
@@ -46,7 +46,7 @@
|
|||||||
android:text="Order #123456789"
|
android:text="Order #123456789"
|
||||||
android:fontFamily="@font/koho_bold"
|
android:fontFamily="@font/koho_bold"
|
||||||
android:textColor="@color/primaryColor"
|
android:textColor="@color/primaryColor"
|
||||||
android:textSize="20sp"
|
android:textSize="18sp"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
app:layout_constraintTop_toTopOf="parent"
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
|
|||||||
Reference in New Issue
Block a user