Refactor and cleanup code

.travis.yml

@@ -7,6 +7,8 @@ android:
     - tools
     - build-tools
     - android-29
+    - extra-google-m2repository
+    - extra-android-m2repository
 
 before_install:
   - yes | sdkmanager "platforms;android-29"

app/src/main/java/org/koitharu/kotatsu/core/db/HistoryDao.kt

@@ -34,7 +34,7 @@ abstract class HistoryDao {
     suspend fun update(entity: HistoryWithManga) = update(entity.manga.id, entity.history.page, entity.history.chapterId, entity.history.updatedAt)
 
     @Transaction
-    suspend open fun upsert(entity: HistoryWithManga) {
+    open suspend fun upsert(entity: HistoryWithManga) {
         if (update(entity) == 0) {
             insertManga(entity.manga)
             insert(entity.history)

app/src/main/java/org/koitharu/kotatsu/core/parser/site/GroupleRepository.kt

@@ -5,7 +5,6 @@ import org.koitharu.kotatsu.core.model.*
 import org.koitharu.kotatsu.core.parser.BaseMangaRepository
 import org.koitharu.kotatsu.domain.MangaLoaderContext
 import org.koitharu.kotatsu.utils.ext.*
-import kotlin.text.removeSurrounding
 
 abstract class GroupleRepository(
 	private val source: MangaSource,

app/src/main/java/org/koitharu/kotatsu/core/parser/site/ReadmangaRepository.kt

@@ -1,11 +1,7 @@
 package org.koitharu.kotatsu.core.parser.site
 
-import androidx.core.text.parseAsHtml
+import org.koitharu.kotatsu.core.model.MangaSource
-import org.koitharu.kotatsu.core.model.*
-import org.koitharu.kotatsu.core.parser.BaseMangaRepository
 import org.koitharu.kotatsu.domain.MangaLoaderContext
-import org.koitharu.kotatsu.core.exceptions.ParseException
-import org.koitharu.kotatsu.utils.ext.*
 
 class ReadmangaRepository(loaderContext: MangaLoaderContext) :
 	GroupleRepository(MangaSource.READMANGA_RU, loaderContext) {

app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt

@@ -7,7 +7,7 @@ import androidx.preference.PreferenceManager
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.utils.delegates.prefs.EnumPreferenceDelegate
 
-class AppSettings private constructor(private val resources: Resources, private val prefs: SharedPreferences) : SharedPreferences by prefs {
+class AppSettings private constructor(resources: Resources, private val prefs: SharedPreferences) : SharedPreferences by prefs {
 
 	constructor(context: Context) : this(context.resources, PreferenceManager.getDefaultSharedPreferences(context))
 

app/src/main/java/org/koitharu/kotatsu/domain/HistoryRepository.kt

@@ -6,12 +6,11 @@ import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.core.db.entity.HistoryEntity
 import org.koitharu.kotatsu.core.db.entity.HistoryWithManga
 import org.koitharu.kotatsu.core.db.entity.MangaEntity
-import org.koitharu.kotatsu.core.model.*
+import org.koitharu.kotatsu.core.model.Manga
-import org.koitharu.kotatsu.core.parser.MangaRepository
+import org.koitharu.kotatsu.core.model.MangaHistory
-import java.io.Closeable
 import java.util.*
 
-class HistoryRepository() : KoinComponent {
+class HistoryRepository : KoinComponent {
 
 	private val db: MangaDatabase by inject()
 

app/src/main/java/org/koitharu/kotatsu/domain/MangaLoaderContext.kt

@@ -1,7 +1,9 @@
 package org.koitharu.kotatsu.domain
 
-import android.content.Context
+import okhttp3.FormBody
-import okhttp3.*
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.Response
 import org.koin.core.KoinComponent
 import org.koin.core.inject
 import org.koitharu.kotatsu.utils.ext.await

app/src/main/java/org/koitharu/kotatsu/ui/common/BaseFragment.kt

@@ -3,9 +3,7 @@ package org.koitharu.kotatsu.ui.common
 import android.content.Context
 import android.content.SharedPreferences
 import android.os.Parcelable
-import androidx.annotation.IdRes
 import androidx.annotation.LayoutRes
-import androidx.recyclerview.widget.RecyclerView
 import moxy.MvpAppCompatFragment
 import org.koin.android.ext.android.inject
 import org.koitharu.kotatsu.core.prefs.AppSettings

app/src/main/java/org/koitharu/kotatsu/ui/common/ChipsFactory.kt

@@ -1,12 +1,8 @@
 package org.koitharu.kotatsu.ui.common
 
 import android.content.Context
-import android.graphics.drawable.Drawable
-import android.view.View
 import androidx.annotation.DrawableRes
 import com.google.android.material.chip.Chip
-import com.google.android.material.shape.CornerFamily
-import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.utils.ext.getThemeColor
 
 class ChipsFactory(private val context: Context) {

app/src/main/java/org/koitharu/kotatsu/ui/common/widgets/CoverImageView.kt

@@ -5,7 +5,6 @@ import android.util.AttributeSet
 import android.widget.LinearLayout
 import androidx.appcompat.widget.AppCompatImageView
 import androidx.core.content.res.use
-import moxy.MvpFacade.init
 import org.koitharu.kotatsu.R
 
 

app/src/main/java/org/koitharu/kotatsu/ui/details/ChaptersAdapter.kt

@@ -2,11 +2,9 @@ package org.koitharu.kotatsu.ui.details
 
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import org.koitharu.kotatsu.core.model.Manga
 import org.koitharu.kotatsu.core.model.MangaChapter
 import org.koitharu.kotatsu.domain.ChapterExtra
 import org.koitharu.kotatsu.ui.common.list.BaseRecyclerAdapter
-import org.koitharu.kotatsu.ui.common.list.BaseViewHolder
 import org.koitharu.kotatsu.ui.common.list.OnRecyclerItemClickListener
 
 class ChaptersAdapter(onItemClickListener: OnRecyclerItemClickListener<MangaChapter>) :

app/src/main/java/org/koitharu/kotatsu/ui/reader/PageLoader.kt

@@ -1,16 +1,13 @@
 package org.koitharu.kotatsu.ui.reader
 
 import android.content.Context
-import android.util.LongSparseArray
 import kotlinx.coroutines.*
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import org.koin.core.KoinComponent
 import org.koin.core.inject
-import org.koitharu.kotatsu.core.model.MangaPage
 import org.koitharu.kotatsu.utils.ext.await
 import org.koitharu.kotatsu.utils.ext.longHashCode
-import java.io.Closeable
 import java.io.File
 import kotlin.coroutines.CoroutineContext
 

app/src/main/java/org/koitharu/kotatsu/ui/reader/PagesAdapter.kt

@@ -3,7 +3,6 @@ package org.koitharu.kotatsu.ui.reader
 import android.view.ViewGroup
 import org.koitharu.kotatsu.core.model.MangaPage
 import org.koitharu.kotatsu.ui.common.list.BaseRecyclerAdapter
-import org.koitharu.kotatsu.ui.common.list.BaseViewHolder
 
 class PagesAdapter(private val loader: PageLoader) : BaseRecyclerAdapter<MangaPage, Unit>() {
 

app/src/main/java/org/koitharu/kotatsu/ui/reader/ReaderActivity.kt

@@ -31,7 +31,7 @@ class ReaderActivity : BaseActivity(), ReaderView {
 		supportActionBar?.setDisplayHomeAsUpEnabled(true)
 		bottomBar.inflateMenu(R.menu.opt_reader_bottom)
 
-		state = savedInstanceState?.getParcelable<ReaderState>(EXTRA_STATE)
+		state = savedInstanceState?.getParcelable(EXTRA_STATE)
 			?: intent.getParcelableExtra<ReaderState>(EXTRA_STATE)
 					?: let {
 				Toast.makeText(this, R.string.error_occurred, Toast.LENGTH_SHORT).show()

app/src/main/java/org/koitharu/kotatsu/ui/reader/ReaderPresenter.kt

@@ -5,8 +5,6 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import moxy.InjectViewState
 import org.koitharu.kotatsu.BuildConfig
-import org.koitharu.kotatsu.core.model.Manga
-import org.koitharu.kotatsu.core.model.MangaChapter
 import org.koitharu.kotatsu.domain.HistoryRepository
 import org.koitharu.kotatsu.domain.MangaProviderFactory
 import org.koitharu.kotatsu.ui.common.BasePresenter

app/src/main/java/org/koitharu/kotatsu/utils/ext/DateExt.kt

@@ -1,7 +1,6 @@
 package org.koitharu.kotatsu.utils.ext
 
 import android.annotation.SuppressLint
-import org.intellij.lang.annotations.PrintFormat
 import java.text.SimpleDateFormat
 import java.util.*
 

app/src/main/java/org/koitharu/kotatsu/utils/ext/ViewExt.kt

@@ -10,13 +10,11 @@ import android.widget.EditText
 import android.widget.TextView
 import androidx.annotation.LayoutRes
 import androidx.core.view.isGone
-import androidx.core.view.isVisible
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.chip.Chip
 import com.google.android.material.chip.ChipGroup
-import kotlinx.android.synthetic.main.fragment_list.view.*
 import org.koitharu.kotatsu.ui.common.ChipsFactory
 
 fun View.hideKeyboard() {

app/src/main/res/drawable/ic_launcher_background.xml

@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:width="108dp"
-	android:height="108dp"
-	android:viewportWidth="108"
-	android:viewportHeight="108">
-	<path
-		android:fillColor="#3DDC84"
-		android:pathData="M0,0h108v108h-108z" />
-	<path
-		android:fillColor="#00000000"
-		android:pathData="M9,0L9,108"
-		android:strokeWidth="0.8"
-		android:strokeColor="#33FFFFFF" />
-	<path
-		android:fillColor="#00000000"
-		android:pathData="M19,0L19,108"
-		android:strokeWidth="0.8"
-		android:strokeColor="#33FFFFFF" />
-	<path
-		android:fillColor="#00000000"
-		android:pathData="M29,0L29,108"
-		android:strokeWidth="0.8"
-		android:strokeColor="#33FFFFFF" />
-	<path
-		android:fillColor="#00000000"
-		android:pathData="M39,0L39,108"
-		android:strokeWidth="0.8"
-		android:strokeColor="#33FFFFFF" />
-	<path
-		android:fillColor="#00000000"
-		android:pathData="M49,0L49,108"
-		android:strokeWidth="0.8"
-		android:strokeColor="#33FFFFFF" />
-	<path
-		android:fillColor="#00000000"
-		android:pathData="M59,0L59,108"
-		android:strokeWidth="0.8"
-		android:strokeColor="#33FFFFFF" />
-	<path
-		android:fillColor="#00000000"
-		android:pathData="M69,0L69,108"
-		android:strokeWidth="0.8"
-		android:strokeColor="#33FFFFFF" />
-	<path
-		android:fillColor="#00000000"
-		android:pathData="M79,0L79,108"
-		android:strokeWidth="0.8"
-		android:strokeColor="#33FFFFFF" />
-	<path
-		android:fillColor="#00000000"
-		android:pathData="M89,0L89,108"
-		android:strokeWidth="0.8"
-		android:strokeColor="#33FFFFFF" />
-	<path
-		android:fillColor="#00000000"
-		android:pathData="M99,0L99,108"
-		android:strokeWidth="0.8"
-		android:strokeColor="#33FFFFFF" />
-	<path
-		android:fillColor="#00000000"
-		android:pathData="M0,9L108,9"
-		android:strokeWidth="0.8"
-		android:strokeColor="#33FFFFFF" />
-	<path
-		android:fillColor="#00000000"
-		android:pathData="M0,19L108,19"
-		android:strokeWidth="0.8"
-		android:strokeColor="#33FFFFFF" />
-	<path
-		android:fillColor="#00000000"
-		android:pathData="M0,29L108,29"
-		android:strokeWidth="0.8"
-		android:strokeColor="#33FFFFFF" />
-	<path
-		android:fillColor="#00000000"
-		android:pathData="M0,39L108,39"
-		android:strokeWidth="0.8"
-		android:strokeColor="#33FFFFFF" />
-	<path
-		android:fillColor="#00000000"
-		android:pathData="M0,49L108,49"
-		android:strokeWidth="0.8"
-		android:strokeColor="#33FFFFFF" />
-	<path
-		android:fillColor="#00000000"
-		android:pathData="M0,59L108,59"
-		android:strokeWidth="0.8"
-		android:strokeColor="#33FFFFFF" />
-	<path
-		android:fillColor="#00000000"
-		android:pathData="M0,69L108,69"
-		android:strokeWidth="0.8"
-		android:strokeColor="#33FFFFFF" />
-	<path
-		android:fillColor="#00000000"
-		android:pathData="M0,79L108,79"
-		android:strokeWidth="0.8"
-		android:strokeColor="#33FFFFFF" />
-	<path
-		android:fillColor="#00000000"
-		android:pathData="M0,89L108,89"
-		android:strokeWidth="0.8"
-		android:strokeColor="#33FFFFFF" />
-	<path
-		android:fillColor="#00000000"
-		android:pathData="M0,99L108,99"
-		android:strokeWidth="0.8"
-		android:strokeColor="#33FFFFFF" />
-	<path
-		android:fillColor="#00000000"
-		android:pathData="M19,29L89,29"
-		android:strokeWidth="0.8"
-		android:strokeColor="#33FFFFFF" />
-	<path
-		android:fillColor="#00000000"
-		android:pathData="M19,39L89,39"
-		android:strokeWidth="0.8"
-		android:strokeColor="#33FFFFFF" />
-	<path
-		android:fillColor="#00000000"
-		android:pathData="M19,49L89,49"
-		android:strokeWidth="0.8"
-		android:strokeColor="#33FFFFFF" />
-	<path
-		android:fillColor="#00000000"
-		android:pathData="M19,59L89,59"
-		android:strokeWidth="0.8"
-		android:strokeColor="#33FFFFFF" />
-	<path
-		android:fillColor="#00000000"
-		android:pathData="M19,69L89,69"
-		android:strokeWidth="0.8"
-		android:strokeColor="#33FFFFFF" />
-	<path
-		android:fillColor="#00000000"
-		android:pathData="M19,79L89,79"
-		android:strokeWidth="0.8"
-		android:strokeColor="#33FFFFFF" />
-	<path
-		android:fillColor="#00000000"
-		android:pathData="M29,19L29,89"
-		android:strokeWidth="0.8"
-		android:strokeColor="#33FFFFFF" />
-	<path
-		android:fillColor="#00000000"
-		android:pathData="M39,19L39,89"
-		android:strokeWidth="0.8"
-		android:strokeColor="#33FFFFFF" />
-	<path
-		android:fillColor="#00000000"
-		android:pathData="M49,19L49,89"
-		android:strokeWidth="0.8"
-		android:strokeColor="#33FFFFFF" />
-	<path
-		android:fillColor="#00000000"
-		android:pathData="M59,19L59,89"
-		android:strokeWidth="0.8"
-		android:strokeColor="#33FFFFFF" />
-	<path
-		android:fillColor="#00000000"
-		android:pathData="M69,19L69,89"
-		android:strokeWidth="0.8"
-		android:strokeColor="#33FFFFFF" />
-	<path
-		android:fillColor="#00000000"
-		android:pathData="M79,19L79,89"
-		android:strokeWidth="0.8"
-		android:strokeColor="#33FFFFFF" />
-</vector>

app/src/main/res/layout/item_manga_grid.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.card.MaterialCardView
-	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content">

app/src/main/res/menu/opt_reader_bottom.xml

@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 
+	<item android:id="@+id/action_settings"
+		android:title="@string/settings" />
+
+
 </menu>

app/src/test/java/org/koitharu/kotatsu/parsers/RepositoryTestEnvironment.kt

@@ -6,9 +6,8 @@ import org.junit.BeforeClass
 import org.koin.core.context.startKoin
 import org.koin.dsl.module
 import org.koitharu.kotatsu.core.model.MangaSource
-import org.koitharu.kotatsu.domain.MangaLoaderContext
 import org.koitharu.kotatsu.core.parser.MangaRepository
-import org.koitharu.kotatsu.parsers.repository.ReadmangaRuTest
+import org.koitharu.kotatsu.domain.MangaLoaderContext
 
 abstract class RepositoryTestEnvironment {