diff --git a/app/src/main/java/org/mian/gitnex/activities/MainActivity.java b/app/src/main/java/org/mian/gitnex/activities/MainActivity.java index 34d16bdf..12a87671 100644 --- a/app/src/main/java/org/mian/gitnex/activities/MainActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/MainActivity.java @@ -70,7 +70,8 @@ import retrofit2.Callback; */ @SuppressWarnings("ConstantConditions") public class MainActivity extends BaseActivity - implements NavigationView.OnNavigationItemSelectedListener, BottomSheetListener { + implements NavigationView.OnNavigationItemSelectedListener, + BottomSheetMyIssuesFilterFragment.BottomSheetListener { public static boolean refActivity = false; public static boolean reloadRepos = false; @@ -323,15 +324,14 @@ public class MainActivity extends BaseActivity mainIntent.removeExtra("launchFragment"); - switch (launchFragment) { - case "notifications": - toolbarTitle.setText(getResources().getString(R.string.pageTitleNotifications)); - getSupportFragmentManager() - .beginTransaction() - .replace(R.id.fragment_container, new NotificationsFragment()) - .commit(); - navigationView.setCheckedItem(R.id.nav_notifications); - return; + if (launchFragment.equals("notifications")) { + toolbarTitle.setText(getResources().getString(R.string.pageTitleNotifications)); + getSupportFragmentManager() + .beginTransaction() + .replace(R.id.fragment_container, new NotificationsFragment()) + .commit(); + navigationView.setCheckedItem(R.id.nav_notifications); + return; } } @@ -590,22 +590,12 @@ public class MainActivity extends BaseActivity @Override public void onButtonClicked(String text) { - switch (text) { - case "openMyIssues": - if (getFragmentRefreshListener() != null) { - getFragmentRefreshListener().onRefresh("open"); - } - break; - case "closedMyIssues": - if (getFragmentRefreshListener() != null) { - getFragmentRefreshListener().onRefresh("closed"); - } - break; - case "assignedToMe": - if (getFragmentRefreshListener() != null) { - getFragmentRefreshListener().onRefresh("assignedToMe"); - } - break; + String[] parts = text.split("_"); + String state = parts[0]; + String filter = parts[1]; + + if (getFragmentRefreshListener() != null) { + getFragmentRefreshListener().onRefresh(state + "_" + filter); } } @@ -731,8 +721,16 @@ public class MainActivity extends BaseActivity if (id == R.id.filter) { + Fragment currentFragment = + getSupportFragmentManager().findFragmentById(R.id.fragment_container); + String currentFilter = "open_created_by_me"; + + if (currentFragment instanceof MyIssuesFragment) { + currentFilter = ((MyIssuesFragment) currentFragment).getCurrentFilter(); + } + BottomSheetMyIssuesFilterFragment filterBottomSheet = - new BottomSheetMyIssuesFilterFragment(); + BottomSheetMyIssuesFilterFragment.newInstance(currentFilter); filterBottomSheet.show(getSupportFragmentManager(), "myIssuesFilterMenuBottomSheet"); return true; } @@ -961,13 +959,15 @@ public class MainActivity extends BaseActivity this.profileInitListener = profileInitListener; } - // My issues interface public FragmentRefreshListener getFragmentRefreshListener() { return fragmentRefreshListenerMyIssues; } - public void setFragmentRefreshListenerMyIssues( - FragmentRefreshListener fragmentRefreshListener) { - this.fragmentRefreshListenerMyIssues = fragmentRefreshListener; + public void setFragmentRefreshListenerMyIssues(FragmentRefreshListener listener) { + this.fragmentRefreshListenerMyIssues = listener; + } + + public interface FragmentRefreshListener { + void onRefresh(String myIssues); } } diff --git a/app/src/main/java/org/mian/gitnex/adapters/TrackedTimeAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/TrackedTimeAdapter.java new file mode 100644 index 00000000..1e39d267 --- /dev/null +++ b/app/src/main/java/org/mian/gitnex/adapters/TrackedTimeAdapter.java @@ -0,0 +1,87 @@ +package org.mian.gitnex.adapters; + +import android.view.LayoutInflater; +import android.view.ViewGroup; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; +import com.bumptech.glide.Glide; +import java.util.List; +import java.util.Locale; +import org.gitnex.tea4j.v2.models.TrackedTime; +import org.mian.gitnex.R; +import org.mian.gitnex.databinding.ListTrackedTimeBinding; + +/** + * @author mmarif + */ +public class TrackedTimeAdapter + extends RecyclerView.Adapter { + + private final List trackedTimeList; + private OnDeleteClickListener deleteClickListener; + + public TrackedTimeAdapter(List trackedTimeList) { + this.trackedTimeList = trackedTimeList; + } + + public void setOnDeleteClickListener(OnDeleteClickListener listener) { + this.deleteClickListener = listener; + } + + @NonNull @Override + public TrackedTimeViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + ListTrackedTimeBinding binding = + ListTrackedTimeBinding.inflate( + LayoutInflater.from(parent.getContext()), parent, false); + return new TrackedTimeViewHolder(binding); + } + + @Override + public void onBindViewHolder(@NonNull TrackedTimeViewHolder holder, int position) { + TrackedTime time = trackedTimeList.get(position); + + Glide.with(holder.itemView.getContext()) + .load(time.getIssue().getUser().getAvatarUrl()) + .placeholder(R.drawable.ic_person) + .into(holder.binding.userAvatar); + + String userName = + time.getIssue().getUser().getFullName().isEmpty() + ? time.getIssue().getUser().getLogin() + : time.getIssue().getUser().getFullName(); + holder.binding.userName.setText(userName); + + long totalSeconds = time.getTime(); + long hours = totalSeconds / 3600; + long minutes = (totalSeconds % 3600) / 60; + long seconds = totalSeconds % 60; + holder.binding.trackedTimeEntry.setText( + String.format(Locale.US, "%dh %dm %ds", hours, minutes, seconds)); + + holder.binding.deleteTrackedTime.setEnabled(true); + holder.binding.deleteTrackedTime.setOnClickListener( + v -> { + if (deleteClickListener != null) { + deleteClickListener.onDeleteClick(time, position); + } + }); + } + + @Override + public int getItemCount() { + return trackedTimeList.size(); + } + + public static class TrackedTimeViewHolder extends RecyclerView.ViewHolder { + private final ListTrackedTimeBinding binding; + + TrackedTimeViewHolder(ListTrackedTimeBinding binding) { + super(binding.getRoot()); + this.binding = binding; + } + } + + public interface OnDeleteClickListener { + void onDeleteClick(TrackedTime time, int position); + } +} diff --git a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetMyIssuesFilterFragment.java b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetMyIssuesFilterFragment.java index 6ddca14b..d1a681b9 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetMyIssuesFilterFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetMyIssuesFilterFragment.java @@ -9,7 +9,6 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.google.android.material.bottomsheet.BottomSheetDialogFragment; import org.mian.gitnex.databinding.BottomSheetMyIssuesFilterBinding; -import org.mian.gitnex.structs.BottomSheetListener; /** * @author M M Arif @@ -17,6 +16,32 @@ import org.mian.gitnex.structs.BottomSheetListener; public class BottomSheetMyIssuesFilterFragment extends BottomSheetDialogFragment { private BottomSheetListener bmListener; + private String selectedState = "open"; + private String selectedFilter = "created_by_me"; + private static final String ARG_FILTER = "currentFilter"; + + public static BottomSheetMyIssuesFilterFragment newInstance(String currentFilter) { + + BottomSheetMyIssuesFilterFragment fragment = new BottomSheetMyIssuesFilterFragment(); + Bundle args = new Bundle(); + args.putString(ARG_FILTER, currentFilter); + fragment.setArguments(args); + return fragment; + } + + @Override + public void onCreate(@Nullable Bundle savedInstanceState) { + + super.onCreate(savedInstanceState); + Bundle args = getArguments(); + + if (args != null && args.containsKey(ARG_FILTER)) { + String currentFilter = args.getString(ARG_FILTER, "open_created_by_me"); + String[] parts = currentFilter.split("_"); + selectedState = parts[0]; + selectedFilter = parts.length > 1 ? parts[1] : "created_by_me"; + } + } @Nullable @Override public View onCreateView( @@ -24,39 +49,68 @@ public class BottomSheetMyIssuesFilterFragment extends BottomSheetDialogFragment @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { - BottomSheetMyIssuesFilterBinding bottomSheetIssuesFilterBinding = + BottomSheetMyIssuesFilterBinding binding = BottomSheetMyIssuesFilterBinding.inflate(inflater, container, false); - bottomSheetIssuesFilterBinding.openMyIssues.setOnClickListener( - v1 -> { - bmListener.onButtonClicked("openMyIssues"); - dismiss(); + // Clear all chip states + binding.chipOpen.setChecked(false); + binding.chipClosed.setChecked(false); + binding.chipCreatedByMe.setChecked(false); + binding.chipAssignedToMe.setChecked(false); + + // Set chip states + binding.chipOpen.setChecked(selectedState.equals("open")); + binding.chipClosed.setChecked(selectedState.equals("closed")); + binding.chipCreatedByMe.setChecked(selectedFilter.equals("created_by_me")); + binding.chipAssignedToMe.setChecked(selectedFilter.equals("assignedToMe")); + + binding.stateChipGroup.setOnCheckedStateChangeListener( + (group, checkedIds) -> { + if (!checkedIds.isEmpty()) { + int checkedId = checkedIds.get(0); + if (checkedId == binding.chipOpen.getId()) { + selectedState = "open"; + } else if (checkedId == binding.chipClosed.getId()) { + selectedState = "closed"; + } + applyFilter(); + } }); - bottomSheetIssuesFilterBinding.closedMyIssues.setOnClickListener( - v12 -> { - bmListener.onButtonClicked("closedMyIssues"); - dismiss(); + binding.filterChipGroup.setOnCheckedStateChangeListener( + (group, checkedIds) -> { + if (!checkedIds.isEmpty()) { + + int checkedId = checkedIds.get(0); + if (checkedId == binding.chipCreatedByMe.getId()) { + selectedFilter = "created_by_me"; + } else if (checkedId == binding.chipAssignedToMe.getId()) { + selectedFilter = "assignedToMe"; + } + applyFilter(); + } }); - bottomSheetIssuesFilterBinding.assignedToMe.setOnClickListener( - v12 -> { - bmListener.onButtonClicked("assignedToMe"); - dismiss(); - }); + return binding.getRoot(); + } - return bottomSheetIssuesFilterBinding.getRoot(); + private void applyFilter() { + String result = selectedState + "_" + selectedFilter; + bmListener.onButtonClicked(result); + dismiss(); } @Override public void onAttach(@NonNull Context context) { - super.onAttach(context); - try { bmListener = (BottomSheetListener) context; } catch (ClassCastException e) { throw new ClassCastException(context + " must implement BottomSheetListener"); } } + + public interface BottomSheetListener { + void onButtonClicked(String text); + } } diff --git a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetSingleIssueFragment.java b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetSingleIssueFragment.java index 2ae2f6b0..5a08eb69 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetSingleIssueFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetSingleIssueFragment.java @@ -252,6 +252,14 @@ public class BottomSheetSingleIssueFragment extends BottomSheetDialogFragment { dismiss(); }); + binding.trackedTime.setOnClickListener( + v -> { + BottomSheetTrackedTimeFragment trackedTimeSheet = + BottomSheetTrackedTimeFragment.newInstance(issue); + trackedTimeSheet.show(getParentFragmentManager(), "trackedTimeBottomSheet"); + dismiss(); + }); + binding.subscribeIssue.setOnClickListener( subscribeToIssue -> { IssueActions.subscribe(ctx, issue); @@ -286,6 +294,7 @@ public class BottomSheetSingleIssueFragment extends BottomSheetDialogFragment { binding.mergePullRequest.setVisibility(View.GONE); binding.updatePullRequest.setVisibility(View.GONE); binding.manageDependencies.setVisibility(View.GONE); + binding.trackedTime.setVisibility(View.GONE); if (issue.getIssueType().equalsIgnoreCase("issue")) { binding.issuePrDivider.setVisibility(View.GONE); } @@ -297,6 +306,7 @@ public class BottomSheetSingleIssueFragment extends BottomSheetDialogFragment { binding.addRemoveAssignees.setVisibility(View.GONE); binding.editLabels.setVisibility(View.GONE); binding.manageDependencies.setVisibility(View.GONE); + binding.trackedTime.setVisibility(View.GONE); } binding.pinIssue.setOnClickListener( diff --git a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetTrackedTimeFragment.java b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetTrackedTimeFragment.java new file mode 100644 index 00000000..4c2ea302 --- /dev/null +++ b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetTrackedTimeFragment.java @@ -0,0 +1,276 @@ +package org.mian.gitnex.fragments; + +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import com.google.android.material.bottomsheet.BottomSheetDialogFragment; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import org.gitnex.tea4j.v2.models.AddTimeOption; +import org.gitnex.tea4j.v2.models.TrackedTime; +import org.mian.gitnex.R; +import org.mian.gitnex.adapters.TrackedTimeAdapter; +import org.mian.gitnex.clients.RetrofitClient; +import org.mian.gitnex.databinding.BottomSheetTrackedTimeBinding; +import org.mian.gitnex.helpers.Constants; +import org.mian.gitnex.helpers.Toasty; +import org.mian.gitnex.helpers.contexts.IssueContext; +import retrofit2.Call; +import retrofit2.Callback; +import retrofit2.Response; + +/** + * @author mmarif + */ +public class BottomSheetTrackedTimeFragment extends BottomSheetDialogFragment { + + private BottomSheetTrackedTimeBinding binding; + private IssueContext issue; + private TrackedTimeAdapter trackedTimeAdapter; + private List trackedTimeList; + private int currentPage = 1; + private boolean isLoading = false; + private boolean hasMore = true; + private int resultLimit; + + public static BottomSheetTrackedTimeFragment newInstance(IssueContext issue) { + + BottomSheetTrackedTimeFragment fragment = new BottomSheetTrackedTimeFragment(); + Bundle args = new Bundle(); + args.putSerializable(IssueContext.INTENT_EXTRA, issue); + fragment.setArguments(args); + return fragment; + } + + @Nullable @Override + public View onCreateView( + @NonNull LayoutInflater inflater, + @Nullable ViewGroup container, + @Nullable Bundle savedInstanceState) { + + binding = BottomSheetTrackedTimeBinding.inflate(inflater, container, false); + + if (getArguments() != null) { + issue = (IssueContext) getArguments().getSerializable(IssueContext.INTENT_EXTRA); + } + if (issue == null) { + throw new IllegalStateException("IssueContext is required"); + } + + resultLimit = Constants.getCurrentResultLimit(requireContext()); + + trackedTimeList = new ArrayList<>(); + trackedTimeAdapter = new TrackedTimeAdapter(trackedTimeList); + LinearLayoutManager layoutManager = new LinearLayoutManager(requireContext()); + binding.trackedTimeRecyclerView.setLayoutManager(layoutManager); + binding.trackedTimeRecyclerView.setAdapter(trackedTimeAdapter); + + trackedTimeAdapter.setOnDeleteClickListener(this::deleteTrackedTime); + + binding.trackedTimeRecyclerView.addOnScrollListener( + new RecyclerView.OnScrollListener() { + @Override + public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) { + super.onScrolled(recyclerView, dx, dy); + int totalItems = layoutManager.getItemCount(); + int lastVisibleItem = layoutManager.findLastVisibleItemPosition(); + if (!isLoading + && hasMore + && totalItems > 0 + && lastVisibleItem >= totalItems - 5) { + currentPage++; + loadTrackedTimes(); + } + } + }); + + binding.addTimeButton.setEnabled(true); + binding.addTimeButton.setOnClickListener(v -> addTrackedTime()); + + loadTrackedTimes(); + + return binding.getRoot(); + } + + private void loadTrackedTimes() { + + if (isLoading) return; + isLoading = true; + + Call> call = + RetrofitClient.getApiInterface(requireContext()) + .issueTrackedTimes( + issue.getRepository().getOwner(), + issue.getRepository().getName(), + (long) issue.getIssueIndex(), + null, + null, + null, + currentPage, + resultLimit); + + call.enqueue( + new Callback<>() { + @Override + public void onResponse( + @NonNull Call> call, + @NonNull Response> response) { + isLoading = false; + if (response.isSuccessful() && response.body() != null) { + List newTimes = response.body(); + int startPosition = trackedTimeList.size(); + trackedTimeList.addAll(newTimes); + trackedTimeAdapter.notifyItemRangeInserted( + startPosition, newTimes.size()); + hasMore = newTimes.size() >= resultLimit; + updateTotalTime(); + updateUI(); + } else { + hasMore = false; + updateUI(); + } + } + + @Override + public void onFailure( + @NonNull Call> call, @NonNull Throwable t) { + isLoading = false; + hasMore = false; + updateUI(); + } + }); + } + + private void addTrackedTime() { + + String hoursStr = + binding.hoursInput.getText() != null ? binding.hoursInput.getText().toString() : ""; + String minutesStr = + binding.minutesInput.getText() != null + ? binding.minutesInput.getText().toString() + : ""; + + int hours = hoursStr.isEmpty() ? 0 : Integer.parseInt(hoursStr); + int minutes = minutesStr.isEmpty() ? 0 : Integer.parseInt(minutesStr); + + if (hours == 0 && minutes == 0) { + Toasty.warning(requireContext(), getString(R.string.enter_time)); + return; + } + + long totalSeconds = (hours * 3600L) + (minutes * 60L); + + AddTimeOption timeOption = new AddTimeOption(); + timeOption.setCreated(new Date()); + timeOption.setTime(totalSeconds); + + Call call = + RetrofitClient.getApiInterface(requireContext()) + .issueAddTime( + issue.getRepository().getOwner(), + issue.getRepository().getName(), + (long) issue.getIssueIndex(), + timeOption); + + call.enqueue( + new Callback<>() { + @Override + public void onResponse( + @NonNull Call call, + @NonNull Response response) { + if (response.isSuccessful() && response.body() != null) { + TrackedTime newTime = response.body(); + trackedTimeList.add(0, newTime); + trackedTimeAdapter.notifyItemInserted(0); + binding.trackedTimeRecyclerView.scrollToPosition(0); + binding.hoursInput.setText(""); + binding.minutesInput.setText(""); + updateTotalTime(); + updateUI(); + Toasty.success(requireContext(), getString(R.string.time_added)); + } else { + Toasty.error(requireContext(), getString(R.string.time_add_failed)); + } + } + + @Override + public void onFailure(@NonNull Call call, @NonNull Throwable t) { + Toasty.error( + requireContext(), getString(R.string.genericServerResponseError)); + } + }); + } + + private void deleteTrackedTime(TrackedTime time, int position) { + + Call call = + RetrofitClient.getApiInterface(requireContext()) + .issueDeleteTime( + issue.getRepository().getOwner(), + issue.getRepository().getName(), + (long) issue.getIssueIndex(), + time.getId()); + + call.enqueue( + new Callback<>() { + @Override + public void onResponse( + @NonNull Call call, @NonNull Response response) { + + if (response.isSuccessful()) { + + trackedTimeList.remove(position); + trackedTimeAdapter.notifyItemRemoved(position); + trackedTimeAdapter.notifyItemRangeChanged( + position, trackedTimeList.size()); + updateTotalTime(); + updateUI(); + Toasty.success(requireContext(), getString(R.string.time_removed)); + } else { + Toasty.error(requireContext(), getString(R.string.time_delete_failed)); + } + } + + @Override + public void onFailure(@NonNull Call call, @NonNull Throwable t) { + Toasty.error( + requireContext(), getString(R.string.genericServerResponseError)); + } + }); + } + + private void updateTotalTime() { + + long totalSeconds = 0; + for (TrackedTime time : trackedTimeList) { + totalSeconds += time.getTime(); + } + long hours = totalSeconds / 3600; + long minutes = (totalSeconds % 3600) / 60; + long seconds = totalSeconds % 60; + binding.totalTrackedTime.setText(getString(R.string.total_time, hours, minutes, seconds)); + } + + private void updateUI() { + + if (trackedTimeList.isEmpty()) { + binding.trackedTimeRecyclerView.setVisibility(View.GONE); + binding.noTrackedTimeText.setVisibility(View.VISIBLE); + } else { + binding.trackedTimeRecyclerView.setVisibility(View.VISIBLE); + binding.noTrackedTimeText.setVisibility(View.GONE); + } + } + + @Override + public void onDestroyView() { + super.onDestroyView(); + binding = null; + } +} diff --git a/app/src/main/java/org/mian/gitnex/fragments/IssuesFragment.java b/app/src/main/java/org/mian/gitnex/fragments/IssuesFragment.java index ba6d6179..0c3f2ea6 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/IssuesFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/IssuesFragment.java @@ -364,18 +364,10 @@ public class IssuesFragment extends Fragment { pinnedIssuesList.clear(); pinnedIssuesList.addAll(response.body()); adapterPinned.notifyDataChanged(); - fragmentIssuesBinding.noDataIssues.setVisibility(View.GONE); } else { pinnedIssuesList.clear(); adapterPinned.notifyDataChanged(); - fragmentIssuesBinding.noDataIssues.setVisibility(View.VISIBLE); } - fragmentIssuesBinding.progressBar.setVisibility(View.GONE); - } else if (response.code() == 404) { - fragmentIssuesBinding.noDataIssues.setVisibility(View.VISIBLE); - fragmentIssuesBinding.progressBar.setVisibility(View.GONE); - } else { - Toasty.error(context, getString(R.string.genericError)); } } @@ -397,6 +389,8 @@ public class IssuesFragment extends Fragment { String labels, String mentionedBy) { + fragmentIssuesBinding.progressBar.setVisibility(View.VISIBLE); + Call> call = RetrofitClient.getApiInterface(context) .issueListIssues( diff --git a/app/src/main/java/org/mian/gitnex/fragments/MyIssuesFragment.java b/app/src/main/java/org/mian/gitnex/fragments/MyIssuesFragment.java index 659bda6e..ec2d6e79 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/MyIssuesFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/MyIssuesFragment.java @@ -11,6 +11,7 @@ import android.view.View; import android.view.ViewGroup; import android.view.inputmethod.EditorInfo; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.core.view.MenuProvider; import androidx.fragment.app.Fragment; import androidx.lifecycle.Lifecycle; @@ -27,20 +28,55 @@ import org.mian.gitnex.viewmodels.IssuesViewModel; */ public class MyIssuesFragment extends Fragment { - public String state = "open"; - public boolean assignedToMe = false; - private IssuesViewModel issuesViewModel; private FragmentIssuesBinding fragmentIssuesBinding; + private IssuesViewModel issuesViewModel; private ExploreIssuesAdapter adapter; - private int page = 1; private Menu menu; + private String state = "open"; + private boolean assignedToMe = false; + private boolean createdByMe = true; + private int page = 1; - @Override + @Nullable @Override public View onCreateView( - @NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + @NonNull LayoutInflater inflater, + @Nullable ViewGroup container, + @Nullable Bundle savedInstanceState) { fragmentIssuesBinding = FragmentIssuesBinding.inflate(inflater, container, false); + issuesViewModel = new ViewModelProvider(this).get(IssuesViewModel.class); + fragmentIssuesBinding.recyclerView.setHasFixedSize(true); + fragmentIssuesBinding.recyclerView.setLayoutManager(new LinearLayoutManager(getContext())); + fragmentIssuesBinding.createNewIssue.setVisibility(View.GONE); + + setupMenu(); + + ((MainActivity) requireActivity()) + .setFragmentRefreshListenerMyIssues( + myIssues -> { + updateFilterState(myIssues); + fetchDataAsync(null); + }); + + fragmentIssuesBinding.pullToRefresh.setOnRefreshListener( + () -> + new Handler(Looper.getMainLooper()) + .postDelayed( + () -> { + page = 1; + fragmentIssuesBinding.pullToRefresh.setRefreshing( + false); + fetchDataAsync(null); + }, + 50)); + + fetchDataAsync(null); + + return fragmentIssuesBinding.getRoot(); + } + + private void setupMenu() { requireActivity() .addMenuProvider( new MenuProvider() { @@ -65,7 +101,7 @@ public class MyIssuesFragment extends Fragment { @Override public boolean onQueryTextSubmit(String query) { - fetchDataAsync(query, state, assignedToMe); + fetchDataAsync(query); searchView.setQuery(null, false); searchItem.collapseActionView(); return false; @@ -80,81 +116,74 @@ public class MyIssuesFragment extends Fragment { @Override public boolean onMenuItemSelected(@NonNull MenuItem menuItem) { + + if (menuItem.getItemId() == R.id.filter) { + + String currentFilter = + state + + "_" + + (assignedToMe + ? "assignedToMe" + : "created_by_me"); + BottomSheetMyIssuesFilterFragment bottomSheet = + BottomSheetMyIssuesFilterFragment.newInstance( + currentFilter); + bottomSheet.show(getParentFragmentManager(), "myIssuesFilter"); + + return true; + } return false; } }, getViewLifecycleOwner(), Lifecycle.State.RESUMED); - - issuesViewModel = new ViewModelProvider(this).get(IssuesViewModel.class); - - fragmentIssuesBinding.recyclerView.setHasFixedSize(true); - fragmentIssuesBinding.recyclerView.setLayoutManager(new LinearLayoutManager(getContext())); - - fragmentIssuesBinding.createNewIssue.setVisibility(View.GONE); - - ((MainActivity) requireActivity()) - .setFragmentRefreshListenerMyIssues( - myIssues -> { - state = myIssues; - if (state.equals("closed")) { - menu.getItem(1).setIcon(R.drawable.ic_filter_closed); - } else { - menu.getItem(1).setIcon(R.drawable.ic_filter); - } - - assignedToMe = state.equals("assignedToMe"); - - fragmentIssuesBinding.progressBar.setVisibility(View.VISIBLE); - fragmentIssuesBinding.noDataIssues.setVisibility(View.GONE); - - fetchDataAsync(null, state, assignedToMe); - }); - - fragmentIssuesBinding.pullToRefresh.setOnRefreshListener( - () -> - new Handler(Looper.getMainLooper()) - .postDelayed( - () -> { - page = 1; - fragmentIssuesBinding.pullToRefresh.setRefreshing( - false); - issuesViewModel.loadIssuesList( - null, - "issues", - true, - state, - assignedToMe, - getContext()); - fragmentIssuesBinding.progressBar.setVisibility( - View.VISIBLE); - }, - 50)); - - fetchDataAsync(null, state, assignedToMe); - - return fragmentIssuesBinding.getRoot(); } - private void fetchDataAsync(String query, String state, boolean assignedToMe) { + public String getCurrentFilter() { + return state + "_" + (assignedToMe ? "assignedToMe" : "created_by_me"); + } + + private void updateFilterState(String filter) { + String[] parts = filter.split("_"); + String stateValue = parts[0]; + String filterValue = parts[1]; + + state = stateValue; + menu.getItem(1) + .setIcon( + state.equals("closed") + ? R.drawable.ic_filter_closed + : R.drawable.ic_filter); + + if (filterValue.equals("created_by_me")) { + createdByMe = true; + assignedToMe = false; + } else if (filterValue.equals("assignedToMe")) { + createdByMe = false; + assignedToMe = true; + } + } + + private void fetchDataAsync(String query) { + + fragmentIssuesBinding.progressBar.setVisibility(View.VISIBLE); + fragmentIssuesBinding.noDataIssues.setVisibility(View.GONE); issuesViewModel - .getIssuesList(query, "issues", true, state, assignedToMe, getContext()) + .getIssuesList(query, "issues", createdByMe, state, assignedToMe, getContext()) .observe( getViewLifecycleOwner(), issuesListMain -> { adapter = new ExploreIssuesAdapter(issuesListMain, getContext()); adapter.setLoadMoreListener( new ExploreIssuesAdapter.OnLoadMoreListener() { - @Override public void onLoadMore() { - page += 1; issuesViewModel.loadMoreIssues( query, "issues", - true, + createdByMe, state, page, assignedToMe, @@ -166,7 +195,6 @@ public class MyIssuesFragment extends Fragment { @Override public void onLoadFinished() { - fragmentIssuesBinding.progressBar.setVisibility( View.GONE); } diff --git a/app/src/main/res/drawable/ic_stopwatch.xml b/app/src/main/res/drawable/ic_stopwatch.xml new file mode 100644 index 00000000..aef3e2df --- /dev/null +++ b/app/src/main/res/drawable/ic_stopwatch.xml @@ -0,0 +1,34 @@ + + + + + + diff --git a/app/src/main/res/layout/bottom_sheet_issues_filter.xml b/app/src/main/res/layout/bottom_sheet_issues_filter.xml index 18acf82b..615b94c9 100644 --- a/app/src/main/res/layout/bottom_sheet_issues_filter.xml +++ b/app/src/main/res/layout/bottom_sheet_issues_filter.xml @@ -49,12 +49,11 @@ android:layout_height="wrap_content" app:singleSelection="true" android:paddingStart="@dimen/dimen16dp" - android:paddingEnd="@dimen/dimen16dp" - android:paddingBottom="@dimen/dimen8dp"> + android:paddingEnd="@dimen/dimen16dp"> @@ -78,21 +77,21 @@ - + android:layout_height="wrap_content" + android:orientation="vertical" + android:padding="@dimen/dimen8dp"> - + android:gravity="center" + android:text="@string/strFilter" + android:textColor="?attr/primaryTextColor" + android:textSize="@dimen/dimen16sp"/> - + - - - - - - - - - - - + android:background="?attr/fabColor" /> - + - + - + - + - + - + + + + + + + + + diff --git a/app/src/main/res/layout/bottom_sheet_single_issue.xml b/app/src/main/res/layout/bottom_sheet_single_issue.xml index eefa779d..470e9b8e 100644 --- a/app/src/main/res/layout/bottom_sheet_single_issue.xml +++ b/app/src/main/res/layout/bottom_sheet_single_issue.xml @@ -176,6 +176,19 @@ app:drawableTopCompat="@drawable/ic_dependencies" app:layout_alignSelf="flex_start" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/list_tracked_time.xml b/app/src/main/res/layout/list_tracked_time.xml new file mode 100644 index 00000000..8530a27f --- /dev/null +++ b/app/src/main/res/layout/list_tracked_time.xml @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8edb7af0..3b90141a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -155,6 +155,7 @@ Comment Please write your comment Comment posted + Created by Me This function will be removed in the future 😱 @@ -554,6 +555,8 @@ Branch Branches Timeline + Hours + Minutes Explore users @@ -956,4 +959,13 @@ Failed to add dependency Search failed No matching results found + + Tracked Time + No time tracked yet + Total: %1$dh %2$dm %3$ds + Please enter some time + Time added + Time removed + Failed to add time + Failed to delete time