Restructuring code base and package names and some apis. See the

changelist for a comprehensive list of changes

Author: naddaf

AndroidManifest.xml

@@ -1,14 +1,25 @@
+<!--
+  Copyright 2015 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.sample.castcompanionlibrary"
-    android:versionCode="14"
-    android:versionName="1.14" >
+    package="com.google.android.libraries.cast.companionlibrary"
+    android:versionCode="15"
+    android:versionName="2.0" >
 
     <uses-sdk
         android:minSdkVersion="10"
-        android:targetSdkVersion="21" />
-
-    <application
-        android:label="@string/app_name">
-    </application>
+        android:targetSdkVersion="22" />
 
-</manifest>
+</manifest>

CastCompanionLibrary.pdf

@@ -1,4 +1,4 @@
-Copyright 2014 Google Inc.
+Copyright 2015 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

LICENSE

@@ -3,7 +3,7 @@
 CastCompanionLibrary-android is a library project to enable developers integrate Cast capabilities into their applications faster and easier.
 
 ## Dependencies
-* google-play-services_lib library from the Android SDK (at least version 6.1)
+* google-play-services_lib library from the Android SDK (at least version 7.0+)
 * android-support-v7-appcompat (version 21 or above)
 * android-support-v7-mediarouter (version 20 or above)
 
