From 107cd22b1a908f7264f4a0b49558c4c7bd393c98 Mon Sep 17 00:00:00 2001 From: qwerty287 Date: Sun, 17 Jul 2022 13:12:17 +0200 Subject: [PATCH] Review suggestions --- .../mian/gitnex/activities/RepoDetailActivity.java | 13 ++++++++----- .../org/mian/gitnex/fragments/RepoInfoFragment.java | 7 ++++++- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java b/app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java index 0ada47eb..f5ae2dd5 100644 --- a/app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java @@ -26,8 +26,11 @@ import androidx.viewpager2.widget.ViewPager2; import com.google.android.material.progressindicator.LinearProgressIndicator; import com.google.android.material.tabs.TabLayout; import com.google.android.material.tabs.TabLayoutMediator; -import org.gitnex.tea4j.v2.models.*; -import org.jetbrains.annotations.NotNull; +import org.gitnex.tea4j.v2.models.Branch; +import org.gitnex.tea4j.v2.models.Milestone; +import org.gitnex.tea4j.v2.models.Organization; +import org.gitnex.tea4j.v2.models.Repository; +import org.gitnex.tea4j.v2.models.WatchInfo; import org.mian.gitnex.R; import org.mian.gitnex.clients.RetrofitClient; import org.mian.gitnex.fragments.BottomSheetIssuesFilterFragment; @@ -135,7 +138,7 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetListe Toolbar toolbar = findViewById(R.id.toolbar); TextView toolbarTitle = findViewById(R.id.toolbar_title); - toolbarTitle.setText(repository.getName()); + toolbarTitle.setText(repository.getFullName()); setSupportActionBar(toolbar); Objects.requireNonNull(getSupportActionBar()).setTitle(repository.getName()); @@ -180,7 +183,7 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetListe RetrofitClient.getApiInterface(ctx).orgGet(repository.getOwner()).enqueue(new Callback<>() { @Override - public void onResponse(@NotNull Call call, @NotNull Response response) { + public void onResponse(@NonNull Call call, @NonNull Response response) { Intent intent = new Intent(ctx, response.isSuccessful() ? OrganizationDetailActivity.class : ProfileActivity.class); intent.putExtra(response.isSuccessful() ? "orgName" : "username", repository.getOwner()); intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); @@ -189,7 +192,7 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetListe } @Override - public void onFailure(@NotNull Call call, @NotNull Throwable t) { + public void onFailure(@NonNull Call call, @NonNull Throwable t) { finish(); } }); 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 6d9d5582..9b0cbccd 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/RepoInfoFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/RepoInfoFragment.java @@ -16,7 +16,12 @@ import org.gitnex.tea4j.v2.models.Organization; import org.gitnex.tea4j.v2.models.Repository; import org.jetbrains.annotations.NotNull; import org.mian.gitnex.R; -import org.mian.gitnex.activities.*; +import org.mian.gitnex.activities.OrganizationDetailActivity; +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.activities.ProfileActivity; import org.mian.gitnex.clients.RetrofitClient; import org.mian.gitnex.databinding.FragmentRepoInfoBinding; import org.mian.gitnex.helpers.AlertDialogs;