From ab959557a056b4e20aaae48174c0dee0fd29a875 Mon Sep 17 00:00:00 2001 From: M M Arif Date: Sat, 30 Apr 2022 15:47:10 +0500 Subject: [PATCH] Fix delete repo selection area, fix follow/unfollow layout --- .../RepositorySettingsActivity.java | 18 +++++++--------- .../BottomSheetUserProfileFragment.java | 21 +++++++++---------- .../layout/activity_repository_settings.xml | 2 +- .../res/layout/bottom_sheet_user_profile.xml | 16 +++++++++++++- app/src/main/res/values/strings.xml | 2 +- 5 files changed, 34 insertions(+), 25 deletions(-) diff --git a/app/src/main/java/org/mian/gitnex/activities/RepositorySettingsActivity.java b/app/src/main/java/org/mian/gitnex/activities/RepositorySettingsActivity.java index d8c3b6d6..4d990c43 100644 --- a/app/src/main/java/org/mian/gitnex/activities/RepositorySettingsActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/RepositorySettingsActivity.java @@ -23,11 +23,12 @@ import org.mian.gitnex.databinding.CustomRepositoryEditPropertiesDialogBinding; import org.mian.gitnex.databinding.CustomRepositoryTransferDialogBinding; import org.mian.gitnex.helpers.Toasty; import org.mian.gitnex.helpers.contexts.RepositoryContext; +import java.util.Objects; import retrofit2.Call; import retrofit2.Callback; /** - * Author M M Arif + * @author M M Arif */ public class RepositorySettingsActivity extends BaseActivity { @@ -58,15 +59,9 @@ public class RepositorySettingsActivity extends BaseActivity { initCloseListener(); closeActivity.setOnClickListener(onClickListener); - // require gitea 1.12 or higher - if(getAccount().requiresVersion("1.12.0")) { - - viewBinding.transferOwnerFrame.setVisibility(View.VISIBLE); - } - viewBinding.editProperties.setOnClickListener(editProperties -> showRepositoryProperties()); - viewBinding.deleteRepository.setOnClickListener(deleteRepository -> showDeleteRepository()); + viewBinding.deleteRepositoryFrame.setOnClickListener(deleteRepository -> showDeleteRepository()); viewBinding.transferOwnerFrame.setOnClickListener(transferRepositoryOwnership -> showTransferRepository()); } @@ -133,7 +128,7 @@ public class RepositorySettingsActivity extends BaseActivity { Toasty.success(ctx, getString(R.string.repoTransferSuccess)); finish(); - BaseApi.getInstance(ctx, RepositoriesApi.class).deleteRepository(repository.getRepositoryId()); + Objects.requireNonNull(BaseApi.getInstance(ctx, RepositoriesApi.class)).deleteRepository(repository.getRepositoryId()); Intent intent = new Intent(RepositorySettingsActivity.this, MainActivity.class); RepositorySettingsActivity.this.startActivity(intent); } @@ -214,7 +209,7 @@ public class RepositorySettingsActivity extends BaseActivity { Toasty.success(ctx, getString(R.string.repoDeletionSuccess)); finish(); - BaseApi.getInstance(ctx, RepositoriesApi.class).deleteRepository(repository.getRepositoryId()); + Objects.requireNonNull(BaseApi.getInstance(ctx, RepositoriesApi.class)).deleteRepository(repository.getRepositoryId()); Intent intent = new Intent(RepositorySettingsActivity.this, MainActivity.class); RepositorySettingsActivity.this.startActivity(intent); } @@ -346,7 +341,8 @@ public class RepositorySettingsActivity extends BaseActivity { repository.setRepository(response.body()); if(!repository.getName().equals(repoName)) { - BaseApi.getInstance(ctx, RepositoriesApi.class).updateRepositoryOwnerAndName(repository.getOwner(), repoName, repository.getRepositoryId()); + Objects.requireNonNull(BaseApi.getInstance(ctx, RepositoriesApi.class)) + .updateRepositoryOwnerAndName(repository.getOwner(), repoName, repository.getRepositoryId()); Intent result = new Intent(); result.putExtra("nameChanged", true); setResult(200, result); diff --git a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetUserProfileFragment.java b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetUserProfileFragment.java index eedcdd12..a803f304 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetUserProfileFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetUserProfileFragment.java @@ -1,16 +1,13 @@ package org.mian.gitnex.fragments; import android.content.Context; -import android.graphics.drawable.Drawable; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import androidx.appcompat.content.res.AppCompatResources; import com.google.android.material.bottomsheet.BottomSheetDialogFragment; -import org.mian.gitnex.R; import org.mian.gitnex.databinding.BottomSheetUserProfileBinding; import org.mian.gitnex.structs.BottomSheetListener; @@ -36,19 +33,22 @@ public class BottomSheetUserProfileFragment extends BottomSheetDialogFragment { BottomSheetUserProfileBinding bottomSheetUserProfileBinding = BottomSheetUserProfileBinding.inflate(inflater, container, false); if(following) { - bottomSheetUserProfileBinding.followUnfollowUser.setText(R.string.unfollowUser); - Drawable drawable = AppCompatResources.getDrawable(requireContext(), R.drawable.ic_person_remove); assert drawable != null; - drawable.setBounds(0, 0, drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight()); - bottomSheetUserProfileBinding.followUnfollowUser.setCompoundDrawablesRelative(drawable, null, null, null); + bottomSheetUserProfileBinding.unfollowUser.setVisibility(View.VISIBLE); + bottomSheetUserProfileBinding.followUser.setVisibility(View.GONE); } - bottomSheetUserProfileBinding.followUnfollowUser.setOnClickListener(v1 -> { + bottomSheetUserProfileBinding.followUser.setOnClickListener(v1 -> { bmListener.onButtonClicked("follow"); dismiss(); - }); + bottomSheetUserProfileBinding.unfollowUser.setOnClickListener(v1 -> { + + bmListener.onButtonClicked("follow"); + dismiss(); + }); + return bottomSheetUserProfileBinding.getRoot(); } @@ -60,8 +60,7 @@ public class BottomSheetUserProfileFragment extends BottomSheetDialogFragment { bmListener = (BottomSheetListener) context; } catch (ClassCastException e) { - throw new ClassCastException(context.toString() + " must implement BottomSheetListener"); + throw new ClassCastException(context + " must implement BottomSheetListener"); } } - } diff --git a/app/src/main/res/layout/activity_repository_settings.xml b/app/src/main/res/layout/activity_repository_settings.xml index e2c05b51..346ff102 100644 --- a/app/src/main/res/layout/activity_repository_settings.xml +++ b/app/src/main/res/layout/activity_repository_settings.xml @@ -85,7 +85,6 @@ android:orientation="vertical" android:focusable="true" android:clickable="true" - android:visibility="gone" tools:visibility="visible"> + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 90908b6c..696163c0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -469,7 +469,7 @@ Edit Delete Copy - Quote and Reply + Quote Reply \u0020\u0020\u0020\u25CF\u0020\u0020\u0020 edited Save