Merge branch 'release/2.0.0'

Release: org.nypl.audiobook.android 2.0.0 Change: (Backwards incompatible) Take all color scheme information from the current Android theme
NYPL-Simplified · Apr 19, 2019 · d53f506 · d53f506
2 parents 5228d58 + a073c4e
commit d53f506
Show file tree

Hide file tree

Showing 27 changed files with 217 additions and 90 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,43 +2,44 @@ language: android
 
 android:
   components:
-    - tools
-    - platform-tools
-    - build-tools-27.0.3
-    - android-27
-    - android-21
-    - sys-img-armeabi-v7a-android-21
+  - tools
+  - platform-tools
+  - build-tools-28.0.3
+  - android-28
+  - android-21
+  - sys-img-armeabi-v7a-android-21
   licenses:
-    - android-sdk-preview-license-.+
-    - android-sdk-license-.+
-    - google-gdk-license-.+
+  - android-sdk-preview-license-.+
+  - android-sdk-license-.+
+  - google-gdk-license-.+
 
 before_script:
-  - android list targets
-  - echo no | android create avd --force -n test -t android-21 --abi armeabi-v7a
-  - emulator -avd test -no-audio -no-window &
+- android list targets
+- echo no | android create avd --force -n test -t android-21 --abi armeabi-v7a
+- emulator -avd test -no-audio -no-window &
 
-before_install: 
-  - yes | sdkmanager "platforms;android-27"
-  - chmod +x gradlew
+before_install:
+- yes | sdkmanager "platforms;android-28"
+- chmod +x gradlew
 
 script:
-  - ./gradlew clean assembleDebug test
-  - android-wait-for-emulator
-  - adb shell input keyevent 82 &
-  - adb shell svc power stayon true &
-  - adb shell settings put global window_animation_scale 0 &
-  - adb shell settings put global transition_animation_scale 0 &
-  - adb shell settings put global animator_duration_scale 0 &
-  - ./gradlew connectedAndroidTest
-  - adb logcat -d | awk NF
+- ./gradlew clean assembleDebug test
+- android-wait-for-emulator
+- adb shell input keyevent 82 &
+- adb shell svc power stayon true &
+- adb shell settings put global window_animation_scale 0 &
+- adb shell settings put global transition_animation_scale 0 &
+- adb shell settings put global animator_duration_scale 0 &
+- ./gradlew connectedAndroidTest
+- adb logcat -d | awk NF
 
 before_cache:
