pull/2692/head
kunfei 2 years ago
parent 5827024d38
commit bbdba2e8c8
  1. 28
      app/src/main/res/layout/dialog_book_group_edit.xml
  2. 1
      app/src/main/res/values-es-rES/strings.xml
  3. 1
      app/src/main/res/values-ja-rJP/strings.xml
  4. 1
      app/src/main/res/values-pt-rBR/strings.xml
  5. 1
      app/src/main/res/values-zh-rHK/strings.xml
  6. 1
      app/src/main/res/values-zh-rTW/strings.xml
  7. 1
      app/src/main/res/values-zh/strings.xml
  8. 8
      app/src/main/res/values/arrays.xml
  9. 1
      app/src/main/res/values/strings.xml

@ -40,10 +40,10 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="6dp" android:layout_margin="6dp"
android:hint="@string/group_name" android:hint="@string/group_name"
app:layout_constraintBottom_toTopOf="@+id/tv_sort"
app:layout_constraintLeft_toRightOf="@+id/iv_cover" app:layout_constraintLeft_toRightOf="@+id/iv_cover"
app:layout_constraintRight_toRightOf="parent" app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tool_bar" app:layout_constraintTop_toBottomOf="@+id/tool_bar">
app:layout_constraintBottom_toTopOf="@+id/tv_sort">
<io.legado.app.lib.theme.view.ThemeEditText <io.legado.app.lib.theme.view.ThemeEditText
android:id="@+id/tie_group_name" android:id="@+id/tie_group_name"
@ -53,22 +53,34 @@
tools:ignore="TouchTargetSizeCheck,SpeakableTextPresentCheck" /> tools:ignore="TouchTargetSizeCheck,SpeakableTextPresentCheck" />
</io.legado.app.ui.widget.text.TextInputLayout> </io.legado.app.ui.widget.text.TextInputLayout>
<TextView <io.legado.app.ui.widget.text.AccentTextView
android:id="@+id/tv_sort" android:id="@+id/tv_sort"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/sort" android:text="@string/sort"
android:textColor="@color/primaryText" android:textColor="@color/primaryText"
app:layout_constraintTop_toBottomOf="@id/til_group_name" app:layout_constraintBottom_toTopOf="@id/btn_ok"
app:layout_constraintLeft_toLeftOf="@id/til_group_name" app:layout_constraintLeft_toLeftOf="@id/til_group_name"
app:layout_constraintBottom_toTopOf="@id/btn_ok" /> app:layout_constraintTop_toBottomOf="@id/til_group_name" />
<androidx.appcompat.widget.AppCompatSpinner
android:id="@+id/sp_sort"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="6dp"
android:entries="@array/book_sort"
app:layout_constraintBottom_toBottomOf="@id/tv_sort"
app:layout_constraintLeft_toRightOf="@+id/tv_sort"
app:layout_constraintTop_toTopOf="@id/tv_sort"
app:theme="@style/Spinner"
tools:ignore="RtlHardcoded" />
<io.legado.app.ui.widget.text.AccentTextView <io.legado.app.ui.widget.text.AccentTextView
android:id="@+id/btn_delete" android:id="@+id/btn_delete"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="6dp"
android:layout_margin="6dp" android:layout_margin="6dp"
android:padding="6dp"
android:text="@string/delete" android:text="@string/delete"
app:layout_constraintBottom_toBottomOf="@id/btn_ok" app:layout_constraintBottom_toBottomOf="@id/btn_ok"
app:layout_constraintLeft_toRightOf="@+id/iv_cover" app:layout_constraintLeft_toRightOf="@+id/iv_cover"
@ -79,8 +91,8 @@
android:id="@+id/btn_ok" android:id="@+id/btn_ok"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="6dp"
android:layout_margin="6dp" android:layout_margin="6dp"
android:padding="6dp"
android:text="@string/ok" android:text="@string/ok"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent" app:layout_constraintRight_toRightOf="parent"
@ -91,8 +103,8 @@
android:id="@+id/btn_cancel" android:id="@+id/btn_cancel"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="6dp"
android:layout_margin="6dp" android:layout_margin="6dp"
android:padding="6dp"
android:text="@string/cancel" android:text="@string/cancel"
app:layout_constraintBottom_toBottomOf="@id/btn_ok" app:layout_constraintBottom_toBottomOf="@id/btn_ok"
app:layout_constraintRight_toLeftOf="@+id/btn_ok" app:layout_constraintRight_toLeftOf="@+id/btn_ok"

