* optimize imports (master)

allgood · allgood · commit 042c7eef3024 · 2020-07-18T09:57:15.000-03:00
diff --git a/Icons and Images/Contributed SVG/app icon black.svg b/Icons and Images/Contributed SVG/app icon black.svg
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="1000px" height="1000px" viewBox="0 0 1000 1000" enable-background="new 0 0 1000 1000" xml:space="preserve">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="1000px"
+    height="1000px" viewBox="0 0 1000 1000" enable-background="new 0 0 1000 1000" xml:space="preserve">
 <g>
 	<path fill="none" stroke="#000000" stroke-width="25" stroke-miterlimit="10" d="M781.104,500
 		c0,169.48-137.399,306.88-306.88,306.88c-9.279,0-18.46-0.41-27.529-1.22C290.115,791.74,167.345,660.2,167.345,500
diff --git a/Icons and Images/Contributed SVG/app icon green.svg b/Icons and Images/Contributed SVG/app icon green.svg
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="1000px" height="1000px" viewBox="0 0 1000 1000" enable-background="new 0 0 1000 1000" xml:space="preserve">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="1000px"
+    height="1000px" viewBox="0 0 1000 1000" enable-background="new 0 0 1000 1000" xml:space="preserve">
 <path fill="none" stroke="#008000" stroke-width="25" stroke-miterlimit="10" d="M806.88,500c0,169.48-137.399,306.88-306.88,306.88
 	c-9.279,0-18.46-0.41-27.529-1.22C315.891,791.74,193.12,660.2,193.12,500c0-169.48,137.399-306.88,306.88-306.88
 	c160.51,0,292.24,123.24,305.73,280.25C806.49,482.15,806.88,491.03,806.88,500z"/>
diff --git a/Icons and Images/Contributed SVG/app icon main.svg b/Icons and Images/Contributed SVG/app icon main.svg
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="1000px" height="1000px" viewBox="0 0 1000 1000" enable-background="new 0 0 1000 1000" xml:space="preserve">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="1000px"
+    height="1000px" viewBox="0 0 1000 1000" enable-background="new 0 0 1000 1000" xml:space="preserve">
 <path fill="#008000" d="M806.88,500c0,169.48-137.396,306.88-306.88,306.88c-9.28,0-18.46-0.41-27.53-1.22
 	C315.89,791.74,193.12,660.2,193.12,500c0-169.48,137.396-306.88,306.88-306.88c160.51,0,292.24,123.24,305.73,280.25
 	C806.49,482.15,806.88,491.03,806.88,500z"/>
diff --git a/Icons and Images/Contributed SVG/app icon white on blk.svg b/Icons and Images/Contributed SVG/app icon white on blk.svg
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="1000px" height="1000px" viewBox="0 0 1000 1000" enable-background="new 0 0 1000 1000" xml:space="preserve">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="1000px"
+    height="1000px" viewBox="0 0 1000 1000" enable-background="new 0 0 1000 1000" xml:space="preserve">
 <g>
 	<path d="M806.88,500c0,169.48-137.399,306.88-306.88,306.88c-9.279,0-18.46-0.41-27.529-1.22
 		C315.891,791.74,193.12,660.2,193.12,500c0-169.479,137.399-306.88,306.88-306.88c160.51,0,292.24,123.24,305.73,280.25
diff --git a/Icons and Images/Contributed SVG/app icon white.svg b/Icons and Images/Contributed SVG/app icon white.svg
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="1000px" height="1000px" viewBox="0 0 1000 1000" enable-background="new 0 0 1000 1000" xml:space="preserve">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="1000px"
+    height="1000px" viewBox="0 0 1000 1000" enable-background="new 0 0 1000 1000" xml:space="preserve">
 <rect fill="#231F20" width="1000" height="1000"/>
 <g>
 	<g>
diff --git a/Icons and Images/Contributed SVG/logotype A blk.svg b/Icons and Images/Contributed SVG/logotype A blk.svg
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="1000px" height="612.713px" viewBox="0 0 1000 612.713" enable-background="new 0 0 1000 612.713" xml:space="preserve">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="1000px"
+    height="612.713px" viewBox="0 0 1000 612.713" enable-background="new 0 0 1000 612.713" xml:space="preserve">
 <g>
 	<path d="M975,25v562.713H25V25H975 M1000,0H0v612.713h1000V0L1000,0z"/>
 </g>
