diff --git a/Readme.md b/Readme.md index 489cc5d0..29517f49 100644 --- a/Readme.md +++ b/Readme.md @@ -1,6 +1,6 @@ # ![ShowsRage](app/src/main/res/mipmap-mdpi/ic_launcher.png) ShowsRage -[![Build Status](https://travis-ci.org/MGaetan89/ShowsRage.svg?branch=master)](https://travis-ci.org/MGaetan89/ShowsRage) [![Coverage Status](https://coveralls.io/repos/MGaetan89/ShowsRage/badge.svg?branch=master&service=github)](https://coveralls.io/github/MGaetan89/ShowsRage?branch=master) [![License](https://img.shields.io/badge/license-Apache%202-blue.svg)](https://raw.githubusercontent.com/MGaetan89/ShowsRage/master/LICENSE) [![Minimum API](https://img.shields.io/badge/API-15%2B-green.svg)](https://android-arsenal.com/api?level=15) [![Support on Paypal](https://img.shields.io/badge/paypal-donate-yellow.svg)](https://www.paypal.me/MGaetan89) +[![Build Status](https://travis-ci.org/MGaetan89/ShowsRage.svg?branch=master)](https://travis-ci.org/MGaetan89/ShowsRage) [![Coverage Status](https://coveralls.io/repos/MGaetan89/ShowsRage/badge.svg?branch=master&service=github)](https://coveralls.io/github/MGaetan89/ShowsRage?branch=master) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/showsrage/localized.svg)](https://crowdin.com/project/showsrage) [![License](https://img.shields.io/badge/license-Apache%202-blue.svg)](https://raw.githubusercontent.com/MGaetan89/ShowsRage/master/LICENSE) [![Minimum API](https://img.shields.io/badge/API-15%2B-green.svg)](https://android-arsenal.com/api?level=15) [![Support on Paypal](https://img.shields.io/badge/paypal-donate-yellow.svg)](https://www.paypal.me/MGaetan89) **ShowsRage** is an Android application that allows you to manage your *[SickRage](https://www.sickrage.tv/)* installation. diff --git a/app/build.gradle b/app/build.gradle index 0697562c..8ddd4fe6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,8 +20,8 @@ android { applicationId 'com.mgaetan89.showsrage' minSdkVersion 15 targetSdkVersion 27 - versionCode 34 - versionName '1.6' + versionCode 35 + versionName '1.6.1' resConfigs 'en', 'fr' testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner' vectorDrawables.useSupportLibrary = true diff --git a/app/src/main/kotlin/com/mgaetan89/showsrage/adapter/ScheduleAdapter.kt b/app/src/main/kotlin/com/mgaetan89/showsrage/adapter/ScheduleAdapter.kt index 43d00bc7..b245766c 100644 --- a/app/src/main/kotlin/com/mgaetan89/showsrage/adapter/ScheduleAdapter.kt +++ b/app/src/main/kotlin/com/mgaetan89/showsrage/adapter/ScheduleAdapter.kt @@ -99,7 +99,7 @@ class ScheduleAdapter(schedules: RealmResults) : RealmRecyclerViewAdap private fun showPlot() { val context = this.itemView.context val schedule = getItem(this.adapterPosition).takeIf { it != null && it.isValid } ?: return - val plot = schedule.episodePlot + val plot = schedule.episodePlot.orEmpty() if (!plot.isEmpty()) { var message = context.getString(R.string.season_episode_name, schedule.season, schedule.episode, schedule.episodeName) diff --git a/app/src/main/kotlin/com/mgaetan89/showsrage/fragment/LogsFilterFragment.kt b/app/src/main/kotlin/com/mgaetan89/showsrage/fragment/LogsFilterFragment.kt index 1d213edf..8a41bbd8 100644 --- a/app/src/main/kotlin/com/mgaetan89/showsrage/fragment/LogsFilterFragment.kt +++ b/app/src/main/kotlin/com/mgaetan89/showsrage/fragment/LogsFilterFragment.kt @@ -35,7 +35,7 @@ class LogsFilterFragment : DialogFragment(), DialogInterface.OnClickListener, Di val data = Intent() data.putExtra(Constants.Bundle.LOGS_GROUPS, selectedItems) - this.targetFragment?.onActivityResult(this.targetRequestCode, Activity.RESULT_OK, data) + this.parentFragment?.onActivityResult(LogsFragment.REQUEST_CODE_FILTER, Activity.RESULT_OK, data) dialog?.dismiss() } diff --git a/app/src/main/kotlin/com/mgaetan89/showsrage/fragment/LogsFragment.kt b/app/src/main/kotlin/com/mgaetan89/showsrage/fragment/LogsFragment.kt index 0e84140b..35ca4d8c 100644 --- a/app/src/main/kotlin/com/mgaetan89/showsrage/fragment/LogsFragment.kt +++ b/app/src/main/kotlin/com/mgaetan89/showsrage/fragment/LogsFragment.kt @@ -208,9 +208,8 @@ class LogsFragment : Fragment(), Callback, RealmChangeListener, RealmChangeListener - + About Actions Active