From 9a8cf61e38e7380a71862e33a5c8eced33bed48e Mon Sep 17 00:00:00 2001
From: Grishka <git@grishka.me>
Date: Fri, 30 Jun 2023 20:28:52 +0300
Subject: [PATCH] More minor fixes

closes #612
---
 .../android/fragments/discover/SearchFragment.java  |  4 +++-
 .../fragments/discover/SearchQueryFragment.java     | 13 +++++++++++--
 .../viewcontrollers/ComposeMediaViewController.java |  2 ++
 mastodon/src/main/res/values/styles.xml             |  2 +-
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java
index a317c6c4..d51078af 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java
@@ -121,8 +121,10 @@ public class SearchFragment extends BaseStatusListFragment<SearchResult>{
 		}else{
 			type=null;
 		}
-		if(currentQuery==null)
+		if(currentQuery==null){
+			dataLoaded();
 			return;
+		}
 		currentRequest=new GetSearchResults(currentQuery, type, true)
 				.setCallback(new Callback<>(){
 					@Override
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchQueryFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchQueryFragment.java
index c2561836..4b183cfe 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchQueryFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchQueryFragment.java
@@ -54,6 +54,7 @@ import java.util.stream.Stream;
 
 import androidx.annotation.Keep;
 import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
 import androidx.recyclerview.widget.RecyclerView;
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.SimpleCallback;
@@ -287,6 +288,14 @@ public class SearchQueryFragment extends MastodonRecyclerFragment<SearchResultVi
 		getActivity().getSystemService(InputMethodManager.class).hideSoftInputFromWindow(getActivity().getWindow().getDecorView().getWindowToken(), 0);
 	}
 
+	@RequiresApi(api = Build.VERSION_CODES.S)
+	private float getScreenCornerRadius(WindowInsets insets, int pos){
+		RoundedCorner corner=insets.getRoundedCorner(pos);
+		if(corner==null)
+			return 0;
+		return corner.getRadius();
+	}
+
 	private Animator createTransition(View prev, View container, boolean enter){
 		int[] loc={0, 0};
 		View searchBtn=prev.findViewById(R.id.search_wrap);
@@ -299,8 +308,8 @@ public class SearchQueryFragment extends MastodonRecyclerFragment<SearchResultVi
 		if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.S){
 			WindowInsets insets=container.getRootWindowInsets();
 			screenRadius=Math.min(
-					Math.min(insets.getRoundedCorner(RoundedCorner.POSITION_TOP_LEFT).getRadius(), insets.getRoundedCorner(RoundedCorner.POSITION_TOP_RIGHT).getRadius()),
-					Math.min(insets.getRoundedCorner(RoundedCorner.POSITION_BOTTOM_LEFT).getRadius(), insets.getRoundedCorner(RoundedCorner.POSITION_BOTTOM_RIGHT).getRadius())
+					Math.min(getScreenCornerRadius(insets, RoundedCorner.POSITION_TOP_LEFT), getScreenCornerRadius(insets, RoundedCorner.POSITION_TOP_RIGHT)),
+					Math.min(getScreenCornerRadius(insets, RoundedCorner.POSITION_BOTTOM_LEFT), getScreenCornerRadius(insets, RoundedCorner.POSITION_BOTTOM_RIGHT))
 			);
 		}else{
 			screenRadius=0;
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposeMediaViewController.java b/mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposeMediaViewController.java
index 1e9dfc30..8b889875 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposeMediaViewController.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposeMediaViewController.java
@@ -315,6 +315,8 @@ public class ComposeMediaViewController{
 				.setProgressListener(new ProgressListener(){
 					@Override
 					public void onProgress(long transferred, long total){
+						if(fragment.getActivity()==null)
+							return;
 						float progressFraction=transferred/(float)total;
 						int progress=Math.round(progressFraction*attachment.progressBar.getMax());
 						if(Build.VERSION.SDK_INT>=24)
diff --git a/mastodon/src/main/res/values/styles.xml b/mastodon/src/main/res/values/styles.xml
index 7702f74e..c5017e88 100644
--- a/mastodon/src/main/res/values/styles.xml
+++ b/mastodon/src/main/res/values/styles.xml
@@ -8,7 +8,7 @@
 		<item name="android:windowBackground">@color/m3_sys_light_surface</item>
 		<item name="android:editTextStyle">@style/Widget.Mastodon.EditText</item>
 
-		<item name="android:buttonStyle">@style/Widget.Mastodon.M3.Button</item>
+		<item name="android:buttonStyle">@style/Widget.Mastodon.M3.Button.Filled</item>
 		<item name="android:actionBarTheme">@style/Theme.Mastodon.Toolbar</item>
 		<item name="android:alertDialogTheme">@style/Theme.Mastodon.Dialog.Alert</item>