From ec105f2b55ce1e0586c15e0ddad812f623c22548 Mon Sep 17 00:00:00 2001 From: aliveoutside <53598473+aliveoutside@users.noreply.github.com> Date: Mon, 20 Jun 2022 00:12:57 +0300 Subject: [PATCH] partially ifx --- app/build.gradle | 3 +- .../lite/ui/fragments/VTSettings.java | 2 - .../ui/fragments/dockbar/DockBarAdapter.java | 16 +-- .../ui/fragments/dockbar/DockBarFragment.java | 28 +++--- .../dockbar/ItemTouchHelperCallback.java | 24 ++--- .../tgstickers/StickersFragment.java | 97 +++++++++---------- 6 files changed, 85 insertions(+), 85 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c8492dab1..2503d39a9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,7 +12,6 @@ versionFile { file = new File(moduleDir.getAbsolutePath() + "/src/main/assets/version.properties") } - task exportDex { doLast { try { @@ -74,7 +73,7 @@ android { defaultConfig { applicationId "ru.vtosters.lite.utils.lite" - minSdkVersion 19 + minSdkVersion 23 targetSdkVersion 31 versionCode 1 versionName "1.0" diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java index dfb67658c..1e83f3636 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java @@ -7,12 +7,10 @@ import static ru.vtosters.lite.utils.About.getCommitLink; import static ru.vtosters.lite.utils.CacheUtils.humanReadableByteCountBin; import static ru.vtosters.lite.utils.Globals.drawableFromUrl; import static ru.vtosters.lite.utils.Globals.edit; -import static ru.vtosters.lite.utils.Globals.getCenterScreenCoords; import static ru.vtosters.lite.utils.Globals.getIdentifier; import static ru.vtosters.lite.utils.Globals.getPrefsValue; import static ru.vtosters.lite.utils.Globals.getUserId; import static ru.vtosters.lite.utils.Globals.isGmsInstalled; -import static ru.vtosters.lite.utils.Globals.restartApplicationWithTimer; import static ru.vtosters.lite.utils.Preferences.ads; import static ru.vtosters.lite.utils.Preferences.devmenu; import static ru.vtosters.lite.utils.Preferences.disableSettingsSumms; diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarAdapter.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarAdapter.java index b10330885..0c7d987e3 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarAdapter.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarAdapter.java @@ -3,6 +3,7 @@ package ru.vtosters.lite.ui.fragments.dockbar; import static ru.vtosters.lite.utils.Globals.convertDpToPixel; import static ru.vtosters.lite.utils.Globals.getContext; +import android.annotation.SuppressLint; import android.content.res.ColorStateList; import android.graphics.Typeface; import android.view.Gravity; @@ -18,7 +19,7 @@ import java.util.List; import ru.vtosters.lite.utils.Themes; -public class DockBarAdapter extends RecyclerView.a +public class DockBarAdapter extends RecyclerView.Adapter implements IItemTouchHelper { public static final int SELECTED_TAB_TYPE = 1; @@ -29,7 +30,7 @@ public class DockBarAdapter extends RecyclerView.a private final DockBarManager mDockBarManager = DockBarManager.getInstance(); @Override - public RecyclerView.a b(ViewGroup parent, int viewType) { + public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { if (viewType == GROUP_TITLE_TYPE) { return new GroupViewHolder(createGroupTitle()); } else { @@ -38,10 +39,11 @@ public class DockBarAdapter extends RecyclerView.a } @Override - public int b(int i) { + public int getItemViewType(int i) { return getItemType(i); } + @SuppressLint("NewApi") private View createTabItem() { LinearLayout container = new LinearLayout(getContext()); container.setTag("tab_item_container"); @@ -97,7 +99,7 @@ public class DockBarAdapter extends RecyclerView.a } @Override - public void a(RecyclerView.x holder, int position) { + public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) { if (holder instanceof GroupViewHolder) { ((GroupViewHolder) holder).bind(mDockBarManager.getGroupTitle(position)); } else { @@ -111,7 +113,7 @@ public class DockBarAdapter extends RecyclerView.a } @Override - public int au_() { + public int getItemCount() { return mDockBarManager.getItemCount(); } @@ -156,7 +158,7 @@ public class DockBarAdapter extends RecyclerView.a return mDockBarManager.getItemType(position); } - static class DockBarEditViewHolder extends RecyclerView.x { + static class DockBarEditViewHolder extends RecyclerView.ViewHolder { private final ImageView mIcon; private final TextView mTitle; @@ -174,7 +176,7 @@ public class DockBarAdapter extends RecyclerView.a } } - static class GroupViewHolder extends RecyclerView.x { + static class GroupViewHolder extends RecyclerView.ViewHolder { private final TextView mGroupTitle; diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarFragment.java index a72815135..d7f048863 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarFragment.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarFragment.java @@ -17,24 +17,26 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.vk.core.fragments.FragmentImpl.a; +import com.vtosters.lite.fragments.MaterialPreferenceToolbarFragment; import me.grishka.appkit.fragments.ToolbarFragment; +import ru.vtosters.lite.utils.Globals; -public class DockBarFragment extends ToolbarFragment { +public class DockBarFragment extends MaterialPreferenceToolbarFragment { private RecyclerView mRecyclerView; private DockBarAdapter mAdapter; private ItemTouchHelper mItemTouchHelper; @Override - public View d(LayoutInflater layoutInflater, ViewGroup viewGroup, Bundle bundle) { - super.b(bundle); + public View onCreateView(LayoutInflater layoutInflater, ViewGroup viewGroup, Bundle bundle) { + super.onCreate(bundle); - LinearLayout container = new LinearLayout(n()); + LinearLayout container = new LinearLayout(getContext()); container.setLayoutParams(new FrameLayout.LayoutParams(-1, -1)); container.setOrientation(LinearLayout.VERTICAL); - LinearLayout buttonsContainer = new LinearLayout(n()); + LinearLayout buttonsContainer = new LinearLayout(getContext()); buttonsContainer.setPadding( convertDpToPixel(13), convertDpToPixel(10), @@ -43,8 +45,8 @@ public class DockBarFragment extends ToolbarFragment { ); container.addView(buttonsContainer, new LinearLayout.LayoutParams(-1, -2)); - TextView save = new TextView(new ContextThemeWrapper(n(), com.vtosters.lite.R.style.VKUIButton_Primary)); - save.setText(getString("dockbar_save")); + TextView save = new TextView(new ContextThemeWrapper(getContext(), com.vtosters.lite.R.style.VKUIButton_Primary)); + save.setText(Globals.getString("dockbar_save")); save.setOnClickListener(v -> { DockBarManager.getInstance().save(); restartApplication(); @@ -54,11 +56,11 @@ public class DockBarFragment extends ToolbarFragment { saveParams.weight = 1.0f; buttonsContainer.addView(save, saveParams); - View divider = new View(n()); + View divider = new View(getContext()); buttonsContainer.addView(divider, new LinearLayout.LayoutParams(convertDpToPixel(10), 0)); - TextView reset = new TextView(new ContextThemeWrapper(n(), com.vtosters.lite.R.style.VKUIButton_Primary)); - reset.setText(getString("dockbar_reset")); + TextView reset = new TextView(new ContextThemeWrapper(getContext(), com.vtosters.lite.R.style.VKUIButton_Primary)); + reset.setText(Globals.getString("dockbar_reset")); reset.setOnClickListener(v -> { DockBarManager.getInstance().delete(); restartApplication(); @@ -68,15 +70,15 @@ public class DockBarFragment extends ToolbarFragment { resetParams.weight = 1.0f; buttonsContainer.addView(reset, resetParams); - mRecyclerView = new RecyclerView(n()); + mRecyclerView = new RecyclerView(getContext()); mRecyclerView.setHasFixedSize(true); - mRecyclerView.setLayoutManager(new LinearLayoutManager(n())); + mRecyclerView.setLayoutManager(new LinearLayoutManager(getContext())); mAdapter = new DockBarAdapter(); mRecyclerView.setAdapter(mAdapter); container.addView(mRecyclerView, new LinearLayout.LayoutParams(-1, -1)); mItemTouchHelper = new ItemTouchHelper(new ItemTouchHelperCallback(mAdapter)); - mItemTouchHelper.a(mRecyclerView); + mItemTouchHelper.attachToRecyclerView(mRecyclerView); return container; } diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/ItemTouchHelperCallback.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/ItemTouchHelperCallback.java index e259b6191..ceaf25d15 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/ItemTouchHelperCallback.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/ItemTouchHelperCallback.java @@ -6,7 +6,7 @@ import androidx.recyclerview.widget.ItemTouchHelper; import androidx.recyclerview.widget.RecyclerView; -public class ItemTouchHelperCallback extends ItemTouchHelper.a { +public class ItemTouchHelperCallback extends ItemTouchHelper.Callback { private final DockBarAdapter mAdapter; @@ -14,33 +14,33 @@ public class ItemTouchHelperCallback extends ItemTouchHelper.a { this.mAdapter = mAdapter; } - @Override // isLongPressDragEnabled - public boolean a() { + @Override + public boolean isLongPressDragEnabled() { return true; } - @Override // isItemViewSwipeEnabled - public boolean b() { + @Override + public boolean isItemViewSwipeEnabled() { return false; } @Override - public int a(RecyclerView recyclerView, RecyclerView.x viewHolder) { - int pos = mAdapter.getItemType(viewHolder.d()); + public int getMovementFlags(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) { + int pos = mAdapter.getItemType(viewHolder.getAdapterPosition()); int dragFlags = pos != DockBarAdapter.GROUP_TITLE_TYPE ? androidx.recyclerview.widget.ItemTouchHelper.UP | androidx.recyclerview.widget.ItemTouchHelper.DOWN : 0; int swipeFlags = pos == 1 ? androidx.recyclerview.widget.ItemTouchHelper.START | androidx.recyclerview.widget.ItemTouchHelper.END : 0; return makeMovementFlags(dragFlags, swipeFlags); } @Override - public void a(RecyclerView.x viewHolder, int direction) { - mAdapter.onItemDismiss(viewHolder.d()); + public void onSwiped(RecyclerView.ViewHolder viewHolder, int direction) { + mAdapter.onItemDismiss(viewHolder.getItemViewType()); } @Override - public boolean b(RecyclerView recyclerView, RecyclerView.x viewHolder, RecyclerView.x target) { - if (mAdapter.getItemType(viewHolder.d()) == DockBarAdapter.GROUP_TITLE_TYPE) + public boolean onMove(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, RecyclerView.ViewHolder target) { + if (mAdapter.getItemType(viewHolder.getPosition()) == DockBarAdapter.GROUP_TITLE_TYPE) return false; - return mAdapter.onItemMove(viewHolder.d(), target.d()); + return mAdapter.onItemMove(viewHolder.getAdapterPosition(), target.getAdapterPosition()); } } diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/tgstickers/StickersFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/tgstickers/StickersFragment.java index a56e22c8b..892a67fcd 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/tgstickers/StickersFragment.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/tgstickers/StickersFragment.java @@ -37,24 +37,24 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.widget.SwitchCompat; import androidx.core.view.ViewCompat; +import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import androidx.recyclerview.widget.StaggeredGridLayoutManager; import com.aefyr.tsg.g2.TelegramStickersPack; import com.aefyr.tsg.g2.TelegramStickersService; import com.aefyr.tsg.g2.stickersgrabber.TelegramStickersGrabber; import com.google.android.material.floatingactionbutton.FloatingActionButton; -import com.vk.core.fragments.FragmentImpl.a; import com.vk.navigation.Navigator; import com.vtosters.lite.R; +import com.vtosters.lite.fragments.MaterialPreferenceToolbarFragment; import java.io.File; -import me.grishka.appkit.fragments.ToolbarFragment; import ru.vtosters.lite.tgs.TGPref; +import ru.vtosters.lite.utils.Globals; import ru.vtosters.lite.ui.PreferencesUtil; -public class StickersFragment extends ToolbarFragment { +public class StickersFragment extends MaterialPreferenceToolbarFragment { public final static String ACTION_RELOAD = "com.vtosters.lite.action.RELOAD_TGS_LIST"; @@ -118,38 +118,38 @@ public class StickersFragment extends ToolbarFragment { private void openMenu(String toast) { if (toast != null) { - makeText(super.n(), toast, LENGTH_SHORT).show(); + makeText(getContext(), toast, LENGTH_SHORT).show(); } - var intent = new Navigator(StickersPreferencesFragment.class, new Bundle()).a(super.n()); - super.n().startActivity(intent); + var intent = new Navigator(StickersPreferencesFragment.class, new Bundle()).b(getContext()); + super.getContext().startActivity(intent); } - + @Override - public void a(Menu menu, MenuInflater menuInflater) { - - super.a(menu, menuInflater); + public void onCreateOptionsMenu(Menu menu, MenuInflater menuInflater) { + super.onCreateOptionsMenu(menu, menuInflater); MenuItem add = menu.add(0, 0, 0, ""); add.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); add.setIcon(getResources().getDrawable(com.vtosters.lite.R.drawable.ic_settings_24)); } - + + @Override - public boolean a_(MenuItem arg0) { + public boolean onOptionsItemSelected(MenuItem arg0) { openMenu(null); return true; } private void enterBotKey(Runnable r) { - LinearLayout linearLayout = new LinearLayout(super.n()); + LinearLayout linearLayout = new LinearLayout(getContext()); - final EditText editText = new EditText(super.n()); - editText.setHintTextColor(PreferencesUtil.getSTextColor(super.n())); + final EditText editText = new EditText(getContext()); + editText.setHintTextColor(PreferencesUtil.getSTextColor(getContext())); // Костыль для китката if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - editText.setBackgroundTintList(ColorStateList.valueOf(PreferencesUtil.getTextColor(super.n()))); + editText.setBackgroundTintList(ColorStateList.valueOf(PreferencesUtil.getTextColor(getContext()))); } else { - ViewCompat.setBackgroundTintList(editText, ColorStateList.valueOf(PreferencesUtil.getTextColor(super.n()))); + ViewCompat.setBackgroundTintList(editText, ColorStateList.valueOf(PreferencesUtil.getTextColor(getContext()))); } linearLayout.addView(editText); @@ -158,28 +158,28 @@ public class StickersFragment extends ToolbarFragment { margin.setMargins(convertDpToPixel(24f), 0, convertDpToPixel(24f), 0); editText.setLayoutParams(margin); - new AlertDialog.Builder(super.n()) - .setTitle(getString("stickersapi5")) - .setMessage(getString("stickersapi6")) + new AlertDialog.Builder(getContext()) + .setTitle(Globals.getString("stickersapi5")) + .setMessage(Globals.getString("stickersapi6")) .setView(linearLayout) .setPositiveButton(android.R.string.ok, (dialog, which) -> { TGPref.setTGBotKey(editText.getText().toString()); if (r != null) r.run(); - }).setNegativeButton(android.R.string.cancel, null).setNeutralButton(getString("stickersapi7"), (dialog, which) -> new AlertDialog.Builder(super.n()) - .setTitle(getString("stickersapi8")) - .setMessage(getString("stickersapi9") + - getString("stickersapi10")).setPositiveButton(android.R.string.ok, null) + }).setNegativeButton(android.R.string.cancel, null).setNeutralButton(Globals.getString("stickersapi7"), (dialog, which) -> new AlertDialog.Builder(getContext()) + .setTitle(Globals.getString("stickersapi8")) + .setMessage(Globals.getString("stickersapi9") + + Globals.getString("stickersapi10")).setPositiveButton(android.R.string.ok, null) .create().show()).create().show(); } private void checkApiKey(final Runnable r) { grabber.setBotApiKey(TGPref.getTGBotKey()); - var context = super.n(); + var context = getContext(); final ProgressDialog progressDialog = new ProgressDialog(context); progressDialog.setProgressStyle(ProgressDialog.STYLE_SPINNER); - progressDialog.setMessage(getString("stickersapi1")); + progressDialog.setMessage(Globals.getString("stickersapi1")); progressDialog.show(); grabber.checkKey(new TelegramStickersGrabber.KeyCheckListener() { @@ -187,7 +187,7 @@ public class StickersFragment extends ToolbarFragment { public void onKeyChecked(boolean ok) { progressDialog.dismiss(); if (!ok) { - makeText(context, getString("stickersapi2"), LENGTH_SHORT).show(); + makeText(context, Globals.getString("stickersapi2"), LENGTH_SHORT).show(); return; } stickersService.setBotKey(TGPref.getTGBotKey()); @@ -199,9 +199,9 @@ public class StickersFragment extends ToolbarFragment { public void onNetError() { progressDialog.dismiss(); new AlertDialog.Builder(context) - .setMessage(getString("stickersapi3")) + .setMessage(Globals.getString("stickersapi3")) .setNegativeButton(android.R.string.cancel, null) - .setPositiveButton(getString("stickersapi4"), (arg0, arg1) -> checkApiKey(r)).create().show(); + .setPositiveButton(Globals.getString("stickersapi4"), (arg0, arg1) -> checkApiKey(r)).create().show(); } }); } @@ -209,7 +209,7 @@ public class StickersFragment extends ToolbarFragment { @SuppressWarnings("rawtypes") @NonNull @Override - public View d(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { + public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { grabber = new TelegramStickersGrabber(TGPref.getTGBotKey()); stickersService = TelegramStickersService.getInstance(getContext()); @@ -232,7 +232,9 @@ public class StickersFragment extends ToolbarFragment { v.addView(recycler); v.addView(fab); - recycler.setLayoutManager(new StaggeredGridLayoutManager(2, StaggeredGridLayoutManager.VERTICAL)); + + var layoutmanager = new LinearLayoutManager(getContext()); + recycler.setLayoutManager(layoutmanager); recycler.setAdapter(new StickerPackAdapter()); return v; } @@ -245,14 +247,14 @@ public class StickersFragment extends ToolbarFragment { switch (method) { case TYPE_SOCKS: if (TGPref.getTGProxyIP() == null) { - openMenu(getString("stickersproxy1")); + openMenu(Globals.getString("stickersproxy1")); return; } case TYPE_DIRECT: final Runnable work = () -> { - LinearLayout linearLayout = new LinearLayout(super.n()); + LinearLayout linearLayout = new LinearLayout(getContext()); - final EditText editText = new EditText(super.n()); + final EditText editText = new EditText(getContext()); editText.setHintTextColor(PreferencesUtil.getSTextColor(getContext())); // Костыль для китката @@ -267,8 +269,8 @@ public class StickersFragment extends ToolbarFragment { margin.setMargins(convertDpToPixel(24f), 0, convertDpToPixel(24f), 0); editText.setLayoutParams(margin); - new AlertDialog.Builder(super.n()).setTitle(getString("stickershelp1")) - .setMessage(getString("stickershelp2")) + new AlertDialog.Builder(getContext()).setTitle(Globals.getString("stickershelp1")) + .setMessage(Globals.getString("stickershelp2")) .setView(linearLayout) .setPositiveButton(android.R.string.ok, (dialog, which) -> { String pack = editText.getText().toString(); @@ -283,30 +285,27 @@ public class StickersFragment extends ToolbarFragment { }; if (method == -1) { - openMenu(getString("stickersconnection")); + openMenu(Globals.getString("stickersconnection")); } else { r.run(); } } @Override - public void b(@Nullable Bundle savedInstanceState) { - super.b(savedInstanceState); + public void onCreate(@Nullable Bundle savedInstanceState) { + super.onCreate(savedInstanceState); getContext().registerReceiver(receiver, new IntentFilter(ACTION_RELOAD)); } @Override - public void a(View arg0, Bundle arg1) { - o_(true); - - super.a(arg0, arg1); - - a(getString("vtltgs")); + public void onViewCreated(View arg0, Bundle arg1) { + setMenuVisibility(true); + super.onViewCreated(arg0, arg1); } @Override - public void A_() { - super.A_(); + public void onDestroyView() { + super.onDestroyView(); getContext().unregisterReceiver(receiver); } @@ -366,7 +365,7 @@ public class StickersFragment extends ToolbarFragment { holder.name.setText(pack.title); holder.switchCompat.setChecked(pack.enabled); holder.switchCompat.setOnCheckedChangeListener((buttonView, isChecked) -> stickersService.setPackEnabled(pack, isChecked, false)); - holder.count.setText(pack.stickersCount + " " + getString("stickerscount")); + holder.count.setText(pack.stickersCount + " " + Globals.getString("stickerscount")); holder.layout.setBackgroundColor(getTabbarBackground());