From d3b88f3311fa8d1ca093f0881efc28f43967bb32 Mon Sep 17 00:00:00 2001 From: M M Arif Date: Mon, 10 Nov 2025 16:10:22 +0100 Subject: [PATCH] Global repo settings (#1548) As title Reviewed-on: https://codeberg.org/gitnex/GitNex/pulls/1548 Co-authored-by: M M Arif Co-committed-by: M M Arif --- .../mian/gitnex/api/clients/ApiInterface.java | 4 + .../api/models/settings/RepositoryGlobal.java | 58 +++++ .../fragments/AdministrationFragment.java | 85 ++++-- app/src/main/res/drawable/ic_directory.xml | 6 +- app/src/main/res/drawable/ic_directory_2.xml | 13 + ...ottom_sheet_global_repository_settings.xml | 243 ++++++++++++++++++ .../res/layout/fragment_administration.xml | 40 ++- app/src/main/res/values/strings.xml | 8 + 8 files changed, 438 insertions(+), 19 deletions(-) create mode 100644 app/src/main/java/org/mian/gitnex/api/models/settings/RepositoryGlobal.java create mode 100644 app/src/main/res/drawable/ic_directory_2.xml create mode 100644 app/src/main/res/layout/bottom_sheet_global_repository_settings.xml diff --git a/app/src/main/java/org/mian/gitnex/api/clients/ApiInterface.java b/app/src/main/java/org/mian/gitnex/api/clients/ApiInterface.java index 59578173..d6f9a9ca 100644 --- a/app/src/main/java/org/mian/gitnex/api/clients/ApiInterface.java +++ b/app/src/main/java/org/mian/gitnex/api/clients/ApiInterface.java @@ -2,6 +2,7 @@ package org.mian.gitnex.api.clients; import java.util.List; import org.mian.gitnex.api.models.contents.RepoGetContentsList; +import org.mian.gitnex.api.models.settings.RepositoryGlobal; import org.mian.gitnex.api.models.topics.Topics; import retrofit2.Call; import retrofit2.http.DELETE; @@ -40,4 +41,7 @@ public interface ApiInterface { @DELETE("repos/{owner}/{repo}/topics/{topic}") // delete a repo topic Call deleteRepoTopic( @Path("owner") String owner, @Path("repo") String repo, @Path("topic") String topic); + + @GET("settings/repository") // get repository global settings + Call getRepositoryGlobalSettings(); } diff --git a/app/src/main/java/org/mian/gitnex/api/models/settings/RepositoryGlobal.java b/app/src/main/java/org/mian/gitnex/api/models/settings/RepositoryGlobal.java new file mode 100644 index 00000000..8cf58fed --- /dev/null +++ b/app/src/main/java/org/mian/gitnex/api/models/settings/RepositoryGlobal.java @@ -0,0 +1,58 @@ +package org.mian.gitnex.api.models.settings; + +import com.google.gson.annotations.SerializedName; + +/** + * @author mmarif + */ +public class RepositoryGlobal { + + @SerializedName("forks_disabled") + private boolean forksDisabled; + + @SerializedName("migrations_disabled") + private boolean migrationsDisabled; + + @SerializedName("http_git_disabled") + private boolean httpGitDisabled; + + @SerializedName("lfs_disabled") + private boolean lfsDisabled; + + @SerializedName("mirrors_disabled") + private boolean mirrorsDisabled; + + @SerializedName("time_tracking_disabled") + private boolean timeTrackingDisabled; + + @SerializedName("stars_disabled") + private boolean starsDisabled; + + public boolean isForksDisabled() { + return forksDisabled; + } + + public boolean isMigrationsDisabled() { + return migrationsDisabled; + } + + public boolean isHttpGitDisabled() { + return httpGitDisabled; + } + + public boolean isLfsDisabled() { + return lfsDisabled; + } + + public boolean isMirrorsDisabled() { + return mirrorsDisabled; + } + + public boolean isTimeTrackingDisabled() { + return timeTrackingDisabled; + } + + public boolean isStarsDisabled() { + return starsDisabled; + } +} diff --git a/app/src/main/java/org/mian/gitnex/fragments/AdministrationFragment.java b/app/src/main/java/org/mian/gitnex/fragments/AdministrationFragment.java index 77aaecbd..7531c769 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/AdministrationFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/AdministrationFragment.java @@ -8,40 +8,44 @@ import android.view.ViewGroup; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; +import com.google.android.material.bottomsheet.BottomSheetDialog; import org.mian.gitnex.activities.AdminCronTasksActivity; import org.mian.gitnex.activities.AdminGetUsersActivity; import org.mian.gitnex.activities.AdminUnadoptedReposActivity; -import org.mian.gitnex.activities.BaseActivity; +import org.mian.gitnex.api.clients.ApiRetrofitClient; +import org.mian.gitnex.api.models.settings.RepositoryGlobal; +import org.mian.gitnex.databinding.BottomSheetGlobalRepositorySettingsBinding; import org.mian.gitnex.databinding.FragmentAdministrationBinding; +import retrofit2.Call; +import retrofit2.Callback; +import retrofit2.Response; /** - * @author M M Arif + * @author mmarif */ public class AdministrationFragment extends Fragment { + private FragmentAdministrationBinding binding; + private BottomSheetDialog settingsBottomSheet; + public View onCreateView( @NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { - FragmentAdministrationBinding fragmentAdministrationBinding = - FragmentAdministrationBinding.inflate(inflater, container, false); + binding = FragmentAdministrationBinding.inflate(inflater, container, false); - fragmentAdministrationBinding.systemUsersFrame.setOnClickListener( + binding.systemUsersFrame.setOnClickListener( v1 -> startActivity(new Intent(getContext(), AdminGetUsersActivity.class))); - // if gitea version is greater/equal(1.13.0) than user installed version - // (installed.higherOrEqual(compareVer)) - if (((BaseActivity) requireActivity()).getAccount().requiresVersion("1.13.0")) { - - fragmentAdministrationBinding.adminCronFrame.setVisibility(View.VISIBLE); - } - - fragmentAdministrationBinding.adminCronFrame.setOnClickListener( + binding.adminCronFrame.setOnClickListener( v1 -> startActivity(new Intent(getContext(), AdminCronTasksActivity.class))); - fragmentAdministrationBinding.unadoptedReposFrame.setOnClickListener( + + binding.unadoptedReposFrame.setOnClickListener( v1 -> startActivity(new Intent(getContext(), AdminUnadoptedReposActivity.class))); + binding.adminRepositoryFrame.setOnClickListener(v -> showRepositorySettings()); + String action = requireActivity().getIntent().getStringExtra("giteaAdminAction"); if (action != null) { if (action.equals("users")) { @@ -51,6 +55,57 @@ public class AdministrationFragment extends Fragment { } } - return fragmentAdministrationBinding.getRoot(); + return binding.getRoot(); + } + + private void showRepositorySettings() { + settingsBottomSheet = new BottomSheetDialog(requireContext()); + BottomSheetGlobalRepositorySettingsBinding sheetBinding = + BottomSheetGlobalRepositorySettingsBinding.inflate( + LayoutInflater.from(requireContext())); + settingsBottomSheet.setContentView(sheetBinding.getRoot()); + + loadRepositorySettings(sheetBinding); + + settingsBottomSheet.show(); + } + + private void loadRepositorySettings(BottomSheetGlobalRepositorySettingsBinding sheetBinding) { + Call call = + ApiRetrofitClient.getInstance(requireContext()).getRepositoryGlobalSettings(); + + call.enqueue( + new Callback<>() { + @Override + public void onResponse( + @NonNull Call call, + @NonNull Response response) { + if (response.isSuccessful() && response.body() != null) { + RepositoryGlobal settings = response.body(); + updateSettingsUI(sheetBinding, settings); + } + } + + @Override + public void onFailure( + @NonNull Call call, @NonNull Throwable t) {} + }); + } + + private void updateSettingsUI( + BottomSheetGlobalRepositorySettingsBinding sheetBinding, RepositoryGlobal settings) { + sheetBinding.forksDisabledValue.setText( + settings.isForksDisabled() ? "Disabled" : "Enabled"); + sheetBinding.migrationsDisabledValue.setText( + settings.isMigrationsDisabled() ? "Disabled" : "Enabled"); + sheetBinding.httpGitDisabledValue.setText( + settings.isHttpGitDisabled() ? "Disabled" : "Enabled"); + sheetBinding.lfsDisabledValue.setText(settings.isLfsDisabled() ? "Disabled" : "Enabled"); + sheetBinding.mirrorsDisabledValue.setText( + settings.isMirrorsDisabled() ? "Disabled" : "Enabled"); + sheetBinding.timeTrackingDisabledValue.setText( + settings.isTimeTrackingDisabled() ? "Disabled" : "Enabled"); + sheetBinding.starsDisabledValue.setText( + settings.isStarsDisabled() ? "Disabled" : "Enabled"); } } diff --git a/app/src/main/res/drawable/ic_directory.xml b/app/src/main/res/drawable/ic_directory.xml index 14f7f97f..50a5ba51 100644 --- a/app/src/main/res/drawable/ic_directory.xml +++ b/app/src/main/res/drawable/ic_directory.xml @@ -1,5 +1,5 @@ - - - + + + diff --git a/app/src/main/res/drawable/ic_directory_2.xml b/app/src/main/res/drawable/ic_directory_2.xml new file mode 100644 index 00000000..7fa464f8 --- /dev/null +++ b/app/src/main/res/drawable/ic_directory_2.xml @@ -0,0 +1,13 @@ + + + diff --git a/app/src/main/res/layout/bottom_sheet_global_repository_settings.xml b/app/src/main/res/layout/bottom_sheet_global_repository_settings.xml new file mode 100644 index 00000000..bbce85b1 --- /dev/null +++ b/app/src/main/res/layout/bottom_sheet_global_repository_settings.xml @@ -0,0 +1,243 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_administration.xml b/app/src/main/res/layout/fragment_administration.xml index 1ee757e4..53c80ef4 100644 --- a/app/src/main/res/layout/fragment_administration.xml +++ b/app/src/main/res/layout/fragment_administration.xml @@ -116,7 +116,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:contentDescription="@string/generalImgContentText" - app:srcCompat="@drawable/ic_directory" /> + app:srcCompat="@drawable/ic_directory_2" /> + + + + + + + + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 63e7f933..8db6a02b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -604,6 +604,11 @@ Idle Value Optional + Loading… + Migrations + LFS + Mirrors + Stars Explore users @@ -1005,6 +1010,7 @@ Search failed No matching results found + Time Tracking Tracked Time No time tracked yet Total: %1$dh %2$dm %3$ds @@ -1049,4 +1055,6 @@ Error deleting topic Error loading topics Invalid topic name + + HTTP Git