Setup initial backend zeroconf scanning

Changes #178
MythTV-Clients · Jan 25, 2017 · 6c46d30 · 6c46d30
1 parent 9a5b1e5
commit 6c46d30
Show file tree

Hide file tree

Showing 17 changed files with 349 additions and 89 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ MythTV Player An application for Android users to play MythTV Recordings and Videos
   ~ Copyright (c) 2015. Daniel Frey
   ~
@@ -16,10 +15,9 @@
   ~ You should have received a copy of the GNU General Public License
   ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
-<manifest
-    package="org.mythtv.android"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="org.mythtv.android">
 
     <uses-sdk tools:overrideLibrary="android.support.v14.preference" />
 
@@ -66,12 +64,12 @@
     <application
         android:name=".presentation.AndroidApplication"
         android:allowBackup="true"
-        android:fullBackupContent="@xml/backup_rules"
         android:banner="@drawable/mythtv_logo"
+        android:fullBackupContent="@xml/backup_rules"
         android:icon="@drawable/ic_mythtv"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme"
-        android:supportsRtl="true">
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
 
         <meta-data
             android:name="com.google.android.gms.version"
@@ -81,279 +79,237 @@
             android:name="com.google.android.gms.cast.framework.OPTIONS_PROVIDER_CLASS_NAME"
             android:value="org.mythtv.android.presentation.provider.CastOptionsProvider" />
 
-        <meta-data android:name="firebase_analytics_collection_enabled" android:value="false" />
+        <meta-data
+            android:name="firebase_analytics_collection_enabled"
+            android:value="false" />
 
         <!-- App Activities -->
         <activity
-            android:name=".presentation.view.activity.phone.MainPhoneActivity"
-            android:clearTaskOnLaunch="true"
+            android:name=".presentation.view.activity.phone.NsdActivity"
             android:label="@string/app_name"
-            android:launchMode="singleTop">
-
+            android:launchMode="singleTask"
+            android:theme="@style/Theme.AppCompat.NoActionBar">
             <intent-filter>
-
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
-
             </intent-filter>
+        </activity>
+        <activity
+            android:name=".presentation.view.activity.phone.MainPhoneActivity"
+            android:clearTaskOnLaunch="true"
+            android:label="@string/app_name"
+            android:launchMode="singleTop">
+            <!--<intent-filter>-->
+                <!--<action android:name="android.intent.action.MAIN" />-->
+
+                <!--<category android:name="android.intent.category.LAUNCHER" />-->
+            <!--</intent-filter>-->
 
             <meta-data
                 android:name="android.app.default_searchable"
                 android:value="org.mythtv.android.presentation.view.activity.phone.SearchableActivity" />
-
         </activity>
-
         <activity
             android:name=".presentation.view.activity.phone.TitleInfoListActivity"
             android:label="@string/watch_recording"
             android:launchMode="singleTop"
             android:parentActivityName=".presentation.view.activity.phone.MainPhoneActivity">
-
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="org.mythtv.android.presentation.view.activity.phone.MainPhoneActivity" />
-
             <meta-data
                 android:name="android.app.default_searchable"
                 android:value="org.mythtv.android.presentation.view.activity.phone.SearchableActivity" />
-
         </activity>
-
         <activity
             android:name=".presentation.view.activity.phone.SeriesListActivity"
             android:label="@string/watch_recording"
             android:launchMode="singleTop"
             android:parentActivityName=".presentation.view.activity.phone.TitleInfoListActivity">
-
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="org.mythtv.android.presentation.view.activity.phone.TitleInfoListActivity" />
-
             <meta-data
                 android:name="android.app.default_searchable"
                 android:value="org.mythtv.android.presentation.view.activity.phone.SearchableActivity" />
-
         </activity>
-
         <activity
             android:name=".presentation.view.activity.phone.MediaItemDetailsActivity"
             android:launchMode="singleTop"
             android:parentActivityName=".presentation.view.activity.phone.SeriesListActivity">
-
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="org.mythtv.android.presentation.view.activity.phone.SeriesListActivity" />
-
             <meta-data
                 android:name="android.app.default_searchable"
                 android:value="org.mythtv.android.presentation.view.activity.phone.SearchableActivity" />
-
         </activity>
