Structure refactor

EtchDroid · Dec 22, 2018 · 53c21a8 · 53c21a8
1 parent b286782
commit 53c21a8
Show file tree

Hide file tree

Showing 51 changed files with 579 additions and 196 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -21,7 +21,7 @@
         android:theme="@style/AppTheme"
         tools:ignore="GoogleAppIndexingWarning">
         <activity
-            android:name=".activities.StartActivity"
+            android:name="eu.depau.etchdroid.ui.activities.StartActivity"
             android:label="@string/app_name"
             android:theme="@style/MaterialAppTheme">
             <intent-filter>
@@ -31,14 +31,14 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".activities.UsbDrivePickerActivity"
+            android:name="eu.depau.etchdroid.ui.activities.UsbDrivePickerActivity"
             android:label="@string/title_activity_usb_drive_picker"
-            android:parentActivityName=".activities.StartActivity"
+            android:parentActivityName="eu.depau.etchdroid.ui.activities.StartActivity"
             android:theme="@style/MaterialAppTheme">
 
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="eu.depau.etchdroid.activities.StartActivity"/>
+                android:value="eu.depau.etchdroid.ui.activities.StartActivity"/>
 
             <!-- Open ISO files by mimetype -->
             <intent-filter android:label="@string/app_name">
@@ -126,17 +126,17 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".activities.ConfirmationActivity"
+            android:name="eu.depau.etchdroid.ui.activities.ConfirmationActivity"
             android:label="@string/title_activity_confirmation"
-            android:parentActivityName=".activities.UsbDrivePickerActivity"
+            android:parentActivityName="eu.depau.etchdroid.ui.activities.UsbDrivePickerActivity"
             android:theme="@style/MaterialAppTheme">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="eu.depau.etchdroid.activities.UsbDrivePickerActivity"/>
+                android:value="eu.depau.etchdroid.ui.activities.UsbDrivePickerActivity"/>
         </activity>
 
         <activity
-            android:name=".activities.ErrorActivity"
+            android:name="eu.depau.etchdroid.ui.activities.ErrorActivity"
             android:excludeFromRecents="true"
             android:label="@string/write_failed"
             android:launchMode="singleTask"

diff --git a/app/src/main/java/eu/depau/etchdroid/StateKeeper.kt b/app/src/main/java/eu/depau/etchdroid/StateKeeper.kt
@@ -3,8 +3,8 @@ package eu.depau.etchdroid
 import android.hardware.usb.UsbDevice
 import android.net.Uri
 import com.github.mjdev.libaums.UsbMassStorageDevice
