From 7a378376fb988eda51c4692795261f78f792d827 Mon Sep 17 00:00:00 2001 From: Filip Babic Date: Tue, 4 Aug 2020 12:11:42 +0200 Subject: [PATCH 1/4] Fixed a bug where the Data binding for the Pro course badge wasn't set up, causing all courses to have the Pro course badge. --- app/src/main/res/layout/fragment_collection.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/layout/fragment_collection.xml b/app/src/main/res/layout/fragment_collection.xml index cc325e7b..bc2cba10 100644 --- a/app/src/main/res/layout/fragment_collection.xml +++ b/app/src/main/res/layout/fragment_collection.xml @@ -238,6 +238,7 @@ android:layout_height="wrap_content" android:background="@drawable/bg_pro" android:text="@string/label_pro" + android:visibility="@{data.professional ? View.VISIBLE : View.GONE}" app:layout_constraintBottom_toBottomOf="@+id/text_collection_language" app:layout_constraintEnd_toEndOf="@+id/guideline_right" app:layout_constraintStart_toEndOf="@+id/text_collection_language" From c89aed9d3a07cc70d92f570ca4b1972578143cb5 Mon Sep 17 00:00:00 2001 From: Filip Babic Date: Tue, 4 Aug 2020 12:21:12 +0200 Subject: [PATCH 2/4] Updated the documentation for the `Data.isProfessional()` function/property. --- model/src/main/java/com/razeware/emitron/model/Data.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model/src/main/java/com/razeware/emitron/model/Data.kt b/model/src/main/java/com/razeware/emitron/model/Data.kt index a24a04bc..50a6e91c 100644 --- a/model/src/main/java/com/razeware/emitron/model/Data.kt +++ b/model/src/main/java/com/razeware/emitron/model/Data.kt @@ -101,7 +101,7 @@ data class Data( fun getCardArtworkUrl(): String? = attributes?.cardArtworkUrl /** - * @return true if content doesn't require subscription, else false + * @return true if content requires a professional subscription, else false */ fun isProfessional(): Boolean = attributes?.professional == true From b65b770ec5e3d856898d3b49d9654e3831650af2 Mon Sep 17 00:00:00 2001 From: Joseph Howard <6590854+orionthewake@users.noreply.github.com> Date: Tue, 4 Aug 2020 11:42:43 -0400 Subject: [PATCH 3/4] Update release-notes.txt --- release-notes.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release-notes.txt b/release-notes.txt index 7d8169e0..b2152055 100644 --- a/release-notes.txt +++ b/release-notes.txt @@ -1,2 +1,2 @@ ## Changes -- Fix login not working on certain browsers +- Fix non-Pro courses labeled as Pro on course detail page. From ac59547302ceb8d6fd9b4a57f4cebd2e656badad Mon Sep 17 00:00:00 2001 From: Joseph Howard <6590854+orionthewake@users.noreply.github.com> Date: Tue, 4 Aug 2020 11:50:54 -0400 Subject: [PATCH 4/4] Update version to v1.0.5 --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 1e9967fe..d073947c 100644 --- a/build.gradle +++ b/build.gradle @@ -2,8 +2,8 @@ buildscript { ext.versions = [ // build - 'versionCode' : 19, - 'versionName' : "1.0.4", + 'versionCode' : 20, + 'versionName' : "1.0.5", 'minSdk' : 21, 'targetSdk' : 29, 'compileSdk' : 29,