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 586169a..5f9dca3 100644 --- a/app/src/main/java/com/capstone/foodify/Activity/MainActivity.java +++ b/app/src/main/java/com/capstone/foodify/Activity/MainActivity.java @@ -367,6 +367,7 @@ public class MainActivity extends AppCompatActivity { @Override protected void onResume() { super.onResume(); + HomeFragment.setNameUser(); if (mRequestingLocationUpdates && checkPermission() && Common.CURRENT_LOCATION == null) { startLocationUpdates(); } diff --git a/app/src/main/java/com/capstone/foodify/Activity/OrderActivity.java b/app/src/main/java/com/capstone/foodify/Activity/OrderActivity.java index cf7c3c8..53ebbdf 100644 --- a/app/src/main/java/com/capstone/foodify/Activity/OrderActivity.java +++ b/app/src/main/java/com/capstone/foodify/Activity/OrderActivity.java @@ -18,15 +18,12 @@ public class OrderActivity extends AppCompatActivity { ViewPager2 viewPager2; ViewPagerAdapter viewPagerAdapter; ImageView back_image; - public static Activity orderActivity; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_order); - orderActivity = this; - //Init Component tabLayout = findViewById(R.id.tab_layout); viewPager2 = findViewById(R.id.view_pager); diff --git a/app/src/main/res/layout/item_order_detail.xml b/app/src/main/res/layout/item_order_detail.xml index 6f1de62..2273264 100644 --- a/app/src/main/res/layout/item_order_detail.xml +++ b/app/src/main/res/layout/item_order_detail.xml @@ -72,7 +72,6 @@ android:layout_height="wrap_content" android:layout_marginTop="2dp" app:layout_constraintStart_toEndOf="@id/image_view" - app:layout_constraintTop_toBottomOf="@id/text_view_1" android:maxLines="1" android:ellipsize="end" />