diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6c33239..71965b6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -18,33 +18,30 @@
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
- android:theme="@style/AppTheme"
- tools:ignore="GoogleAppIndexingWarning">
+ android:theme="@style/MaterialAppTheme">
+ android:label="@string/app_name">
-
+
-
+
+ android:parentActivityName="eu.depau.etchdroid.ui.activities.StartActivity">
+ android:value="eu.depau.etchdroid.ui.activities.StartActivity" />
-
+
-
+
@@ -128,11 +125,10 @@
+ android:parentActivityName="eu.depau.etchdroid.ui.activities.UsbDrivePickerActivity">
+ android:value="eu.depau.etchdroid.ui.activities.UsbDrivePickerActivity" />
FlashMethod.FLASH_API
- R.id.btn_image_dmg -> FlashMethod.FLASH_DMG_API
- else -> null
+ R.id.buttonRaw -> FlashMethod.FLASH_API
+ R.id.buttonDmg -> 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 c7d004d..4f61a19 100644
--- a/app/src/main/res/layout/activity_confirmation.xml
+++ b/app/src/main/res/layout/activity_confirmation.xml
@@ -1,6 +1,5 @@
-
+ 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" />
@@ -174,8 +169,7 @@
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 ca854e8..e6b4ffd 100644
--- a/app/src/main/res/layout/activity_start.xml
+++ b/app/src/main/res/layout/activity_start.xml
@@ -1,203 +1,164 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/buttonDmg">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:layout_marginTop="@dimen/default_gap"
+ android:text="@string/broken_usb_title" />
-
+
-
-
-
-
-
-
-
-
-
+
-
\ 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 6dd47e9..c6709d3 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -113,4 +113,5 @@
LibreSSL это вилка OpenSSL 1.0.1g, разработанная под OpenBSD проектом.
Guava-это набор основных библиотек Java от Google, который включает в себя новые типы коллекций (такие как multimap и multiset),неизменяемые коллекции, библиотеку графиков и утилиты для параллелизма, ввода-вывода, хэширования, кэширования, примитивов, строк и многое другое!
bzip2-это библиотека сжатия данных с высокой степенью сжатия
-
+ Статус бета
+
\ 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 de852a9..0e4d074 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,5 +1,6 @@
16dp
+ 16dp
16dp
10dp
5dp
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fe101df..f5f2a32 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,6 +1,15 @@
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 that it\'s unsupported 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)
@@ -67,10 +76,6 @@
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
@@ -144,8 +149,6 @@
(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 dd803cb..ef62eef 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,6 +1,6 @@
-