Move abstract classes to respective packages
This commit is contained in:
parent
d11efbe41f
commit
34d8f52e1d
11 changed files with 12 additions and 16 deletions
|
@ -3,7 +3,7 @@ package eu.depau.etchdroid
|
||||||
import android.hardware.usb.UsbDevice
|
import android.hardware.usb.UsbDevice
|
||||||
import android.net.Uri
|
import android.net.Uri
|
||||||
import com.github.mjdev.libaums.UsbMassStorageDevice
|
import com.github.mjdev.libaums.UsbMassStorageDevice
|
||||||
import eu.depau.etchdroid.abc.WizardFragment
|
import eu.depau.etchdroid.fragments.WizardFragment
|
||||||
import eu.depau.etchdroid.enums.FlashMethod
|
import eu.depau.etchdroid.enums.FlashMethod
|
||||||
import eu.depau.etchdroid.enums.ImageLocation
|
import eu.depau.etchdroid.enums.ImageLocation
|
||||||
import eu.depau.etchdroid.enums.WizardStep
|
import eu.depau.etchdroid.enums.WizardStep
|
||||||
|
|
|
@ -12,8 +12,7 @@ import android.view.Menu
|
||||||
import android.view.MenuItem
|
import android.view.MenuItem
|
||||||
import eu.depau.etchdroid.R
|
import eu.depau.etchdroid.R
|
||||||
import eu.depau.etchdroid.StateKeeper
|
import eu.depau.etchdroid.StateKeeper
|
||||||
import eu.depau.etchdroid.abc.WizardActivity
|
import eu.depau.etchdroid.fragments.WizardFragment
|
||||||
import eu.depau.etchdroid.abc.WizardFragment
|
|
||||||
import eu.depau.etchdroid.fragments.FlashMethodFragment
|
import eu.depau.etchdroid.fragments.FlashMethodFragment
|
||||||
import eu.depau.etchdroid.fragments.UsbDriveFragment
|
import eu.depau.etchdroid.fragments.UsbDriveFragment
|
||||||
import kotlinx.android.synthetic.main.activity_main.*
|
import kotlinx.android.synthetic.main.activity_main.*
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package eu.depau.etchdroid.abc
|
package eu.depau.etchdroid.activities
|
||||||
|
|
||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
|
@ -6,6 +6,7 @@ import android.support.v7.app.AppCompatActivity
|
||||||
import android.view.View
|
import android.view.View
|
||||||
import com.github.isabsent.filepicker.SimpleFilePickerDialog
|
import com.github.isabsent.filepicker.SimpleFilePickerDialog
|
||||||
import eu.depau.etchdroid.StateKeeper
|
import eu.depau.etchdroid.StateKeeper
|
||||||
|
import eu.depau.etchdroid.fragments.WizardFragment
|
||||||
|
|
||||||
abstract class WizardActivity : AppCompatActivity(), SimpleFilePickerDialog.InteractionListenerString {
|
abstract class WizardActivity : AppCompatActivity(), SimpleFilePickerDialog.InteractionListenerString {
|
||||||
override fun onResult(dialogTag: String, which: Int, extras: Bundle): Boolean {
|
override fun onResult(dialogTag: String, which: Int, extras: Bundle): Boolean {
|
|
@ -7,7 +7,6 @@ import android.view.View
|
||||||
import android.view.ViewGroup
|
import android.view.ViewGroup
|
||||||
import eu.depau.etchdroid.R
|
import eu.depau.etchdroid.R
|
||||||
import eu.depau.etchdroid.StateKeeper
|
import eu.depau.etchdroid.StateKeeper
|
||||||
import eu.depau.etchdroid.abc.WizardFragment
|
|
||||||
import eu.depau.etchdroid.services.UsbAPIWriteService
|
import eu.depau.etchdroid.services.UsbAPIWriteService
|
||||||
import eu.depau.etchdroid.kotlin_exts.*
|
import eu.depau.etchdroid.kotlin_exts.*
|
||||||
import eu.depau.etchdroid.enums.FlashMethod
|
import eu.depau.etchdroid.enums.FlashMethod
|
||||||
|
|
|
@ -6,8 +6,7 @@ import android.view.View
|
||||||
import android.view.ViewGroup
|
import android.view.ViewGroup
|
||||||
import eu.depau.etchdroid.R
|
import eu.depau.etchdroid.R
|
||||||
import eu.depau.etchdroid.StateKeeper
|
import eu.depau.etchdroid.StateKeeper
|
||||||
import eu.depau.etchdroid.abc.WizardActivity
|
import eu.depau.etchdroid.activities.WizardActivity
|
||||||
import eu.depau.etchdroid.abc.WizardFragment
|
|
||||||
import eu.depau.etchdroid.kotlin_exts.snackbar
|
import eu.depau.etchdroid.kotlin_exts.snackbar
|
||||||
import eu.depau.etchdroid.enums.FlashMethod
|
import eu.depau.etchdroid.enums.FlashMethod
|
||||||
import eu.depau.etchdroid.enums.WizardStep
|
import eu.depau.etchdroid.enums.WizardStep
|
||||||
|
|
|
@ -16,8 +16,7 @@ import android.view.ViewGroup
|
||||||
import com.github.isabsent.filepicker.SimpleFilePickerDialog
|
import com.github.isabsent.filepicker.SimpleFilePickerDialog
|
||||||
import eu.depau.etchdroid.R
|
import eu.depau.etchdroid.R
|
||||||
import eu.depau.etchdroid.StateKeeper
|
import eu.depau.etchdroid.StateKeeper
|
||||||
import eu.depau.etchdroid.abc.WizardActivity
|
import eu.depau.etchdroid.activities.WizardActivity
|
||||||
import eu.depau.etchdroid.abc.WizardFragment
|
|
||||||
import eu.depau.etchdroid.kotlin_exts.getFileName
|
import eu.depau.etchdroid.kotlin_exts.getFileName
|
||||||
import eu.depau.etchdroid.kotlin_exts.snackbar
|
import eu.depau.etchdroid.kotlin_exts.snackbar
|
||||||
import eu.depau.etchdroid.enums.FlashMethod
|
import eu.depau.etchdroid.enums.FlashMethod
|
||||||
|
|
|
@ -11,9 +11,8 @@ import android.view.*
|
||||||
import com.github.mjdev.libaums.UsbMassStorageDevice
|
import com.github.mjdev.libaums.UsbMassStorageDevice
|
||||||
import eu.depau.etchdroid.R
|
import eu.depau.etchdroid.R
|
||||||
import eu.depau.etchdroid.StateKeeper
|
import eu.depau.etchdroid.StateKeeper
|
||||||
import eu.depau.etchdroid.abc.ClickListener
|
import eu.depau.etchdroid.utils.ClickListener
|
||||||
import eu.depau.etchdroid.abc.WizardActivity
|
import eu.depau.etchdroid.activities.WizardActivity
|
||||||
import eu.depau.etchdroid.abc.WizardFragment
|
|
||||||
import eu.depau.etchdroid.activities.MainActivity
|
import eu.depau.etchdroid.activities.MainActivity
|
||||||
import eu.depau.etchdroid.adapters.UsbDrivesRecyclerViewAdapter
|
import eu.depau.etchdroid.adapters.UsbDrivesRecyclerViewAdapter
|
||||||
import eu.depau.etchdroid.kotlin_exts.name
|
import eu.depau.etchdroid.kotlin_exts.name
|
||||||
|
|
|
@ -1,8 +1,9 @@
|
||||||
package eu.depau.etchdroid.abc
|
package eu.depau.etchdroid.fragments
|
||||||
|
|
||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
import android.support.v4.app.Fragment
|
import android.support.v4.app.Fragment
|
||||||
import android.view.View
|
import android.view.View
|
||||||
|
import eu.depau.etchdroid.activities.WizardActivity
|
||||||
|
|
||||||
abstract class WizardFragment() : Fragment() {
|
abstract class WizardFragment() : Fragment() {
|
||||||
private lateinit var wizardActivity: WizardActivity
|
private lateinit var wizardActivity: WizardActivity
|
|
@ -5,7 +5,6 @@ import android.hardware.usb.UsbDevice
|
||||||
import android.net.Uri
|
import android.net.Uri
|
||||||
import android.util.Log
|
import android.util.Log
|
||||||
import com.github.mjdev.libaums.UsbMassStorageDevice
|
import com.github.mjdev.libaums.UsbMassStorageDevice
|
||||||
import eu.depau.etchdroid.abc.UsbWriteService
|
|
||||||
import eu.depau.etchdroid.kotlin_exts.getFileName
|
import eu.depau.etchdroid.kotlin_exts.getFileName
|
||||||
import eu.depau.etchdroid.kotlin_exts.getFileSize
|
import eu.depau.etchdroid.kotlin_exts.getFileSize
|
||||||
import eu.depau.etchdroid.kotlin_exts.name
|
import eu.depau.etchdroid.kotlin_exts.name
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package eu.depau.etchdroid.abc
|
package eu.depau.etchdroid.services
|
||||||
|
|
||||||
import android.app.IntentService
|
import android.app.IntentService
|
||||||
import android.app.Notification
|
import android.app.Notification
|
|
@ -1,4 +1,4 @@
|
||||||
package eu.depau.etchdroid.abc
|
package eu.depau.etchdroid.utils
|
||||||
|
|
||||||
import android.view.View
|
import android.view.View
|
||||||
|
|
Loading…
Reference in a new issue