version upgrade, bug fix, code cleanup

nuclearfog · Jan 4, 2024 · b1f1ed2 · b1f1ed2
1 parent 79a8ee4
commit b1f1ed2
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 36 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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" />
 
 	<Button
 		android:id="@+id/profile_edit_add_banner"

diff --git a/app/src/main/res/layout/fragment_list.xml b/app/src/main/res/layout/fragment_list.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.swiperefreshlayout.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:id="@+id/fragment_refresh"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">

diff --git a/app/src/main/res/layout/item_announcement.xml b/app/src/main/res/layout/item_announcement.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"