8 files changed
+274
-227
No files matched your search
@@ -23,27 +23,29 @@
|
||||
tools:ignore="UnusedAttribute">
|
||||
<activity
|
||||
android:name="eu.depau.etchdroid.ui.activities.StartActivity"
|
||||
android:label="@string/app_name">
|
||||
android:label="@string/app_name"
|
||||
android:theme="@style/MaterialAppTheme">
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.MAIN" />
|
||||
<action android:name="android.intent.action.MAIN"/>
|
||||
|
||||
<category android:name="android.intent.category.LAUNCHER" />
|
||||
<category android:name="android.intent.category.LAUNCHER"/>
|
||||
</intent-filter>
|
||||
</activity>
|
||||
<activity
|
||||
android:name="eu.depau.etchdroid.ui.activities.UsbDrivePickerActivity"
|
||||
android:label="@string/title_activity_usb_drive_picker"
|
||||
android:parentActivityName="eu.depau.etchdroid.ui.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.ui.activities.StartActivity" />
|
||||
android:value="eu.depau.etchdroid.ui.activities.StartActivity"/>
|
||||
|
||||
<!-- Open ISO files by mimetype -->
|
||||
<intent-filter android:label="@string/app_name">
|
||||
<action android:name="android.intent.action.VIEW" />
|
||||
<action android:name="android.intent.action.VIEW"/>
|
||||
|
||||
<category android:name="android.intent.category.DEFAULT" />
|
||||
<category android:name="android.intent.category.DEFAULT"/>
|
||||
<category android:name="android.intent.category.BROWSABLE"/>
|
||||
|
||||
<data android:scheme="file"/>
|
||||
@@ -127,10 +129,11 @@
|
||||
<activity
|
||||
android:name="eu.depau.etchdroid.ui.activities.ConfirmationActivity"
|
||||
android:label="@string/title_activity_confirmation"
|
||||
android:parentActivityName="eu.depau.etchdroid.ui.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.ui.activities.UsbDrivePickerActivity" />
|
||||
android:value="eu.depau.etchdroid.ui.activities.UsbDrivePickerActivity"/>
|
||||
</activity>
|
||||
|
||||
<activity
|
||||
@@ -157,4 +160,4 @@
|
||||
</provider>
|
||||
|
||||
</application>
|
||||
</manifest>
|
||||
</manifest>
|
||||
@@ -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) {
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:id="@+id/linearLayout"
|
||||
@@ -25,16 +26,17 @@
|
||||
|
||||
<RelativeLayout
|
||||
android:id="@+id/relativeLayout"
|
||||
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: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"
|
||||
>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/confirm_sel_method_title"
|
||||
@@ -46,26 +48,27 @@
|
||||
android:text="@string/selected_method"
|
||||
android:textColor="@color/name"
|
||||
android:textSize="16sp"
|
||||
android:textStyle="bold" />
|
||||
android:textStyle="bold"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/confirm_sel_method"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/confirm_sel_method_title" />
|
||||
android:layout_below="@id/confirm_sel_method_title"/>
|
||||
</RelativeLayout>
|
||||
|
||||
<RelativeLayout
|
||||
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: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"
|
||||
>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/confirm_sel_image_title"
|
||||
@@ -76,13 +79,13 @@
|
||||
android:text="@string/selected_image"
|
||||
android:textColor="@color/name"
|
||||
android:textSize="16sp"
|
||||
android:textStyle="bold" />
|
||||
android:textStyle="bold"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/confirm_sel_image"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/confirm_sel_image_title" />
|
||||
android:layout_below="@id/confirm_sel_image_title"/>
|
||||
|
||||
|
||||
<TextView
|
||||
@@ -90,22 +93,23 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:textColor="@color/info" />
|
||||
android:textColor="@color/info"/>
|
||||
</RelativeLayout>
|
||||
|
||||
|
||||
<RelativeLayout
|
||||
android:id="@+id/relativeLayout2"
|
||||
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: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"
|
||||
>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/confirm_sel_usbdev_title"
|
||||
@@ -116,35 +120,36 @@
|
||||
android:text="@string/selected_usbdev"
|
||||
android:textColor="@color/name"
|
||||
android:textSize="16sp"
|
||||
android:textStyle="bold" />
|
||||
android:textStyle="bold"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/confirm_sel_usbdev"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/confirm_sel_usbdev_title" />
|
||||
android:layout_below="@id/confirm_sel_usbdev_title"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/confirm_sel_usbdev_size"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:textColor="@color/info" />
|
||||
android:textColor="@color/info"/>
|
||||
|
||||
</RelativeLayout>
|
||||
|
||||
|
||||
<RelativeLayout
|
||||
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: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"
|
||||
>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/confirm_extra_info"
|
||||
@@ -153,7 +158,7 @@
|
||||
android:layout_alignParentTop="true"
|
||||
android:ellipsize="end"
|
||||
android:textColor="@color/name"
|
||||
android:textSize="16sp" />
|
||||
android:textSize="16sp"/>
|
||||
|
||||
|
||||
</RelativeLayout>
|
||||
@@ -169,7 +174,8 @@
|
||||
android:paddingBottom="@dimen/row_padding"
|
||||
android:textColor="@color/name"
|
||||
android:textSize="16sp"
|
||||
android:textStyle="bold" />
|
||||
android:textStyle="bold"
|
||||
/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/part_table_header_side"
|
||||
@@ -179,7 +185,8 @@
|
||||
android:paddingTop="@dimen/row_padding"
|
||||
android:paddingRight="@dimen/activity_horizontal_margin"
|
||||
android:paddingBottom="@dimen/row_padding"
|
||||
android:textColor="@color/info" />
|
||||
android:textColor="@color/info"
|
||||
/>
|
||||
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
@@ -190,11 +197,13 @@
|
||||
android:paddingTop="@dimen/row_padding"
|
||||
android:paddingRight="@dimen/activity_horizontal_margin"
|
||||
android:paddingBottom="@dimen/row_padding"
|
||||
app:layout_constraintTop_toBottomOf="@+id/relativeLayout2" />
|
||||
app:layout_constraintTop_toBottomOf="@+id/relativeLayout2"
|
||||
/>
|
||||
|
||||
</LinearLayout>
|
||||
</androidx.core.widget.NestedScrollView>
|
||||
|
||||
|
||||
<com.google.android.material.floatingactionbutton.FloatingActionButton
|
||||
android:id="@+id/confirm_fab"
|
||||
style="@style/Widget.MaterialComponents.FloatingActionButton"
|
||||
@@ -206,6 +215,6 @@
|
||||
android:layout_marginBottom="8dp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:srcCompat="@drawable/ic_twotone_save_alt_24px" />
|
||||
app:srcCompat="@drawable/ic_twotone_save_alt_24px"/>
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
@@ -1,164 +1,203 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
<LinearLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical"
|
||||
android:theme="@style/DarkThemeOverlay"
|
||||
tools:context=".ui.activities.StartActivity">
|
||||
|
||||
<!-- TODO extract styles -->
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:id="@+id/buttonRaw"
|
||||
style="@style/Widget.MaterialComponents.Button"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginStart="@dimen/default_margin"
|
||||
android:layout_marginTop="@dimen/default_margin"
|
||||
android:layout_marginEnd="@dimen/default_margin"
|
||||
android:background="@color/background"
|
||||
android:clickable="true"
|
||||
android:focusable="true"
|
||||
android:padding="0dp"
|
||||
app:layout_constraintBottom_toTopOf="@id/buttonDmg"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/rawButtonImage"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="@dimen/default_margin"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:srcCompat="@drawable/ic_raw" />
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="@dimen/default_margin"
|
||||
android:layout_marginEnd="@dimen/default_margin"
|
||||
android:orientation="vertical"
|
||||
app:layout_constraintBottom_toBottomOf="@id/rawButtonImage"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@id/rawButtonImage"
|
||||
app:layout_constraintTop_toTopOf="@id/rawButtonImage">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/rawButtonTitle"
|
||||
style="@style/TextAppearance.AppCompat.Subhead"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/write_image_or_iso" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/rawButtonDescription"
|
||||
style="@style/TextAppearance.AppCompat.Caption"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/raw_image_desc" />
|
||||
</LinearLayout>
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:id="@+id/buttonDmg"
|
||||
style="@style/Widget.MaterialComponents.Button"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginStart="@dimen/default_margin"
|
||||
android:layout_marginTop="@dimen/default_margin"
|
||||
android:layout_marginEnd="@dimen/default_margin"
|
||||
android:background="@color/background"
|
||||
android:clickable="true"
|
||||
android:focusable="true"
|
||||
android:padding="0dp"
|
||||
app:layout_constraintBottom_toTopOf="@id/buttonBrokenUsb"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/buttonRaw">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/dmgButtonImage"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="@dimen/default_margin"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:srcCompat="@drawable/ic_dmg" />
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="@dimen/default_margin"
|
||||
android:layout_marginEnd="@dimen/default_margin"
|
||||
android:orientation="vertical"
|
||||
app:layout_constraintBottom_toBottomOf="@id/dmgButtonImage"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@id/dmgButtonImage"
|
||||
app:layout_constraintTop_toTopOf="@id/dmgButtonImage">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/dmgButtonTitle"
|
||||
style="@style/TextAppearance.AppCompat.Subhead"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/write_apple_dmg" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/dmgButtonDescription"
|
||||
style="@style/TextAppearance.AppCompat.Caption"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/dmg_image_desc" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/dmgButtonStatus"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:contentDescription="@string/tag_item_beta"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:srcCompat="@drawable/ic_beta" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/buttonBrokenUsb"
|
||||
style="@style/Widget.MaterialComponents.Button"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="88dp"
|
||||
android:layout_margin="@dimen/default_margin"
|
||||
android:layout_marginStart="@dimen/default_margin"
|
||||
android:layout_marginEnd="@dimen/default_margin"
|
||||
android:layout_marginBottom="@dimen/default_margin"
|
||||
android:background="@color/brokenUsbCardBackground"
|
||||
android:gravity="start"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/buttonDmg">
|
||||
android:background="?android:windowBackground"
|
||||
tools:showIn="@layout/activity_start">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/buttonUsbTitle"
|
||||
style="@style/TextAppearance.AppCompat.Subhead"
|
||||
android:layout_width="wrap_content"
|
||||
<androidx.cardview.widget.CardView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:layout_weight="1"
|
||||
android:clickable="true"
|
||||
android:focusable="true"
|
||||
android:layout_marginLeft="@dimen/card_margin"
|
||||
android:layout_marginTop="@dimen/card_margin"
|
||||
android:layout_marginRight="@dimen/card_margin"
|
||||
android:background="@color/background"
|
||||
android:minHeight="200dp">
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:id="@+id/btn_image_raw"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:theme="@style/CardContentStyle"
|
||||
android:foreground="?attr/selectableItemBackground">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/imageView"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginStart="32dp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintVertical_bias="0.0"
|
||||
app:srcCompat="@drawable/ic_raw"/>
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="32dp"
|
||||
android:layout_marginEnd="32dp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@id/imageView"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintVertical_bias="0.502">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/textView"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/write_image_or_iso"
|
||||
android:textColor="@color/name"
|
||||
android:textStyle="bold"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/textView2"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/textView"
|
||||
android:text="@string/raw_image_desc"/>
|
||||
</RelativeLayout>
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
</androidx.cardview.widget.CardView>
|
||||
|
||||
|
||||
<androidx.cardview.widget.CardView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:layout_weight="1"
|
||||
android:clickable="true"
|
||||
android:focusable="true"
|
||||
android:layout_marginLeft="@dimen/card_margin"
|
||||
android:layout_marginTop="@dimen/card_margin"
|
||||
android:layout_marginRight="@dimen/card_margin"
|
||||
android:layout_marginBottom="@dimen/card_margin"
|
||||
android:background="@color/background"
|
||||
android:minHeight="200dp">
|
||||
<!--
|
||||
android:background="?attr/selectableItemBackground"-->
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:id="@+id/btn_image_dmg"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:theme="@style/CardContentStyle"
|
||||
android:foreground="?attr/selectableItemBackground">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/imageView2"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginStart="32dp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintVertical_bias="0.0"
|
||||
app:srcCompat="@drawable/ic_dmg"/>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/imageView3"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginRight="-2dp"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:srcCompat="@drawable/ic_beta"/>
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="32dp"
|
||||
android:layout_marginEnd="36dp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@id/imageView2"
|
||||
app:layout_constraintTop_toTopOf="parent">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/textView4"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/write_apple_dmg"
|
||||
android:textColor="@color/name"
|
||||
android:textStyle="bold"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/textView5"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/textView4"
|
||||
android:text="@string/dmg_image_desc" />
|
||||
</RelativeLayout>
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
</androidx.cardview.widget.CardView>
|
||||
|
||||
<androidx.cardview.widget.CardView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/default_gap"
|
||||
android:text="@string/broken_usb_title" />
|
||||
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">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/buttonUsbDescription"
|
||||
style="@style/TextAppearance.AppCompat.Caption"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="@dimen/default_gap"
|
||||
android:text="@string/broken_usb_text" />
|
||||
<LinearLayout
|
||||
android:id="@+id/btn_broken_usb"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/brokenUsbCardBackground"
|
||||
android:foreground="?attr/selectableItemBackground"
|
||||
android:theme="@style/CardContentStyle">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="16dp"
|
||||
android:background="@color/brokenUsbCardBackground"
|
||||
android:orientation="vertical">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/textView_1"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/broken_usb_title"
|
||||
android:textStyle="bold"
|
||||
android:background="@color/brokenUsbCardBackground"
|
||||
app:layout_constraintBottom_toTopOf="@id/textView_2"
|
||||
app:layout_constraintLeft_toLeftOf="parent"
|
||||
app:layout_constraintRight_toRightOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/textView_2"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/broken_usb_text"
|
||||
android:background="@color/brokenUsbCardBackground"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintLeft_toLeftOf="parent"
|
||||
app:layout_constraintRight_toRightOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/textView_1" />
|
||||
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
</androidx.cardview.widget.CardView>
|
||||
</LinearLayout>
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
</LinearLayout>
|
||||
@@ -116,4 +116,4 @@
|
||||
<string name="tag_item_beta">Статус бета</string>
|
||||
<string name="contributor_german_name">Герман Прошунин</string>
|
||||
<string name="contributor_german_task">Разработчик, рус. переводчик</string>
|
||||
</resources>
|
||||
</resources>
|
||||
@@ -1,6 +1,5 @@
|
||||
<resources>
|
||||
<dimen name="fab_margin">16dp</dimen>
|
||||
<dimen name="default_margin">16dp</dimen>
|
||||
<dimen name="activity_horizontal_margin">16dp</dimen>
|
||||
<dimen name="row_padding">10dp</dimen>
|
||||
<dimen name="grid_padding">5dp</dimen>
|
||||
|
||||
@@ -1,15 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="app_name" translatable="false">EtchDroid</string>
|
||||
<!-- Main activity -->
|
||||
<string name="tag_item_beta">Beta status</string>
|
||||
<string name="write_image_or_iso">Write raw image or ISO</string>
|
||||
<string name="raw_image_desc">Good for GNU/Linux distro ISOs, Raspberry Pi images, and disk images created on Windows or Linux.</string>
|
||||
<string name="write_apple_dmg">Write Apple® DMG image</string>
|
||||
<string name="dmg_image_desc">Restore an image created with macOS Disk Utility</string>
|
||||
<string name="broken_usb_title">Unsupported USB drive?</string>
|
||||
<string name="broken_usb_text">If Android says there\'s an issue with your USB drive or Windows does not detect it after using EtchDroid, read this.</string>
|
||||
<!-- Unordered -->
|
||||
<string name="flash_dd_usb_api">Write image directly to disk (using Android API)</string>
|
||||
<string name="flash_dmg_api">Restore macOS DMG image to disk (using Android API)</string>
|
||||
<string name="flash_unetbootin">Unetbootin-style flash (MBR only, requires root)</string>
|
||||
@@ -76,6 +67,10 @@
|
||||
<string name="check_notification_progress">Check notification for progress</string>
|
||||
<string name="partition_table_title">Partition table:</string>
|
||||
<string name="could_not_access_usb_error">Could not access USB device. Maybe you ran the app previously and it crashed? Remove and reinsert the USB drive, then restart the app.</string>
|
||||
<string name="write_image_or_iso">Write raw image or ISO</string>
|
||||
<string name="raw_image_desc">Good for GNU/Linux distro ISOs, Raspberry Pi images, and disk images created on Windows or Linux.</string>
|
||||
<string name="write_apple_dmg">Write Apple® DMG image</string>
|
||||
<string name="dmg_image_desc">Restore an image created with macOS Disk Utility</string>
|
||||
<string name="no_usb_drives_detected">No USB drives detected.\nNote that you need an SD card to USB adapter to write to SD cards.</string>
|
||||
<string name="do_not_show_again">Do not show again</string>
|
||||
<string name="here_be_dragons">Here be dragons</string>
|
||||
@@ -149,6 +144,8 @@
|
||||
<string name="file_unknown">(unknown)</string>
|
||||
<string name="write_x_to_y">Write %1$s to %2$s</string>
|
||||
<string name="i2o_action_name">"Copy data from "%1$s" to "%2$s"</string>
|
||||
<string name="broken_usb_text">If Android says there\'s an issue with your USB drive or that it\'s unsupported after using EtchDroid, read this.</string>
|
||||
<string name="broken_usb_title">Unsupported USB drive?</string>
|
||||
<string name="step_x_of_y">Step %1$d of %2$d</string>
|
||||
<!-- About -->
|
||||
<string name="fdroid" translatable="false">F-Droid</string>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<resources>
|
||||
|
||||
<style name="MaterialAppTheme" parent="Theme.MaterialComponents.Light.DarkActionBar">
|
||||
<style name="MaterialAppTheme" parent="Theme.AppCompat">
|
||||
<item name="colorPrimary">@color/colorPrimary</item>
|
||||
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
|
||||
<item name="colorAccent">@color/colorAccent</item>
|
||||
|
||||
Reference in new issue
Block a user