-
         <activity
             android:name=".presentation.view.activity.phone.VideoListActivity"
             android:label="@string/watch_video"
             android:launchMode="singleTop"
             android:parentActivityName=".presentation.view.activity.phone.MainPhoneActivity">
-
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="org.mythtv.android.presentation.view.activity.phone.MainPhoneActivity" />
-
             <meta-data
                 android:name="android.app.default_searchable"
                 android:value="org.mythtv.android.presentation.view.activity.phone.SearchableActivity" />
-
         </activity>
-
         <activity
             android:name=".presentation.view.activity.phone.SettingsActivity"
             android:label="@string/title_activity_settings"
             android:launchMode="singleTop"
             android:parentActivityName=".presentation.view.activity.phone.MainPhoneActivity">
-
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="org.mythtv.android.presentation.view.activity.phone.MainPhoneActivity" />
-
             <meta-data
                 android:name="android.app.default_searchable"
                 android:value="org.mythtv.android.presentation.view.activity.phone.SearchableActivity" />
-
         </activity>
-
         <activity
             android:name=".presentation.view.activity.phone.RecordingSettingsActivity"
             android:label="@string/title_activity_settings"
             android:launchMode="singleTop"
             android:parentActivityName=".presentation.view.activity.phone.SettingsActivity">
-
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="org.mythtv.android.presentation.view.activity.phone.SettingsActivity" />
-
         </activity>
-
         <activity
             android:name=".presentation.view.activity.phone.VideoSettingsActivity"
             android:label="@string/title_activity_settings"
             android:launchMode="singleTop"
             android:parentActivityName=".presentation.view.activity.phone.SettingsActivity">
-
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="org.mythtv.android.presentation.view.activity.phone.SettingsActivity" />
-
         </activity>
-
-        <activity
-            android:name=".presentation.view.activity.phone.SearchableActivity">
-
+        <activity android:name=".presentation.view.activity.phone.SearchableActivity">
             <intent-filter>
-
                 <action android:name="android.intent.action.SEARCH" />
-
             </intent-filter>
 
             <meta-data
                 android:name="android.app.searchable"
                 android:resource="@xml/searchable" />
-
         </activity>
-
         <activity
             android:name=".presentation.view.activity.phone.LocalPlayerActivity"
             android:configChanges="orientation|keyboard|keyboardHidden|screenSize|screenLayout|uiMode"
             android:label="@string/app_name"
             android:launchMode="singleTask"
             android:theme="@style/Theme.AppCompat.NoActionBar">
-
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
-
         </activity>
-
         <activity
             android:name=".presentation.view.activity.phone.ExpandedControlsActivity"
             android:label="@string/app_name"
             android:launchMode="singleTask"
             android:screenOrientation="portrait">
-
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
 
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="org.mythtv.android.presentation.view.activity.phone.MainPhoneActivity" />
-
         </activity>
 
         <!-- AndroidTv activities -->
         <activity
-            android:name=".presentation.view.activity.tv.MainTvActivity"
-            android:theme="@style/Theme.Leanback"
-            android:configChanges="keyboard|keyboardHidden|navigation">
+            android:name=".presentation.view.activity.tv.NsdActivity"
+            android:label="@string/app_name"
+            android:configChanges="keyboard|keyboardHidden|navigation"
+            android:theme="@style/Theme.Leanback">
             <intent-filter>
-
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
-
             </intent-filter>
         </activity>
+        <activity
+            android:name=".presentation.view.activity.tv.MainTvActivity"
+            android:configChanges="keyboard|keyboardHidden|navigation"
+            android:theme="@style/Theme.Leanback">
+            <!--<intent-filter>-->
+                <!--<action android:name="android.intent.action.MAIN" />-->
 
+                <!--<category android:name="android.intent.category.LEANBACK_LAUNCHER" />-->
+            <!--</intent-filter>-->
+        </activity>
         <activity
             android:name=".presentation.view.activity.tv.RecordingsActivity"
             android:parentActivityName=".presentation.view.activity.tv.MainTvActivity"
             android:theme="@style/Theme.Leanback">
-
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".presentation.view.activity.tv.MainTvActivity" />
-
             <meta-data
                 android:name="android.app.default_searchable"
                 android:value=".presentation.view.activity.SearchableActivity" />
