nezumi/Foodify
1
0
Fork 0
mirror of https://github.com/Nezumi-2711/Foodify.git synced 2026-09-22 13:38:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash when click on Basket Fragment

Browse Source
This commit is contained in:
Nezumi
2023-03-23 21:40:09 +07:00
parent c166919527
commit a05fc3a5b2
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/capstone/foodify/Activity/MainActivity.java
+5 -2
View File
@@ -120,14 +120,17 @@ public class MainActivity extends AppCompatActivity {
viewPager2.setCurrentItem(1); viewPager2.setCurrentItem(1);
break; break;
case R.id.activity_basket: case R.id.activity_basket:
viewPager2.setCurrentItem(2); if(Common.CURRENT_USER != null){
viewPager2.setCurrentItem(2);
} else {
startActivity(new Intent(MainActivity.this, SignInActivity.class));
}
break; break;
case R.id.activity_profile: case R.id.activity_profile:
if(Common.CURRENT_USER != null){ if(Common.CURRENT_USER != null){
viewPager2.setCurrentItem(3); viewPager2.setCurrentItem(3);
} else { } else {
startActivity(new Intent(MainActivity.this, SignInActivity.class)); startActivity(new Intent(MainActivity.this, SignInActivity.class));
finish();
} }
break; break;
} }
app/src/main/java/com/capstone/foodify/Fragment/BasketFragment.java
+1
View File
@@ -19,6 +19,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import com.capstone.foodify.Activity.OrderCheckOutActivity; import com.capstone.foodify.Activity.OrderCheckOutActivity;
import com.capstone.foodify.Activity.SignInActivity;
import com.capstone.foodify.Common; import com.capstone.foodify.Common;
import com.capstone.foodify.ItemTouchHelperListener; import com.capstone.foodify.ItemTouchHelperListener;
import com.capstone.foodify.Model.Basket; import com.capstone.foodify.Model.Basket;