-  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
-  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
+- rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
+- rm -fr $HOME/.gradle/caches/*/plugin-resolution/
 
 cache:
   directories:
-    - $HOME/.gradle/caches/
-    - $HOME/.gradle/wrapper/
-    - $HOME/.android/build-cache
+  - $HOME/.gradle/caches/
+  - $HOME/.gradle/wrapper/
+  - $HOME/.android/build-cache
+
diff --git a/README-CHANGES.xml b/README-CHANGES.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<c:changelog project="org.nypl.audiobook.android" xmlns:c="urn:com.io7m.changelog:4.0">
+  <c:releases>
+    <c:release date="2019-01-23T00:00:00+00:00" ticket-system="org.nypl.jira" version="1.0.0">
+      <c:changes/>
+    </c:release>
+    <c:release date="2019-04-19T10:19:14+00:00" ticket-system="org.nypl.jira" version="2.0.0">
+      <c:changes>
+        <c:change compatible="false" date="2019-04-19T10:19:14+00:00" summary="Take all color scheme information from the current Android theme"/>
+      </c:changes>
+    </c:release>
+  </c:releases>
+  <c:ticket-systems>
+    <c:ticket-system default="true" id="org.nypl.jira" url="https://jira.nypl.org/browse/"/>
+  </c:ticket-systems>
+</c:changelog>
diff --git a/build.gradle b/build.gradle
@@ -35,11 +35,13 @@ ext {
   dependency_rxjava_version = "1.2.3"
   dependency_slf4j_version = "1.7.25"
   dependency_support_v4_version = "27.1.1"
+  dependency_support_v7_version = "27.1.1"
+  dependency_support_design_version = "27.1.1"
 }
 
 allprojects {
   group = 'org.nypl.audiobook'
-  version = '1.0.0'
+  version = '2.0.0'
 
   apply plugin: 'maven'
   apply plugin: 'maven-publish'

diff --git a/org.nypl.audiobook.android.api/build.gradle b/org.nypl.audiobook.android.api/build.gradle
@@ -12,8 +12,8 @@ dependencies {
 }
 
 android {
-  compileSdkVersion 27
-  buildToolsVersion "27.0.3"
+  compileSdkVersion 28
+  buildToolsVersion "28.0.3"
 
   packagingOptions {
 

diff --git a/...ook.android.api/src/main/java/org/nypl/audiobook/android/api/PlayerJSONParserUtilities.kt b/...ook.android.api/src/main/java/org/nypl/audiobook/android/api/PlayerJSONParserUtilities.kt
@@ -535,6 +535,9 @@ class PlayerJSONParserUtilities private constructor() {
           sb.append("Received: A value of type ")
           sb.append(v.nodeType)
           sb.append("\n")
+          sb.append("Key: ")
+          sb.append(key)
+          sb.append("\n")
           throw PlayerJSONParseException(sb.toString())
         }
 

diff --git a/org.nypl.audiobook.android.downloads/build.gradle b/org.nypl.audiobook.android.downloads/build.gradle
@@ -10,8 +10,8 @@ dependencies {
 }
 
 android {
-  compileSdkVersion 27
-  buildToolsVersion "27.0.3"
+  compileSdkVersion 28
+  buildToolsVersion "28.0.3"
 
   packagingOptions {
 

diff --git a/org.nypl.audiobook.android.manifest.nypl/build.gradle b/org.nypl.audiobook.android.manifest.nypl/build.gradle
@@ -32,8 +32,8 @@ task generatePropertiesResources {
 preBuild.dependsOn generatePropertiesResources
 
 android {
-  compileSdkVersion 27
-  buildToolsVersion "27.0.3"
+  compileSdkVersion 28
+  buildToolsVersion "28.0.3"
 
   packagingOptions {
 

diff --git a/org.nypl.audiobook.android.mocking/build.gradle b/org.nypl.audiobook.android.mocking/build.gradle
@@ -11,8 +11,8 @@ dependencies {
 }
 
 android {
-  compileSdkVersion 27
-  buildToolsVersion "27.0.3"
+  compileSdkVersion 28
+  buildToolsVersion "28.0.3"
 
   packagingOptions {
 

diff --git a/org.nypl.audiobook.android.open_access/build.gradle b/org.nypl.audiobook.android.open_access/build.gradle
@@ -36,8 +36,8 @@ task generatePropertiesResources {
 preBuild.dependsOn generatePropertiesResources
 
 android {
-  compileSdkVersion 27
-  buildToolsVersion "27.0.3"
+  compileSdkVersion 28
+  buildToolsVersion "28.0.3"
 
   packagingOptions {
 

diff --git a/org.nypl.audiobook.android.rbdigital/build.gradle b/org.nypl.audiobook.android.rbdigital/build.gradle
@@ -33,8 +33,8 @@ task generatePropertiesResources {
 preBuild.dependsOn generatePropertiesResources
 
 android {
-  compileSdkVersion 27
-  buildToolsVersion "27.0.3"
+  compileSdkVersion 28
+  buildToolsVersion "28.0.3"
 
   packagingOptions {
 

diff --git a/org.nypl.audiobook.android.tests.device/build.gradle b/org.nypl.audiobook.android.tests.device/build.gradle
@@ -12,6 +12,8 @@ dependencies {
     exclude group: 'com.google.android', module: 'android'
   }
 
+  implementation "com.android.support:appcompat-v7:${dependency_support_v7_version}"
+  implementation "com.android.support:design:${dependency_support_design_version}"
   implementation "com.android.support:support-v4:${dependency_support_v4_version}"
   implementation "com.android.support:recyclerview-v7:${dependency_recyclerview_version}"
 
@@ -32,8 +34,8 @@ dependencies {
 }
 
 android {
-  compileSdkVersion 27
-  buildToolsVersion "27.0.3"
+  compileSdkVersion 28
+  buildToolsVersion "28.0.3"
 
   defaultConfig {
     testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

diff --git a/...device/src/androidTest/java/org/nypl/audiobook/android/tests/device/MockPlayerActivity.kt b/...device/src/androidTest/java/org/nypl/audiobook/android/tests/device/MockPlayerActivity.kt
@@ -5,6 +5,7 @@ import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
 import android.support.v4.app.FragmentActivity
+import android.support.v7.app.AppCompatActivity
 import android.widget.ImageView
 import com.google.common.util.concurrent.ListeningExecutorService
 import com.google.common.util.concurrent.MoreExecutors
@@ -30,7 +31,7 @@ import java.util.concurrent.ExecutorService
 import java.util.concurrent.Executors
 import java.util.concurrent.ScheduledExecutorService
 
-class MockPlayerActivity : FragmentActivity(), PlayerFragmentListenerType {
+class MockPlayerActivity : AppCompatActivity(), PlayerFragmentListenerType {
 
   val timer: MockingSleepTimer = MockingSleepTimer()
 
@@ -60,6 +61,8 @@ class MockPlayerActivity : FragmentActivity(), PlayerFragmentListenerType {
   override fun onCreate(state: Bundle?) {
     super.onCreate(state)
 
+    this.setTheme(R.style.AudioBooksWithActionBar)
+
     for (i in 0..100) {
       val e = this.book.createSpineElement(
         "id$i",

diff --git a/org.nypl.audiobook.android.tests.device/src/main/res/values/styles.xml b/org.nypl.audiobook.android.tests.device/src/main/res/values/styles.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<resources>
+  <color name="audiobooks_background">#ffffff</color>
+  <color name="audiobooks_material_blue_primary">#2196f3</color>
+  <color name="audiobooks_material_blue_primary_light">#6ec6ff</color>
+  <color name="audiobooks_material_blue_primary_dark">#0069c0</color>
+
+  <style name="AudioBooksWithActionBar" parent="Theme.AppCompat.Light.DarkActionBar">
+    <item name="colorPrimary">@color/audiobooks_material_blue_primary</item>
+    <item name="colorPrimaryDark">@color/audiobooks_material_blue_primary_dark</item>
+    <item name="colorAccent">@color/audiobooks_material_blue_primary_light</item>
+    <item name="android:windowActionBar">true</item>
+    <item name="android:actionBarStyle">@style/AudioBooksActionBar</item>
+    <item name="android:windowBackground">@color/audiobooks_background</item>
+  </style>
+
+  <style name="AudioBooksActionBar" parent="Widget.AppCompat.Light.ActionBar.Solid.Inverse">
+    <item name="android:displayOptions">homeAsUp|showTitle</item>
+  </style>
+
+</resources>
diff --git a/org.nypl.audiobook.android.tests.sandbox/build.gradle b/org.nypl.audiobook.android.tests.sandbox/build.gradle
@@ -12,6 +12,8 @@ dependencies {
   implementation project(':org.nypl.audiobook.android.open_access')
   implementation project(':org.nypl.audiobook.android.views')
 
+  implementation "com.android.support:appcompat-v7:${dependency_support_v7_version}"
+  implementation "com.android.support:design:${dependency_support_design_version}"
   implementation "com.android.support:support-v4:${dependency_support_v4_version}"
   implementation "com.android.support:recyclerview-v7:${dependency_recyclerview_version}"
 
@@ -23,8 +25,8 @@ dependencies {
 }
 
 android {
-  compileSdkVersion 27
-  buildToolsVersion "27.0.3"
+  compileSdkVersion 28
+  buildToolsVersion "28.0.3"
 
   defaultConfig {
     testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

diff --git a/...s.sandbox/src/main/java/org/nypl/audiobook/android/tests/sandbox/SandboxPlayerActivity.kt b/...s.sandbox/src/main/java/org/nypl/audiobook/android/tests/sandbox/SandboxPlayerActivity.kt
@@ -1,11 +1,10 @@
 package org.nypl.audiobook.android.tests.sandbox
 
 import android.app.AlertDialog
-import android.graphics.Color
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
-import android.support.v4.app.FragmentActivity
+import android.support.v7.app.AppCompatActivity
 import android.widget.Button
 import android.widget.ImageView
 import android.widget.Toast
@@ -33,7 +32,7 @@ import java.util.concurrent.ExecutorService
 import java.util.concurrent.Executors
 import java.util.concurrent.ScheduledExecutorService
 
-class SandboxPlayerActivity : FragmentActivity(), PlayerFragmentListenerType {
+class SandboxPlayerActivity : AppCompatActivity(), PlayerFragmentListenerType {
 
   private val timer: MockingSleepTimer = MockingSleepTimer()
 
@@ -67,6 +66,7 @@ class SandboxPlayerActivity : FragmentActivity(), PlayerFragmentListenerType {
   override fun onCreate(state: Bundle?) {
     super.onCreate(state)
 
+    this.setTheme(R.style.AudioBooksWithActionBar)
     this.book.supportsStreaming = false
 
     for (i in 1..100) {
@@ -83,8 +83,7 @@ class SandboxPlayerActivity : FragmentActivity(), PlayerFragmentListenerType {
     this.setContentView(R.layout.example_player_activity)
 
     this.playerFragment =
-      PlayerFragment.newInstance(PlayerFragmentParameters(
-        primaryColor = Color.parseColor("#af1a16")))
+      PlayerFragment.newInstance(PlayerFragmentParameters())
 
     this.supportFragmentManager
       .beginTransaction()
@@ -184,8 +183,7 @@ class SandboxPlayerActivity : FragmentActivity(), PlayerFragmentListenerType {
 
   override fun onPlayerTOCShouldOpen() {
     val fragment =
-      PlayerTOCFragment.newInstance(PlayerTOCFragmentParameters(
-        primaryColor = Color.parseColor("#af1a16")))
+      PlayerTOCFragment.newInstance(PlayerTOCFragmentParameters())
 
     this.supportFragmentManager
       .beginTransaction()
@@ -208,10 +206,9 @@ class SandboxPlayerActivity : FragmentActivity(), PlayerFragmentListenerType {
      * The player fragment wants us to open the playback rate selection dialog.
      */
 
