From 4ae16efe33e26a2e3600e5639dfd94af77f80a8a Mon Sep 17 00:00:00 2001 From: albendz Date: Sun, 21 Jul 2019 19:46:45 -0700 Subject: [PATCH 1/4] Clear parent from customView if parent is not null --- app/src/main/java/fr/free/nrw/commons/utils/DialogUtil.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/src/main/java/fr/free/nrw/commons/utils/DialogUtil.java b/app/src/main/java/fr/free/nrw/commons/utils/DialogUtil.java index e9765551ce..d1de43c4d6 100644 --- a/app/src/main/java/fr/free/nrw/commons/utils/DialogUtil.java +++ b/app/src/main/java/fr/free/nrw/commons/utils/DialogUtil.java @@ -5,6 +5,7 @@ import android.app.Dialog; import android.content.DialogInterface; import android.view.View; +import android.view.ViewGroup; import org.apache.commons.lang3.StringUtils; @@ -116,6 +117,8 @@ private static void showAlertDialog(Activity activity, final Runnable onNegativeBtnClick, View customView, boolean cancelable) { + if (customView != null && customView.getParent() != null) + ((ViewGroup) customView.getParent()).removeAllViews(); AlertDialog.Builder builder = new AlertDialog.Builder(activity); builder.setTitle(title); builder.setMessage(message); From 8517f6e9503cb838b40c8fe950a1133e408c8f8c Mon Sep 17 00:00:00 2001 From: Alicia Bendz Date: Sat, 18 Jan 2020 17:00:19 -0500 Subject: [PATCH 2/4] Apply white search bar theme to nearby search --- app/src/main/res/layout/filter_search_view_layout.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/layout/filter_search_view_layout.xml b/app/src/main/res/layout/filter_search_view_layout.xml index 2ab24d7732..fa0f6c23a6 100644 --- a/app/src/main/res/layout/filter_search_view_layout.xml +++ b/app/src/main/res/layout/filter_search_view_layout.xml @@ -2,6 +2,7 @@ android:layout_height="wrap_content" android:id="@+id/search_view_layout" android:paddingVertical="15dp" + xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:android="http://schemas.android.com/apk/res/android"> - + android:searchIcon="@drawable/ic_search_white_24dp" + app:theme="@style/WhiteSearchBarTheme"> \ No newline at end of file From 145fddbb0e28a78bfca58064b95089da6737af3b Mon Sep 17 00:00:00 2001 From: Alicia Bendz Date: Sat, 18 Jan 2020 17:02:43 -0500 Subject: [PATCH 3/4] Undo changes from bad merge --- app/src/main/java/fr/free/nrw/commons/utils/DialogUtil.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/utils/DialogUtil.java b/app/src/main/java/fr/free/nrw/commons/utils/DialogUtil.java index 1bc169aa27..0ce8ca9c9e 100644 --- a/app/src/main/java/fr/free/nrw/commons/utils/DialogUtil.java +++ b/app/src/main/java/fr/free/nrw/commons/utils/DialogUtil.java @@ -5,7 +5,6 @@ import android.app.Dialog; import android.content.DialogInterface; import android.view.View; -import android.view.ViewGroup; import org.apache.commons.lang3.StringUtils; @@ -117,14 +116,13 @@ private static void showAlertDialog(Activity activity, final Runnable onNegativeBtnClick, View customView, boolean cancelable) { - // If the custom view already has a parent, there is already a dialog showing with the view // This happens for on resume - return to avoid creating a second dialog - the first one // will still show if (customView != null && customView.getParent() != null) { return; } - + AlertDialog.Builder builder = new AlertDialog.Builder(activity); builder.setTitle(title); builder.setMessage(message); From 818adb69dc526985157868a2ca4235a4dd1405b7 Mon Sep 17 00:00:00 2001 From: Alicia Bendz Date: Sat, 18 Jan 2020 17:17:10 -0500 Subject: [PATCH 4/4] Fix up tag formatting --- app/src/main/res/layout/filter_search_view_layout.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/layout/filter_search_view_layout.xml b/app/src/main/res/layout/filter_search_view_layout.xml index fa0f6c23a6..7d5dc31b63 100644 --- a/app/src/main/res/layout/filter_search_view_layout.xml +++ b/app/src/main/res/layout/filter_search_view_layout.xml @@ -20,6 +20,6 @@ android:tint="@color/white" android:queryHint="@string/nearby_search_hint" android:searchIcon="@drawable/ic_search_white_24dp" - app:theme="@style/WhiteSearchBarTheme"> + app:theme="@style/WhiteSearchBarTheme"/> \ No newline at end of file