-import eu.depau.etchdroid.enums.FlashMethod
-import eu.depau.etchdroid.img_types.Image
+import eu.depau.etchdroid.utils.enums.FlashMethod
+import eu.depau.etchdroid.utils.imagetypes.Image
 
 object StateKeeper {
     var flashMethod: FlashMethod? = null

diff --git a/app/src/main/java/eu/depau/etchdroid/activities/LicensesActivity.kt b/app/src/main/java/eu/depau/etchdroid/activities/LicensesActivity.kt
diff --git a/app/src/main/java/eu/depau/etchdroid/adapters/LicenseRecyclerViewAdapter.kt b/app/src/main/java/eu/depau/etchdroid/adapters/LicenseRecyclerViewAdapter.kt
diff --git a/app/src/main/java/eu/depau/etchdroid/enums/PartitionType.kt b/app/src/main/java/eu/depau/etchdroid/enums/PartitionType.kt
diff --git a/app/src/main/java/eu/depau/etchdroid/services/UsbApiDmgWriteService.kt b/app/src/main/java/eu/depau/etchdroid/services/UsbApiDmgWriteService.kt
@@ -5,10 +5,10 @@ import android.net.Uri
 import com.google.common.util.concurrent.SimpleTimeLimiter
 import com.google.common.util.concurrent.TimeLimiter
 import com.google.common.util.concurrent.UncheckedTimeoutException
-import eu.depau.etchdroid.kotlin_exts.getBinary
-import eu.depau.etchdroid.kotlin_exts.getFileName
-import eu.depau.etchdroid.kotlin_exts.getFileSize
-import eu.depau.etchdroid.kotlin_exts.name
+import eu.depau.etchdroid.utils.ktexts.getBinary
+import eu.depau.etchdroid.utils.ktexts.getFileName
+import eu.depau.etchdroid.utils.ktexts.getFileSize
+import eu.depau.etchdroid.utils.ktexts.name
 import java.io.BufferedReader
 import java.io.InputStream
 import java.util.concurrent.Executors

diff --git a/app/src/main/java/eu/depau/etchdroid/services/UsbApiImgWriteService.kt b/app/src/main/java/eu/depau/etchdroid/services/UsbApiImgWriteService.kt
@@ -2,9 +2,9 @@ package eu.depau.etchdroid.services
 
 import android.hardware.usb.UsbDevice
 import android.net.Uri
-import eu.depau.etchdroid.kotlin_exts.getFileName
-import eu.depau.etchdroid.kotlin_exts.getFileSize
-import eu.depau.etchdroid.kotlin_exts.name
+import eu.depau.etchdroid.utils.ktexts.getFileName
+import eu.depau.etchdroid.utils.ktexts.getFileSize
+import eu.depau.etchdroid.utils.ktexts.name
 import java.io.InputStream
 
 class UsbApiImgWriteService : UsbApiWriteService("UsbApiImgWriteService") {

diff --git a/app/src/main/java/eu/depau/etchdroid/services/UsbApiWriteService.kt b/app/src/main/java/eu/depau/etchdroid/services/UsbApiWriteService.kt
@@ -5,9 +5,9 @@ import android.hardware.usb.UsbDevice
 import android.net.Uri
 import android.util.Log
 import com.github.mjdev.libaums.UsbMassStorageDevice
-import eu.depau.etchdroid.exceptions.UsbWriteException
-import eu.depau.etchdroid.kotlin_exts.getFileName
-import eu.depau.etchdroid.kotlin_exts.name
+import eu.depau.etchdroid.utils.exception.UsbWriteException
+import eu.depau.etchdroid.utils.ktexts.getFileName
+import eu.depau.etchdroid.utils.ktexts.name
 import java.io.BufferedInputStream
 import java.io.InputStream
 import java.nio.ByteBuffer

diff --git a/app/src/main/java/eu/depau/etchdroid/services/UsbWriteService.kt b/app/src/main/java/eu/depau/etchdroid/services/UsbWriteService.kt
@@ -7,9 +7,9 @@ import android.os.Build
 import android.os.PowerManager
 import androidx.core.app.NotificationCompat
 import eu.depau.etchdroid.R
-import eu.depau.etchdroid.activities.ErrorActivity
-import eu.depau.etchdroid.kotlin_exts.toHRSize
-import eu.depau.etchdroid.kotlin_exts.toHRTime
+import eu.depau.etchdroid.ui.activities.ErrorActivity
+import eu.depau.etchdroid.utils.ktexts.toHRSize
+import eu.depau.etchdroid.utils.ktexts.toHRTime
 import java.util.*
 import kotlin.math.max
 

diff --git a/...epau/etchdroid/activities/ActivityBase.kt → ...u/etchdroid/ui/activities/ActivityBase.kt b/...epau/etchdroid/activities/ActivityBase.kt → ...u/etchdroid/ui/activities/ActivityBase.kt
@@ -1,4 +1,4 @@
-package eu.depau.etchdroid.activities
+package eu.depau.etchdroid.ui.activities
 
 import android.Manifest
 import android.content.pm.PackageManager
@@ -10,9 +10,9 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import eu.depau.etchdroid.R
-import eu.depau.etchdroid.kotlin_exts.toast
-import eu.depau.etchdroid.utils.DoNotShowAgainDialogFragment
-import eu.depau.etchdroid.utils.NightModeHelper
+import eu.depau.etchdroid.utils.ktexts.toast
+import eu.depau.etchdroid.ui.misc.DoNotShowAgainDialogFragment
+import eu.depau.etchdroid.ui.misc.NightModeHelper
 import me.jfenn.attribouter.Attribouter
 import android.content.Intent
 import android.net.Uri

diff --git a/...hdroid/activities/ConfirmationActivity.kt → ...oid/ui/activities/ConfirmationActivity.kt b/...hdroid/activities/ConfirmationActivity.kt → ...oid/ui/activities/ConfirmationActivity.kt
@@ -1,4 +1,4 @@
-package eu.depau.etchdroid.activities
+package eu.depau.etchdroid.ui.activities
 
 import android.content.Intent
 import android.os.Build
@@ -8,13 +8,13 @@ import android.widget.Toast
 import androidx.recyclerview.widget.LinearLayoutManager
 import eu.depau.etchdroid.R
 import eu.depau.etchdroid.StateKeeper
-import eu.depau.etchdroid.adapters.PartitionTableRecyclerViewAdapter
-import eu.depau.etchdroid.enums.FlashMethod
-import eu.depau.etchdroid.img_types.DMGImage
-import eu.depau.etchdroid.kotlin_exts.*
+import eu.depau.etchdroid.ui.adapters.PartitionTableRecyclerViewAdapter
+import eu.depau.etchdroid.utils.enums.FlashMethod
+import eu.depau.etchdroid.utils.imagetypes.DMGImage
+import eu.depau.etchdroid.utils.ktexts.*
 import eu.depau.etchdroid.services.UsbApiDmgWriteService
 import eu.depau.etchdroid.services.UsbApiImgWriteService
-import eu.depau.etchdroid.utils.DoNotShowAgainDialogFragment
+import eu.depau.etchdroid.ui.misc.DoNotShowAgainDialogFragment
 import kotlinx.android.synthetic.main.activity_confirmation.*
 import java.io.IOException
 

diff --git a/...pau/etchdroid/activities/ErrorActivity.kt → .../etchdroid/ui/activities/ErrorActivity.kt b/...pau/etchdroid/activities/ErrorActivity.kt → .../etchdroid/ui/activities/ErrorActivity.kt
@@ -1,4 +1,4 @@
-package eu.depau.etchdroid.activities
+package eu.depau.etchdroid.ui.activities
 
 import android.os.Bundle
 import eu.depau.etchdroid.R

diff --git a/...pau/etchdroid/activities/StartActivity.kt → .../etchdroid/ui/activities/StartActivity.kt b/...pau/etchdroid/activities/StartActivity.kt → .../etchdroid/ui/activities/StartActivity.kt
@@ -1,4 +1,4 @@
-package eu.depau.etchdroid.activities
+package eu.depau.etchdroid.ui.activities
 
 import android.content.Intent
 import android.content.pm.PackageManager
@@ -10,8 +10,8 @@ import androidx.appcompat.app.AppCompatActivity
 import com.codekidlabs.storagechooser.StorageChooser
 import eu.depau.etchdroid.R
 import eu.depau.etchdroid.StateKeeper
-import eu.depau.etchdroid.enums.FlashMethod
-import eu.depau.etchdroid.utils.DoNotShowAgainDialogFragment
+import eu.depau.etchdroid.utils.enums.FlashMethod
+import eu.depau.etchdroid.ui.misc.DoNotShowAgainDialogFragment
 import kotlinx.android.synthetic.main.activity_start.*
 import java.io.File
 

diff --git a/...roid/activities/UsbDrivePickerActivity.kt → ...d/ui/activities/UsbDrivePickerActivity.kt b/...roid/activities/UsbDrivePickerActivity.kt → ...d/ui/activities/UsbDrivePickerActivity.kt
@@ -1,4 +1,4 @@
-package eu.depau.etchdroid.activities
+package eu.depau.etchdroid.ui.activities
 
 import android.app.PendingIntent
 import android.content.BroadcastReceiver
@@ -19,12 +19,12 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import com.github.mjdev.libaums.UsbMassStorageDevice
 import eu.depau.etchdroid.R
 import eu.depau.etchdroid.StateKeeper
-import eu.depau.etchdroid.adapters.UsbDrivesRecyclerViewAdapter
-import eu.depau.etchdroid.enums.FlashMethod
-import eu.depau.etchdroid.kotlin_exts.*
-import eu.depau.etchdroid.utils.ClickListener
-import eu.depau.etchdroid.utils.EmptyRecyclerView
-import eu.depau.etchdroid.utils.RecyclerViewTouchListener
+import eu.depau.etchdroid.ui.adapters.UsbDrivesRecyclerViewAdapter
+import eu.depau.etchdroid.utils.enums.FlashMethod
+import eu.depau.etchdroid.utils.ktexts.*
+import eu.depau.etchdroid.ui.misc.ClickListener
+import eu.depau.etchdroid.ui.misc.EmptyRecyclerView
+import eu.depau.etchdroid.ui.misc.RecyclerViewTouchListener
 import kotlinx.android.synthetic.main.activity_usb_drive_picker.*
 import java.io.File
 

diff --git a/...ters/PartitionTableRecyclerViewAdapter.kt → ...ters/PartitionTableRecyclerViewAdapter.kt b/...ters/PartitionTableRecyclerViewAdapter.kt → ...ters/PartitionTableRecyclerViewAdapter.kt
@@ -1,11 +1,11 @@
-package eu.depau.etchdroid.adapters
+package eu.depau.etchdroid.ui.adapters
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import android.widget.LinearLayout
 import androidx.recyclerview.widget.RecyclerView
 import eu.depau.etchdroid.R
-import eu.depau.etchdroid.kotlin_exts.toHRSize
+import eu.depau.etchdroid.utils.ktexts.toHRSize
 import eu.depau.etchdroid.utils.Partition
 import kotlinx.android.synthetic.main.part_data_keyvalue.view.*
 import kotlinx.android.synthetic.main.partition_row.view.*

diff --git a/.../adapters/UsbDrivesRecyclerViewAdapter.kt → .../adapters/UsbDrivesRecyclerViewAdapter.kt b/.../adapters/UsbDrivesRecyclerViewAdapter.kt → .../adapters/UsbDrivesRecyclerViewAdapter.kt
@@ -1,4 +1,4 @@
-package eu.depau.etchdroid.adapters
+package eu.depau.etchdroid.ui.adapters
 
 import android.annotation.SuppressLint
 import android.os.Build
@@ -8,7 +8,7 @@ import android.widget.RelativeLayout
 import androidx.recyclerview.widget.RecyclerView
 import com.github.mjdev.libaums.UsbMassStorageDevice
 import eu.depau.etchdroid.R
-import eu.depau.etchdroid.kotlin_exts.vidpid
+import eu.depau.etchdroid.utils.ktexts.vidpid
 import kotlinx.android.synthetic.main.usb_device_row.view.*
 
 class UsbDrivesRecyclerViewAdapter(private val dataset: Array<UsbMassStorageDevice>) : RecyclerView.Adapter<UsbDrivesRecyclerViewAdapter.ViewHolder>() {

diff --git a/...eu/depau/etchdroid/utils/ClickListener.kt → .../depau/etchdroid/ui/misc/ClickListener.kt b/...eu/depau/etchdroid/utils/ClickListener.kt → .../depau/etchdroid/ui/misc/ClickListener.kt
@@ -1,4 +1,4 @@
-package eu.depau.etchdroid.utils
+package eu.depau.etchdroid.ui.misc
 
 import android.view.View
 

diff --git a/...oid/utils/DoNotShowAgainDialogFragment.kt → ...d/ui/misc/DoNotShowAgainDialogFragment.kt b/...oid/utils/DoNotShowAgainDialogFragment.kt → ...d/ui/misc/DoNotShowAgainDialogFragment.kt
@@ -1,4 +1,4 @@
-package eu.depau.etchdroid.utils
+package eu.depau.etchdroid.ui.misc
 
 import android.annotation.SuppressLint
 import android.app.Dialog

diff --git a/...epau/etchdroid/utils/EmptyRecyclerView.kt → ...au/etchdroid/ui/misc/EmptyRecyclerView.kt b/...epau/etchdroid/utils/EmptyRecyclerView.kt → ...au/etchdroid/ui/misc/EmptyRecyclerView.kt
@@ -1,4 +1,4 @@
-package eu.depau.etchdroid.utils
+package eu.depau.etchdroid.ui.misc
 
 import android.content.Context
 import android.util.AttributeSet

diff --git a/.../depau/etchdroid/utils/NightModeHelper.kt → ...epau/etchdroid/ui/misc/NightModeHelper.kt b/.../depau/etchdroid/utils/NightModeHelper.kt → ...epau/etchdroid/ui/misc/NightModeHelper.kt
@@ -1,4 +1,4 @@
-package eu.depau.etchdroid.utils
+package eu.depau.etchdroid.ui.misc
 
 import android.content.SharedPreferences
 import android.content.res.Configuration

diff --git a/...hdroid/utils/RecyclerViewTouchListener.kt → ...roid/ui/misc/RecyclerViewTouchListener.kt b/...hdroid/utils/RecyclerViewTouchListener.kt → ...roid/ui/misc/RecyclerViewTouchListener.kt
@@ -1,4 +1,4 @@
-package eu.depau.etchdroid.utils
+package eu.depau.etchdroid.ui.misc
 
 import android.content.Context
 import android.view.GestureDetector

diff --git a/app/src/main/java/eu/depau/etchdroid/utils/License.kt b/app/src/main/java/eu/depau/etchdroid/utils/License.kt