@@ -29,109 +29,58 @@ See LICENSE
 Google Cast Developers Community on Google+ [http://goo.gl/TPLDxj](http://goo.gl/TPLDxj)
 
 ## Change List
-1.14
+2.0
+#### Notice: this release introduces a restructured and updated code base that has backward-incompatible changes. Most of these changes can be handled by a simple search-and-replace action but there are some changes to the API names and signatures that may need more manual handling. Below you can find a list of changes.
+
+ * Change in the package name: CCL now has a new package name "com.google.android.libraries.cast.companionlibrary.cast"
+ * All string, dimension and color resources now have "ccl_" as prefix. This allows developers to
+ work with these resources without any collision with their own apps or other libraries. In addition, some
+ unused resources have been removed from the "res/*" directories.
+ * CCL no longer needs a reference to your "Activity" context. Instead, only an Application Context
+ is adequate when you initialize it. Any API that may need an Activity Context (for example opening the
+ VideoCastControllerActivity) will ask for such context as an argument. As a result, it is recommended
+ to initialize the library in your Application's onCreate() and access the VideoCastManager singleton
+ instance by VideoCastManager.getInstance(). Same applies to DataCastManager.
+ * Most interface names have changed:
+    * IMediaAuthListener -> MediaAuthListener
+    * IMediaAuthService -> MediaAuthService
+    * IBaseCastConsumer -> BaseCastConsumer
+    * IDataCastConsumer -> DataCastConsumer
+    * IVideoCastConsumer -> VideoCastConsumer
+ * Some methods have been renamed:
+    * IVideoVideoCastContoller#setLine1() -> VideoCastController#setTitle()
+    * IVideoVideoCastContoller#setLine2() -> VideoCastController#setSubTitle()
+    * IVideoVideoCastContoller#updateClosedCaption() -> VideoCastController#setClosedCaptionState()
+    * VideoCastManager#getRemoteMovieUrl() -> getRemoteMediaUrl()
+    * VideoCastManager#isRemoteMoviePlaying() -> isRemoteMediaPlaying()
+    * VideoCastManager#isRemoteMoviePaused() -> isRemoteMediaPaused()
+    * VideoCastManager#startCastControllerActivity() -> startVideoCastControllerActivity()
+    * BaseCastManager#incremenetDeviceVolume() -> adjustDeviceVolume()
+    * TracksPreferenceManager#setupPreferences() -> setUpPreferences()
+    * VideoCastConsumer#onRemovedNamespace() -> onNamespaceRemoved()
+    * MediaAuthService#start() -> startAuthorization()
+    * MediaAuthService#setOnResult() -> setMediaAuthListener()
+    * MediaAuthService#abort() -> abortAuthorization()
+    * MediaAuthStatus#RESULT_AUTHORIZED -> AUTHORIZED
+    * MediaAuthStatus#RESULT_NOT_AUTHORIZED -> NOT_AUTHORIZED
+    * MediaAuthStatus#ABORT_TIMEOUT -> TIMED_OUT
+    * MediaAuthStatus#ABORT_USER_CANCELLED -> CANCELED_BY_USER
+    * VideoCastController#updateClosedCaption() -> setClosedCaptionStatus()
+    * Utils#fromMediaInfo() -> mediaInfoToBundle()
+    * Utils#toMediaInfo() -> bundleToMediaInfo()
+    * Utils#scaleCenterCrop -> scaleAndCenterCropBitmap()
+    * IMiniController.setSubTitle() -> setSubtitle()
+    * MediaAuthListener#onResult() -> onAuthResult()
+    * MediaAuthListener#onFailure() -> onAuthFailure()
+    * BaseCastManager.clearContext() has been removed (see earlier comments)
+ * All the "consumer" callbacks used to be wrapped inside a try-catch block inside the library. We have
+ now removed this and expect the "consumers" to handle that in the client code; the previous approach was masking
+ client issues in the library while they needed to be addressed inside the client itself.
+ * BaseCastManager#addMediaRouterButton(MediaRouteButton button) now has no return value (it was redundant)
+ * VideoCastConsumer#onApplicationConnectionFailed() no longer returns any value.
+ * BaseCastConsumer#onConnectionFailed(() no longer returns any value.
+ * [New] There is a new callback "void onMediaLoadResult(int statusCode)" in VideoCastConsumer to
+ inform the consumers when a load operation is finished.
+ * Updated the build to use the latest gradle binaries.
+ * Updated to use the latest versions of Play Services and support libraries.
 
- * Wrapped some IllegalStateExceptions for proper handling. This should address issue #144 as well.
- * Fixing an issue that sometimes when a media finishes, start of the next media would result in
- immediate closure of the VideoCastControllerActivity
- * Fixed a corner case where sometimes when the receiver is stopped due to reaching a time out, the
-  sender was disconnecting but the cast icon was not reflecting that correctly.
-
-1.13
-
- * Addressed a NPE in reconnection task (issue #143)
- * Made sure we don't set the duration of a MediaInfo object to a negative number
- * Some internal cleanup
-
-1.12
-#### Notice: there are some backward-incompatible changes in this release, please read the change list carefully
- * Changing CCL to use Application Context in most everything. As a result, one does not need to set context for CCL in each
-       Activity which should avoid any context leaks and prevent some random NPEs. Consequently, there will be no "dialog" supported by
-       CCL unless the caller method provides an explicit context. For various versions of reconnectSessionIfPossible, we now have
-       reconnection callbacks that can be used by callers to provide visual feedback, so these methods now have new signatures.
-       In addition, now you can initialize Cast Managers in your Application's onCreate().
-       There are some backward-incompatible changes so clients need to make adjustments if needed.
-       In particular, the noteworthy breaking changes are:
-     * Variations of reconnectSessionIfPossible have new arguments
-     * Utils.showErrorDialog() has been removed
-     * setContext() on Cast Managers is removed
-     * CastManagers' getInstance(Context) are removed
- * Updating BaseCastManager, VideoCastManager and DataCastManager to use CopyOnWriteArraySet to manage consumers. Since the number of
- consumers is low, there will be no performance hit and CopyOnWriteArraySet provides a safer data structure.
- * Decoupled dependency between components interested in receiving notifications when the list of active tracks
-   changes and the sources that can cause such changes. This also allowed improving the TracksChooserDialog
-   to gracefully rebuild itself when needed.
- * Improving VideoCastControllerFragment's behavior when it needs to be closed.
- * Fixing an issue that upon reconstruction of VideoCastControllerActivity/Fragment, it would restart the media.
- * In VideoCastControllerFragment, moved most of the initial work to onActivityCreated() so that a rebuild of the associated activity and fragment doesn't run into a NPE
- * Adding a new API to allow clients set the MediaAuthService directly (VideoCastManager.setMediaAuthService(IMediaAuthService authService))
- * Making sure that the reconnection AsyncTask is using a thread pool regardless of the Android version,
- * Removed "Video Tracks" from Tracks Chooser Dialog since that doesn't make sense to be presented there.
- * Updating the style of Cast dialog for Lollipop to match the respective framework.
- * Adding Toolbar component to the simple cast_activity.xml layout in landscape, this was missed in a previous update where toolbar was introduced.
- * Changing the icon representing "Disconnect" in Lollipop notification
- * Fixing a bug where notification service wouldn't restart if playback was restarted on a different device.
- * Fixing an issue that when a new media was started while another one was casting, the metadata wouldn't update immediately
-   in VideoCastControllerActivity to reflect the new media.
- * Updating to the latest version of Gradle suitable for the latest publicly released version of Android Studio,
- * Updating the gradle build to use the latest version of Google Play Services and selectively use cast APIs from Google Play Services.
- * Improving discovery for MediaRouteButton by resetting the count of discovered routes whenever cast discovery is stopped.
- * Updating the PDF documentation
- * Fixing some typos
- * Addressing issues #89, #130, #132, #134, #137, #138, #139, #140,
-
-1.11
- * Added support for Notifications and Lock Screen controls (via Notifications) on Android Lollipop.
- * Updated dependencies to use Google Play Services 6.1 and Support Libraries v21.
- * Added Toolbar as a replacement for ActionBar.
- * Added support for Android Studio 0.9.1 and updated gradle support to the latest versions.
- * Fixed issues 74, 110, 115, 119.
-
-1.10
- * Added support for Tracks and Closed Captions. See the documentation for details.
- * Refactored image loading across the library.
- * Fixed issue 105
- 
-1.9
- * Added the complete reconnection logic per Cast UX Checklist
- * Addressed issues 70, 75, 92, 93, 94, 96
- * Added logic to handle failure when loading a media item in the VideoCastControllerActivity
- * Added "stream duration" to MediaInfo serialization
- * Updated the gradle build file to use newer version of the Google Play services
- * Updated the documentation
- 
-1.5
- * Fixed the issue where VideoCastNotificationService was not setting up data namespace if one was configured
- * Fixed issue 50
- * Added aversion number that will be printed in the log statements for tracking purposes
- * Correcting the typo in the name of method checkGooglePlaySevices() by introducing a new method and deprecating the old one (issue 48)
- * Fixing many typos in comments and some resources
- * Updating documentation to reflect the correct name of callbacks for the custom namespace for VideoCastManager
-
-1.4
- * Added support for MediaRouteButton
- * Added "alias" resources for Mini Controller play/pause/stop buttons so clients can customize them easily
- * Added a color resource to control thw color of the title of the custom VideoMediaRouteControllerDialog
- * Fixed some typos in JavaDoc
-
-1.3
- * Fixing issue 32
- * Fixing issue 33
- * Adding a better BaseCastManager.clearContext() variation
- * Implementing enhancement 30
- * Making sure play/pause button is hidden when ProgressBar is shown in VideoMediaRouteControllerDialog
- * probably some more adjustments and bug fixes
-
-1.2
- * Improving thread-safety in calling various ConsumerImpl callbacks
- * (backward incompatible) Changing the signature of IMediaAuthListener.onResult
- * Adding an API to BaseCastManager so clients can clear the "context" to avoid any leaks
- * Various bug fixes
-
-1.1
- * Added gradle build scripts (make sure you have Android Support Repository)
- * For live media, the "pause" button at various places is replaced with a "stop" button
- * Refactored the VideoCastControllerActivity to enable configuration changes without losing any running process
- * Added new capabilities for clients to hook in an authorization process prior to casting a video
- * A number of bug fixes, style fixes, etc
- * Updated documentation

README.md

@@ -1,6 +1,22 @@
+/*
+ * Copyright (C) 2015 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 buildscript {
     repositories {
-        mavenCentral()
+        jcenter()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:1.0.0'
@@ -9,18 +25,21 @@ buildscript {
 
 repositories {
     mavenCentral()
+    flatDir {
+        dirs 'libs'
+    }
 }
 
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 21
-    buildToolsVersion "20.0.0"
+    compileSdkVersion 22
+    buildToolsVersion "22.0.1"
     publishNonDefault true
 
     defaultConfig {
         minSdkVersion 10
-        targetSdkVersion 21
+        targetSdkVersion 22
     }
 
     sourceSets {
@@ -30,14 +49,10 @@ android {
             res.srcDirs = ['res']
         }
     }
-
-    lintOptions {
-        abortOnError false
-    }
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:21.+'
-    compile 'com.android.support:mediarouter-v7:21.+'
-    compile 'com.google.android.gms:play-services-cast:6.5+'
+    compile 'com.android.support:appcompat-v7:22.+'
+    compile 'com.android.support:mediarouter-v7:22.+'
+    compile 'com.google.android.gms:play-services:7.+'
 }

build.gradle

@@ -1,4 +1,4 @@
-#Mon Dec 15 08:22:16 PST 2014
+#Fri Mar 27 23:28:18 PDT 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,20 @@
+# To enable ProGuard in your project, edit project.properties
+# to define the proguard.config property as described in that file.
+#
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in ${sdk.dir}/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the ProGuard
+# include property in project.properties.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}

libs/android-support-v4.jar

@@ -13,6 +13,6 @@
 # Project target.
 target=android-19
 android.library=true
+android.library.reference.3=../../../../../../android-sdk/extras/google/google_play_services/libproject/google-play-services_lib
 android.library.reference.1=../../../../../../android-sdk/extras/android/support/v7/appcompat
 android.library.reference.2=../../../../../../android-sdk/extras/android/support/v7/mediarouter
-android.library.reference.3=../../../../../../android-sdk/extras/google/google_play_services/libproject/google-play-services_lib