-    runOnUIThread (Runnable {
-      val fragment = PlayerPlaybackRateFragment.newInstance(
-        PlayerFragmentParameters(
-          primaryColor = Color.parseColor("#af1a16")))
+    runOnUIThread(Runnable {
+      val fragment =
+        PlayerPlaybackRateFragment.newInstance(PlayerFragmentParameters())
       fragment.show(this.supportFragmentManager, "PLAYER_RATE")
     })
   }
@@ -228,10 +225,9 @@ class SandboxPlayerActivity : FragmentActivity(), PlayerFragmentListenerType {
      * The player fragment wants us to open the sleep timer.
      */
 
-    runOnUIThread (Runnable {
-      val fragment = PlayerSleepTimerFragment.newInstance(
-        PlayerFragmentParameters(
-          primaryColor = Color.parseColor("#af1a16")))
+    runOnUIThread(Runnable {
+      val fragment =
+        PlayerSleepTimerFragment.newInstance(PlayerFragmentParameters())
       fragment.show(this.supportFragmentManager, "PLAYER_SLEEP_TIMER")
     })
   }

diff --git a/org.nypl.audiobook.android.tests.sandbox/src/main/res/values/styles.xml b/org.nypl.audiobook.android.tests.sandbox/src/main/res/values/styles.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<resources>
+  <color name="audiobooks_background">#ffffff</color>
+  <color name="audiobooks_material_blue_primary">#2196f3</color>
+  <color name="audiobooks_material_blue_primary_light">#6ec6ff</color>
+  <color name="audiobooks_material_blue_primary_dark">#0069c0</color>
+
+  <style name="AudioBooksWithActionBar" parent="Theme.AppCompat.Light.DarkActionBar">
+    <item name="colorPrimary">@color/audiobooks_material_blue_primary</item>
+    <item name="colorPrimaryDark">@color/audiobooks_material_blue_primary_dark</item>
+    <item name="colorAccent">@color/audiobooks_material_blue_primary_light</item>
+    <item name="android:windowActionBar">true</item>
+    <item name="android:actionBarStyle">@style/AudioBooksActionBar</item>
+    <item name="android:windowBackground">@color/audiobooks_background</item>
+  </style>
+
+  <style name="AudioBooksActionBar" parent="Widget.AppCompat.Light.ActionBar.Solid.Inverse">
+    <item name="android:displayOptions">homeAsUp|showTitle</item>
+  </style>
+
+</resources>
diff --git a/org.nypl.audiobook.android.tests/build.gradle b/org.nypl.audiobook.android.tests/build.gradle
@@ -16,8 +16,8 @@ dependencies {
 }
 
 android {
-  compileSdkVersion 27
-  buildToolsVersion "27.0.3"
+  compileSdkVersion 28
+  buildToolsVersion "28.0.3"
 
   packagingOptions {
 

diff --git a/org.nypl.audiobook.android.views/build.gradle b/org.nypl.audiobook.android.views/build.gradle
@@ -9,13 +9,14 @@ dependencies {
   implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
   implementation "org.slf4j:slf4j-api:${dependency_slf4j_version}"
 
+  implementation "com.android.support:appcompat-v7:${dependency_support_v7_version}"
   implementation "com.android.support:support-v4:${dependency_support_v4_version}"
   implementation "com.android.support:recyclerview-v7:${dependency_recyclerview_version}"
 }
 
 android {
-  compileSdkVersion 27
-  buildToolsVersion "27.0.3"
+  compileSdkVersion 28
+  buildToolsVersion "28.0.3"
 
   packagingOptions {