Added custom target type

meefik · Jun 30, 2017 · 8390855 · 8390855
1 parent 89774c6
commit 8390855
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 1 deletion.
diff --git a/CHANGELOG b/CHANGELOG
@@ -6,6 +6,7 @@ Fixed an architecture emulation via binfmt_misc
 Fixed Arch Linux bootstrap (+libnghttp2, -xorg-utils)
 Fixed issue of launching Xfce and Mate (issue #807)
 Added file system check (issue #785)
+Added custom target type
 
 2.0.1
 Added Fedora 25 (issue #683)
@@ -374,6 +375,7 @@ Updated list packages of base system installation
 Исправлен установщик Arch Linux (+libnghttp2, -xorg-utils)
 Исправлена проблема запуска Xfce и Mate (тикет #807)
 Добавлена проверка файловой системы (тикет #785)
+Добавлен пользовательский тип установки
 
 2.0.1
 Добавлена поддержка Fedora 25 (тикет #683)

diff --git a/app/build.gradle b/app/build.gradle
@@ -8,7 +8,7 @@ android {
         applicationId 'ru.meefik.linuxdeploy'
         minSdkVersion 10
         targetSdkVersion 25
-        versionCode 221
+        versionCode 223
         versionName "2.0.2"
     }
     buildTypes {

diff --git a/app/src/main/java/ru/meefik/linuxdeploy/PropertiesActivity.java b/app/src/main/java/ru/meefik/linuxdeploy/PropertiesActivity.java
@@ -305,6 +305,13 @@ private void setSummary(Preference pref, boolean init) {
                         disksize.setEnabled(true);
                         fstype.setEnabled(false);
                         break;
+                    case "custom":
+                        if (init) {
+                            targetpath.setText(getString(R.string.target_path_custom));
+                        }
+                        disksize.setEnabled(false);
+                        fstype.setEnabled(false);
+                        break;
                 }
             }
         }

diff --git a/app/src/main/res/values-ru/arrays.xml b/app/src/main/res/values-ru/arrays.xml
@@ -10,6 +10,7 @@
         <item>Директория</item>
         <item>Раздел</item>
         <item>Оперативная память</item>
+        <item>Пользовательский</item>
     </string-array>
     <string-array name="fs_type_entries">
         <item>Автоопределение</item>

diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
@@ -42,12 +42,14 @@
         <item>directory</item>
         <item>partition</item>
         <item>ram</item>
+        <item>custom</item>
     </string-array>
     <string-array name="target_type_entries">
         <item>File</item>
         <item>Directory</item>
         <item>Partition</item>
         <item>RAM</item>
+        <item>Custom</item>
     </string-array>
     <string-array name="fs_type_values" translatable="false">
         <item>auto</item>

diff --git a/app/src/main/res/values/preferences.xml b/app/src/main/res/values/preferences.xml
@@ -41,6 +41,7 @@
     <string name="target_path_directory" translatable="false">${ENV_DIR}/rootfs/linux</string>
     <string name="target_path_partition" translatable="false">/dev/block/mmcblkXpY</string>
     <string name="target_path_ram" translatable="false">/data/local/ram</string>
+    <string name="target_path_custom" translatable="false"></string>
     <string name="rootfs_archive" translatable="false">${EXTERNAL_STORAGE}/linux-rootfs.tar.gz</string>
     <string name="disk_size" translatable="false">0</string>
     <string name="fs_type" translatable="false">auto</string>