diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f29bf52..769bc8d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -23,27 +23,29 @@ tools:ignore="UnusedAttribute"> + android:label="@string/app_name" + android:theme="@style/MaterialAppTheme"> - + - + + android:parentActivityName="eu.depau.etchdroid.ui.activities.StartActivity" + android:theme="@style/MaterialAppTheme"> + android:value="eu.depau.etchdroid.ui.activities.StartActivity"/> - + - + @@ -127,10 +129,11 @@ + android:parentActivityName="eu.depau.etchdroid.ui.activities.UsbDrivePickerActivity" + android:theme="@style/MaterialAppTheme"> + android:value="eu.depau.etchdroid.ui.activities.UsbDrivePickerActivity"/> - \ No newline at end of file + diff --git a/app/src/main/java/eu/depau/etchdroid/ui/activities/StartActivity.kt b/app/src/main/java/eu/depau/etchdroid/ui/activities/StartActivity.kt index 47a9a48..ad5af02 100644 --- a/app/src/main/java/eu/depau/etchdroid/ui/activities/StartActivity.kt +++ b/app/src/main/java/eu/depau/etchdroid/ui/activities/StartActivity.kt @@ -39,9 +39,9 @@ class StartActivity : ActivityBase() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_start) - buttonRaw.setOnClickListener(this::onButtonClicked) - buttonDmg.setOnClickListener(this::onButtonClicked) - buttonBrokenUsb.setOnClickListener(this::onButtonClicked) + btn_image_raw.setOnClickListener(this::onButtonClicked) + btn_image_dmg.setOnClickListener(this::onButtonClicked) + btn_broken_usb.setOnClickListener(this::onButtonClicked) if (!StateKeeper.libusbRegistered) { UsbCommunicationFactory.apply { @@ -61,15 +61,15 @@ class StartActivity : ActivityBase() { private fun onButtonClicked(view: View?, showDMGDialog: Boolean = true, showAndroidPieDialog: Boolean = true) { if (view != null) { - if (view.id == R.id.buttonBrokenUsb) { + if (view.id == R.id.btn_broken_usb) { openBrokenUsbPage() return } StateKeeper.flashMethod = when (view.id) { - R.id.buttonRaw -> FlashMethod.FLASH_API - R.id.buttonDmg -> FlashMethod.FLASH_DMG_API - else -> null + R.id.btn_image_raw -> FlashMethod.FLASH_API + R.id.btn_image_dmg -> FlashMethod.FLASH_DMG_API + else -> null } // if (showAndroidPieDialog && shouldShowAndroidPieAlertDialog) { diff --git a/app/src/main/res/layout/activity_confirmation.xml b/app/src/main/res/layout/activity_confirmation.xml index 4f61a19..c7d004d 100644 --- a/app/src/main/res/layout/activity_confirmation.xml +++ b/app/src/main/res/layout/activity_confirmation.xml @@ -1,5 +1,6 @@ - + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:background="?attr/selectableItemBackground" + android:clickable="true" + android:focusable="true" + android:orientation="vertical" + android:paddingLeft="@dimen/activity_horizontal_margin" + android:paddingTop="@dimen/row_padding" + android:paddingRight="@dimen/activity_horizontal_margin" + android:paddingBottom="@dimen/row_padding" + > + android:textStyle="bold"/> + android:layout_below="@id/confirm_sel_method_title"/> + android:layout_height="wrap_content" + android:background="?attr/selectableItemBackground" + android:clickable="true" + android:focusable="true" + android:orientation="vertical" + android:paddingLeft="@dimen/activity_horizontal_margin" + android:paddingTop="@dimen/row_padding" + android:paddingRight="@dimen/activity_horizontal_margin" + android:paddingBottom="@dimen/row_padding" + > + android:textStyle="bold"/> + android:layout_below="@id/confirm_sel_image_title"/> + android:textColor="@color/info"/> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:background="?attr/selectableItemBackground" + android:clickable="true" + android:focusable="true" + android:orientation="vertical" + android:paddingLeft="@dimen/activity_horizontal_margin" + android:paddingTop="@dimen/row_padding" + android:paddingRight="@dimen/activity_horizontal_margin" + android:paddingBottom="@dimen/row_padding" + > + android:textStyle="bold"/> + android:layout_below="@id/confirm_sel_usbdev_title"/> + android:textColor="@color/info"/> + android:layout_height="wrap_content" + android:background="?attr/selectableItemBackground" + android:clickable="true" + android:focusable="true" + android:orientation="vertical" + android:paddingLeft="@dimen/activity_horizontal_margin" + android:paddingTop="@dimen/row_padding" + android:paddingRight="@dimen/activity_horizontal_margin" + android:paddingBottom="@dimen/row_padding" + > + android:textSize="16sp"/> @@ -169,7 +174,8 @@ android:paddingBottom="@dimen/row_padding" android:textColor="@color/name" android:textSize="16sp" - android:textStyle="bold" /> + android:textStyle="bold" + /> + android:textColor="@color/info" + /> + app:layout_constraintTop_toBottomOf="@+id/relativeLayout2" + /> + + app:srcCompat="@drawable/ic_twotone_save_alt_24px"/> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_start.xml b/app/src/main/res/layout/activity_start.xml index e6b4ffd..ca854e8 100644 --- a/app/src/main/res/layout/activity_start.xml +++ b/app/src/main/res/layout/activity_start.xml @@ -1,164 +1,203 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:background="?android:windowBackground" + tools:showIn="@layout/activity_start"> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + android:layout_marginLeft="@dimen/card_margin" + android:layout_marginRight="@dimen/card_margin" + android:layout_marginBottom="@dimen/card_margin" + android:background="@color/brokenUsbCardBackground" + android:clickable="true" + android:focusable="true"> - + + + + + + + + + + - + \ No newline at end of file diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 9784ff2..2ebca9f 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -116,4 +116,4 @@ Статус бета Герман Прошунин Разработчик, рус. переводчик - \ No newline at end of file + diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 0e4d074..de852a9 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -1,6 +1,5 @@ 16dp - 16dp 16dp 10dp 5dp diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index bea8f40..e260bd1 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,15 +1,6 @@ EtchDroid - - Beta status - Write raw image or ISO - Good for GNU/Linux distro ISOs, Raspberry Pi images, and disk images created on Windows or Linux. - Write Apple® DMG image - Restore an image created with macOS Disk Utility - Unsupported USB drive? - If Android says there\'s an issue with your USB drive or Windows does not detect it after using EtchDroid, read this. - Write image directly to disk (using Android API) Restore macOS DMG image to disk (using Android API) Unetbootin-style flash (MBR only, requires root) @@ -76,6 +67,10 @@ Check notification for progress Partition table: Could not access USB device. Maybe you ran the app previously and it crashed? Remove and reinsert the USB drive, then restart the app. + Write raw image or ISO + Good for GNU/Linux distro ISOs, Raspberry Pi images, and disk images created on Windows or Linux. + Write Apple® DMG image + Restore an image created with macOS Disk Utility No USB drives detected.\nNote that you need an SD card to USB adapter to write to SD cards. Do not show again Here be dragons @@ -149,6 +144,8 @@ (unknown) Write %1$s to %2$s "Copy data from "%1$s" to "%2$s" + If Android says there\'s an issue with your USB drive or that it\'s unsupported after using EtchDroid, read this. + Unsupported USB drive? Step %1$d of %2$d F-Droid diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index ef62eef..dd803cb 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,6 +1,6 @@ -