@ -662,6 +662,7 @@
<string name="plus">Plus</string> <string name="plus">Plus</string>
<string name="system_typeface">System typeface</string> <string name="system_typeface">System typeface</string>
<string name="delete_book_file">Delete source file</string> <string name="delete_book_file">Delete source file</string>
<string name="text_default">Default</string>
<string name="default1">Default-1</string> <string name="default1">Default-1</string>
<string name="default2">Default-2</string> <string name="default2">Default-2</string>
<string name="default3">Default-3</string> <string name="default3">Default-3</string>

@ -666,6 +666,7 @@
<string name="plus">Plus</string> <string name="plus">Plus</string>
<string name="system_typeface">System typeface</string> <string name="system_typeface">System typeface</string>
<string name="delete_book_file">Delete source file</string> <string name="delete_book_file">Delete source file</string>
<string name="text_default">Default</string>
<string name="default1">Default-1</string> <string name="default1">Default-1</string>
<string name="default2">Default-2</string> <string name="default2">Default-2</string>
<string name="default3">Default-3</string> <string name="default3">Default-3</string>

@ -664,6 +664,7 @@
<string name="plus">Mais</string> <string name="plus">Mais</string>
<string name="system_typeface">Tamanho e tipo da fonte</string> <string name="system_typeface">Tamanho e tipo da fonte</string>
<string name="delete_book_file">Excluir arquivo fonte</string> <string name="delete_book_file">Excluir arquivo fonte</string>
<string name="text_default">Padrão</string>
<string name="default1">Padrão-1</string> <string name="default1">Padrão-1</string>
<string name="default2">Padrão-2</string> <string name="default2">Padrão-2</string>
<string name="default3">Padrão-3</string> <string name="default3">Padrão-3</string>

@ -657,6 +657,7 @@
<string name="plus"></string> <string name="plus"></string>
<string name="system_typeface">系統內置字體樣式</string> <string name="system_typeface">系統內置字體樣式</string>
<string name="delete_book_file">刪除源文件</string> <string name="delete_book_file">刪除源文件</string>
<string name="text_default">默认</string>
<string name="default1">預設一</string> <string name="default1">預設一</string>
<string name="default2">預設二</string> <string name="default2">預設二</string>
<string name="default3">預設三</string> <string name="default3">預設三</string>

@ -665,6 +665,7 @@
<string name="plus"></string> <string name="plus"></string>
<string name="system_typeface">系統內建字體樣式</string> <string name="system_typeface">系統內建字體樣式</string>
<string name="delete_book_file">刪除來源文件</string> <string name="delete_book_file">刪除來源文件</string>
<string name="text_default">默认</string>
<string name="default1">預設一</string> <string name="default1">預設一</string>
<string name="default2">預設二</string> <string name="default2">預設二</string>
<string name="default3">預設三</string> <string name="default3">預設三</string>

@ -665,6 +665,7 @@
<string name="plus"></string> <string name="plus"></string>
<string name="system_typeface">系统内置字体样式</string> <string name="system_typeface">系统内置字体样式</string>
<string name="delete_book_file">删除源文件</string> <string name="delete_book_file">删除源文件</string>
<string name="text_default">默认</string>
<string name="default1">预设一</string> <string name="default1">预设一</string>
<string name="default2">预设二</string> <string name="default2">预设二</string>
<string name="default3">预设三</string> <string name="default3">预设三</string>

@ -12,6 +12,14 @@
<item>Folder</item> <item>Folder</item>
</string-array> </string-array>
<string-array name="book_sort">
<item>@string/text_default</item>
<item>@string/bookshelf_px_0</item>
<item>@string/bookshelf_px_1</item>
<item>@string/bookshelf_px_2</item>
<item>@string/bookshelf_px_3</item>
</string-array>
<string-array name="indent"> <string-array name="indent">
<item>@string/indent_0</item> <item>@string/indent_0</item>
<item>@string/indent_1</item> <item>@string/indent_1</item>

@ -667,6 +667,7 @@
<string name="plus">Plus</string> <string name="plus">Plus</string>
<string name="system_typeface">System typeface</string> <string name="system_typeface">System typeface</string>
<string name="delete_book_file">Delete source file</string> <string name="delete_book_file">Delete source file</string>
<string name="text_default">Default</string>
<string name="default1">Default-1</string> <string name="default1">Default-1</string>
<string name="default2">Default-2</string> <string name="default2">Default-2</string>
<string name="default3">Default-3</string> <string name="default3">Default-3</string>

Loading…
Cancel
Save