From 39cc9dd23b54cb5d7b3becafe22a770b32829647 Mon Sep 17 00:00:00 2001 From: Floens Date: Mon, 17 Aug 2015 15:32:37 +0200 Subject: [PATCH] Various fixes for Android < 5.0 Use the AlertDialog from the support library everywhere. The toolbar was not the last view in the viewgroup, and since the elevation is ignored on <5.0 it became visible when a collapsing toolbar was used. The FAB has a wrong margin when the parent CoordinatorLayout has a top margin, to account for non collapsing toolbars. Since this is only an issue on not so important layouts, ignore this issue. --- .../org/floens/chan/ui/activity/StartActivity.java | 2 +- .../chan/ui/controller/AdvancedSettingsController.java | 2 +- .../floens/chan/ui/controller/BoardEditController.java | 2 +- .../floens/chan/ui/controller/DrawerController.java | 2 +- .../floens/chan/ui/controller/HistoryController.java | 2 +- .../chan/ui/controller/ImageViewerController.java | 2 +- .../chan/ui/controller/ViewThreadController.java | 2 +- .../java/org/floens/chan/ui/layout/ThreadLayout.java | 2 +- .../floens/chan/ui/settings/IntegerSettingView.java | 2 +- .../org/floens/chan/ui/settings/StringSettingView.java | 2 +- .../main/res/layout/controller_navigation_toolbar.xml | 10 +++++----- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Clover/app/src/main/java/org/floens/chan/ui/activity/StartActivity.java b/Clover/app/src/main/java/org/floens/chan/ui/activity/StartActivity.java index 2785fd51..27aeaeb5 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/activity/StartActivity.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/activity/StartActivity.java @@ -17,7 +17,6 @@ */ package org.floens.chan.ui.activity; -import android.app.AlertDialog; import android.content.DialogInterface; import android.content.Intent; import android.content.res.Configuration; @@ -27,6 +26,7 @@ import android.nfc.NfcAdapter; import android.nfc.NfcEvent; import android.os.Bundle; import android.support.annotation.NonNull; +import android.support.v7.app.AlertDialog; import android.support.v7.app.AppCompatActivity; import android.view.KeyEvent; import android.view.LayoutInflater; diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/AdvancedSettingsController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/AdvancedSettingsController.java index b7bccdc4..98b930e0 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/controller/AdvancedSettingsController.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/AdvancedSettingsController.java @@ -18,8 +18,8 @@ package org.floens.chan.ui.controller; import android.app.Activity; -import android.app.AlertDialog; import android.content.Context; +import android.support.v7.app.AlertDialog; import android.view.View; import android.widget.LinearLayout; diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/BoardEditController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/BoardEditController.java index 3c3318e3..f8b9fc91 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/controller/BoardEditController.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/BoardEditController.java @@ -18,11 +18,11 @@ package org.floens.chan.ui.controller; import android.annotation.SuppressLint; -import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; import android.support.design.widget.FloatingActionButton; import android.support.design.widget.Snackbar; +import android.support.v7.app.AlertDialog; import android.support.v7.widget.RecyclerView; import android.text.TextUtils; import android.view.LayoutInflater; diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/DrawerController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/DrawerController.java index aae7c356..21caeadb 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/controller/DrawerController.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/DrawerController.java @@ -17,12 +17,12 @@ */ package org.floens.chan.ui.controller; -import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; import android.content.res.Configuration; import android.support.design.widget.Snackbar; import android.support.v4.widget.DrawerLayout; +import android.support.v7.app.AlertDialog; import android.support.v7.widget.RecyclerView; import android.text.TextUtils; import android.view.Gravity; diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/HistoryController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/HistoryController.java index 0ca63be9..859672a9 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/controller/HistoryController.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/HistoryController.java @@ -17,9 +17,9 @@ */ package org.floens.chan.ui.controller; -import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; +import android.support.v7.app.AlertDialog; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import android.support.v7.widget.SwitchCompat; diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/ImageViewerController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/ImageViewerController.java index 0d06346a..93026d02 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/controller/ImageViewerController.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/ImageViewerController.java @@ -24,7 +24,6 @@ import android.animation.ObjectAnimator; import android.animation.ValueAnimator; import android.annotation.SuppressLint; import android.app.Activity; -import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; import android.graphics.Bitmap; @@ -32,6 +31,7 @@ import android.graphics.Color; import android.graphics.Point; import android.graphics.PointF; import android.os.Build; +import android.support.v7.app.AlertDialog; import android.util.Log; import android.view.LayoutInflater; import android.view.View; diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/ViewThreadController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/ViewThreadController.java index 99b224e6..7771efea 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/controller/ViewThreadController.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/ViewThreadController.java @@ -17,9 +17,9 @@ */ package org.floens.chan.ui.controller; -import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; +import android.support.v7.app.AlertDialog; import org.floens.chan.Chan; import org.floens.chan.R; diff --git a/Clover/app/src/main/java/org/floens/chan/ui/layout/ThreadLayout.java b/Clover/app/src/main/java/org/floens/chan/ui/layout/ThreadLayout.java index cd5f5503..cc758844 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/layout/ThreadLayout.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/layout/ThreadLayout.java @@ -19,7 +19,6 @@ package org.floens.chan.ui.layout; import android.annotation.SuppressLint; import android.app.Activity; -import android.app.AlertDialog; import android.app.ProgressDialog; import android.content.ClipData; import android.content.ClipboardManager; @@ -28,6 +27,7 @@ import android.content.DialogInterface; import android.support.design.widget.CoordinatorLayout; import android.support.design.widget.FloatingActionButton; import android.support.design.widget.Snackbar; +import android.support.v7.app.AlertDialog; import android.util.AttributeSet; import android.view.KeyEvent; import android.view.LayoutInflater; diff --git a/Clover/app/src/main/java/org/floens/chan/ui/settings/IntegerSettingView.java b/Clover/app/src/main/java/org/floens/chan/ui/settings/IntegerSettingView.java index c4b53ecb..735f459c 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/settings/IntegerSettingView.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/settings/IntegerSettingView.java @@ -17,8 +17,8 @@ */ package org.floens.chan.ui.settings; -import android.app.AlertDialog; import android.content.DialogInterface; +import android.support.v7.app.AlertDialog; import android.text.InputType; import android.view.View; import android.view.WindowManager; diff --git a/Clover/app/src/main/java/org/floens/chan/ui/settings/StringSettingView.java b/Clover/app/src/main/java/org/floens/chan/ui/settings/StringSettingView.java index d94a740c..a8461f56 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/settings/StringSettingView.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/settings/StringSettingView.java @@ -17,8 +17,8 @@ */ package org.floens.chan.ui.settings; -import android.app.AlertDialog; import android.content.DialogInterface; +import android.support.v7.app.AlertDialog; import android.view.View; import android.view.WindowManager; import android.view.inputmethod.EditorInfo; diff --git a/Clover/app/src/main/res/layout/controller_navigation_toolbar.xml b/Clover/app/src/main/res/layout/controller_navigation_toolbar.xml index ee0a8f69..24a4cca4 100644 --- a/Clover/app/src/main/res/layout/controller_navigation_toolbar.xml +++ b/Clover/app/src/main/res/layout/controller_navigation_toolbar.xml @@ -20,14 +20,14 @@ along with this program. If not, see . android:layout_height="match_parent" android:background="?backcolor"> - - + +