From 6662da797f75e4e0c7fe18c72daef24ce5826e60 Mon Sep 17 00:00:00 2001
From: Davide Depau <davide@depau.eu>
Date: Thu, 16 Aug 2018 16:22:50 +0200
Subject: [PATCH] Separate adapters and Kotlin extensions

---
 app/src/main/java/eu/depau/etchdroid/abc/UsbWriteService.kt | 4 ++--
 .../{utils => adapters}/UsbDrivesRecyclerViewAdapter.kt     | 5 +++--
 .../eu/depau/etchdroid/fragments/ConfirmInfoFragment.kt     | 2 +-
 .../eu/depau/etchdroid/fragments/FlashMethodFragment.kt     | 2 +-
 .../eu/depau/etchdroid/fragments/ImageLocationFragment.kt   | 4 ++--
 .../java/eu/depau/etchdroid/fragments/UsbDriveFragment.kt   | 6 +++---
 .../depau/etchdroid/{utils => kotlin_exts}/ContextToast.kt  | 2 +-
 .../etchdroid/{utils => kotlin_exts}/NumberToSizeString.kt  | 2 +-
 .../etchdroid/{utils => kotlin_exts}/NumberToTimeString.kt  | 2 +-
 .../etchdroid/{utils => kotlin_exts}/UriGetDisplayName.kt   | 2 +-
 .../etchdroid/{utils => kotlin_exts}/UriGetFileSize.kt      | 2 +-
 .../etchdroid/{utils => kotlin_exts}/UsbDeviceVidPidName.kt | 2 +-
 .../depau/etchdroid/{utils => kotlin_exts}/ViewSnackbar.kt  | 2 +-
 .../java/eu/depau/etchdroid/services/UsbAPIWriteService.kt  | 6 +++---
 14 files changed, 22 insertions(+), 21 deletions(-)
 rename app/src/main/java/eu/depau/etchdroid/{utils => adapters}/UsbDrivesRecyclerViewAdapter.kt (93%)
 rename app/src/main/java/eu/depau/etchdroid/{utils => kotlin_exts}/ContextToast.kt (82%)
 rename app/src/main/java/eu/depau/etchdroid/{utils => kotlin_exts}/NumberToSizeString.kt (95%)
 rename app/src/main/java/eu/depau/etchdroid/{utils => kotlin_exts}/NumberToTimeString.kt (90%)
 rename app/src/main/java/eu/depau/etchdroid/{utils => kotlin_exts}/UriGetDisplayName.kt (94%)
 rename app/src/main/java/eu/depau/etchdroid/{utils => kotlin_exts}/UriGetFileSize.kt (96%)
 rename app/src/main/java/eu/depau/etchdroid/{utils => kotlin_exts}/UsbDeviceVidPidName.kt (90%)
 rename app/src/main/java/eu/depau/etchdroid/{utils => kotlin_exts}/ViewSnackbar.kt (83%)

diff --git a/app/src/main/java/eu/depau/etchdroid/abc/UsbWriteService.kt b/app/src/main/java/eu/depau/etchdroid/abc/UsbWriteService.kt
index 8535b0f..1b46caa 100644
--- a/app/src/main/java/eu/depau/etchdroid/abc/UsbWriteService.kt
+++ b/app/src/main/java/eu/depau/etchdroid/abc/UsbWriteService.kt
@@ -10,8 +10,8 @@ import android.os.Build
 import android.os.PowerManager
 import android.support.v4.app.NotificationCompat
 import eu.depau.etchdroid.R
