gitnex/GitNex
gitnex/GitNex
Archived
14
57
Fork 14
Code Issues Pull Requests 2 Releases 22 Wiki Activity

Increasing usability and design of files diff. #413

Merged
mmarif merged 42 commits from :diff-cleaner into master 2020-04-28 12:39:46 +00:00
Conversation 28 Commits 42 Files Changed 40 +43 -36
5 changed files with 43 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 29dc1736f0 - Show all commits

4
README.md
View File

@ -17,7 +17,9 @@ No trackers are used and source code is available here for anyone to audit.
## Downloads ## Downloads
[<img alt='Get it on F-droid' src='https://gitlab.com/fdroid/artwork/raw/master/badge/get-it-on.png' height="80"/>](https://f-droid.org/en/packages/org.mian.gitnex/) [<img alt='Get it on F-droid' src='https://gitlab.com/fdroid/artwork/raw/master/badge/get-it-on.png' height="80"/>](https://f-droid.org/en/packages/org.mian.gitnex/)
[<img alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png' height="80"/>](https://play.google.com/store/apps/details?id=org.mian.gitnex) [<img alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png' height="80"/>](https://play.google.com/store/apps/details?id=org.mian.gitnex)
[<img alt='Download APK' src='https://gitnex.com/img/download-apk.png' height="80"/>](https://gitea.com/gitnex/GitNex/releases) [<img alt='Download APK' src='https://gitnex.com/img/download-apk.png' height="80"/>](https://gitnex.com/download/)
Download latest build from master: [https://cloud.swatian.com/s/Cq592xGEfnsGAAW](https://cloud.swatian.com/s/Cq592xGEfnsGAAW)
## Note about Gitea version ## Note about Gitea version
Please make sure that you are on latest stable release or later for better app experience. Please make sure that you are on latest stable release or later for better app experience.

29
app/src/main/java/org/mian/gitnex/actions/IssueActions.java
View File

@ -120,11 +120,18 @@ public class IssueActions {
tinyDb.putBoolean("resumeIssues", true); tinyDb.putBoolean("resumeIssues", true);
tinyDb.putBoolean("resumeClosedIssues", true); tinyDb.putBoolean("resumeClosedIssues", true);
if(issueState.equals("closed")) { if(issueState.equals("closed")) {
Toasty.info(ctx, ctx.getString(R.string.issueStateClosed)); Toasty.info(ctx, ctx.getString(R.string.issueStateClosed));
tinyDb.putString("issueState", "closed");
} }
else if(issueState.equals("open")) { else if(issueState.equals("open")) {
Toasty.info(ctx, ctx.getString(R.string.issueStateReopened)); Toasty.info(ctx, ctx.getString(R.string.issueStateReopened));
tinyDb.putString("issueState", "open");
} }
} }
@ -191,9 +198,14 @@ public class IssueActions {
if(response.isSuccessful()) { if(response.isSuccessful()) {
Toasty.info(ctx, ctx.getString(R.string.issueSubscribtion)); if(response.code() == 201) {
subscribeIssue.setVisibility(View.GONE);
unsubscribeIssue.setVisibility(View.VISIBLE); unsubscribeIssue.setVisibility(View.VISIBLE);
subscribeIssue.setVisibility(View.GONE);
Toasty.info(ctx, ctx.getString(R.string.issueSubscribtion));
tinyDB.putString("issueSubscriptionState", "unsubscribeToIssue");
}
} }
else if(response.code() == 401) { else if(response.code() == 401) {
@ -248,9 +260,14 @@ public class IssueActions {
if(response.isSuccessful()) { if(response.isSuccessful()) {
Toasty.info(ctx, ctx.getString(R.string.issueUnsubscribtion)); if(response.code() == 201) {
unsubscribeIssue.setVisibility(View.GONE);
subscribeIssue.setVisibility(View.VISIBLE); unsubscribeIssue.setVisibility(View.GONE);
subscribeIssue.setVisibility(View.VISIBLE);
Toasty.info(ctx, ctx.getString(R.string.issueUnsubscribtion));
tinyDB.putString("issueSubscriptionState", "subscribeToIssue");
}
} }
else if(response.code() == 401) { else if(response.code() == 401) {

41
app/src/main/java/org/mian/gitnex/fragments/BottomSheetSingleIssueFragment.java
View File

@ -15,9 +15,6 @@ import org.mian.gitnex.activities.AddRemoveLabelsActivity;
import org.mian.gitnex.activities.EditIssueActivity; import org.mian.gitnex.activities.EditIssueActivity;
import org.mian.gitnex.activities.FileDiffActivity; import org.mian.gitnex.activities.FileDiffActivity;
import org.mian.gitnex.activities.MergePullRequestActivity; import org.mian.gitnex.activities.MergePullRequestActivity;
import org.mian.gitnex.activities.ReplyToIssueActivity;
import org.mian.gitnex.clients.RetrofitClient;
import org.mian.gitnex.helpers.AlertDialogs;
import org.mian.gitnex.helpers.Toasty; import org.mian.gitnex.helpers.Toasty;
import org.mian.gitnex.util.TinyDB; import org.mian.gitnex.util.TinyDB;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
@ -25,8 +22,6 @@ import androidx.annotation.Nullable;
import android.content.ClipboardManager; import android.content.ClipboardManager;
import android.content.ClipData; import android.content.ClipData;
import java.util.Objects; import java.util.Objects;
import retrofit2.Call;
import retrofit2.Callback;
/** /**
* Author M M Arif * Author M M Arif
@ -187,30 +182,26 @@ public class BottomSheetSingleIssueFragment extends BottomSheetDialogFragment {
if (tinyDB.getString("issueState").equals("open")) { // close issue if (tinyDB.getString("issueState").equals("open")) { // close issue
reOpenIssue.setVisibility(View.GONE); reOpenIssue.setVisibility(View.GONE);
closeIssue.setVisibility(View.VISIBLE);
closeIssue.setOnClickListener(new View.OnClickListener() { closeIssue.setOnClickListener(closeSingleIssue -> {
@Override
public void onClick(View v) {
IssueActions.closeReopenIssue(ctx, Integer.parseInt(tinyDB.getString("issueNumber")), "closed"); IssueActions.closeReopenIssue(ctx, Integer.parseInt(tinyDB.getString("issueNumber")), "closed");
dismiss(); dismiss();
}
}); });
} }
else if (tinyDB.getString("issueState").equals("closed")) { else if (tinyDB.getString("issueState").equals("closed")) {
closeIssue.setVisibility(View.GONE); closeIssue.setVisibility(View.GONE);
reOpenIssue.setVisibility(View.VISIBLE);
reOpenIssue.setOnClickListener(new View.OnClickListener() { reOpenIssue.setOnClickListener(reOpenSingleIssue -> {
@Override
public void onClick(View v) {
IssueActions.closeReopenIssue(ctx, Integer.parseInt(tinyDB.getString("issueNumber")), "open"); IssueActions.closeReopenIssue(ctx, Integer.parseInt(tinyDB.getString("issueNumber")), "open");
dismiss(); dismiss();
}
}); });
} }
@ -223,22 +214,18 @@ public class BottomSheetSingleIssueFragment extends BottomSheetDialogFragment {
} }
subscribeIssue.setOnClickListener(new View.OnClickListener() { subscribeIssue.setOnClickListener(subscribeToIssue -> {
@Override
public void onClick(View v) {
IssueActions.subscribe(ctx, subscribeIssue, unsubscribeIssue); IssueActions.subscribe(ctx, subscribeIssue, unsubscribeIssue);
//dismiss();
}
}); });
unsubscribeIssue.setOnClickListener(new View.OnClickListener() { unsubscribeIssue.setOnClickListener(unsubscribeToIssue -> {
@Override
public void onClick(View v) {
IssueActions.unsubscribe(ctx, subscribeIssue, unsubscribeIssue); IssueActions.unsubscribe(ctx, subscribeIssue, unsubscribeIssue);
//dismiss();
}
}); });
//if RepoWatch True Provide Unsubscribe first //if RepoWatch True Provide Unsubscribe first

3
app/src/main/res/layout/bottom_sheet_single_issue_layout.xml
View File

@ -88,7 +88,8 @@
android:drawablePadding="24dp" android:drawablePadding="24dp"
android:textColor="?attr/primaryTextColor" android:textColor="?attr/primaryTextColor"
android:textSize="16sp" android:textSize="16sp"
android:padding="16dp" /> android:padding="16dp"
android:visibility="gone" />
<TextView <TextView
android:id="@+id/unsubscribeIssue" android:id="@+id/unsubscribeIssue"

2
build.gradle
View File

@ -7,7 +7,7 @@ buildscript {
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.6.2' classpath 'com.android.tools.build:gradle:3.6.3'
} }
} }