diff --git a/Icons and Images/Contributed SVG/logotype A green.svg b/Icons and Images/Contributed SVG/logotype A green.svg
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="1000px" height="612.713px" viewBox="0 0 1000 612.713" enable-background="new 0 0 1000 612.713" xml:space="preserve">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="1000px"
+    height="612.713px" viewBox="0 0 1000 612.713" enable-background="new 0 0 1000 612.713" xml:space="preserve">
 <g>
 	<path fill="#008000" d="M975,25v562.713H25V25H975 M1000,0H0v612.713h1000V0L1000,0z"/>
 </g>
diff --git a/Icons and Images/Contributed SVG/logotype A white.svg b/Icons and Images/Contributed SVG/logotype A white.svg
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="1000px" height="612.713px" viewBox="0 0 1000 612.713" enable-background="new 0 0 1000 612.713" xml:space="preserve">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="1000px"
+    height="612.713px" viewBox="0 0 1000 612.713" enable-background="new 0 0 1000 612.713" xml:space="preserve">
 <rect fill="#008000" width="1000" height="612.713"/>
 <g>
 	<g>
diff --git a/Icons and Images/Contributed SVG/logotype B blk.svg b/Icons and Images/Contributed SVG/logotype B blk.svg
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="1000px" height="612.713px" viewBox="0 0 1000 612.713" enable-background="new 0 0 1000 612.713" xml:space="preserve">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="1000px"
+    height="612.713px" viewBox="0 0 1000 612.713" enable-background="new 0 0 1000 612.713" xml:space="preserve">
 <g>
 	<path d="M975,25v562.713H25V25H975 M1000,0H0v612.713h1000V0L1000,0z"/>
 </g>
diff --git a/Icons and Images/Contributed SVG/logotype B green.svg b/Icons and Images/Contributed SVG/logotype B green.svg
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="1000px" height="612.713px" viewBox="0 0 1000 612.713" enable-background="new 0 0 1000 612.713" xml:space="preserve">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="1000px"
+    height="612.713px" viewBox="0 0 1000 612.713" enable-background="new 0 0 1000 612.713" xml:space="preserve">
 <g>
 	<path fill="#008000" d="M975,25v562.713H25V25H975 M1000,0H0v612.713h1000V0L1000,0z"/>
 </g>
diff --git a/Icons and Images/Contributed SVG/logotype B white.svg b/Icons and Images/Contributed SVG/logotype B white.svg
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="1000px" height="612.713px" viewBox="0 0 1000 612.713" enable-background="new 0 0 1000 612.713" xml:space="preserve">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="1000px"
+    height="612.713px" viewBox="0 0 1000 612.713" enable-background="new 0 0 1000 612.713" xml:space="preserve">
 <rect fill="#008000" width="1000" height="612.713"/>
 <g>
 	<g>
diff --git a/Icons and Images/main icon design.svg b/Icons and Images/main icon design.svg
@@ -1,25 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   width="1000px"
-   height="1000px"
-   viewBox="0 0 1000 1000"
-   enable-background="new 0 0 1000 1000"
-   xml:space="preserve"
-   sodipodi:docname="main icon design.svg"
-   inkscape:version="0.92.1 r15371"><metadata
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.1" id="Layer_1" x="0px"
+    y="0px" width="1000px" height="1000px" viewBox="0 0 1000 1000" enable-background="new 0 0 1000 1000"
+    xml:space="preserve" sodipodi:docname="main icon design.svg" inkscape:version="0.92.1 r15371"><metadata
      id="metadata51"><rdf:RDF><cc:Work
          rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
diff --git a/app/src/main/java/com/todobom/opennotescanner/FullScreenImageAdapter.java b/app/src/main/java/com/todobom/opennotescanner/FullScreenImageAdapter.java
@@ -6,7 +6,6 @@
 
 import android.app.Activity;
 import android.content.Context;
-import androidx.viewpager.widget.PagerAdapter;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -15,8 +14,11 @@
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.nostra13.universalimageloader.core.assist.ImageSize;
 import com.ortiz.touchview.TouchImageView;
