From a96d57f7995351ae88d1a5320f7829d3ddb6326b Mon Sep 17 00:00:00 2001 From: M M Arif Date: Mon, 14 Mar 2022 13:28:46 +0500 Subject: [PATCH] Enable repo forks --- .../gitnex/activities/RepoForksActivity.java | 21 +++++++++++-------- .../gitnex/fragments/RepoInfoFragment.java | 12 +++++++++-- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/org/mian/gitnex/activities/RepoForksActivity.java b/app/src/main/java/org/mian/gitnex/activities/RepoForksActivity.java index f8f79791..7b3a5da2 100644 --- a/app/src/main/java/org/mian/gitnex/activities/RepoForksActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/RepoForksActivity.java @@ -26,6 +26,7 @@ import org.mian.gitnex.adapters.RepoForksAdapter; import org.mian.gitnex.clients.RetrofitClient; import org.mian.gitnex.databinding.ActivityRepoForksBinding; import org.mian.gitnex.helpers.Constants; +import org.mian.gitnex.helpers.contexts.RepositoryContext; import java.util.ArrayList; import java.util.List; import retrofit2.Call; @@ -49,6 +50,8 @@ public class RepoForksActivity extends BaseActivity { private RepoForksAdapter adapter; private ProgressBar progressLoadMore; + private RepositoryContext repository; + @SuppressLint("DefaultLocale") @Override public void onCreate(Bundle savedInstanceState) { @@ -61,11 +64,9 @@ public class RepoForksActivity extends BaseActivity { Toolbar toolbar = activityRepoForksBinding.toolbar; setSupportActionBar(toolbar); - String repoFullNameForForks = getIntent().getStringExtra("repoFullNameForForks"); - assert repoFullNameForForks != null; - String[] parts = repoFullNameForForks.split("/"); - final String repoOwner = parts[0]; - final String repoName = parts[1]; + repository = RepositoryContext.fromIntent(getIntent()); + final String repoOwner = repository.getOwner(); + final String repoName = repository.getName(); activityRepoForksBinding.toolbarTitle.setText(ctx.getResources().getString(R.string.infoTabRepoForksCount)); @@ -75,10 +76,7 @@ public class RepoForksActivity extends BaseActivity { progressBar = activityRepoForksBinding.progressBar; SwipeRefreshLayout swipeRefresh = activityRepoForksBinding.pullToRefresh; - closeActivity.setOnClickListener(v -> { - getIntent().removeExtra("repoFullNameForForks"); - finish(); - }); + closeActivity.setOnClickListener(v -> finish()); // if gitea is 1.12 or higher use the new limit (resultLimitNewGiteaInstances) if(getAccount().requiresVersion("1.12")) { @@ -241,4 +239,9 @@ public class RepoForksActivity extends BaseActivity { adapter.updateList(userRepositories); } + @Override + public void onResume() { + super.onResume(); + repository.checkAccountSwitch(this); + } } diff --git a/app/src/main/java/org/mian/gitnex/fragments/RepoInfoFragment.java b/app/src/main/java/org/mian/gitnex/fragments/RepoInfoFragment.java index 7a74e98d..ddc5f203 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/RepoInfoFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/RepoInfoFragment.java @@ -1,7 +1,6 @@ package org.mian.gitnex.fragments; import android.content.Context; -import android.net.Uri; import android.os.Bundle; import android.util.Log; import android.view.LayoutInflater; @@ -17,11 +16,18 @@ import org.gitnex.tea4j.models.UserRepositories; import org.mian.gitnex.R; import org.mian.gitnex.activities.BaseActivity; import org.mian.gitnex.activities.RepoDetailActivity; +import org.mian.gitnex.activities.RepoForksActivity; import org.mian.gitnex.activities.RepoStargazersActivity; import org.mian.gitnex.activities.RepoWatchersActivity; import org.mian.gitnex.clients.RetrofitClient; import org.mian.gitnex.databinding.FragmentRepoInfoBinding; -import org.mian.gitnex.helpers.*; +import org.mian.gitnex.helpers.AlertDialogs; +import org.mian.gitnex.helpers.AppUtil; +import org.mian.gitnex.helpers.ClickListener; +import org.mian.gitnex.helpers.Markdown; +import org.mian.gitnex.helpers.TimeHelper; +import org.mian.gitnex.helpers.TinyDB; +import org.mian.gitnex.helpers.Toasty; import org.mian.gitnex.helpers.contexts.RepositoryContext; import java.util.Locale; import retrofit2.Call; @@ -85,6 +91,8 @@ public class RepoInfoFragment extends Fragment { binding.repoMetaWatchersFrame.setOnClickListener(metaWatchers -> ctx.startActivity(repository.getIntent(ctx, RepoWatchersActivity.class))); + binding.repoMetaForksFrame.setOnClickListener(metaForks -> ctx.startActivity(repository.getIntent(ctx, RepoForksActivity.class))); + binding.repoMetaPullRequestsFrame.setOnClickListener(metaPR -> ((RepoDetailActivity) requireActivity()).mViewPager.setCurrentItem(3)); return binding.getRoot();