diff --git a/app/src/main/java/org/mian/gitnex/actions/RepositoryActions.java b/app/src/main/java/org/mian/gitnex/actions/RepositoryActions.java index 30696583..a6814701 100644 --- a/app/src/main/java/org/mian/gitnex/actions/RepositoryActions.java +++ b/app/src/main/java/org/mian/gitnex/actions/RepositoryActions.java @@ -32,7 +32,7 @@ public class RepositoryActions { if(response.isSuccessful()) { if(response.code() == 204) { - MainActivity.repoCreated = true; + MainActivity.reloadRepos = true; Toasty.success(context, context.getString(R.string.starRepositorySuccess)); } } @@ -78,7 +78,7 @@ public class RepositoryActions { if(response.isSuccessful()) { if(response.code() == 204) { - MainActivity.repoCreated = true; + MainActivity.reloadRepos = true; Toasty.success(context, context.getString(R.string.unStarRepositorySuccess)); } } diff --git a/app/src/main/java/org/mian/gitnex/activities/CreateIssueActivity.java b/app/src/main/java/org/mian/gitnex/activities/CreateIssueActivity.java index b0c257f1..dc8f53ee 100644 --- a/app/src/main/java/org/mian/gitnex/activities/CreateIssueActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/CreateIssueActivity.java @@ -256,7 +256,7 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis Toasty.success(ctx, getString(R.string.issueCreated)); enableProcessButton(); RepoDetailActivity.updateRepo = true; - MainActivity.repoCreated = true; + MainActivity.reloadRepos = true; finish(); } else if(response2.code() == 401) { diff --git a/app/src/main/java/org/mian/gitnex/activities/CreatePullRequestActivity.java b/app/src/main/java/org/mian/gitnex/activities/CreatePullRequestActivity.java index 66192274..79de1298 100644 --- a/app/src/main/java/org/mian/gitnex/activities/CreatePullRequestActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/CreatePullRequestActivity.java @@ -180,7 +180,7 @@ public class CreatePullRequestActivity extends BaseActivity implements LabelsLis Toasty.success(ctx, getString(R.string.prCreateSuccess)); RepoDetailActivity.updateRepo = true; PullRequestsFragment.resumePullRequests = true; - MainActivity.repoCreated = true; + MainActivity.reloadRepos = true; finish(); } else if(response.code() == 409 || response.message().equals("Conflict")) { diff --git a/app/src/main/java/org/mian/gitnex/activities/CreateRepoActivity.java b/app/src/main/java/org/mian/gitnex/activities/CreateRepoActivity.java index c080179b..4db9316d 100644 --- a/app/src/main/java/org/mian/gitnex/activities/CreateRepoActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/CreateRepoActivity.java @@ -178,7 +178,7 @@ public class CreateRepoActivity extends BaseActivity { if(response.code() == 201) { - MainActivity.repoCreated = true; + MainActivity.reloadRepos = true; Toasty.success(ctx, getString(R.string.repoCreated)); enableProcessButton(); finish(); 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 c1f86ca3..9cb381a4 100644 --- a/app/src/main/java/org/mian/gitnex/activities/MainActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/MainActivity.java @@ -69,7 +69,7 @@ import retrofit2.Callback; public class MainActivity extends BaseActivity implements NavigationView.OnNavigationItemSelectedListener, BottomSheetListener { public static boolean refActivity = false; - public static boolean repoCreated = false; + public static boolean reloadRepos = false; private DrawerLayout drawer; private TextView toolbarTitle; diff --git a/app/src/main/java/org/mian/gitnex/adapters/ReleasesAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/ReleasesAdapter.java index 9e798066..b514dcd8 100644 --- a/app/src/main/java/org/mian/gitnex/adapters/ReleasesAdapter.java +++ b/app/src/main/java/org/mian/gitnex/adapters/ReleasesAdapter.java @@ -21,6 +21,7 @@ import org.mian.gitnex.activities.ProfileActivity; import org.mian.gitnex.activities.RepoDetailActivity; import org.mian.gitnex.clients.PicassoService; import org.mian.gitnex.clients.RetrofitClient; +import org.mian.gitnex.databinding.FragmentReleasesBinding; import org.mian.gitnex.helpers.AppUtil; import org.mian.gitnex.helpers.ClickListener; import org.mian.gitnex.helpers.Markdown; @@ -49,8 +50,9 @@ public class ReleasesAdapter extends RecyclerView.Adapter releasesMain, FragmentRefreshListener startDownload, String repoOwner, String repoName) { + public ReleasesAdapter(Context ctx, List releasesMain, FragmentRefreshListener startDownload, String repoOwner, String repoName, FragmentReleasesBinding fragmentReleasesBinding) { this.context = ctx; this.releasesList = releasesMain; this.startDownload = startDownload; this.repoOwner = repoOwner; this.repoName = repoName; + this.fragmentReleasesBinding = fragmentReleasesBinding; } @NonNull @@ -272,7 +275,10 @@ public class ReleasesAdapter extends RecyclerView.Adapter releasesMain, String repoOwner, String repoName, FragmentRefreshListener startDownload) { + public TagsAdapter(Context ctx, List releasesMain, String repoOwner, String repoName, FragmentRefreshListener startDownload, FragmentReleasesBinding fragmentReleasesBinding) { this.context = ctx; this.tags = releasesMain; owner = repoOwner; repo = repoName; this.startDownload = startDownload; + this.fragmentReleasesBinding = fragmentReleasesBinding; } @NonNull @@ -180,7 +182,7 @@ public class TagsAdapter extends RecyclerView.Adapter { if(!repository.isReleasesViewTypeIsTag()) { - adapter = new ReleasesAdapter(getContext(), releasesListMain, this::requestFileDownload, repository.getOwner(), repository.getName()); + adapter = new ReleasesAdapter(getContext(), releasesListMain, this::requestFileDownload, repository.getOwner(), repository.getName(), fragmentReleasesBinding); adapter.setLoadMoreListener(new ReleasesAdapter.OnLoadMoreListener() { @Override @@ -166,7 +166,7 @@ public class ReleasesFragment extends Fragment { releasesModel.getTagsList(owner, repo, getContext()).observe(getViewLifecycleOwner(), tagList -> { if(repository.isReleasesViewTypeIsTag()) { - tagsAdapter = new TagsAdapter(getContext(), tagList, owner, repo, this::requestFileDownload); + tagsAdapter = new TagsAdapter(getContext(), tagList, owner, repo, this::requestFileDownload, fragmentReleasesBinding); tagsAdapter.setLoadMoreListener(new TagsAdapter.OnLoadMoreListener() { @Override diff --git a/app/src/main/java/org/mian/gitnex/fragments/RepositoriesByOrgFragment.java b/app/src/main/java/org/mian/gitnex/fragments/RepositoriesByOrgFragment.java index f3722d65..7b6b983f 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/RepositoriesByOrgFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/RepositoriesByOrgFragment.java @@ -126,9 +126,9 @@ public class RepositoriesByOrgFragment extends Fragment { super.onResume(); - if(MainActivity.repoCreated) { + if(MainActivity.reloadRepos) { repositoriesViewModel.loadReposList(page, resultLimit, null, "org", orgName, getContext()); - MainActivity.repoCreated = false; + MainActivity.reloadRepos = false; } } diff --git a/app/src/main/java/org/mian/gitnex/fragments/RepositoriesFragment.java b/app/src/main/java/org/mian/gitnex/fragments/RepositoriesFragment.java index b53df8d9..e689cab0 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/RepositoriesFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/RepositoriesFragment.java @@ -115,10 +115,10 @@ public class RepositoriesFragment extends Fragment { public void onResume() { super.onResume(); - if(MainActivity.repoCreated) { + if(MainActivity.reloadRepos) { page = 1; fetchDataAsync(); - MainActivity.repoCreated = false; + MainActivity.reloadRepos = false; } } diff --git a/app/src/main/java/org/mian/gitnex/fragments/StarredRepositoriesFragment.java b/app/src/main/java/org/mian/gitnex/fragments/StarredRepositoriesFragment.java index 1458e2da..fffbdde1 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/StarredRepositoriesFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/StarredRepositoriesFragment.java @@ -142,10 +142,10 @@ public class StarredRepositoriesFragment extends Fragment { public void onResume() { super.onResume(); - if(MainActivity.repoCreated) { + if(MainActivity.reloadRepos) { page = 1; fetchDataAsync(); - MainActivity.repoCreated = false; + MainActivity.reloadRepos = false; } }