Reorganize layouts by feature

2017-05-25 12:16:58 +02:00
parent c7686323b7
commit ca2236958a
98 changed files with 107 additions and 282 deletions
@@ -33,7 +33,7 @@ import eu.kanade.tachiyomi.util.plusAssign
 import eu.kanade.tachiyomi.util.toast
 import eu.kanade.tachiyomi.widget.SimpleAnimationListener
 import eu.kanade.tachiyomi.widget.SimpleSeekBarListener
-import kotlinx.android.synthetic.main.activity_reader.*
+import kotlinx.android.synthetic.main.reader_activity.*
 import me.zhanghai.android.systemuihelper.SystemUiHelper
 import me.zhanghai.android.systemuihelper.SystemUiHelper.*
 import nucleus.factory.RequiresPresenter
@@ -92,7 +92,7 @@ class ReaderActivity : BaseRxActivity<ReaderPresenter>() {

    override fun onCreate(savedState: Bundle?) {
        super.onCreate(savedState)
-        setContentView(R.layout.activity_reader)
+        setContentView(R.layout.reader_activity)

        if (savedState == null && SharedData.get(ReaderEvent::class.java) == null) {
            finish()
@@ -13,7 +13,7 @@ import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.data.preference.getOrDefault
 import eu.kanade.tachiyomi.util.plusAssign
 import eu.kanade.tachiyomi.widget.SimpleSeekBarListener
-import kotlinx.android.synthetic.main.dialog_reader_custom_filter.view.*
+import kotlinx.android.synthetic.main.reader_custom_filter_dialog.view.*
 import rx.Subscription
 import rx.android.schedulers.AndroidSchedulers
 import rx.subscriptions.CompositeSubscription
@@ -65,7 +65,7 @@ class ReaderCustomFilterDialog : DialogFragment() {
     */
    override fun onCreateDialog(savedState: Bundle?): Dialog {
        val dialog = MaterialDialog.Builder(activity)
-                .customView(R.layout.dialog_reader_custom_filter, false)
+                .customView(R.layout.reader_custom_filter_dialog, false)
                .positiveText(android.R.string.ok)
                .build()

@@ -10,7 +10,7 @@ import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.data.preference.getOrDefault
 import eu.kanade.tachiyomi.util.plusAssign
 import eu.kanade.tachiyomi.widget.IgnoreFirstSpinnerListener
-import kotlinx.android.synthetic.main.dialog_reader_settings.view.*
+import kotlinx.android.synthetic.main.reader_settings_dialog.view.*
 import rx.Observable
 import rx.android.schedulers.AndroidSchedulers
 import rx.subscriptions.CompositeSubscription
@@ -26,7 +26,7 @@ class ReaderSettingsDialog : DialogFragment() {
    override fun onCreateDialog(savedState: Bundle?): Dialog {
        val dialog = MaterialDialog.Builder(activity)
                .title(R.string.label_settings)
-                .customView(R.layout.dialog_reader_settings, true)
+                .customView(R.layout.reader_settings_dialog, true)
                .positiveText(android.R.string.ok)
                .build()

@@ -6,7 +6,7 @@ import android.view.View
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.ui.reader.ReaderActivity
-import kotlinx.android.synthetic.main.page_decode_error.view.*
+import kotlinx.android.synthetic.main.reader_page_decode_error.view.*

 class PageDecodeErrorLayout(
        val view: View,
@@ -16,8 +16,7 @@ import eu.kanade.tachiyomi.ui.reader.viewer.base.PageDecodeErrorLayout
 import eu.kanade.tachiyomi.ui.reader.viewer.pager.horizontal.RightToLeftReader
 import eu.kanade.tachiyomi.ui.reader.viewer.pager.vertical.VerticalReader
 import eu.kanade.tachiyomi.util.inflate
-import kotlinx.android.synthetic.main.chapter_image.view.*
-import kotlinx.android.synthetic.main.item_pager_reader.view.*
+import kotlinx.android.synthetic.main.reader_pager_item.view.*
 import rx.Observable
 import rx.Subscription
 import rx.android.schedulers.AndroidSchedulers
@@ -259,7 +258,7 @@ class PageView @JvmOverloads constructor(context: Context, attrs: AttributeSet?

        val activity = reader.activity as ReaderActivity

-        val layout = inflate(R.layout.page_decode_error)
+        val layout = inflate(R.layout.reader_page_decode_error)
        PageDecodeErrorLayout(layout, page, activity.readerTheme, {
            if (reader.isAdded) {
                activity.presenter.retryPage(page)
@@ -23,7 +23,7 @@ class PagerReaderAdapter(private val reader: PagerReader) : ViewPagerAdapter() {
        }

    override fun createView(container: ViewGroup, position: Int): View {
-        val view = container.inflate(R.layout.item_pager_reader) as PageView
+        val view = container.inflate(R.layout.reader_pager_item) as PageView
        view.initialize(reader, pages[position])
        return view
    }
@@ -51,7 +51,7 @@ class WebtoonAdapter(val fragment: WebtoonReader) : RecyclerView.Adapter<Webtoon
     * @return a new view holder for a manga.
     */
    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): WebtoonHolder {
-        val v = parent.inflate(R.layout.item_webtoon_reader)
+        val v = parent.inflate(R.layout.reader_webtoon_item)
        return WebtoonHolder(v, this)
    }

@@ -14,8 +14,7 @@ import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.ui.reader.ReaderActivity
 import eu.kanade.tachiyomi.ui.reader.viewer.base.PageDecodeErrorLayout
 import eu.kanade.tachiyomi.util.inflate
-import kotlinx.android.synthetic.main.chapter_image.view.*
-import kotlinx.android.synthetic.main.item_webtoon_reader.view.*
+import kotlinx.android.synthetic.main.reader_webtoon_item.view.*
 import rx.Observable
 import rx.Subscription
 import rx.android.schedulers.AndroidSchedulers
@@ -25,7 +24,7 @@ import java.util.concurrent.TimeUnit

 /**
 * Holder for webtoon reader for a single page of a chapter.
- * All the elements from the layout file "item_webtoon_reader" are available in this class.
+ * All the elements from the layout file "reader_webtoon_item" are available in this class.
 *
 * @param view the inflated view for this holder.
 * @param adapter the adapter handling this holder.
@@ -287,7 +286,7 @@ class WebtoonHolder(private val view: View, private val adapter: WebtoonAdapter)
        val page = page ?: return
        if (decodeErrorLayout != null || !webtoonReader.isAdded) return

-        val layout = (view as ViewGroup).inflate(R.layout.page_decode_error)
+        val layout = (view as ViewGroup).inflate(R.layout.reader_page_decode_error)
        PageDecodeErrorLayout(layout, page, readerActivity.readerTheme, {
            if (webtoonReader.isAdded) {
                readerActivity.presenter.retryPage(page)