From 87ba0ef6aeec9921cb04c972e9c194463fcb4f73 Mon Sep 17 00:00:00 2001 From: Aleksandr Zhukov Date: Thu, 18 Jun 2026 14:54:37 +0200 Subject: [PATCH 1/4] Remove twitter login option for SocialAuthActivity.kt --- .../droid/ui/adapters/SocialAuthAdapter.java | 42 ++----------------- .../android/view/auth/model/SocialNetwork.kt | 1 - .../auth/ui/activity/SocialAuthActivity.kt | 38 ++--------------- .../res/drawable/ic_login_social_twitter.xml | 6 --- .../main/res/layout/activity_auth_social.xml | 22 +--------- app/src/main/res/values-be/strings.xml | 2 - app/src/main/res/values-ru/strings.xml | 2 - app/src/main/res/values/strings.xml | 2 - 8 files changed, 8 insertions(+), 107 deletions(-) delete mode 100644 app/src/main/res/drawable/ic_login_social_twitter.xml diff --git a/app/src/main/java/org/stepic/droid/ui/adapters/SocialAuthAdapter.java b/app/src/main/java/org/stepic/droid/ui/adapters/SocialAuthAdapter.java index f93780b806..73e65cda2c 100644 --- a/app/src/main/java/org/stepic/droid/ui/adapters/SocialAuthAdapter.java +++ b/app/src/main/java/org/stepic/droid/ui/adapters/SocialAuthAdapter.java @@ -16,28 +16,12 @@ import kotlin.jvm.functions.Function1; public class SocialAuthAdapter extends RecyclerView.Adapter implements OnItemClickListener { - private SocialNetwork[] socialList; - private Function1 onSocialItemClick; + private final SocialNetwork[] socialList; + private final Function1 onSocialItemClick; - private State state; - - public enum State { - EXPANDED(4), NORMAL(3); - - public final int multiplier; - State(int multiplier) { - this.multiplier = multiplier; - } - } - - public SocialAuthAdapter(Function1 onSocialItemClick, State state) { + public SocialAuthAdapter(Function1 onSocialItemClick) { this.onSocialItemClick = onSocialItemClick; socialList = SocialNetwork.values(); - if (state == null) { - this.state = State.NORMAL; - } else { - this.state = state; - } } @@ -56,7 +40,7 @@ public void onBindViewHolder(SocialViewHolder holder, int position) { @Override public int getItemCount() { - return state.multiplier; + return socialList.length; } @Override @@ -64,24 +48,6 @@ public void onItemClick(int position) { onSocialItemClick.invoke(socialList[position]); } - public void showMore() { - int start = getItemCount(); - state = State.EXPANDED; - int end = getItemCount(); - notifyItemRangeInserted(start, end - start); - } - - public void showLess() { - int end = getItemCount(); - state = State.NORMAL; - int start = getItemCount(); - notifyItemRangeRemoved(start, end - start); - } - - public State getState() { - return state; - } - static class SocialViewHolder extends RecyclerView.ViewHolder { private final ImageView imageView; diff --git a/app/src/main/java/org/stepik/android/view/auth/model/SocialNetwork.kt b/app/src/main/java/org/stepik/android/view/auth/model/SocialNetwork.kt index fb59c57dcf..67aaa930f3 100644 --- a/app/src/main/java/org/stepik/android/view/auth/model/SocialNetwork.kt +++ b/app/src/main/java/org/stepik/android/view/auth/model/SocialNetwork.kt @@ -15,6 +15,5 @@ enum class SocialNetwork( GOOGLE("google", R.drawable.ic_login_social_google), VK("vk", R.drawable.ic_login_social_vk, isNeedUseAccessTokenInsteadOfCode = true), // FACEBOOK("facebook", R.drawable.ic_login_social_fb, isNeedUseAccessTokenInsteadOfCode = true), - TWITTER("twitter", R.drawable.ic_login_social_twitter), GITHUB("github", R.drawable.ic_login_social_github) } \ No newline at end of file diff --git a/app/src/main/java/org/stepik/android/view/auth/ui/activity/SocialAuthActivity.kt b/app/src/main/java/org/stepik/android/view/auth/ui/activity/SocialAuthActivity.kt index 93b5e319c2..525a3900af 100644 --- a/app/src/main/java/org/stepik/android/view/auth/ui/activity/SocialAuthActivity.kt +++ b/app/src/main/java/org/stepik/android/view/auth/ui/activity/SocialAuthActivity.kt @@ -20,7 +20,6 @@ import com.vk.api.sdk.auth.VKAccessToken import com.vk.api.sdk.auth.VKAuthCallback import com.vk.api.sdk.auth.VKScope import com.vk.api.sdk.exceptions.VKApiCodes -import jp.wasabeef.recyclerview.animators.FadeInDownAnimator import org.stepic.droid.R import org.stepic.droid.analytic.Analytic import org.stepic.droid.analytic.experiments.DeferredAuthSplitTest @@ -55,7 +54,6 @@ class SocialAuthActivity : SmartLockActivityBase(), SocialAuthView, SocialAuthCo companion object { private const val REQUEST_CODE_GOOGLE_SIGN_IN = 7007 - private const val KEY_SOCIAL_ADAPTER_STATE = "social_adapter_state_key" private const val KEY_SELECTED_SOCIAL_TYPE = "selected_social_type" private const val EXTRA_WAS_LOGOUT_KEY = "wasLogoutKey" @@ -135,12 +133,7 @@ class SocialAuthActivity : SmartLockActivityBase(), SocialAuthView, SocialAuthCo initGoogleApiClient(true) { showNetworkError() } - val recyclerState = savedInstanceState?.getSerializable(KEY_SOCIAL_ADAPTER_STATE) - if (recyclerState is SocialAuthAdapter.State) { - initSocialRecycler(recyclerState) - } else { - initSocialRecycler() - } + initSocialRecycler() selectedSocialType = savedInstanceState?.getSerializable(KEY_SELECTED_SOCIAL_TYPE) as? SocialNetwork @@ -208,31 +201,10 @@ class SocialAuthActivity : SmartLockActivityBase(), SocialAuthView, SocialAuthCo super.onPause() } - private fun initSocialRecycler(state: SocialAuthAdapter.State = SocialAuthAdapter.State.NORMAL) { + private fun initSocialRecycler() { binding.socialListRecyclerView.layoutManager = GridLayoutManager(this, 3) - binding.socialListRecyclerView.itemAnimator = FadeInDownAnimator() - .apply { - removeDuration = 0 - } - - val adapter = SocialAuthAdapter(this::onSocialItemClicked, state) - binding.showMore.setOnClickListener { - binding.showMore.isVisible = false - binding.showLess.isVisible = true - adapter.showMore() - } - - binding.showLess.setOnClickListener { - binding.showLess.isVisible = false - binding.showMore.isVisible = true - adapter.showLess() - } - - binding.showLess.isVisible = state == SocialAuthAdapter.State.EXPANDED - binding.showMore.isVisible = state == SocialAuthAdapter.State.NORMAL - - binding.socialListRecyclerView.adapter = adapter + binding.socialListRecyclerView.adapter = SocialAuthAdapter(this::onSocialItemClicked) } private fun onSocialItemClicked(type: SocialNetwork) { @@ -391,10 +363,6 @@ class SocialAuthActivity : SmartLockActivityBase(), SocialAuthView, SocialAuthCo } override fun onSaveInstanceState(outState: Bundle) { - val adapter = binding.socialListRecyclerView.adapter - if (adapter is SocialAuthAdapter) { - outState.putSerializable(KEY_SOCIAL_ADAPTER_STATE, adapter.state) - } selectedSocialType?.let { outState.putSerializable(KEY_SELECTED_SOCIAL_TYPE, it) } super.onSaveInstanceState(outState) } diff --git a/app/src/main/res/drawable/ic_login_social_twitter.xml b/app/src/main/res/drawable/ic_login_social_twitter.xml deleted file mode 100644 index b415802f33..0000000000 --- a/app/src/main/res/drawable/ic_login_social_twitter.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - diff --git a/app/src/main/res/layout/activity_auth_social.xml b/app/src/main/res/layout/activity_auth_social.xml index 4273f96c62..f7f65ba8dc 100644 --- a/app/src/main/res/layout/activity_auth_social.xml +++ b/app/src/main/res/layout/activity_auth_social.xml @@ -94,7 +94,7 @@ app:layout_constraintTop_toBottomOf="@id/stepikLogo" app:layout_constraintBottom_toTopOf="@id/bottomButtons" - android:layout_marginTop="36dp"> + android:layout_marginTop="32dp"> -