mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2025-06-28 20:17:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Various dependency updates

Browse Source
This commit is contained in:
NerdNumber9
2018-07-21 15:26:14 -04:00
parent 35239af039
commit d9d71c8745
9 changed files with 63 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/AndroidManifest.xml
View File

@ -110,8 +110,8 @@
<!-- EH -->
<activity
android:name="exh.ui.intercept.InterceptActivity"
android:excludeFromRecents="true"
android:label="TachiyomiEH">
android:label="TachiyomiEH"
android:theme="@style/Theme.EHIntercept">
<intent-filter>
<action android:name="android.intent.action.VIEW"/>

2
app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/global_search/CatalogueSearchAdapter.kt
View File

@ -25,7 +25,7 @@ class CatalogueSearchAdapter(val controller: CatalogueSearchController) :
*/
private var bundle = Bundle()
override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int, payloads: List<Any?>?) {
override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int, payloads: List<Any?>) {
super.onBindViewHolder(holder, position, payloads)
restoreHolderState(holder)
}

1
app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt
View File

@ -13,6 +13,7 @@ import eu.kanade.tachiyomi.data.cache.ChapterCache
import eu.kanade.tachiyomi.data.database.DatabaseHelper
import eu.kanade.tachiyomi.data.library.LibraryUpdateService
import eu.kanade.tachiyomi.data.library.LibraryUpdateService.Target
import eu.kanade.tachiyomi.data.preference.PreferenceKeys
import eu.kanade.tachiyomi.network.NetworkHelper
import eu.kanade.tachiyomi.ui.base.controller.DialogController
import eu.kanade.tachiyomi.ui.library.LibraryController

16
app/src/main/java/exh/ui/intercept/InterceptActivity.kt
View File

@ -8,6 +8,8 @@ import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.ui.base.activity.BaseRxActivity
import eu.kanade.tachiyomi.ui.main.MainActivity
import eu.kanade.tachiyomi.ui.manga.MangaController
import eu.kanade.tachiyomi.util.gone
import eu.kanade.tachiyomi.util.visible
import kotlinx.android.synthetic.main.eh_activity_intercept.*
import nucleus.factory.RequiresPresenter
import rx.Subscription
@ -29,8 +31,11 @@ class InterceptActivity : BaseRxActivity<InterceptActivityPresenter>() {
}
private fun processLink() {
if(Intent.ACTION_VIEW == intent.action)
if(Intent.ACTION_VIEW == intent.action) {
intercept_progress.visible()
intercept_status.text = "Loading gallery..."
presenter.loadGallery(intent.dataString)
}
}
override fun onOptionsItemSelected(item: MenuItem): Boolean {
@ -49,13 +54,17 @@ class InterceptActivity : BaseRxActivity<InterceptActivityPresenter>() {
.subscribe {
when(it) {
is InterceptResult.Success -> {
intercept_progress.gone()
intercept_status.text = "Launching app..."
onBackPressed()
startActivity(Intent(this, MainActivity::class.java)
.setAction(MainActivity.SHORTCUT_MANGA)
.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
.putExtra(MangaController.MANGA_EXTRA, it.mangaId))
onBackPressed()
}
is InterceptResult.Failure ->
is InterceptResult.Failure -> {
intercept_progress.gone()
intercept_status.text = "Error: ${it.reason}"
MaterialDialog.Builder(this)
.title("Error")
.content("Could not open this gallery:\n\n${it.reason}")
@ -65,6 +74,7 @@ class InterceptActivity : BaseRxActivity<InterceptActivityPresenter>() {
.cancelListener { onBackPressed() }
.dismissListener { onBackPressed() }
.show()
}
}
}
}

2
app/src/main/res/layout/eh_activity_intercept.xml
View File

@ -37,6 +37,7 @@
android:orientation="vertical">
<TextView
android:id="@+id/intercept_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
@ -45,6 +46,7 @@
android:textColor="@color/white" />
<ProgressBar
android:id="@+id/intercept_progress"
style="?android:attr/progressBarStyleLarge"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

8
app/src/main/res/values-v21/themes.xml
View File

@ -30,6 +30,14 @@
<item name="android:navigationBarColor">@color/colorAmoledPrimary</item>
</style>
<!-- EH Intercept Theme-->
<style name="Theme.EHIntercept" parent="Theme.Tachiyomi">
<!-- Attributes specific for SDK 21 and up -->
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
<item name="android:statusBarColor">@color/colorPrimaryDark</item>
<item name="android:navigationBarColor">@color/colorPrimaryDark</item>
</style>
<!--==============-->
<!-- Reader Theme -->
<!--==============-->

4
app/src/main/res/values/themes.xml
View File

@ -47,6 +47,10 @@
<!-- Attributes specific for SDK 16 to SDK 20 -->
</style>
<style name="Theme.EHIntercept" parent="Theme.Tachiyomi">
<!-- Attributes specific for SDK 16 to SDK 20 -->
</style>
<!--=============-->
<!-- Dark Themes -->
<!--=============-->