Merge pull request #5814 from seadowg/outlined-button

Fallback to Material 2 OutlinedButton on API 22
getodk · Oct 31, 2023 · b8d4cc8 · b8d4cc8
2 parents 7dff22a + 533a00b
commit b8d4cc8
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/collect_app/src/main/res/layout/form_entry_end.xml b/collect_app/src/main/res/layout/form_entry_end.xml
@@ -90,7 +90,7 @@ the specific language governing permissions and limitations under the License.
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/save_as_draft"
-                style="@style/Widget.Material3.Button.OutlinedButton"
+                style="@style/Widget.Collect.Material3.Button.OutlinedButton"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:text="@string/save_as_draft"

diff --git a/collect_app/src/main/res/layout/quit_form_dialog_layout.xml b/collect_app/src/main/res/layout/quit_form_dialog_layout.xml
@@ -21,7 +21,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/discard_changes"
-            style="@style/Widget.Material3.Button.OutlinedButton.Icon"
+            style="@style/Widget.Collect.Material3.Button.OutlinedButton.Icon"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_marginTop="@dimen/margin"
@@ -35,7 +35,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/keep_editing_outlined"
-            style="@style/Widget.Material3.Button.OutlinedButton.Icon"
+            style="@style/Widget.Collect.Material3.Button.OutlinedButton.Icon"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_marginTop="@dimen/margin_small"

diff --git a/collect_app/src/main/res/values-v23/outlined_button.xml b/collect_app/src/main/res/values-v23/outlined_button.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="Widget.Collect.Material3.Button.OutlinedButton" parent="Widget.Material3.Button.OutlinedButton"></style>
+
+    <style name="Widget.Collect.Material3.Button.OutlinedButton.Icon" parent="Widget.Material3.Button.OutlinedButton.Icon"></style>
+</resources>
diff --git a/collect_app/src/main/res/values/outlined_button.xml b/collect_app/src/main/res/values/outlined_button.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Material3.Button.OutlinedButton` doesn't work properly on older API levels (22 and under) without a Material 3 theme so we fall back to Material 2 -->
+    <style name="Widget.Collect.Material3.Button.OutlinedButton" parent="Widget.MaterialComponents.Button.OutlinedButton"></style>
+
+    <style name="Widget.Collect.Material3.Button.OutlinedButton.Icon" parent="Widget.MaterialComponents.Button.OutlinedButton"></style>
+</resources>