GitNex/GitNex
GitNex/GitNex
2
6
Fork 0
mirror of https://codeberg.org/gitnex/GitNex.git synced 2023-12-13 20:50:18 +01:00
Code Issues 1 Projects Releases Wiki Activity

Implement commit statuses

Browse source
This commit is contained in:
qwerty287 2022-10-01 08:29:52 +02:00
parent 325560c08d
commit a52a814cc0
No known key found for this signature in database
GPG key ID: E0464C650D9D25B2
6 changed files with 304 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

115
app/src/main/java/org/mian/gitnex/adapters/CommitStatusesAdapter.java Normal file
View file

@ -0,0 +1,115 @@
package org.mian.gitnex.adapters;
import android.content.res.ColorStateList;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.core.widget.ImageViewCompat;
import androidx.recyclerview.widget.RecyclerView;
import org.gitnex.tea4j.v2.models.CommitStatus;
import org.mian.gitnex.R;
import org.mian.gitnex.helpers.AppUtil;
import java.util.List;
/**
* @author qwerty287
*/
public class CommitStatusesAdapter
extends RecyclerView.Adapter<CommitStatusesAdapter.CronTasksViewHolder> {
private final List<CommitStatus> statuses;
static class CronTasksViewHolder extends RecyclerView.ViewHolder {
private CommitStatus status;
private final TextView name;
private final TextView description;
private final ImageView icon;
private CronTasksViewHolder(View itemView) {
super(itemView);
icon = itemView.findViewById(R.id.statusIcon);
name = itemView.findViewById(R.id.name);
description = itemView.findViewById(R.id.description);
itemView.setOnClickListener(
taskInfo -> openUrl());
}
private void openUrl() {
if (status.getTargetUrl() != null) {
AppUtil.openUrlInBrowser(itemView.getContext(), status.getTargetUrl());
}
}
}
public CommitStatusesAdapter(List<CommitStatus> statuses) {
this.statuses = statuses;
}
@NonNull @Override
public CommitStatusesAdapter.CronTasksViewHolder onCreateViewHolder(
@NonNull ViewGroup parent, int viewType) {
View v =
LayoutInflater.from(parent.getContext())
.inflate(R.layout.list_commit_status, parent, false);
return new CommitStatusesAdapter.CronTasksViewHolder(v);
}
@Override
public void onBindViewHolder(
@NonNull CommitStatusesAdapter.CronTasksViewHolder holder, int position) {
CommitStatus currentItem = statuses.get(position);
holder.status = currentItem;
holder.name.setText(currentItem.getContext());
holder.description.setText(currentItem.getDescription());
switch (currentItem.getStatus()) {
case "pending":
holder.icon.setImageResource(R.drawable.ic_dot_fill);
ImageViewCompat.setImageTintList(
holder.icon,
ColorStateList.valueOf(
holder.name.getContext().getResources()
.getColor(R.color.lightYellow, null)));
case "success":
holder.icon.setImageResource(R.drawable.ic_check);
ImageViewCompat.setImageTintList(
holder.icon,
ColorStateList.valueOf(
holder.name.getContext().getResources()
.getColor(R.color.colorLightGreen, null)));
case "error":
case "failure":
holder.icon.setImageResource(R.drawable.ic_close);
ImageViewCompat.setImageTintList(
holder.icon,
ColorStateList.valueOf(
holder.name.getContext().getResources()
.getColor(R.color.iconIssuePrClosedColor, null)));
case "warning":
holder.icon.setImageResource(R.drawable.ic_warning);
ImageViewCompat.setImageTintList(
holder.icon,
ColorStateList.valueOf(
holder.name.getContext().getResources()
.getColor(R.color.lightYellow, null)));
default:
holder.icon.setVisibility(View.GONE);
}
}
@Override
public int getItemCount() {
return statuses.size();
}
}

56
app/src/main/java/org/mian/gitnex/fragments/CommitDetailFragment.java
View file

