Gitea/GitNex-Android-App
1
0
Fork 0
mirror of https://codeberg.org/gitnex/GitNex synced 2025-02-02 04:16:58 +01:00
Code Issues Releases Wiki Activity

[FrontPort #429] Dismiss bottom sheet on subscribe/unsubscribe to issue & Fix (#428)

Browse Source 
Merge branch 'master' into 427-dismiss-bottom-sheet

Does not really fix the issue as there is way to handle this without a proper call.
And dismiss does not work properly either.

But added few improvements and fixed close/reopen issue along the way.

Co-authored-by: 6543 <6543@noreply.gitea.io>
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/428
Reviewed-by: 6543 <6543@noreply.gitea.io>
This commit is contained in:
M M Arif 2020-04-18 14:29:42 +00:00
parent 01e451556e
commit af6cbfdb66
4 changed files with 40 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
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); unsubscribeIssue.setVisibility(View.GONE);
subscribeIssue.setVisibility(View.VISIBLE); 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) {

29
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'
} }
} }