From b1f1ed2d62c5322016c8bbb355930b543148e986 Mon Sep 17 00:00:00 2001 From: nuclearfog Date: Thu, 4 Jan 2024 21:26:18 +0100 Subject: [PATCH] version upgrade, bug fix, code cleanup --- app/build.gradle | 4 +- .../twidda/ui/activities/UsersActivity.java | 49 +++++++++---------- .../twidda/ui/fragments/ScheduleFragment.java | 2 +- .../twidda/ui/fragments/TagFragment.java | 6 +-- .../main/res/layout-land/page_editprofile.xml | 2 +- app/src/main/res/layout/fragment_list.xml | 3 +- app/src/main/res/layout/item_announcement.xml | 3 +- 7 files changed, 33 insertions(+), 36 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 94f8028f6..4345b5309 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,8 +11,8 @@ android { applicationId 'org.nuclearfog.twidda' minSdkVersion 21 targetSdkVersion 34 - versionCode 105 - versionName '3.5.2' + versionCode 106 + versionName '3.5.3' resConfigs 'en', 'es', 'de', 'zh-rCN' } diff --git a/app/src/main/java/org/nuclearfog/twidda/ui/activities/UsersActivity.java b/app/src/main/java/org/nuclearfog/twidda/ui/activities/UsersActivity.java index 11af309e4..3afda0072 100644 --- a/app/src/main/java/org/nuclearfog/twidda/ui/activities/UsersActivity.java +++ b/app/src/main/java/org/nuclearfog/twidda/ui/activities/UsersActivity.java @@ -95,7 +95,6 @@ public class UsersActivity extends AppCompatActivity implements OnTabSelectedLis private UserFilterAction filterLoader; private UserAdapter adapter; - private TabSelector tabSelector; private ViewPager2 viewPager; private int mode; @@ -114,7 +113,7 @@ protected void onCreate(Bundle savedInst) { ViewGroup root = findViewById(R.id.page_tab_view_root); Toolbar toolbar = findViewById(R.id.page_tab_view_toolbar); View fragmentContainer = findViewById(R.id.page_tab_view_fragment_container); - tabSelector = findViewById(R.id.page_tab_view_tabs); + TabSelector tabSelector = findViewById(R.id.page_tab_view_tabs); viewPager = findViewById(R.id.page_tab_view_pager); FragmentTransaction fragmentTransaction; @@ -212,7 +211,7 @@ protected void onCreate(Bundle savedInst) { @Override public void onBackPressed() { - if (tabSelector.getVisibility() == View.VISIBLE && viewPager.getCurrentItem() > 0) { + if (viewPager.getVisibility() == View.VISIBLE && viewPager.getCurrentItem() > 0) { viewPager.setCurrentItem(0); } else { super.onBackPressed(); @@ -262,29 +261,29 @@ public void onTabSelected() { @Override public boolean onQueryTextSubmit(String query) { - if (!filterLoader.isIdle()) - return false; - if (viewPager.getCurrentItem() == 0) { - if (USERNAME_PATTERN.matcher(query).matches()) { - UserFilterAction.Param param = new UserFilterAction.Param(UserFilterAction.Param.MUTE_USER, query); - filterLoader.execute(param, this); - return true; - } - Toast.makeText(getApplicationContext(), R.string.error_username_format, Toast.LENGTH_SHORT).show(); - } else if (viewPager.getCurrentItem() == 1) { - if (USERNAME_PATTERN.matcher(query).matches()) { - UserFilterAction.Param param = new UserFilterAction.Param(UserFilterAction.Param.BLOCK_USER, query); - filterLoader.execute(param, this); - return true; - } - Toast.makeText(getApplicationContext(), R.string.error_username_format, Toast.LENGTH_SHORT).show(); - } else if (viewPager.getCurrentItem() == 2) { - if (Patterns.WEB_URL.matcher(query).matches()) { - UserFilterAction.Param param = new UserFilterAction.Param(UserFilterAction.Param.BLOCK_DOMAIN, Uri.parse(query).getHost()); - filterLoader.execute(param, this); - return true; + if (filterLoader.isIdle()) { + if (viewPager.getCurrentItem() == 0) { + if (USERNAME_PATTERN.matcher(query).matches()) { + UserFilterAction.Param param = new UserFilterAction.Param(UserFilterAction.Param.MUTE_USER, query); + filterLoader.execute(param, this); + return true; + } + Toast.makeText(getApplicationContext(), R.string.error_username_format, Toast.LENGTH_SHORT).show(); + } else if (viewPager.getCurrentItem() == 1) { + if (USERNAME_PATTERN.matcher(query).matches()) { + UserFilterAction.Param param = new UserFilterAction.Param(UserFilterAction.Param.BLOCK_USER, query); + filterLoader.execute(param, this); + return true; + } + Toast.makeText(getApplicationContext(), R.string.error_username_format, Toast.LENGTH_SHORT).show(); + } else if (viewPager.getCurrentItem() == 2) { + if (Patterns.WEB_URL.matcher(query).matches()) { + UserFilterAction.Param param = new UserFilterAction.Param(UserFilterAction.Param.BLOCK_DOMAIN, Uri.parse(query).getHost()); + filterLoader.execute(param, this); + return true; + } + Toast.makeText(getApplicationContext(), R.string.error_domain_format, Toast.LENGTH_SHORT).show(); } - Toast.makeText(getApplicationContext(), R.string.error_domain_format, Toast.LENGTH_SHORT).show(); } return false; } diff --git a/app/src/main/java/org/nuclearfog/twidda/ui/fragments/ScheduleFragment.java b/app/src/main/java/org/nuclearfog/twidda/ui/fragments/ScheduleFragment.java index 58f41b445..311871305 100644 --- a/app/src/main/java/org/nuclearfog/twidda/ui/fragments/ScheduleFragment.java +++ b/app/src/main/java/org/nuclearfog/twidda/ui/fragments/ScheduleFragment.java @@ -60,8 +60,8 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat confirm = new ConfirmDialog(requireActivity(), this); timepicker = new TimePickerDialog(requireActivity(), this); audioDialog = new AudioPlayerDialog(requireActivity()); - setAdapter(adapter, false); + if (savedInstanceState != null) { Object data = savedInstanceState.getSerializable(KEY_SAVE); if (data instanceof ScheduledStatuses) { diff --git a/app/src/main/java/org/nuclearfog/twidda/ui/fragments/TagFragment.java b/app/src/main/java/org/nuclearfog/twidda/ui/fragments/TagFragment.java index f9ab6157f..c093ea0c7 100644 --- a/app/src/main/java/org/nuclearfog/twidda/ui/fragments/TagFragment.java +++ b/app/src/main/java/org/nuclearfog/twidda/ui/fragments/TagFragment.java @@ -106,15 +106,15 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat search = args.getString(KEY_SEARCH, ""); mode = args.getInt(KEY_MODE, 0); } - if (mode == MODE_FOLLOW || mode == MODE_FEATURE) { - adapter.enableDelete(); - } if (savedInstanceState != null) { Object data = savedInstanceState.getSerializable(KEY_DATA); if (data instanceof Tags) { adapter.setItems((Tags) data); } } + if (mode == MODE_FOLLOW || mode == MODE_FEATURE) { + adapter.enableDelete(); + } } diff --git a/app/src/main/res/layout-land/page_editprofile.xml b/app/src/main/res/layout-land/page_editprofile.xml index be6823fdf..3290c239c 100644 --- a/app/src/main/res/layout-land/page_editprofile.xml +++ b/app/src/main/res/layout-land/page_editprofile.xml @@ -18,7 +18,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintDimensionRatio="3.0" - app:layout_constraintWidth_percent="0.5"/> + app:layout_constraintWidth_percent="0.5" />