Merge pull request #272 from razeware/development

v1.0.5: Daffy 🦆
razeware · Aug 4, 2020 · 7479239 · 7479239
2 parents 0c520a7 + ac59547
commit 7479239
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git 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"

diff --git 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,

diff --git 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
 

diff --git 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.