+
 import java.util.ArrayList;
 
+import androidx.viewpager.widget.PagerAdapter;
+
 public class FullScreenImageAdapter extends PagerAdapter {
 
     private static final String TAG = "FullScreenImageAdapter";
diff --git a/app/src/main/java/com/todobom/opennotescanner/OpenNoteScannerActivity.java b/app/src/main/java/com/todobom/opennotescanner/OpenNoteScannerActivity.java
@@ -24,12 +24,6 @@
 import android.os.Message;
 import android.preference.PreferenceManager;
 import android.provider.MediaStore;
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
-import com.google.android.material.navigation.NavigationView;
-import androidx.core.app.ActivityCompat;
-import androidx.fragment.app.FragmentManager;
-import androidx.core.content.ContextCompat;
-import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.view.Display;
 import android.view.MenuItem;
@@ -49,16 +43,20 @@
 import android.widget.Toast;
 
 import com.github.fafaldo.fabtoolbar.widget.FABToolbarLayout;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.navigation.NavigationView;
 import com.todobom.opennotescanner.helpers.CustomOpenCVLoader;
 import com.todobom.opennotescanner.helpers.OpenNoteMessage;
 import com.todobom.opennotescanner.helpers.PreviewFrame;
 import com.todobom.opennotescanner.helpers.ScanTopicDialogFragment;
 import com.todobom.opennotescanner.helpers.ScannedDocument;
 import com.todobom.opennotescanner.views.HUDCanvasView;
 
-import org.opencv.android.OpenCVLoader;
+import org.matomo.sdk.Tracker;
+import org.matomo.sdk.extra.TrackHelper;
 import org.opencv.android.BaseLoaderCallback;
 import org.opencv.android.LoaderCallbackInterface;
+import org.opencv.android.OpenCVLoader;
 import org.opencv.core.Core;
 import org.opencv.core.CvType;
 import org.opencv.core.Mat;
@@ -77,8 +75,10 @@
 import java.util.Date;
 import java.util.List;
 
-import org.matomo.sdk.Tracker;
-import org.matomo.sdk.extra.TrackHelper;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.FragmentManager;
 
 import static com.todobom.opennotescanner.helpers.Utils.addImageToGallery;
 import static com.todobom.opennotescanner.helpers.Utils.decodeSampledBitmapFromUri;
diff --git a/app/src/main/java/com/todobom/opennotescanner/helpers/ScanTopicDialogFragment.java b/app/src/main/java/com/todobom/opennotescanner/helpers/ScanTopicDialogFragment.java
@@ -4,14 +4,15 @@
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import androidx.fragment.app.DialogFragment;
-import androidx.appcompat.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.EditText;
 
 import com.todobom.opennotescanner.R;
 
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.DialogFragment;
+
 public class ScanTopicDialogFragment extends DialogFragment {
 
     private EditText scanTopic;
diff --git a/app/src/main/java/com/todobom/opennotescanner/views/TagEditorFragment.java b/app/src/main/java/com/todobom/opennotescanner/views/TagEditorFragment.java
@@ -4,8 +4,6 @@
 import android.content.res.ColorStateList;
 import android.media.ExifInterface;
 import android.os.Bundle;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.DialogFragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -17,6 +15,9 @@
 
 import java.io.IOException;
 
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
+
 /**
  * Created by allgood on 29/05/16.
  */
diff --git a/app/src/main/res/layout/activity_gallery.xml b/app/src/main/res/layout/activity_gallery.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
diff --git a/app/src/main/res/layout/activity_open_note_scanner.xml b/app/src/main/res/layout/activity_open_note_scanner.xml
@@ -1,6 +1,5 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    xmlns:opencv="http://schemas.android.com/apk/res-auto"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/gallery_item.xml b/app/src/main/res/layout/gallery_item.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:padding="4dp">
diff --git a/app/src/main/res/xml/provider_paths.xml b/app/src/main/res/xml/provider_paths.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<paths xmlns:android="http://schemas.android.com/apk/res/android">
+<paths>
     <external-path name="external_files" path="."/>
 </paths>
