From 5b33d64a516898ab8d298e772729cea703f67d4a Mon Sep 17 00:00:00 2001 From: M66B Date: Mon, 1 Jul 2019 19:59:09 +0200 Subject: [PATCH] Simplification, cleanup --- .../java/eu/faircode/email/ActivitySetup.java | 1 - .../java/eu/faircode/email/ActivityView.java | 1 - .../eu/faircode/email/FragmentAnswer.java | 5 +++-- .../eu/faircode/email/FragmentContacts.java | 6 +++-- .../eu/faircode/email/FragmentOperations.java | 1 - .../email/FragmentOptionsDisplay.java | 1 - .../java/eu/faircode/email/FragmentRule.java | 1 - .../java/eu/faircode/email/FragmentSetup.java | 1 - .../main/java/eu/faircode/email/Helper.java | 1 - .../eu/faircode/email/ZoomableImageView.java | 7 +++--- app/src/main/res/layout/dialog_message.xml | 22 ------------------- 11 files changed, 10 insertions(+), 37 deletions(-) delete mode 100644 app/src/main/res/layout/dialog_message.xml diff --git a/app/src/main/java/eu/faircode/email/ActivitySetup.java b/app/src/main/java/eu/faircode/email/ActivitySetup.java index 8a12274f46..6fdc89511d 100644 --- a/app/src/main/java/eu/faircode/email/ActivitySetup.java +++ b/app/src/main/java/eu/faircode/email/ActivitySetup.java @@ -56,7 +56,6 @@ import androidx.appcompat.app.AlertDialog; import androidx.constraintlayout.widget.ConstraintLayout; import androidx.documentfile.provider.DocumentFile; import androidx.drawerlayout.widget.DrawerLayout; -import androidx.fragment.app.DialogFragment; import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentTransaction; import androidx.lifecycle.Lifecycle; diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java index e89d11c78e..1f8a92bc4f 100644 --- a/app/src/main/java/eu/faircode/email/ActivityView.java +++ b/app/src/main/java/eu/faircode/email/ActivityView.java @@ -49,7 +49,6 @@ import androidx.appcompat.app.AlertDialog; import androidx.constraintlayout.widget.Group; import androidx.core.app.NotificationCompat; import androidx.drawerlayout.widget.DrawerLayout; -import androidx.fragment.app.DialogFragment; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentTransaction; diff --git a/app/src/main/java/eu/faircode/email/FragmentAnswer.java b/app/src/main/java/eu/faircode/email/FragmentAnswer.java index 1a0343bde1..50a8c8403a 100644 --- a/app/src/main/java/eu/faircode/email/FragmentAnswer.java +++ b/app/src/main/java/eu/faircode/email/FragmentAnswer.java @@ -37,7 +37,6 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; import androidx.constraintlayout.widget.Group; -import androidx.fragment.app.DialogFragment; import com.google.android.material.bottomnavigation.BottomNavigationView; @@ -267,10 +266,12 @@ public class FragmentAnswer extends FragmentBase { getString(R.string.title_answer_template_email) + "

"); - View dview = LayoutInflater.from(getContext()).inflate(R.layout.dialog_message, null); + View dview = LayoutInflater.from(getContext()).inflate(R.layout.dialog_ask_again, null); TextView tvMessage = dview.findViewById(R.id.tvMessage); + CheckBox cbNotAgain = dview.findViewById(R.id.cbNotAgain); tvMessage.setText(spanned); + cbNotAgain.setVisibility(View.GONE); return new AlertDialog.Builder(getContext()) .setView(dview) diff --git a/app/src/main/java/eu/faircode/email/FragmentContacts.java b/app/src/main/java/eu/faircode/email/FragmentContacts.java index 03e615410c..953edd602a 100644 --- a/app/src/main/java/eu/faircode/email/FragmentContacts.java +++ b/app/src/main/java/eu/faircode/email/FragmentContacts.java @@ -33,6 +33,7 @@ import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; +import android.widget.CheckBox; import android.widget.TextView; import androidx.annotation.NonNull; @@ -40,7 +41,6 @@ import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; import androidx.appcompat.widget.SearchView; import androidx.constraintlayout.widget.Group; -import androidx.fragment.app.DialogFragment; import androidx.lifecycle.Observer; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -184,10 +184,12 @@ public class FragmentContacts extends FragmentBase { @NonNull @Override public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) { - final View dview = LayoutInflater.from(getContext()).inflate(R.layout.dialog_message, null); + final View dview = LayoutInflater.from(getContext()).inflate(R.layout.dialog_ask_again, null); final TextView tvMessage = dview.findViewById(R.id.tvMessage); + CheckBox cbNotAgain = dview.findViewById(R.id.cbNotAgain); tvMessage.setText(getText(R.string.title_delete_contacts)); + cbNotAgain.setVisibility(View.GONE); return new AlertDialog.Builder(getContext()) .setView(dview) diff --git a/app/src/main/java/eu/faircode/email/FragmentOperations.java b/app/src/main/java/eu/faircode/email/FragmentOperations.java index 0516b27296..e87119e49b 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOperations.java +++ b/app/src/main/java/eu/faircode/email/FragmentOperations.java @@ -38,7 +38,6 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; import androidx.constraintlayout.widget.Group; -import androidx.fragment.app.DialogFragment; import androidx.lifecycle.Observer; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java index df645156c3..b40919f306 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java @@ -38,7 +38,6 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; import androidx.appcompat.widget.SwitchCompat; -import androidx.fragment.app.DialogFragment; import androidx.preference.PreferenceManager; public class FragmentOptionsDisplay extends FragmentBase implements SharedPreferences.OnSharedPreferenceChangeListener { diff --git a/app/src/main/java/eu/faircode/email/FragmentRule.java b/app/src/main/java/eu/faircode/email/FragmentRule.java index 101864f7ad..7528e1dd54 100644 --- a/app/src/main/java/eu/faircode/email/FragmentRule.java +++ b/app/src/main/java/eu/faircode/email/FragmentRule.java @@ -51,7 +51,6 @@ import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; import androidx.constraintlayout.widget.ConstraintLayout; import androidx.constraintlayout.widget.Group; -import androidx.fragment.app.DialogFragment; import androidx.localbroadcastmanager.content.LocalBroadcastManager; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; diff --git a/app/src/main/java/eu/faircode/email/FragmentSetup.java b/app/src/main/java/eu/faircode/email/FragmentSetup.java index cdf79e6568..c0572ed7a5 100644 --- a/app/src/main/java/eu/faircode/email/FragmentSetup.java +++ b/app/src/main/java/eu/faircode/email/FragmentSetup.java @@ -45,7 +45,6 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; import androidx.core.content.ContextCompat; -import androidx.fragment.app.DialogFragment; import androidx.lifecycle.Observer; import androidx.localbroadcastmanager.content.LocalBroadcastManager; import androidx.preference.PreferenceManager; diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java index 97ffbdf044..4e2147a03b 100644 --- a/app/src/main/java/eu/faircode/email/Helper.java +++ b/app/src/main/java/eu/faircode/email/Helper.java @@ -58,7 +58,6 @@ import androidx.browser.customtabs.CustomTabsIntent; import androidx.constraintlayout.widget.ConstraintLayout; import androidx.core.content.ContextCompat; import androidx.exifinterface.media.ExifInterface; -import androidx.fragment.app.DialogFragment; import androidx.fragment.app.FragmentManager; import androidx.lifecycle.LifecycleOwner; import androidx.localbroadcastmanager.content.LocalBroadcastManager; diff --git a/app/src/main/java/eu/faircode/email/ZoomableImageView.java b/app/src/main/java/eu/faircode/email/ZoomableImageView.java index 83a3ea614e..838e48bbb3 100644 --- a/app/src/main/java/eu/faircode/email/ZoomableImageView.java +++ b/app/src/main/java/eu/faircode/email/ZoomableImageView.java @@ -102,7 +102,7 @@ public class ZoomableImageView extends ImageView { float width = getMeasuredWidth(); float height = getMeasuredHeight(); //Fit to screen. - float scale = width > height ? height / bmHeight : width / bmWidth; + float scale = width > height ? height / bmHeight : width / bmWidth; matrix.setScale(scale, scale); saveScale = 1f; @@ -162,8 +162,7 @@ public class ZoomableImageView extends ImageView { //limit left and right movement if (scaleWidth < getWidth() && scaleHeight < getHeight()) { // don't do anything - } - else if (scaleWidth < getWidth()) { + } else if (scaleWidth < getWidth()) { deltaX = 0; limitY = true; } @@ -184,7 +183,7 @@ public class ZoomableImageView extends ImageView { if (limitY) { if (y + deltaY > 0) { deltaY = -y; - } else if (y + deltaY < -bottom) { + } else if (y + deltaY < -bottom) { deltaY = -(y + bottom); } diff --git a/app/src/main/res/layout/dialog_message.xml b/app/src/main/res/layout/dialog_message.xml deleted file mode 100644 index c07ea17241..0000000000 --- a/app/src/main/res/layout/dialog_message.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - \ No newline at end of file