Minor edits

This commit is contained in:
arkon 2020-03-29 16:41:14 -04:00
parent af937f2e31
commit 441e2a69d8
4 changed files with 6 additions and 14 deletions

View file

@ -10,7 +10,6 @@ import eu.kanade.tachiyomi.util.view.inflate
import eu.kanade.tachiyomi.widget.SimpleNavigationView import eu.kanade.tachiyomi.widget.SimpleNavigationView
import kotlinx.android.synthetic.main.catalogue_drawer_content.view.reset_btn import kotlinx.android.synthetic.main.catalogue_drawer_content.view.reset_btn
import kotlinx.android.synthetic.main.catalogue_drawer_content.view.search_btn import kotlinx.android.synthetic.main.catalogue_drawer_content.view.search_btn
import kotlinx.android.synthetic.main.catalogue_drawer_content.view.title
class CatalogueNavigationView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : class CatalogueNavigationView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) :
SimpleNavigationView(context, attrs) { SimpleNavigationView(context, attrs) {
@ -29,7 +28,6 @@ class CatalogueNavigationView @JvmOverloads constructor(context: Context, attrs:
val view = inflate(R.layout.catalogue_drawer_content) val view = inflate(R.layout.catalogue_drawer_content)
((view as ViewGroup).getChildAt(1) as ViewGroup).addView(recycler) ((view as ViewGroup).getChildAt(1) as ViewGroup).addView(recycler)
addView(view) addView(view)
title.text = context.getString(R.string.source_search_options)
search_btn.setOnClickListener { onSearchClicked() } search_btn.setOnClickListener { onSearchClicked() }
reset_btn.setOnClickListener { onResetClicked() } reset_btn.setOnClickListener { onResetClicked() }
} }

View file

@ -149,7 +149,7 @@ class AboutController : SettingsController() {
override fun onCreateDialog(savedViewState: Bundle?): Dialog { override fun onCreateDialog(savedViewState: Bundle?): Dialog {
return MaterialDialog.Builder(activity!!) return MaterialDialog.Builder(activity!!)
.title(R.string.update_check_title) .title(R.string.update_check_notification_update_available)
.content(args.getString(BODY_KEY) ?: "") .content(args.getString(BODY_KEY) ?: "")
.positiveText(R.string.update_check_confirm) .positiveText(R.string.update_check_confirm)
.negativeText(R.string.update_check_ignore) .negativeText(R.string.update_check_ignore)

View file

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:clickable="true" android:clickable="true"
@ -18,15 +17,14 @@
android:paddingEnd="?attr/listPreferredItemPaddingEnd"> android:paddingEnd="?attr/listPreferredItemPaddingEnd">
<TextView <TextView
android:id="@+id/title"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="1" android:maxLines="1"
android:text="@string/source_search_options"
android:textAppearance="@style/TextAppearance.AppCompat.Body2" android:textAppearance="@style/TextAppearance.AppCompat.Body2"
android:textColor="?attr/colorOnPrimary" android:textColor="?attr/colorOnPrimary" />
tools:text="Title" />
</LinearLayout> </LinearLayout>

View file

@ -418,6 +418,7 @@
<string name="delete_downloads_for_manga">Delete downloaded chapters?</string> <string name="delete_downloads_for_manga">Delete downloaded chapters?</string>
<string name="copied_to_clipboard">%1$s copied to clipboard</string> <string name="copied_to_clipboard">%1$s copied to clipboard</string>
<string name="source_not_installed">Source not installed: %1$s</string> <string name="source_not_installed">Source not installed: %1$s</string>
<string name="snack_add_to_library">Add manga to library?</string>
<!-- Manga chapters fragment --> <!-- Manga chapters fragment -->
<string name="manga_chapters_tab">Chapters</string> <string name="manga_chapters_tab">Chapters</string>
@ -475,9 +476,6 @@
<string name="dialog_with_checkbox_remove_description">This will remove the read date of this chapter. Are you sure?</string> <string name="dialog_with_checkbox_remove_description">This will remove the read date of this chapter. Are you sure?</string>
<string name="dialog_with_checkbox_reset">Reset all chapters for this manga</string> <string name="dialog_with_checkbox_reset">Reset all chapters for this manga</string>
<!-- SnackBar -->
<string name="snack_add_to_library">Add manga to library?</string>
<!-- Image notifier --> <!-- Image notifier -->
<string name="picture_saved">Picture saved</string> <string name="picture_saved">Picture saved</string>
<string name="saving_picture">Saving picture</string> <string name="saving_picture">Saving picture</string>
@ -506,7 +504,7 @@
<string name="transition_pages_loading">Loading pages…</string> <string name="transition_pages_loading">Loading pages…</string>
<string name="transition_pages_error">Failed to load pages: %1$s</string> <string name="transition_pages_error">Failed to load pages: %1$s</string>
<!-- Recent manga fragment --> <!-- History fragment -->
<string name="recent_manga_source">%1$s - Ch.%2$s</string> <string name="recent_manga_source">%1$s - Ch.%2$s</string>
<!-- Source migration screen --> <!-- Source migration screen -->
@ -553,11 +551,9 @@
<string name="file_select_icon">Select shortcut icon</string> <string name="file_select_icon">Select shortcut icon</string>
<!--UpdateCheck--> <!--UpdateCheck-->
<string name="update_check_title">New version available!</string>
<string name="update_check_confirm">Download</string> <string name="update_check_confirm">Download</string>
<string name="update_check_ignore">Ignore</string> <string name="update_check_ignore">Ignore</string>
<string name="update_check_no_new_updates">No new updates available</string> <string name="update_check_no_new_updates">No new updates available</string>
<string name="update_check_download_started">Download started</string>
<string name="update_check_look_for_updates">Searching for updates…</string> <string name="update_check_look_for_updates">Searching for updates…</string>
<!--UpdateCheck Notifications--> <!--UpdateCheck Notifications-->
@ -565,7 +561,7 @@
<string name="update_check_notification_download_in_progress">Downloading…</string> <string name="update_check_notification_download_in_progress">Downloading…</string>
<string name="update_check_notification_download_complete">Download complete</string> <string name="update_check_notification_download_complete">Download complete</string>
<string name="update_check_notification_download_error">Download error</string> <string name="update_check_notification_download_error">Download error</string>
<string name="update_check_notification_update_available">Update available</string> <string name="update_check_notification_update_available">New version available!</string>
<!--Extension Updates Notifications--> <!--Extension Updates Notifications-->
<plurals name="update_check_notification_ext_updates"> <plurals name="update_check_notification_ext_updates">