diff --git a/.idea/misc.xml b/.idea/misc.xml index 0ad17cb..8978d23 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,3 @@ - diff --git a/app/src/main/java/com/capstone/foodify/Activity/FavoriteFoodActivity.java b/app/src/main/java/com/capstone/foodify/Activity/FavoriteFoodActivity.java index fff7ad1..06f50bf 100644 --- a/app/src/main/java/com/capstone/foodify/Activity/FavoriteFoodActivity.java +++ b/app/src/main/java/com/capstone/foodify/Activity/FavoriteFoodActivity.java @@ -50,7 +50,7 @@ public class FavoriteFoodActivity extends AppCompatActivity implements ItemTouch private FoodFavoriteAdapter adapter; private final List listFavoriteFood = new ArrayList<>(); private ImageView back_image; - private ConstraintLayout listFavoriteFoodView, progressLayout; + private ConstraintLayout listFavoriteFoodView; private NestedScrollView nestedScrollView; private ProgressBar progressBar; private TextView endOfListText; @@ -61,7 +61,6 @@ public class FavoriteFoodActivity extends AppCompatActivity implements ItemTouch //Init component back_image = findViewById(R.id.back_image); - progressLayout = findViewById(R.id.progress_layout); nestedScrollView = findViewById(R.id.nestedScrollView); progressBar = findViewById(R.id.progress_bar); endOfListText = findViewById(R.id.end_of_list_text); @@ -124,8 +123,6 @@ public class FavoriteFoodActivity extends AppCompatActivity implements ItemTouch FoodApiToken.apiService.getListFavoriteFood(Common.CURRENT_USER.getId(), page, PAGE_SIZE, SORT_BY, SORT_DIR).enqueue(new Callback() { @Override public void onResponse(Call call, Response response) { - //Dismiss progress - progressLayout.setVisibility(View.GONE); Foods foodData = response.body(); diff --git a/app/src/main/java/com/capstone/foodify/Fragment/ProfileFragment.java b/app/src/main/java/com/capstone/foodify/Fragment/ProfileFragment.java index 7a3e5ec..a4a1ca3 100644 --- a/app/src/main/java/com/capstone/foodify/Fragment/ProfileFragment.java +++ b/app/src/main/java/com/capstone/foodify/Fragment/ProfileFragment.java @@ -8,6 +8,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Button; import android.widget.LinearLayout; +import android.widget.TextView; import androidx.constraintlayout.widget.ConstraintLayout; import androidx.fragment.app.Fragment; @@ -31,19 +32,26 @@ import io.paperdb.Paper; public class ProfileFragment extends Fragment { LinearLayout account_and_profile, manage_address, favorite_food, order_history, log_out; PopupDialog popupDialog; + TextView user_name; @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { // Inflate the layout for this fragment View rootView = inflater.inflate(R.layout.fragment_profile, container, false); + + //Init component account_and_profile = rootView.findViewById(R.id.account_and_profile); manage_address = rootView.findViewById(R.id.manage_address); favorite_food = rootView.findViewById(R.id.favorite_food); order_history = rootView.findViewById(R.id.order_history); log_out = rootView.findViewById(R.id.log_out); + user_name = rootView.findViewById(R.id.user_name); popupDialog = PopupDialog.getInstance(getContext()); + //Set user name on textview + user_name.setText(Common.CURRENT_USER.getFullName()); + account_and_profile.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { diff --git a/app/src/main/res/layout/activity_favorite_food.xml b/app/src/main/res/layout/activity_favorite_food.xml index 9cda551..5b1e350 100644 --- a/app/src/main/res/layout/activity_favorite_food.xml +++ b/app/src/main/res/layout/activity_favorite_food.xml @@ -44,7 +44,7 @@ - - - - - - \ No newline at end of file