javara999/mihon-bookoasis
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases 5 Wiki Activity

Reorganize layouts by feature

Browse Source
This commit is contained in:
inorichi
2017-05-25 12:16:58 +02:00
parent c7686323b7
commit ca2236958a
98 changed files with 107 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
+1 -1
View File
@@ -30,7 +30,7 @@ import eu.kanade.tachiyomi.ui.manga.chapter.ChaptersController
import eu.kanade.tachiyomi.ui.manga.info.MangaInfoController
import eu.kanade.tachiyomi.ui.manga.track.TrackController
import eu.kanade.tachiyomi.util.toast
import kotlinx.android.synthetic.main.activity_main.*
import kotlinx.android.synthetic.main.main_activity.*
import kotlinx.android.synthetic.main.manga_controller.view.*
import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get
app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChapterHolder.kt
+1 -1
View File
@@ -6,7 +6,7 @@ import eu.davidea.viewholders.FlexibleViewHolder
import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.data.database.models.Manga
import eu.kanade.tachiyomi.data.download.model.Download
import kotlinx.android.synthetic.main.item_chapter.view.*
import kotlinx.android.synthetic.main.chapters_item.view.*
import java.util.*
class ChapterHolder(
app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChapterItem.kt
+1 -1
View File
@@ -24,7 +24,7 @@ class ChapterItem(val chapter: Chapter, val manga: Manga) : AbstractFlexibleItem
get() = status == Download.DOWNLOADED
override fun getLayoutRes(): Int {
return R.layout.item_chapter
return R.layout.chapters_item
}
override fun createViewHolder(adapter: FlexibleAdapter<*>,
app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersController.kt
+2 -2
View File
@@ -25,7 +25,7 @@ import eu.kanade.tachiyomi.ui.reader.ReaderActivity
import eu.kanade.tachiyomi.util.getCoordinates
import eu.kanade.tachiyomi.util.snack
import eu.kanade.tachiyomi.util.toast
import kotlinx.android.synthetic.main.fragment_manga_chapters.view.*
import kotlinx.android.synthetic.main.chapters_controller.view.*
import timber.log.Timber
class ChaptersController : NucleusController<ChaptersPresenter>(),
@@ -65,7 +65,7 @@ class ChaptersController : NucleusController<ChaptersPresenter>(),
}
override fun inflateView(inflater: LayoutInflater, container: ViewGroup): View {
return inflater.inflate(R.layout.fragment_manga_chapters, container, false)
return inflater.inflate(R.layout.chapters_controller, container, false)
}
override fun onViewCreated(view: View, savedViewState: Bundle?) {
app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoController.kt
+3 -3
View File
@@ -32,7 +32,7 @@ import jp.wasabeef.glide.transformations.CropCircleTransformation
import jp.wasabeef.glide.transformations.CropSquareTransformation
import jp.wasabeef.glide.transformations.MaskTransformation
import jp.wasabeef.glide.transformations.RoundedCornersTransformation
import kotlinx.android.synthetic.main.fragment_manga_info.view.*
import kotlinx.android.synthetic.main.manga_info_controller.view.*
import rx.Observable
import rx.android.schedulers.AndroidSchedulers
import rx.schedulers.Schedulers
@@ -42,7 +42,7 @@ import java.text.DecimalFormat
/**
* Fragment that shows manga information.
* Uses R.layout.fragment_manga_info.
* Uses R.layout.manga_info_controller.
* UI related actions should be called from here.
*/
class MangaInfoController : NucleusController<MangaInfoPresenter>(),
@@ -65,7 +65,7 @@ class MangaInfoController : NucleusController<MangaInfoPresenter>(),
}
override fun inflateView(inflater: LayoutInflater, container: ViewGroup): View {
return inflater.inflate(R.layout.fragment_manga_info, container, false)
return inflater.inflate(R.layout.manga_info_controller, container, false)
}
override fun onViewCreated(view: View, savedViewState: Bundle?) {
app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/SetTrackChaptersDialog.kt
+1 -1
View File
@@ -36,7 +36,7 @@ class SetTrackChaptersDialog<T> : DialogController
val dialog = MaterialDialog.Builder(activity!!)
.title(R.string.chapters)
.customView(R.layout.dialog_track_chapters, false)
.customView(R.layout.track_chapters_dialog, false)
.positiveText(android.R.string.ok)
.negativeText(android.R.string.cancel)
.onPositive { dialog, _ ->
app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/SetTrackScoreDialog.kt
+1 -1
View File
@@ -36,7 +36,7 @@ class SetTrackScoreDialog<T> : DialogController
val dialog = MaterialDialog.Builder(activity!!)
.title(R.string.score)
.customView(R.layout.dialog_track_score, false)
.customView(R.layout.track_score_dialog, false)
.positiveText(android.R.string.ok)
.negativeText(android.R.string.cancel)
.onPositive { dialog, _ ->
app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackAdapter.kt
+1 -1
View File
@@ -26,7 +26,7 @@ class TrackAdapter(controller: TrackController) : RecyclerView.Adapter<TrackHold
}
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): TrackHolder {
val view = parent.inflate(R.layout.item_track)
val view = parent.inflate(R.layout.track_item)
return TrackHolder(view, this)
}
app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackController.kt
+2 -2
View File
@@ -11,7 +11,7 @@ import eu.kanade.tachiyomi.data.database.models.Track
import eu.kanade.tachiyomi.ui.base.controller.NucleusController
import eu.kanade.tachiyomi.ui.manga.MangaController
import eu.kanade.tachiyomi.util.toast
import kotlinx.android.synthetic.main.fragment_track.view.*
import kotlinx.android.synthetic.main.track_controller.view.*
class TrackController : NucleusController<TrackPresenter>(),
TrackAdapter.OnRowClickListener,
@@ -26,7 +26,7 @@ class TrackController : NucleusController<TrackPresenter>(),
}
override fun inflateView(inflater: LayoutInflater, container: ViewGroup): View {
return inflater.inflate(R.layout.fragment_track, container, false)
return inflater.inflate(R.layout.track_controller, container, false)
}
override fun onViewCreated(view: View, savedViewState: Bundle?) {
app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackHolder.kt
+1 -1
View File
@@ -4,7 +4,7 @@ import android.annotation.SuppressLint
import android.support.v7.widget.RecyclerView
import android.view.View
import eu.kanade.tachiyomi.R
import kotlinx.android.synthetic.main.item_track.view.*
import kotlinx.android.synthetic.main.track_item.view.*
class TrackHolder(view: View, adapter: TrackAdapter) : RecyclerView.ViewHolder(view) {
app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSearchAdapter.kt
+3 -3
View File
@@ -7,11 +7,11 @@ import android.widget.ArrayAdapter
import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.data.database.models.Track
import eu.kanade.tachiyomi.util.inflate
import kotlinx.android.synthetic.main.item_track_search.view.*
import kotlinx.android.synthetic.main.track_search_item.view.*
import java.util.*
class TrackSearchAdapter(context: Context)
: ArrayAdapter<Track>(context, R.layout.item_track_search, ArrayList<Track>()) {
: ArrayAdapter<Track>(context, R.layout.track_search_item, ArrayList<Track>()) {
override fun getView(position: Int, view: View?, parent: ViewGroup): View {
var v = view
@@ -20,7 +20,7 @@ class TrackSearchAdapter(context: Context)
// Check if an existing view is being reused, otherwise inflate the view
val holder: TrackSearchHolder // view lookup cache stored in tag
if (v == null) {
v = parent.inflate(R.layout.item_track_search)
v = parent.inflate(R.layout.track_search_item)
holder = TrackSearchHolder(v)
v.tag = holder
} else {
app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSearchDialog.kt
+2 -2
View File
@@ -12,7 +12,7 @@ import eu.kanade.tachiyomi.data.track.TrackManager
import eu.kanade.tachiyomi.data.track.TrackService
import eu.kanade.tachiyomi.ui.base.controller.DialogController
import eu.kanade.tachiyomi.util.plusAssign
import kotlinx.android.synthetic.main.dialog_track_search.view.*
import kotlinx.android.synthetic.main.track_search_dialog.view.*
import rx.Subscription
import rx.android.schedulers.AndroidSchedulers
import rx.subscriptions.CompositeSubscription
@@ -51,7 +51,7 @@ class TrackSearchDialog : DialogController {
override fun onCreateDialog(savedState: Bundle?): Dialog {
val dialog = MaterialDialog.Builder(activity!!)
.customView(R.layout.dialog_track_search, false)
.customView(R.layout.track_search_dialog, false)
.positiveText(android.R.string.ok)
.negativeText(android.R.string.cancel)
.onPositive { _, _ -> onPositiveButtonClick() }