From f8ea502a5012763bb1f7000d1844c31b50b4837d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gae=CC=88tan=20Muller?= Date: Thu, 17 May 2018 23:37:40 +0200 Subject: [PATCH 1/4] Fix crash and prepare Crowdin integration --- Readme.md | 2 +- .../kotlin/com/mgaetan89/showsrage/adapter/ScheduleAdapter.kt | 2 +- app/src/main/kotlin/com/mgaetan89/showsrage/model/Schedule.kt | 2 +- app/src/main/res/values/strings.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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/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/model/Schedule.kt b/app/src/main/kotlin/com/mgaetan89/showsrage/model/Schedule.kt index 8c48cd69..b214d517 100644 --- a/app/src/main/kotlin/com/mgaetan89/showsrage/model/Schedule.kt +++ b/app/src/main/kotlin/com/mgaetan89/showsrage/model/Schedule.kt @@ -13,7 +13,7 @@ open class Schedule : RealmObject() { @SerializedName("ep_name") open var episodeName: String = "" @SerializedName("ep_plot") - open var episodePlot: String = "" + open var episodePlot: String? = "" @PrimaryKey open var id: String = "" @SerializedName("indexerid") diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a7d9e614..ece0cb3e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,5 @@ - + About Actions Active From 38779ea24ad04272cde34a2707f0a1404465d8e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gae=CC=88tan=20Muller?= Date: Fri, 18 May 2018 11:37:33 +0200 Subject: [PATCH 2/4] Fix crashes --- .../showsrage/fragment/LogsFilterFragment.kt | 2 +- .../showsrage/fragment/LogsFragment.kt | 8 ++--- .../mgaetan89/showsrage/helper/Migration.kt | 33 +++++++++++++++---- .../com/mgaetan89/showsrage/helper/Utils.kt | 2 +- 4 files changed, 32 insertions(+), 13 deletions(-) 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 Date: Fri, 18 May 2018 11:56:59 +0200 Subject: [PATCH 3/4] Update Crowdin configuration file --- crowdin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crowdin.yml b/crowdin.yml index 70b956a0..60c9aded 100644 --- a/crowdin.yml +++ b/crowdin.yml @@ -3,4 +3,4 @@ files: translation: /app/src/main/res/values-%two_letters_code%/strings.xml languages_mapping: two_letters_code: - pt-BR: pt_BR + pt-BR: pt-rBR From a25eacf1cb9f4be8c8ef83ae530640ac2b436968 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gae=CC=88tan=20Muller?= Date: Sun, 20 May 2018 14:04:58 +0200 Subject: [PATCH 4/4] Update to version 1.6.1 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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