github/tachiyomi
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update support library and kotlin

Browse source
This commit is contained in:
inorichi 2017-11-28 00:21:38 +01:00
parent 4a9151e4aa
commit 604929d002
14 changed files with 29 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.travis/build.sh
View file

@ -12,7 +12,7 @@ if [ -z "$TRAVIS_TAG" ]; then
else else
./gradlew clean assembleStandardRelease ./gradlew clean assembleStandardRelease
TOOLS="${ANDROID_HOME}/build-tools/26.0.1" TOOLS="$(ls -d ${ANDROID_HOME}/build-tools/* | tail -1)"
export ARTIFACT="tachiyomi-${TRAVIS_TAG}.apk" export ARTIFACT="tachiyomi-${TRAVIS_TAG}.apk"
${TOOLS}/zipalign -v -p 4 app/build/outputs/apk/standard/release/app-standard-release-unsigned.apk app-aligned.apk ${TOOLS}/zipalign -v -p 4 app/build/outputs/apk/standard/release/app-standard-release-unsigned.apk app-aligned.apk

10
app/build.gradle
View file

@ -30,7 +30,7 @@ ext {
android { android {
compileSdkVersion 26 compileSdkVersion 26
buildToolsVersion "26.0.2" buildToolsVersion "27.0.1"
publishNonDefault true publishNonDefault true
defaultConfig { defaultConfig {
@ -106,7 +106,7 @@ dependencies {
implementation 'com.github.inorichi:junrar-android:634c1f5' implementation 'com.github.inorichi:junrar-android:634c1f5'
// Android support library // Android support library
final support_library_version = '26.1.0' final support_library_version = '27.0.1'
implementation "com.android.support:support-v4:$support_library_version" implementation "com.android.support:support-v4:$support_library_version"
implementation "com.android.support:appcompat-v7:$support_library_version" implementation "com.android.support:appcompat-v7:$support_library_version"
implementation "com.android.support:cardview-v7:$support_library_version" implementation "com.android.support:cardview-v7:$support_library_version"
@ -122,13 +122,13 @@ dependencies {
// ReactiveX // ReactiveX
implementation 'io.reactivex:rxandroid:1.2.1' implementation 'io.reactivex:rxandroid:1.2.1'
implementation 'io.reactivex:rxjava:1.3.3' implementation 'io.reactivex:rxjava:1.3.4'
implementation 'com.jakewharton.rxrelay:rxrelay:1.2.0' implementation 'com.jakewharton.rxrelay:rxrelay:1.2.0'
implementation 'com.f2prateek.rx.preferences:rx-preferences:1.0.2' implementation 'com.f2prateek.rx.preferences:rx-preferences:1.0.2'
implementation 'com.github.pwittchen:reactivenetwork:0.7.0' implementation 'com.github.pwittchen:reactivenetwork:0.7.0'
// Network client // Network client
implementation "com.squareup.okhttp3:okhttp:3.9.0" implementation "com.squareup.okhttp3:okhttp:3.9.1"
implementation 'com.squareup.okio:okio:1.13.0' implementation 'com.squareup.okio:okio:1.13.0'
// REST // REST
@ -232,7 +232,7 @@ dependencies {
} }
buildscript { buildscript {
ext.kotlin_version = '1.1.51' ext.kotlin_version = '1.1.61'
repositories { repositories {
mavenCentral() mavenCentral()
} }

2
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryAdapter.kt
View file

@ -79,7 +79,7 @@ class LibraryAdapter(private val controller: LibraryController) : RecyclerViewPa
/** /**
* Returns the position of the view. * Returns the position of the view.
*/ */
override fun getItemPosition(obj: Any?): Int { override fun getItemPosition(obj: Any): Int {
val view = obj as? LibraryCategoryView ?: return POSITION_NONE val view = obj as? LibraryCategoryView ?: return POSITION_NONE
val index = categories.indexOfFirst { it.id == view.category.id } val index = categories.indexOfFirst { it.id == view.category.id }
return if (index == -1) POSITION_NONE else index return if (index == -1) POSITION_NONE else index

2
app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderCustomFilterDialog.kt
View file

@ -64,7 +64,7 @@ class ReaderCustomFilterDialog : DialogFragment() {
* @param savedState The last saved instance state of the Fragment. * @param savedState The last saved instance state of the Fragment.
*/ */
override fun onCreateDialog(savedState: Bundle?): Dialog { override fun onCreateDialog(savedState: Bundle?): Dialog {
val dialog = MaterialDialog.Builder(activity) val dialog = MaterialDialog.Builder(activity!!)
.customView(R.layout.reader_custom_filter_dialog, false) .customView(R.layout.reader_custom_filter_dialog, false)
.positiveText(android.R.string.ok) .positiveText(android.R.string.ok)
.build() .build()

9
app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderSettingsDialog.kt
View file

@ -24,7 +24,7 @@ class ReaderSettingsDialog : DialogFragment() {
private lateinit var subscriptions: CompositeSubscription private lateinit var subscriptions: CompositeSubscription
override fun onCreateDialog(savedState: Bundle?): Dialog { override fun onCreateDialog(savedState: Bundle?): Dialog {
val dialog = MaterialDialog.Builder(activity) val dialog = MaterialDialog.Builder(activity!!)
.title(R.string.label_settings) .title(R.string.label_settings)
.customView(R.layout.reader_settings_dialog, true) .customView(R.layout.reader_settings_dialog, true)
.positiveText(android.R.string.ok) .positiveText(android.R.string.ok)
@ -40,8 +40,11 @@ class ReaderSettingsDialog : DialogFragment() {
viewer.onItemSelectedListener = IgnoreFirstSpinnerListener { position -> viewer.onItemSelectedListener = IgnoreFirstSpinnerListener { position ->
subscriptions += Observable.timer(250, MILLISECONDS, AndroidSchedulers.mainThread()) subscriptions += Observable.timer(250, MILLISECONDS, AndroidSchedulers.mainThread())
.subscribe { .subscribe {
(activity as ReaderActivity).presenter.updateMangaViewer(position) val readerActivity = activity as? ReaderActivity
activity.recreate() if (readerActivity != null) {
readerActivity.presenter.updateMangaViewer(position)
readerActivity.recreate()
}
} }
} }
viewer.setSelection((activity as ReaderActivity).presenter.manga.viewer, false) viewer.setSelection((activity as ReaderActivity).presenter.manga.viewer, false)

4
app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerReader.kt
View file

@ -100,12 +100,12 @@ abstract class PagerReader : BaseReader() {
/** /**
* Text color for black theme. * Text color for black theme.
*/ */
val whiteColor by lazy { ContextCompat.getColor(context, R.color.textColorSecondaryDark) } val whiteColor by lazy { ContextCompat.getColor(context!!, R.color.textColorSecondaryDark) }
/** /**
* Text color for white theme. * Text color for white theme.
*/ */
val blackColor by lazy { ContextCompat.getColor(context, R.color.textColorSecondaryLight) } val blackColor by lazy { ContextCompat.getColor(context!!, R.color.textColorSecondaryLight) }
/** /**
* Initializes the pager. * Initializes the pager.

4
app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/horizontal/HorizontalPager.kt
View file

@ -24,7 +24,7 @@ class HorizontalPager(context: Context) : ViewPager(context), Pager {
override fun onInterceptTouchEvent(ev: MotionEvent): Boolean { override fun onInterceptTouchEvent(ev: MotionEvent): Boolean {
try { try {
if (ev.action and MotionEvent.ACTION_MASK == MotionEvent.ACTION_DOWN) { if (ev.action and MotionEvent.ACTION_MASK == MotionEvent.ACTION_DOWN) {
if (currentItem == 0 || currentItem == adapter.count - 1) { if (currentItem == 0 || currentItem == adapter!!.count - 1) {
startDragX = ev.x startDragX = ev.x
} }
} }
@ -50,7 +50,7 @@ class HorizontalPager(context: Context) : ViewPager(context), Pager {
startDragX = 0f startDragX = 0f
} }
} else if (currentItem == adapter.count - 1) { } else if (currentItem == adapter!!.count - 1) {
if (ev.action and MotionEvent.ACTION_MASK == MotionEvent.ACTION_UP) { if (ev.action and MotionEvent.ACTION_MASK == MotionEvent.ACTION_UP) {
val displacement = startDragX - ev.x val displacement = startDragX - ev.x

2
app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/horizontal/LeftToRightReader.kt
View file

@ -13,7 +13,7 @@ import eu.kanade.tachiyomi.ui.reader.viewer.pager.PagerReader
class LeftToRightReader : PagerReader() { class LeftToRightReader : PagerReader() {
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedState: Bundle?): View? { override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedState: Bundle?): View? {
return HorizontalPager(activity).apply { initializePager(this) } return HorizontalPager(activity!!).apply { initializePager(this) }
} }
} }

2
app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/horizontal/RightToLeftReader.kt
View file

@ -13,7 +13,7 @@ import eu.kanade.tachiyomi.ui.reader.viewer.pager.PagerReader
class RightToLeftReader : PagerReader() { class RightToLeftReader : PagerReader() {
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedState: Bundle?): View? { override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedState: Bundle?): View? {
return HorizontalPager(activity).apply { return HorizontalPager(activity!!).apply {
rotation = 180f rotation = 180f
initializePager(this) initializePager(this)
} }

2
app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/vertical/VerticalReader.kt
View file

@ -13,7 +13,7 @@ import eu.kanade.tachiyomi.ui.reader.viewer.pager.PagerReader
class VerticalReader : PagerReader() { class VerticalReader : PagerReader() {
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedState: Bundle?): View? { override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedState: Bundle?): View? {
return VerticalPager(activity).apply { initializePager(this) } return VerticalPager(activity!!).apply { initializePager(this) }
} }
} }

13
app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/vertical/VerticalViewPagerImpl.java
View file

@ -33,7 +33,6 @@ import android.support.annotation.DrawableRes;
import android.support.v4.os.ParcelableCompat; import android.support.v4.os.ParcelableCompat;
import android.support.v4.os.ParcelableCompatCreatorCallbacks; import android.support.v4.os.ParcelableCompatCreatorCallbacks;
import android.support.v4.view.AccessibilityDelegateCompat; import android.support.v4.view.AccessibilityDelegateCompat;
import android.support.v4.view.KeyEventCompat;
import android.support.v4.view.MotionEventCompat; import android.support.v4.view.MotionEventCompat;
import android.support.v4.view.PagerAdapter; import android.support.v4.view.PagerAdapter;
import android.support.v4.view.VelocityTrackerCompat; import android.support.v4.view.VelocityTrackerCompat;
@ -2598,14 +2597,10 @@ public class VerticalViewPagerImpl extends ViewGroup {
handled = arrowScroll(FOCUS_RIGHT); handled = arrowScroll(FOCUS_RIGHT);
break; break;
case KeyEvent.KEYCODE_TAB: case KeyEvent.KEYCODE_TAB:
if (Build.VERSION.SDK_INT >= 11) { if (event.hasNoModifiers()) {
// The focus finder had a bug handling FOCUS_FORWARD and FOCUS_BACKWARD handled = arrowScroll(FOCUS_FORWARD);
// before Android 3.0. Ignore the tab key on those devices. } else if (event.hasModifiers(KeyEvent.META_SHIFT_ON)) {
if (KeyEventCompat.hasNoModifiers(event)) { handled = arrowScroll(FOCUS_BACKWARD);
handled = arrowScroll(FOCUS_FORWARD);
} else if (KeyEventCompat.hasModifiers(event, KeyEvent.META_SHIFT_ON)) {
handled = arrowScroll(FOCUS_BACKWARD);
}
} }
break; break;
default: default:

4
app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonReader.kt
View file

@ -73,7 +73,7 @@ class WebtoonReader : BaseReader() {
private var scrollDistance: Int = 0 private var scrollDistance: Int = 0
val screenHeight by lazy { val screenHeight by lazy {
val display = activity.windowManager.defaultDisplay val display = activity!!.windowManager.defaultDisplay
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
val metrics = DisplayMetrics() val metrics = DisplayMetrics()
@ -91,7 +91,7 @@ class WebtoonReader : BaseReader() {
val screenHeight = resources.displayMetrics.heightPixels val screenHeight = resources.displayMetrics.heightPixels
scrollDistance = screenHeight * 3 / 4 scrollDistance = screenHeight * 3 / 4
layoutManager = PreCachingLayoutManager(activity) layoutManager = PreCachingLayoutManager(activity!!)
layoutManager.extraLayoutSpace = screenHeight / 2 layoutManager.extraLayoutSpace = screenHeight / 2
recycler = RecyclerView(activity).apply { recycler = RecyclerView(activity).apply {

2
app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsDownloadController.kt
View file

@ -194,7 +194,7 @@ class SettingsDownloadController : SettingsController() {
File.separator + "downloads" File.separator + "downloads"
return mutableListOf(File(defaultDir)) + return mutableListOf(File(defaultDir)) +
ContextCompat.getExternalFilesDirs(activity, "").filterNotNull() ContextCompat.getExternalFilesDirs(activity!!, "").filterNotNull()
} }
} }

2
build.gradle
View file

@ -7,7 +7,7 @@ buildscript {
google() google()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.0.0' classpath 'com.android.tools.build:gradle:3.0.1'
classpath 'com.github.ben-manes:gradle-versions-plugin:0.17.0' classpath 'com.github.ben-manes:gradle-versions-plugin:0.17.0'
classpath 'com.github.zellius:android-shortcut-gradle-plugin:0.1.1' classpath 'com.github.zellius:android-shortcut-gradle-plugin:0.1.1'
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong