From 7d0f1c1cc9c46ca067975f619d893243cdcc2f85 Mon Sep 17 00:00:00 2001
From: Bill Farmer <williamjfarmer@yahoo.co.uk>
Date: Sat, 10 Sep 2022 19:22:01 +0100
Subject: [PATCH] Fix toasts

---
 build.gradle                                  |  2 +-
 .../org/billthefarmer/scope/MainActivity.java |  5 ++++
 src/main/res/drawable-v21/toast_frame.xml     | 23 +++++++++++++++++++
 3 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 src/main/res/drawable-v21/toast_frame.xml

diff --git a/build.gradle b/build.gradle
index 9f82632..e091398 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.0'
+        classpath 'com.android.tools.build:gradle:7.2.2'
     }
 }
 
diff --git a/src/main/java/org/billthefarmer/scope/MainActivity.java b/src/main/java/org/billthefarmer/scope/MainActivity.java
index eed3cc0..63e065a 100644
--- a/src/main/java/org/billthefarmer/scope/MainActivity.java
+++ b/src/main/java/org/billthefarmer/scope/MainActivity.java
@@ -41,6 +41,7 @@
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.SubMenu;
+import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
 import android.widget.Toast;
@@ -557,6 +558,10 @@ void showToast(String text)
         // Make a new one
         toast = Toast.makeText(this, text, Toast.LENGTH_SHORT);
         toast.setGravity(Gravity.CENTER, 0, 0);
+        // Fix for android 13
+        View view = toast.getView();
+        if (view != null && Build.VERSION.SDK_INT > Build.VERSION_CODES.P)
+            view.setBackgroundResource(R.drawable.toast_frame);
         toast.show();
     }
 
diff --git a/src/main/res/drawable-v21/toast_frame.xml b/src/main/res/drawable-v21/toast_frame.xml
new file mode 100644
index 0000000..44c00c0
--- /dev/null
+++ b/src/main/res/drawable-v21/toast_frame.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* Copyright 2017, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+    <solid android:color="?android:attr/colorBackground" />
+    <corners android:radius="28dp" />
+</shape>
+