From d49497f2e06278ee15c3159f0e02fa81e7a42c22 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Wed, 15 Aug 2018 19:04:45 +0200 Subject: [PATCH] Rebrand from "DDroid" to "EtchDroid" --- app/build.gradle | 2 +- .../ExampleInstrumentedTest.kt | 4 ++-- app/src/main/AndroidManifest.xml | 2 +- .../{ddroid => etchdroid}/StateKeeper.kt | 10 ++++----- .../abc/ClickListener.kt | 2 +- .../abc/UsbWriteService.kt | 16 +++++++------- .../abc/WizardActivity.kt | 4 ++-- .../abc/WizardFragment.kt | 2 +- .../activities/MainActivity.kt | 16 +++++++------- .../fragments/ConfirmInfoFragment.kt | 18 +++++++-------- .../fragments/FlashMethodFragment.kt | 16 +++++++------- .../fragments/ImageLocationFragment.kt | 20 ++++++++--------- .../fragments/UsbDriveFragment.kt | 22 +++++++++---------- .../services/UsbAPIWriteService.kt | 14 ++++++------ .../utils/ContextToast.kt | 2 +- .../utils/NumberToSizeString.kt | 2 +- .../utils/NumberToTimeString.kt | 2 +- .../utils/UriGetDisplayName.kt | 2 +- .../utils/UriGetFileSize.kt | 2 +- .../utils/UsbDeviceVidPidName.kt | 2 +- .../utils/UsbDrivesRecyclerViewAdapter.kt | 4 ++-- .../utils/ViewSnackbar.kt | 2 +- .../values/FlashMethod.kt | 2 +- .../values/ImageLocation.kt | 2 +- .../values/WizardStep.kt | 2 +- app/src/main/res/menu/menu_main.xml | 2 +- app/src/main/res/menu/usb_devices_menu.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- .../{ddroid => etchdroid}/ExampleUnitTest.kt | 2 +- 29 files changed, 90 insertions(+), 90 deletions(-) rename app/src/androidTest/java/eu/depau/{ddroid => etchdroid}/ExampleInstrumentedTest.kt (85%) rename app/src/main/java/eu/depau/{ddroid => etchdroid}/StateKeeper.kt (70%) rename app/src/main/java/eu/depau/{ddroid => etchdroid}/abc/ClickListener.kt (81%) rename app/src/main/java/eu/depau/{ddroid => etchdroid}/abc/UsbWriteService.kt (93%) rename app/src/main/java/eu/depau/{ddroid => etchdroid}/abc/WizardActivity.kt (93%) rename app/src/main/java/eu/depau/{ddroid => etchdroid}/abc/WizardFragment.kt (95%) rename app/src/main/java/eu/depau/{ddroid => etchdroid}/activities/MainActivity.kt (89%) rename app/src/main/java/eu/depau/{ddroid => etchdroid}/fragments/ConfirmInfoFragment.kt (90%) rename app/src/main/java/eu/depau/{ddroid => etchdroid}/fragments/FlashMethodFragment.kt (79%) rename app/src/main/java/eu/depau/{ddroid => etchdroid}/fragments/ImageLocationFragment.kt (94%) rename app/src/main/java/eu/depau/{ddroid => etchdroid}/fragments/UsbDriveFragment.kt (92%) rename app/src/main/java/eu/depau/{ddroid => etchdroid}/services/UsbAPIWriteService.kt (87%) rename app/src/main/java/eu/depau/{ddroid => etchdroid}/utils/ContextToast.kt (84%) rename app/src/main/java/eu/depau/{ddroid => etchdroid}/utils/NumberToSizeString.kt (95%) rename app/src/main/java/eu/depau/{ddroid => etchdroid}/utils/NumberToTimeString.kt (90%) rename app/src/main/java/eu/depau/{ddroid => etchdroid}/utils/UriGetDisplayName.kt (95%) rename app/src/main/java/eu/depau/{ddroid => etchdroid}/utils/UriGetFileSize.kt (97%) rename app/src/main/java/eu/depau/{ddroid => etchdroid}/utils/UsbDeviceVidPidName.kt (91%) rename app/src/main/java/eu/depau/{ddroid => etchdroid}/utils/UsbDrivesRecyclerViewAdapter.kt (96%) rename app/src/main/java/eu/depau/{ddroid => etchdroid}/utils/ViewSnackbar.kt (85%) rename app/src/main/java/eu/depau/{ddroid => etchdroid}/values/FlashMethod.kt (72%) rename app/src/main/java/eu/depau/{ddroid => etchdroid}/values/ImageLocation.kt (58%) rename app/src/main/java/eu/depau/{ddroid => etchdroid}/values/WizardStep.kt (75%) rename app/src/test/java/eu/depau/{ddroid => etchdroid}/ExampleUnitTest.kt (92%) diff --git a/app/build.gradle b/app/build.gradle index 1a62968..4b7462b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,7 +7,7 @@ apply plugin: 'kotlin-android-extensions' android { compileSdkVersion 28 defaultConfig { - applicationId "eu.depau.ddroid" + applicationId "eu.depau.etchdroid" minSdkVersion 19 targetSdkVersion 28 versionCode 1 diff --git a/app/src/androidTest/java/eu/depau/ddroid/ExampleInstrumentedTest.kt b/app/src/androidTest/java/eu/depau/etchdroid/ExampleInstrumentedTest.kt similarity index 85% rename from app/src/androidTest/java/eu/depau/ddroid/ExampleInstrumentedTest.kt rename to app/src/androidTest/java/eu/depau/etchdroid/ExampleInstrumentedTest.kt index 696e183..199add1 100644 --- a/app/src/androidTest/java/eu/depau/ddroid/ExampleInstrumentedTest.kt +++ b/app/src/androidTest/java/eu/depau/etchdroid/ExampleInstrumentedTest.kt @@ -1,4 +1,4 @@ -package eu.depau.ddroid +package eu.depau.etchdroid import android.support.test.InstrumentationRegistry import android.support.test.runner.AndroidJUnit4 @@ -19,6 +19,6 @@ class ExampleInstrumentedTest { fun useAppContext() { // Context of the app under test. val appContext = InstrumentationRegistry.getTargetContext() - assertEquals("eu.depau.ddroid", appContext.packageName) + assertEquals("eu.depau.etchdroid", appContext.packageName) } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 50d4301..191307b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="eu.depau.etchdroid"> diff --git a/app/src/main/java/eu/depau/ddroid/StateKeeper.kt b/app/src/main/java/eu/depau/etchdroid/StateKeeper.kt similarity index 70% rename from app/src/main/java/eu/depau/ddroid/StateKeeper.kt rename to app/src/main/java/eu/depau/etchdroid/StateKeeper.kt index 18e0e25..3197dae 100644 --- a/app/src/main/java/eu/depau/ddroid/StateKeeper.kt +++ b/app/src/main/java/eu/depau/etchdroid/StateKeeper.kt @@ -1,12 +1,12 @@ -package eu.depau.ddroid +package eu.depau.etchdroid import android.hardware.usb.UsbDevice import android.net.Uri import com.github.mjdev.libaums.UsbMassStorageDevice -import eu.depau.ddroid.abc.WizardFragment -import eu.depau.ddroid.values.FlashMethod -import eu.depau.ddroid.values.ImageLocation -import eu.depau.ddroid.values.WizardStep +import eu.depau.etchdroid.abc.WizardFragment +import eu.depau.etchdroid.values.FlashMethod +import eu.depau.etchdroid.values.ImageLocation +import eu.depau.etchdroid.values.WizardStep object StateKeeper { var wizardStep: WizardStep = WizardStep.SELECT_FLASH_METHOD diff --git a/app/src/main/java/eu/depau/ddroid/abc/ClickListener.kt b/app/src/main/java/eu/depau/etchdroid/abc/ClickListener.kt similarity index 81% rename from app/src/main/java/eu/depau/ddroid/abc/ClickListener.kt rename to app/src/main/java/eu/depau/etchdroid/abc/ClickListener.kt index 50d4d00..83da319 100644 --- a/app/src/main/java/eu/depau/ddroid/abc/ClickListener.kt +++ b/app/src/main/java/eu/depau/etchdroid/abc/ClickListener.kt @@ -1,4 +1,4 @@ -package eu.depau.ddroid.abc +package eu.depau.etchdroid.abc import android.view.View diff --git a/app/src/main/java/eu/depau/ddroid/abc/UsbWriteService.kt b/app/src/main/java/eu/depau/etchdroid/abc/UsbWriteService.kt similarity index 93% rename from app/src/main/java/eu/depau/ddroid/abc/UsbWriteService.kt rename to app/src/main/java/eu/depau/etchdroid/abc/UsbWriteService.kt index 15220d2..a43cb0d 100644 --- a/app/src/main/java/eu/depau/ddroid/abc/UsbWriteService.kt +++ b/app/src/main/java/eu/depau/etchdroid/abc/UsbWriteService.kt @@ -1,4 +1,4 @@ -package eu.depau.ddroid.abc +package eu.depau.etchdroid.abc import android.app.IntentService import android.app.Notification @@ -10,19 +10,19 @@ import android.net.Uri import android.os.Build import android.os.PowerManager import android.support.v4.app.NotificationCompat -import eu.depau.ddroid.R -import eu.depau.ddroid.utils.getFileName -import eu.depau.ddroid.utils.toHRSize -import eu.depau.ddroid.utils.toHRTime +import eu.depau.etchdroid.R +import eu.depau.etchdroid.utils.getFileName +import eu.depau.etchdroid.utils.toHRSize +import eu.depau.etchdroid.utils.toHRTime abstract class UsbWriteService(name: String) : IntentService(name) { val TAG = name val FOREGROUND_ID = 1931 val RESULT_NOTIFICATION_ID = 3829 - val WRITE_PROGRESS_CHANNEL_ID = "eu.depau.ddroid.notifications.USB_WRITE_PROGRESS" - val WRITE_RESULT_CHANNEL_ID = "eu.depau.ddroid.notifications.USB_WRITE_RESULT" - val WAKELOCK_TAG = "eu.depau.ddroid.wakelocks.USB_WRITING" + val WRITE_PROGRESS_CHANNEL_ID = "eu.depau.etchdroid.notifications.USB_WRITE_PROGRESS" + val WRITE_RESULT_CHANNEL_ID = "eu.depau.etchdroid.notifications.USB_WRITE_RESULT" + val WAKELOCK_TAG = "eu.depau.etchdroid.wakelocks.USB_WRITING" private var prevTime = System.currentTimeMillis() private var prevBytes = 0L diff --git a/app/src/main/java/eu/depau/ddroid/abc/WizardActivity.kt b/app/src/main/java/eu/depau/etchdroid/abc/WizardActivity.kt similarity index 93% rename from app/src/main/java/eu/depau/ddroid/abc/WizardActivity.kt rename to app/src/main/java/eu/depau/etchdroid/abc/WizardActivity.kt index 536bca3..3866cde 100644 --- a/app/src/main/java/eu/depau/ddroid/abc/WizardActivity.kt +++ b/app/src/main/java/eu/depau/etchdroid/abc/WizardActivity.kt @@ -1,9 +1,9 @@ -package eu.depau.ddroid.abc +package eu.depau.etchdroid.abc import android.content.Intent import android.support.v7.app.AppCompatActivity import android.view.View -import eu.depau.ddroid.StateKeeper +import eu.depau.etchdroid.StateKeeper abstract class WizardActivity : AppCompatActivity() { abstract fun goToNewFragment(fragment: WizardFragment) diff --git a/app/src/main/java/eu/depau/ddroid/abc/WizardFragment.kt b/app/src/main/java/eu/depau/etchdroid/abc/WizardFragment.kt similarity index 95% rename from app/src/main/java/eu/depau/ddroid/abc/WizardFragment.kt rename to app/src/main/java/eu/depau/etchdroid/abc/WizardFragment.kt index ebe7c78..b7cd24a 100644 --- a/app/src/main/java/eu/depau/ddroid/abc/WizardFragment.kt +++ b/app/src/main/java/eu/depau/etchdroid/abc/WizardFragment.kt @@ -1,4 +1,4 @@ -package eu.depau.ddroid.abc +package eu.depau.etchdroid.abc import android.content.Intent import android.support.v4.app.Fragment diff --git a/app/src/main/java/eu/depau/ddroid/activities/MainActivity.kt b/app/src/main/java/eu/depau/etchdroid/activities/MainActivity.kt similarity index 89% rename from app/src/main/java/eu/depau/ddroid/activities/MainActivity.kt rename to app/src/main/java/eu/depau/etchdroid/activities/MainActivity.kt index eea10fc..ec2971a 100644 --- a/app/src/main/java/eu/depau/ddroid/activities/MainActivity.kt +++ b/app/src/main/java/eu/depau/etchdroid/activities/MainActivity.kt @@ -1,4 +1,4 @@ -package eu.depau.ddroid.activities +package eu.depau.etchdroid.activities import android.app.PendingIntent import android.content.BroadcastReceiver @@ -10,17 +10,17 @@ import android.hardware.usb.UsbManager import android.os.Bundle import android.view.Menu import android.view.MenuItem -import eu.depau.ddroid.R -import eu.depau.ddroid.StateKeeper -import eu.depau.ddroid.abc.WizardActivity -import eu.depau.ddroid.abc.WizardFragment -import eu.depau.ddroid.fragments.FlashMethodFragment -import eu.depau.ddroid.fragments.UsbDriveFragment +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.fragments.FlashMethodFragment +import eu.depau.etchdroid.fragments.UsbDriveFragment import kotlinx.android.synthetic.main.activity_main.* class MainActivity : WizardActivity() { val TAG = "MainActivity" - val ACTION_USB_PERMISSION = "eu.depau.ddroid.USB_PERMISSION" + val ACTION_USB_PERMISSION = "eu.depau.etchdroid.USB_PERMISSION" lateinit var mUsbPermissionIntent: PendingIntent private val mUsbReceiver = object : BroadcastReceiver() { diff --git a/app/src/main/java/eu/depau/ddroid/fragments/ConfirmInfoFragment.kt b/app/src/main/java/eu/depau/etchdroid/fragments/ConfirmInfoFragment.kt similarity index 90% rename from app/src/main/java/eu/depau/ddroid/fragments/ConfirmInfoFragment.kt rename to app/src/main/java/eu/depau/etchdroid/fragments/ConfirmInfoFragment.kt index 46c4f08..19b1ae1 100644 --- a/app/src/main/java/eu/depau/ddroid/fragments/ConfirmInfoFragment.kt +++ b/app/src/main/java/eu/depau/etchdroid/fragments/ConfirmInfoFragment.kt @@ -1,4 +1,4 @@ -package eu.depau.ddroid.fragments +package eu.depau.etchdroid.fragments import android.content.Intent import android.os.Bundle @@ -6,14 +6,14 @@ import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import eu.depau.ddroid.R -import eu.depau.ddroid.StateKeeper -import eu.depau.ddroid.abc.WizardActivity -import eu.depau.ddroid.abc.WizardFragment -import eu.depau.ddroid.services.UsbAPIWriteService -import eu.depau.ddroid.utils.* -import eu.depau.ddroid.values.FlashMethod -import eu.depau.ddroid.values.WizardStep +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.services.UsbAPIWriteService +import eu.depau.etchdroid.utils.* +import eu.depau.etchdroid.values.FlashMethod +import eu.depau.etchdroid.values.WizardStep import kotlinx.android.synthetic.main.fragment_confirminfo.view.* import java.io.IOException diff --git a/app/src/main/java/eu/depau/ddroid/fragments/FlashMethodFragment.kt b/app/src/main/java/eu/depau/etchdroid/fragments/FlashMethodFragment.kt similarity index 79% rename from app/src/main/java/eu/depau/ddroid/fragments/FlashMethodFragment.kt rename to app/src/main/java/eu/depau/etchdroid/fragments/FlashMethodFragment.kt index e6f2ea1..0268816 100644 --- a/app/src/main/java/eu/depau/ddroid/fragments/FlashMethodFragment.kt +++ b/app/src/main/java/eu/depau/etchdroid/fragments/FlashMethodFragment.kt @@ -1,16 +1,16 @@ -package eu.depau.ddroid.fragments +package eu.depau.etchdroid.fragments import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import eu.depau.ddroid.R -import eu.depau.ddroid.StateKeeper -import eu.depau.ddroid.abc.WizardActivity -import eu.depau.ddroid.abc.WizardFragment -import eu.depau.ddroid.utils.snackbar -import eu.depau.ddroid.values.FlashMethod -import eu.depau.ddroid.values.WizardStep +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.values.FlashMethod +import eu.depau.etchdroid.values.WizardStep /** * A placeholder fragment containing a simple view. diff --git a/app/src/main/java/eu/depau/ddroid/fragments/ImageLocationFragment.kt b/app/src/main/java/eu/depau/etchdroid/fragments/ImageLocationFragment.kt similarity index 94% rename from app/src/main/java/eu/depau/ddroid/fragments/ImageLocationFragment.kt rename to app/src/main/java/eu/depau/etchdroid/fragments/ImageLocationFragment.kt index 786b5ab..fd50f7b 100644 --- a/app/src/main/java/eu/depau/ddroid/fragments/ImageLocationFragment.kt +++ b/app/src/main/java/eu/depau/etchdroid/fragments/ImageLocationFragment.kt @@ -1,4 +1,4 @@ -package eu.depau.ddroid.fragments +package eu.depau.etchdroid.fragments import android.Manifest import android.app.Activity @@ -13,15 +13,15 @@ import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import eu.depau.ddroid.R -import eu.depau.ddroid.StateKeeper -import eu.depau.ddroid.abc.WizardActivity -import eu.depau.ddroid.abc.WizardFragment -import eu.depau.ddroid.utils.getFileName -import eu.depau.ddroid.utils.snackbar -import eu.depau.ddroid.values.FlashMethod -import eu.depau.ddroid.values.ImageLocation -import eu.depau.ddroid.values.WizardStep +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.values.FlashMethod +import eu.depau.etchdroid.values.ImageLocation +import eu.depau.etchdroid.values.WizardStep import kotlinx.android.synthetic.main.activity_main.* import kotlinx.android.synthetic.main.fragment_select_location.* import kotlinx.android.synthetic.main.wizard_fragment_layout.* diff --git a/app/src/main/java/eu/depau/ddroid/fragments/UsbDriveFragment.kt b/app/src/main/java/eu/depau/etchdroid/fragments/UsbDriveFragment.kt similarity index 92% rename from app/src/main/java/eu/depau/ddroid/fragments/UsbDriveFragment.kt rename to app/src/main/java/eu/depau/etchdroid/fragments/UsbDriveFragment.kt index 200ab28..c868d15 100644 --- a/app/src/main/java/eu/depau/ddroid/fragments/UsbDriveFragment.kt +++ b/app/src/main/java/eu/depau/etchdroid/fragments/UsbDriveFragment.kt @@ -1,4 +1,4 @@ -package eu.depau.ddroid.fragments +package eu.depau.etchdroid.fragments import android.content.Context import android.hardware.usb.UsbDevice @@ -10,16 +10,16 @@ import android.support.v7.widget.LinearLayoutManager import android.support.v7.widget.RecyclerView import android.view.* import com.github.mjdev.libaums.UsbMassStorageDevice -import eu.depau.ddroid.R -import eu.depau.ddroid.StateKeeper -import eu.depau.ddroid.abc.ClickListener -import eu.depau.ddroid.abc.WizardActivity -import eu.depau.ddroid.abc.WizardFragment -import eu.depau.ddroid.activities.MainActivity -import eu.depau.ddroid.utils.UsbDrivesRecyclerViewAdapter -import eu.depau.ddroid.utils.name -import eu.depau.ddroid.utils.snackbar -import eu.depau.ddroid.values.WizardStep +import eu.depau.etchdroid.R +import eu.depau.etchdroid.StateKeeper +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.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/ddroid/services/UsbAPIWriteService.kt b/app/src/main/java/eu/depau/etchdroid/services/UsbAPIWriteService.kt similarity index 87% rename from app/src/main/java/eu/depau/ddroid/services/UsbAPIWriteService.kt rename to app/src/main/java/eu/depau/etchdroid/services/UsbAPIWriteService.kt index 5d4c596..5c4c4c8 100644 --- a/app/src/main/java/eu/depau/ddroid/services/UsbAPIWriteService.kt +++ b/app/src/main/java/eu/depau/etchdroid/services/UsbAPIWriteService.kt @@ -1,14 +1,14 @@ -package eu.depau.ddroid.services +package eu.depau.etchdroid.services import android.content.Intent import android.hardware.usb.UsbDevice import android.net.Uri import android.util.Log import com.github.mjdev.libaums.UsbMassStorageDevice -import eu.depau.ddroid.abc.UsbWriteService -import eu.depau.ddroid.utils.getFileName -import eu.depau.ddroid.utils.getFileSize -import eu.depau.ddroid.utils.name +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 java.nio.ByteBuffer class UsbAPIWriteService : UsbWriteService("UsbAPIWriteService") { @@ -16,8 +16,8 @@ class UsbAPIWriteService : UsbWriteService("UsbAPIWriteService") { val DD_BLOCKSIZE = 512 * 32 * 64 // 1 MB class Action { - val WRITE_IMAGE = "eu.depau.ddroid.action.API_WRITE_IMAGE" - val WRITE_CANCEL = "eu.depau.ddroid.action.API_WRITE_CANCEL" + val WRITE_IMAGE = "eu.depau.etchdroid.action.API_WRITE_IMAGE" + val WRITE_CANCEL = "eu.depau.etchdroid.action.API_WRITE_CANCEL" } private fun getUsbMSDevice(usbDevice: UsbDevice): UsbMassStorageDevice? { diff --git a/app/src/main/java/eu/depau/ddroid/utils/ContextToast.kt b/app/src/main/java/eu/depau/etchdroid/utils/ContextToast.kt similarity index 84% rename from app/src/main/java/eu/depau/ddroid/utils/ContextToast.kt rename to app/src/main/java/eu/depau/etchdroid/utils/ContextToast.kt index 78feabf..85a5838 100644 --- a/app/src/main/java/eu/depau/ddroid/utils/ContextToast.kt +++ b/app/src/main/java/eu/depau/etchdroid/utils/ContextToast.kt @@ -1,4 +1,4 @@ -package eu.depau.ddroid.utils +package eu.depau.etchdroid.utils import android.content.Context import android.widget.Toast diff --git a/app/src/main/java/eu/depau/ddroid/utils/NumberToSizeString.kt b/app/src/main/java/eu/depau/etchdroid/utils/NumberToSizeString.kt similarity index 95% rename from app/src/main/java/eu/depau/ddroid/utils/NumberToSizeString.kt rename to app/src/main/java/eu/depau/etchdroid/utils/NumberToSizeString.kt index b1c133d..82db81b 100644 --- a/app/src/main/java/eu/depau/ddroid/utils/NumberToSizeString.kt +++ b/app/src/main/java/eu/depau/etchdroid/utils/NumberToSizeString.kt @@ -1,4 +1,4 @@ -package eu.depau.ddroid.utils +package eu.depau.etchdroid.utils // https://stackoverflow.com/a/3758880/1124621 diff --git a/app/src/main/java/eu/depau/ddroid/utils/NumberToTimeString.kt b/app/src/main/java/eu/depau/etchdroid/utils/NumberToTimeString.kt similarity index 90% rename from app/src/main/java/eu/depau/ddroid/utils/NumberToTimeString.kt rename to app/src/main/java/eu/depau/etchdroid/utils/NumberToTimeString.kt index 3413b6d..34a9960 100644 --- a/app/src/main/java/eu/depau/ddroid/utils/NumberToTimeString.kt +++ b/app/src/main/java/eu/depau/etchdroid/utils/NumberToTimeString.kt @@ -1,4 +1,4 @@ -package eu.depau.ddroid.utils +package eu.depau.etchdroid.utils private val timeStrings = arrayOf("s", "m", "h", "d") private val timeDivs = arrayOf(60, 60, 24) diff --git a/app/src/main/java/eu/depau/ddroid/utils/UriGetDisplayName.kt b/app/src/main/java/eu/depau/etchdroid/utils/UriGetDisplayName.kt similarity index 95% rename from app/src/main/java/eu/depau/ddroid/utils/UriGetDisplayName.kt rename to app/src/main/java/eu/depau/etchdroid/utils/UriGetDisplayName.kt index c611044..cd56911 100644 --- a/app/src/main/java/eu/depau/ddroid/utils/UriGetDisplayName.kt +++ b/app/src/main/java/eu/depau/etchdroid/utils/UriGetDisplayName.kt @@ -1,4 +1,4 @@ -package eu.depau.ddroid.utils +package eu.depau.etchdroid.utils import android.content.Context import android.net.Uri diff --git a/app/src/main/java/eu/depau/ddroid/utils/UriGetFileSize.kt b/app/src/main/java/eu/depau/etchdroid/utils/UriGetFileSize.kt similarity index 97% rename from app/src/main/java/eu/depau/ddroid/utils/UriGetFileSize.kt rename to app/src/main/java/eu/depau/etchdroid/utils/UriGetFileSize.kt index 347b4d3..c938dbe 100644 --- a/app/src/main/java/eu/depau/ddroid/utils/UriGetFileSize.kt +++ b/app/src/main/java/eu/depau/etchdroid/utils/UriGetFileSize.kt @@ -1,4 +1,4 @@ -package eu.depau.ddroid.utils +package eu.depau.etchdroid.utils import android.content.ContentResolver import android.content.Context diff --git a/app/src/main/java/eu/depau/ddroid/utils/UsbDeviceVidPidName.kt b/app/src/main/java/eu/depau/etchdroid/utils/UsbDeviceVidPidName.kt similarity index 91% rename from app/src/main/java/eu/depau/ddroid/utils/UsbDeviceVidPidName.kt rename to app/src/main/java/eu/depau/etchdroid/utils/UsbDeviceVidPidName.kt index 2fa678c..9dba022 100644 --- a/app/src/main/java/eu/depau/ddroid/utils/UsbDeviceVidPidName.kt +++ b/app/src/main/java/eu/depau/etchdroid/utils/UsbDeviceVidPidName.kt @@ -1,4 +1,4 @@ -package eu.depau.ddroid.utils +package eu.depau.etchdroid.utils import android.hardware.usb.UsbDevice import android.os.Build diff --git a/app/src/main/java/eu/depau/ddroid/utils/UsbDrivesRecyclerViewAdapter.kt b/app/src/main/java/eu/depau/etchdroid/utils/UsbDrivesRecyclerViewAdapter.kt similarity index 96% rename from app/src/main/java/eu/depau/ddroid/utils/UsbDrivesRecyclerViewAdapter.kt rename to app/src/main/java/eu/depau/etchdroid/utils/UsbDrivesRecyclerViewAdapter.kt index 902db3c..c9612a6 100644 --- a/app/src/main/java/eu/depau/ddroid/utils/UsbDrivesRecyclerViewAdapter.kt +++ b/app/src/main/java/eu/depau/etchdroid/utils/UsbDrivesRecyclerViewAdapter.kt @@ -1,4 +1,4 @@ -package eu.depau.ddroid.utils +package eu.depau.etchdroid.utils import android.annotation.SuppressLint import android.os.Build @@ -8,7 +8,7 @@ import android.view.ViewGroup import android.widget.RelativeLayout import android.widget.TextView import com.github.mjdev.libaums.UsbMassStorageDevice -import eu.depau.ddroid.R +import eu.depau.etchdroid.R import kotlinx.android.synthetic.main.usb_device_row.view.* import java.lang.Integer diff --git a/app/src/main/java/eu/depau/ddroid/utils/ViewSnackbar.kt b/app/src/main/java/eu/depau/etchdroid/utils/ViewSnackbar.kt similarity index 85% rename from app/src/main/java/eu/depau/ddroid/utils/ViewSnackbar.kt rename to app/src/main/java/eu/depau/etchdroid/utils/ViewSnackbar.kt index 2e39cde..3ea8303 100644 --- a/app/src/main/java/eu/depau/ddroid/utils/ViewSnackbar.kt +++ b/app/src/main/java/eu/depau/etchdroid/utils/ViewSnackbar.kt @@ -1,4 +1,4 @@ -package eu.depau.ddroid.utils +package eu.depau.etchdroid.utils import android.support.design.widget.Snackbar import android.view.View diff --git a/app/src/main/java/eu/depau/ddroid/values/FlashMethod.kt b/app/src/main/java/eu/depau/etchdroid/values/FlashMethod.kt similarity index 72% rename from app/src/main/java/eu/depau/ddroid/values/FlashMethod.kt rename to app/src/main/java/eu/depau/etchdroid/values/FlashMethod.kt index f7f3d99..dfad0ba 100644 --- a/app/src/main/java/eu/depau/ddroid/values/FlashMethod.kt +++ b/app/src/main/java/eu/depau/etchdroid/values/FlashMethod.kt @@ -1,4 +1,4 @@ -package eu.depau.ddroid.values +package eu.depau.etchdroid.values enum class FlashMethod { FLASH_API, diff --git a/app/src/main/java/eu/depau/ddroid/values/ImageLocation.kt b/app/src/main/java/eu/depau/etchdroid/values/ImageLocation.kt similarity index 58% rename from app/src/main/java/eu/depau/ddroid/values/ImageLocation.kt rename to app/src/main/java/eu/depau/etchdroid/values/ImageLocation.kt index 05c2c41..4a1de57 100644 --- a/app/src/main/java/eu/depau/ddroid/values/ImageLocation.kt +++ b/app/src/main/java/eu/depau/etchdroid/values/ImageLocation.kt @@ -1,4 +1,4 @@ -package eu.depau.ddroid.values +package eu.depau.etchdroid.values enum class ImageLocation { REMOTE, diff --git a/app/src/main/java/eu/depau/ddroid/values/WizardStep.kt b/app/src/main/java/eu/depau/etchdroid/values/WizardStep.kt similarity index 75% rename from app/src/main/java/eu/depau/ddroid/values/WizardStep.kt rename to app/src/main/java/eu/depau/etchdroid/values/WizardStep.kt index dc3df68..4ba058c 100644 --- a/app/src/main/java/eu/depau/ddroid/values/WizardStep.kt +++ b/app/src/main/java/eu/depau/etchdroid/values/WizardStep.kt @@ -1,4 +1,4 @@ -package eu.depau.ddroid.values +package eu.depau.etchdroid.values enum class WizardStep { SELECT_FLASH_METHOD, diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml index 25feacd..4c540a6 100644 --- a/app/src/main/res/menu/menu_main.xml +++ b/app/src/main/res/menu/menu_main.xml @@ -1,7 +1,7 @@ + tools:context="eu.depau.etchdroid.activities.MainActivity"> + tools:context="eu.depau.etchdroid.fragments.UsbDriveFragment"> - DDroid + EtchDroid Settings Download image from URL Use local image diff --git a/app/src/test/java/eu/depau/ddroid/ExampleUnitTest.kt b/app/src/test/java/eu/depau/etchdroid/ExampleUnitTest.kt similarity index 92% rename from app/src/test/java/eu/depau/ddroid/ExampleUnitTest.kt rename to app/src/test/java/eu/depau/etchdroid/ExampleUnitTest.kt index 9ae7b9b..fc960ea 100644 --- a/app/src/test/java/eu/depau/ddroid/ExampleUnitTest.kt +++ b/app/src/test/java/eu/depau/etchdroid/ExampleUnitTest.kt @@ -1,4 +1,4 @@ -package eu.depau.ddroid +package eu.depau.etchdroid import org.junit.Test