-import eu.depau.etchdroid.utils.toHRSize
-import eu.depau.etchdroid.utils.toHRTime
+import eu.depau.etchdroid.kotlin_exts.toHRSize
+import eu.depau.etchdroid.kotlin_exts.toHRTime
 
 
 abstract class UsbWriteService(name: String) : IntentService(name) {
diff --git a/app/src/main/java/eu/depau/etchdroid/utils/UsbDrivesRecyclerViewAdapter.kt b/app/src/main/java/eu/depau/etchdroid/adapters/UsbDrivesRecyclerViewAdapter.kt
similarity index 93%
rename from app/src/main/java/eu/depau/etchdroid/utils/UsbDrivesRecyclerViewAdapter.kt
rename to app/src/main/java/eu/depau/etchdroid/adapters/UsbDrivesRecyclerViewAdapter.kt
index 6d3de28..c567055 100644
--- a/app/src/main/java/eu/depau/etchdroid/utils/UsbDrivesRecyclerViewAdapter.kt
+++ b/app/src/main/java/eu/depau/etchdroid/adapters/UsbDrivesRecyclerViewAdapter.kt
@@ -1,4 +1,4 @@
-package eu.depau.etchdroid.utils
+package eu.depau.etchdroid.adapters
 
 import android.annotation.SuppressLint
 import android.os.Build
@@ -8,6 +8,7 @@ import android.view.ViewGroup
 import android.widget.RelativeLayout
 import com.github.mjdev.libaums.UsbMassStorageDevice
 import eu.depau.etchdroid.R
+import eu.depau.etchdroid.kotlin_exts.vidpid
 import kotlinx.android.synthetic.main.usb_device_row.view.*
 
 class UsbDrivesRecyclerViewAdapter(private val dataset: Array<UsbMassStorageDevice>) : RecyclerView.Adapter<UsbDrivesRecyclerViewAdapter.ViewHolder>() {
@@ -16,7 +17,7 @@ class UsbDrivesRecyclerViewAdapter(private val dataset: Array<UsbMassStorageDevi
 
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int):
-            UsbDrivesRecyclerViewAdapter.ViewHolder {
+            ViewHolder {
 
         val relLayout = LayoutInflater.from(parent.context)
                 .inflate(R.layout.usb_device_row, parent, false) as RelativeLayout
diff --git a/app/src/main/java/eu/depau/etchdroid/fragments/ConfirmInfoFragment.kt b/app/src/main/java/eu/depau/etchdroid/fragments/ConfirmInfoFragment.kt
index 5594bc0..5b3e735 100644
--- a/app/src/main/java/eu/depau/etchdroid/fragments/ConfirmInfoFragment.kt
+++ b/app/src/main/java/eu/depau/etchdroid/fragments/ConfirmInfoFragment.kt
@@ -9,7 +9,7 @@ import eu.depau.etchdroid.R
 import eu.depau.etchdroid.StateKeeper
 import eu.depau.etchdroid.abc.WizardFragment
 import eu.depau.etchdroid.services.UsbAPIWriteService
-import eu.depau.etchdroid.utils.*
+import eu.depau.etchdroid.kotlin_exts.*
 import eu.depau.etchdroid.values.FlashMethod
 import eu.depau.etchdroid.values.WizardStep
 import kotlinx.android.synthetic.main.fragment_confirminfo.view.*
diff --git a/app/src/main/java/eu/depau/etchdroid/fragments/FlashMethodFragment.kt b/app/src/main/java/eu/depau/etchdroid/fragments/FlashMethodFragment.kt
index 9f9bc8e..3fa46d0 100644
--- a/app/src/main/java/eu/depau/etchdroid/fragments/FlashMethodFragment.kt
+++ b/app/src/main/java/eu/depau/etchdroid/fragments/FlashMethodFragment.kt
@@ -8,7 +8,7 @@ import eu.depau.etchdroid.R
 import eu.depau.etchdroid.StateKeeper
 import eu.depau.etchdroid.abc.WizardActivity
 import eu.depau.etchdroid.abc.WizardFragment
-import eu.depau.etchdroid.utils.snackbar
+import eu.depau.etchdroid.kotlin_exts.snackbar
 import eu.depau.etchdroid.values.FlashMethod
 import eu.depau.etchdroid.values.WizardStep
 
diff --git a/app/src/main/java/eu/depau/etchdroid/fragments/ImageLocationFragment.kt b/app/src/main/java/eu/depau/etchdroid/fragments/ImageLocationFragment.kt
index 331e2df..87fdfa6 100644
--- a/app/src/main/java/eu/depau/etchdroid/fragments/ImageLocationFragment.kt
+++ b/app/src/main/java/eu/depau/etchdroid/fragments/ImageLocationFragment.kt
@@ -18,8 +18,8 @@ import eu.depau.etchdroid.R
 import eu.depau.etchdroid.StateKeeper
 import eu.depau.etchdroid.abc.WizardActivity
 import eu.depau.etchdroid.abc.WizardFragment
-import eu.depau.etchdroid.utils.getFileName
-import eu.depau.etchdroid.utils.snackbar
+import eu.depau.etchdroid.kotlin_exts.getFileName
+import eu.depau.etchdroid.kotlin_exts.snackbar
 import eu.depau.etchdroid.values.FlashMethod
 import eu.depau.etchdroid.values.ImageLocation
 import eu.depau.etchdroid.values.WizardStep
diff --git a/app/src/main/java/eu/depau/etchdroid/fragments/UsbDriveFragment.kt b/app/src/main/java/eu/depau/etchdroid/fragments/UsbDriveFragment.kt
index efc03da..ab2bbe6 100644
--- a/app/src/main/java/eu/depau/etchdroid/fragments/UsbDriveFragment.kt
+++ b/app/src/main/java/eu/depau/etchdroid/fragments/UsbDriveFragment.kt
@@ -15,9 +15,9 @@ import eu.depau.etchdroid.abc.ClickListener
 import eu.depau.etchdroid.abc.WizardActivity
 import eu.depau.etchdroid.abc.WizardFragment
 import eu.depau.etchdroid.activities.MainActivity
-import eu.depau.etchdroid.utils.UsbDrivesRecyclerViewAdapter
-import eu.depau.etchdroid.utils.name
-import eu.depau.etchdroid.utils.snackbar
+import eu.depau.etchdroid.adapters.UsbDrivesRecyclerViewAdapter
+import eu.depau.etchdroid.kotlin_exts.name
+import eu.depau.etchdroid.kotlin_exts.snackbar
 import eu.depau.etchdroid.values.WizardStep
 import kotlinx.android.synthetic.main.activity_main.*
 import kotlinx.android.synthetic.main.fragment_select_usb_drive.view.*
diff --git a/app/src/main/java/eu/depau/etchdroid/utils/ContextToast.kt b/app/src/main/java/eu/depau/etchdroid/kotlin_exts/ContextToast.kt
similarity index 82%
rename from app/src/main/java/eu/depau/etchdroid/utils/ContextToast.kt
rename to app/src/main/java/eu/depau/etchdroid/kotlin_exts/ContextToast.kt
index 85a5838..9f44b4f 100644
--- a/app/src/main/java/eu/depau/etchdroid/utils/ContextToast.kt
+++ b/app/src/main/java/eu/depau/etchdroid/kotlin_exts/ContextToast.kt
@@ -1,4 +1,4 @@
-package eu.depau.etchdroid.utils
+package eu.depau.etchdroid.kotlin_exts
 
 import android.content.Context
 import android.widget.Toast
diff --git a/app/src/main/java/eu/depau/etchdroid/utils/NumberToSizeString.kt b/app/src/main/java/eu/depau/etchdroid/kotlin_exts/NumberToSizeString.kt
similarity index 95%
rename from app/src/main/java/eu/depau/etchdroid/utils/NumberToSizeString.kt
rename to app/src/main/java/eu/depau/etchdroid/kotlin_exts/NumberToSizeString.kt
index 82db81b..9dd789e 100644
--- a/app/src/main/java/eu/depau/etchdroid/utils/NumberToSizeString.kt
+++ b/app/src/main/java/eu/depau/etchdroid/kotlin_exts/NumberToSizeString.kt
@@ -1,4 +1,4 @@
-package eu.depau.etchdroid.utils
+package eu.depau.etchdroid.kotlin_exts
 
 // https://stackoverflow.com/a/3758880/1124621
 
diff --git a/app/src/main/java/eu/depau/etchdroid/utils/NumberToTimeString.kt b/app/src/main/java/eu/depau/etchdroid/kotlin_exts/NumberToTimeString.kt
similarity index 90%
rename from app/src/main/java/eu/depau/etchdroid/utils/NumberToTimeString.kt
rename to app/src/main/java/eu/depau/etchdroid/kotlin_exts/NumberToTimeString.kt
index 34a9960..5a0ea78 100644
--- a/app/src/main/java/eu/depau/etchdroid/utils/NumberToTimeString.kt
+++ b/app/src/main/java/eu/depau/etchdroid/kotlin_exts/NumberToTimeString.kt
@@ -1,4 +1,4 @@
-package eu.depau.etchdroid.utils
+package eu.depau.etchdroid.kotlin_exts
 
 private val timeStrings = arrayOf("s", "m", "h", "d")
 private val timeDivs = arrayOf(60, 60, 24)
diff --git a/app/src/main/java/eu/depau/etchdroid/utils/UriGetDisplayName.kt b/app/src/main/java/eu/depau/etchdroid/kotlin_exts/UriGetDisplayName.kt
similarity index 94%
rename from app/src/main/java/eu/depau/etchdroid/utils/UriGetDisplayName.kt
rename to app/src/main/java/eu/depau/etchdroid/kotlin_exts/UriGetDisplayName.kt
index cd56911..c52c4b9 100644
--- a/app/src/main/java/eu/depau/etchdroid/utils/UriGetDisplayName.kt
+++ b/app/src/main/java/eu/depau/etchdroid/kotlin_exts/UriGetDisplayName.kt
@@ -1,4 +1,4 @@
-package eu.depau.etchdroid.utils
+package eu.depau.etchdroid.kotlin_exts
 
 import android.content.Context
 import android.net.Uri
diff --git a/app/src/main/java/eu/depau/etchdroid/utils/UriGetFileSize.kt b/app/src/main/java/eu/depau/etchdroid/kotlin_exts/UriGetFileSize.kt
similarity index 96%
rename from app/src/main/java/eu/depau/etchdroid/utils/UriGetFileSize.kt
rename to app/src/main/java/eu/depau/etchdroid/kotlin_exts/UriGetFileSize.kt
index c938dbe..46fa800 100644
--- a/app/src/main/java/eu/depau/etchdroid/utils/UriGetFileSize.kt
+++ b/app/src/main/java/eu/depau/etchdroid/kotlin_exts/UriGetFileSize.kt
@@ -1,4 +1,4 @@
-package eu.depau.etchdroid.utils
+package eu.depau.etchdroid.kotlin_exts
 
 import android.content.ContentResolver
 import android.content.Context
diff --git a/app/src/main/java/eu/depau/etchdroid/utils/UsbDeviceVidPidName.kt b/app/src/main/java/eu/depau/etchdroid/kotlin_exts/UsbDeviceVidPidName.kt
similarity index 90%
rename from app/src/main/java/eu/depau/etchdroid/utils/UsbDeviceVidPidName.kt
rename to app/src/main/java/eu/depau/etchdroid/kotlin_exts/UsbDeviceVidPidName.kt
index 81633e5..76a0ac9 100644
--- a/app/src/main/java/eu/depau/etchdroid/utils/UsbDeviceVidPidName.kt
+++ b/app/src/main/java/eu/depau/etchdroid/kotlin_exts/UsbDeviceVidPidName.kt
@@ -1,4 +1,4 @@
-package eu.depau.etchdroid.utils
+package eu.depau.etchdroid.kotlin_exts
 
 import android.hardware.usb.UsbDevice
 import android.os.Build
diff --git a/app/src/main/java/eu/depau/etchdroid/utils/ViewSnackbar.kt b/app/src/main/java/eu/depau/etchdroid/kotlin_exts/ViewSnackbar.kt
similarity index 83%
rename from app/src/main/java/eu/depau/etchdroid/utils/ViewSnackbar.kt
rename to app/src/main/java/eu/depau/etchdroid/kotlin_exts/ViewSnackbar.kt
index 3ea8303..e34c342 100644
--- a/app/src/main/java/eu/depau/etchdroid/utils/ViewSnackbar.kt
+++ b/app/src/main/java/eu/depau/etchdroid/kotlin_exts/ViewSnackbar.kt
@@ -1,4 +1,4 @@
-package eu.depau.etchdroid.utils
+package eu.depau.etchdroid.kotlin_exts
 
 import android.support.design.widget.Snackbar
 import android.view.View
diff --git a/app/src/main/java/eu/depau/etchdroid/services/UsbAPIWriteService.kt b/app/src/main/java/eu/depau/etchdroid/services/UsbAPIWriteService.kt
index 5c4c4c8..e3cf585 100644
--- a/app/src/main/java/eu/depau/etchdroid/services/UsbAPIWriteService.kt
+++ b/app/src/main/java/eu/depau/etchdroid/services/UsbAPIWriteService.kt
@@ -6,9 +6,9 @@ import android.net.Uri
 import android.util.Log
 import com.github.mjdev.libaums.UsbMassStorageDevice
 import eu.depau.etchdroid.abc.UsbWriteService
-import eu.depau.etchdroid.utils.getFileName
-import eu.depau.etchdroid.utils.getFileSize
-import eu.depau.etchdroid.utils.name
+import eu.depau.etchdroid.kotlin_exts.getFileName
+import eu.depau.etchdroid.kotlin_exts.getFileSize
+import eu.depau.etchdroid.kotlin_exts.name
 import java.nio.ByteBuffer
 
 class UsbAPIWriteService : UsbWriteService("UsbAPIWriteService") {