-
         </activity>
-
         <activity
             android:name=".presentation.view.activity.tv.MediaItemDetailsActivity"
             android:parentActivityName=".presentation.view.activity.tv.MainTvActivity"
             android:theme="@style/Theme.Leanback">
-
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".presentation.view.activity.tv.MainTvActivity" />
-
         </activity>
-
         <activity
             android:name=".presentation.view.activity.tv.SettingsActivity"
             android:theme="@style/Theme.Leanback" />
-
         <activity
             android:name=".presentation.view.activity.tv.RecordingSettingsActivity"
             android:theme="@style/Theme.Leanback" />
-
         <activity
             android:name=".presentation.view.activity.tv.VideosActivity"
             android:parentActivityName=".presentation.view.activity.tv.MainTvActivity"
             android:theme="@style/Theme.Leanback">
-
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".presentation.view.activity.tv.MainTvActivity" />
-
         </activity>
-
         <activity
             android:name=".presentation.view.activity.tv.VideoCategoryActivity"
             android:parentActivityName=".presentation.view.activity.tv.VideosActivity"
             android:theme="@style/Theme.Leanback">
-
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".presentation.view.activity.tv.VideosActivity" />
-
             <meta-data
                 android:name="android.app.default_searchable"
                 android:value=".view.activity.SearchableActivity" />
         </activity>
-
         <activity
             android:name=".presentation.view.activity.tv.TvVideoSettingsActivity"
             android:theme="@style/Theme.Leanback" />
-
         <activity
             android:name=".presentation.view.activity.tv.SearchableActivity"
             android:theme="@style/Theme.Leanback">
-
             <intent-filter>
-
                 <action android:name="android.intent.action.SEARCH" />
-
             </intent-filter>
 
             <meta-data
                 android:name="android.app.searchable"
                 android:resource="@xml/searchable" />
-
         </activity>
-
         <activity
             android:name=".presentation.view.activity.tv.PlaybackOverlayActivity"
             android:screenOrientation="landscape"
             android:theme="@android:style/Theme.NoTitleBar.Fullscreen" />
 
         <provider
-            android:name="org.mythtv.android.presentation.provider.MythtvSearchSuggestionProvider"
+            android:name=".presentation.provider.MythtvSearchSuggestionProvider"
             android:authorities="org.mythtv.android.presentation.provider.MythtvSearchSuggestionProvider"
             android:exported="false" />
 
     </application>
 
-</manifest>
+</manifest>
diff --git a/app/src/main/java/org/mythtv/android/presentation/navigation/TvNavigator.java b/app/src/main/java/org/mythtv/android/presentation/navigation/TvNavigator.java
@@ -23,6 +23,7 @@
 import android.util.Log;
 
 import org.mythtv.android.domain.Media;
+import org.mythtv.android.presentation.view.activity.tv.MainTvActivity;
 import org.mythtv.android.presentation.view.activity.tv.RecordingsActivity;
 import org.mythtv.android.presentation.view.activity.tv.SearchableActivity;
 import org.mythtv.android.presentation.view.activity.tv.SettingsActivity;
@@ -50,6 +51,19 @@ public TvNavigator() {
         //empty
     }
 
+    public void navigateToMain( Context context ) {
+        Log.d( TAG, "navigateToMain : enter" );
+
+        if( null != context ) {
+
+            Intent intentToLaunch = MainTvActivity.getCallingIntent( context );
+            context.startActivity( intentToLaunch );
+
+        }
+
+        Log.d( TAG, "navigateToMain : exit" );
+    }
+
     public void navigateToRecordings( Context context ) {
         Log.d( TAG, "navigateToRecordings : enter" );
 

diff --git a/app/src/main/java/org/mythtv/android/presentation/view/activity/phone/MainPhoneActivity.java b/app/src/main/java/org/mythtv/android/presentation/view/activity/phone/MainPhoneActivity.java
@@ -57,7 +57,6 @@ public static Intent getCallingIntent( Context context ) {
         return callingIntent;
     }
 
-
     private MediaItemListFragment recentFragment;
     private EncoderListFragment encodersFragment;
     private MediaItemListFragment upcomingFragment;