@ -18,9 +18,11 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import org.gitnex.tea4j.v2.models.Commit;
import org.gitnex.tea4j.v2.models.CommitStatus;
import org.mian.gitnex.R;
import org.mian.gitnex.activities.BaseActivity;
import org.mian.gitnex.activities.ProfileActivity;
import org.mian.gitnex.adapters.CommitStatusesAdapter;
import org.mian.gitnex.adapters.DiffFilesAdapter;
import org.mian.gitnex.clients.PicassoService;
import org.mian.gitnex.clients.RetrofitClient;
@ -84,6 +86,17 @@ public class CommitDetailFragment extends Fragment {
getCommit();
getDiff();
getStatuses();
binding.statuses.setOnClickListener(view -> {
if (binding.statusesLv.getVisibility() == View.GONE) {
binding.statusesExpandCollapse.setImageResource(R.drawable.ic_chevron_up);
binding.statusesLv.setVisibility(View.VISIBLE);
} else {
binding.statusesExpandCollapse.setImageResource(R.drawable.ic_chevron_down);
binding.statusesLv.setVisibility(View.GONE);
}
});
binding.close.setOnClickListener((v) -> requireActivity().finish());
@ -375,9 +388,50 @@ public class CommitDetailFragment extends Fragment {
});
}
private void getStatuses() {
RetrofitClient.getApiInterface(requireContext())
.repoListStatuses(repoOwner, repoName, sha, null, null, null, null)
.enqueue(
new Callback<>() {
@Override
public void onResponse(
@NonNull Call<List<CommitStatus>> call,
@NonNull Response<List<CommitStatus>> response) {
checkLoading();
if (!response.isSuccessful() || response.body() == null) {
onFailure(call, new Throwable());
return;
}
if (response.body().size() < 1) {
binding.statusesLvMain.setVisibility(View.GONE);
return;
}
binding.statusesList.setLayoutManager(new LinearLayoutManager(requireContext()));
binding.statusesList.setAdapter(new CommitStatusesAdapter(response.body()));
}
@Override
public void onFailure(
@NonNull Call<List<CommitStatus>> call, @NonNull Throwable t) {
checkLoading();
if (getContext() != null) {
Toasty.error(
requireContext(), getString(R.string.genericError));
requireActivity().finish();
}
}
});
}
private void checkLoading() {
loadingFinished += 1;
if (loadingFinished >= 2) {
if (loadingFinished >= 3) {
binding.progressBar.setVisibility(View.GONE);
}
}

10
app/src/main/res/drawable/ic_dot_fill.xml Normal file
View file

@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="16dp"
android:height="16dp"
android:viewportWidth="16"
android:viewportHeight="16">
<path
android:fillColor="#FF000000"
android:pathData="M8,4a4,4 0,1 0,0 8,4 4,0 0,0 0,-8z"
android:fillType="evenOdd"/>
</vector>

61
app/src/main/res/layout/fragment_commit_details.xml
View file

@ -181,6 +181,67 @@
</LinearLayout>
<LinearLayout
android:id="@+id/statusesLvMain"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:foreground="?android:attr/selectableItemBackground"
android:background="?attr/materialCardBackgroundColor"
android:orientation="vertical">
<LinearLayout
android:id="@+id/statuses"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:minHeight="@dimen/dimen48dp"
android:orientation="horizontal">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/commitStatuses"
android:textSize="@dimen/dimen16sp"
android:paddingTop="@dimen/dimen10dp"
android:layout_weight="0.9"
android:gravity="center_vertical"
android:paddingBottom="@dimen/dimen10dp"
android:paddingStart="@dimen/dimen0dp"
android:paddingEnd="@dimen/dimen0dp"
android:autoLink="web"
android:textColorLink="@color/lightBlue"
android:textColor="@color/lightGray"/>
<ImageView
android:id="@+id/statusesExpandCollapse"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="0.1"
android:layout_gravity="center_vertical|end"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/generalImgContentText"
app:srcCompat="@drawable/ic_chevron_up"/>
</LinearLayout>
<LinearLayout
android:id="@+id/statusesLv"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/statusesList"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textIsSelectable="true"
android:textSize="@dimen/dimen16sp"
android:textColor="?attr/primaryTextColor"/>
</LinearLayout>
</LinearLayout>
</LinearLayout>
</com.google.android.material.card.MaterialCardView>

61
app/src/main/res/layout/list_commit_status.xml Normal file
View file

@ -0,0 +1,61 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:paddingTop="@dimen/dimen4dp"
android:paddingBottom="@dimen/dimen4dp">
<com.google.android.material.card.MaterialCardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="?attr/materialCardViewFilledStyle"
android:background="?android:attr/selectableItemBackground"
app:cardElevation="@dimen/dimen0dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:foreground="?android:attr/selectableItemBackground"
android:background="?attr/materialCardBackgroundColor"
android:padding="@dimen/dimen12dp"
android:orientation="horizontal">
<ImageView
android:id="@+id/statusIcon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:scaleType="fitCenter"
android:contentDescription="@string/adminCron"
android:layout_marginEnd="@dimen/dimen16dp"/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:id="@+id/name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/dimen6dp"
android:textColor="?attr/primaryTextColor"
android:textSize="@dimen/dimen16sp"/>
<TextView
android:id="@+id/description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/dimen6dp"
android:textColor="?attr/primaryTextColor"
android:textSize="@dimen/dimen12sp"/>
</LinearLayout>
</LinearLayout>
</com.google.android.material.card.MaterialCardView>
</RelativeLayout>

2
app/src/main/res/values/strings.xml
View file

@ -833,4 +833,6 @@
<string name="timelineRefPr">%1$s referenced this pull request in #%2$d %3$s</string>
<string name="timelineStatusRefIssue"><![CDATA[%1$s referenced this issue from a <font color=\'%2$d\'>%3$s</font> %4$s]]></string>
<string name="commitStatuses">Statuses</string>
</resources>