def launcher

yuliskov · Nov 12, 2020 · 39eaae4 · 39eaae4
1 parent 12faa14
commit 39eaae4
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 21 deletions.
diff --git a/MediaServiceCore b/MediaServiceCore
diff --git a/SharedModules b/SharedModules
diff --git a/smartyoutubetv/build.gradle b/smartyoutubetv/build.gradle
@@ -43,8 +43,8 @@ android {
         minSdkVersion project.properties.minSdkVersion
         targetSdkVersion project.properties.targetSdkVersion
         applicationId "com.liskovsoft.videomanager"
-        versionCode 1308
-        versionName "6.17.728"
+        versionCode 1309
+        versionName "6.17.729"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         buildConfigField "long", "TIMESTAMP", System.currentTimeMillis() + "L"
 

diff --git a/smartyoutubetv/src/main/java/com/liskovsoft/smartyoutubetv/bootstrap/BootstrapActivity.java b/smartyoutubetv/src/main/java/com/liskovsoft/smartyoutubetv/bootstrap/BootstrapActivity.java
@@ -97,7 +97,7 @@ private void tryToRestoreLastActivity() {
         boolean isChecked = mPrefs.getBootstrapSaveSelection();
         if (isChecked) {
             if (bootstrapActivityName == null) {
-                bootstrapActivityName = SmartYouTubeTV4K.class.getCanonicalName();
+                bootstrapActivityName = SmartYouTubeTV1080Activity.class.getCanonicalName();
             }
 
             startActivity(this, bootstrapActivityName);
@@ -106,10 +106,10 @@ private void tryToRestoreLastActivity() {
 
     private void initLauncherMapping() {
         mLauncherMapping = new HashMap<>();
-        mLauncherMapping.put(R.id.button_exo, SmartYouTubeTV4K.class);
-        mLauncherMapping.put(R.id.button_exo2, SmartYouTubeTV4KAlt.class);
         mLauncherMapping.put(R.id.button_webview, SmartYouTubeTV1080Activity.class);
         mLauncherMapping.put(R.id.button_xwalk, SmartYouTubeTV1080AltActivity.class);
+        mLauncherMapping.put(R.id.button_exo, SmartYouTubeTV4K.class);
+        mLauncherMapping.put(R.id.button_exo2, SmartYouTubeTV4KAlt.class);
     }
 
     public void selectFlavour(View view) {

diff --git a/smartyoutubetv/src/main/res/layout/bootstrap_launchers_row.xml b/smartyoutubetv/src/main/res/layout/bootstrap_launchers_row.xml
@@ -2,20 +2,6 @@
 <LinearLayout xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:android="http://schemas.android.com/apk/res/android"
               xmlns:tools="http://schemas.android.com/tools" android:layout_width="wrap_content" android:layout_height="wrap_content"
               android:orientation="horizontal" tools:showIn="@layout/activity_bootstrap">
-    <com.liskovsoft.smartyoutubetv.widgets.BootstrapLargeButton android:id="@+id/button_exo"
-                                                                android:onClick="selectFlavour"
-                                                                android:layout_height="wrap_content"
-                                                                android:layout_width="wrap_content"
-                                                                app:mainIcon="@drawable/bootstrap_icon_pro"
-                                                                app:titleText="@string/title_exo_main"
-                                                                app:tipText="@string/exo_tip"/>
-    <com.liskovsoft.smartyoutubetv.widgets.BootstrapLargeButton android:id="@+id/button_exo2"
-                                                                android:onClick="selectFlavour"
-                                                                android:layout_height="wrap_content"
-                                                                android:layout_width="wrap_content"
-                                                                app:mainIcon="@drawable/bootstrap_icon_pro"
-                                                                app:titleText="@string/title_exo_alt"
-                                                                app:tipText="@string/exo_alt_tip"/>
     <com.liskovsoft.smartyoutubetv.widgets.BootstrapLargeButton android:id="@+id/button_webview"
                                                                 android:onClick="selectFlavour"
                                                                 android:layout_height="wrap_content"
@@ -30,4 +16,18 @@
                                                                 app:mainIcon="@drawable/bootstrap_icon_lite"
                                                                 app:titleText="@string/title_xwalk"
                                                                 app:tipText="@string/xwalk_tip"/>
+    <com.liskovsoft.smartyoutubetv.widgets.BootstrapLargeButton android:id="@+id/button_exo"
+                                                                android:onClick="selectFlavour"
+                                                                android:layout_height="wrap_content"
+                                                                android:layout_width="wrap_content"
+                                                                app:mainIcon="@drawable/bootstrap_icon_pro"
+                                                                app:titleText="@string/title_exo_main"
+                                                                app:tipText="@string/exo_tip"/>
+    <com.liskovsoft.smartyoutubetv.widgets.BootstrapLargeButton android:id="@+id/button_exo2"
+                                                                android:onClick="selectFlavour"
+                                                                android:layout_height="wrap_content"
+                                                                android:layout_width="wrap_content"
+                                                                app:mainIcon="@drawable/bootstrap_icon_pro"
+                                                                app:titleText="@string/title_exo_alt"
+                                                                app:tipText="@string/exo_alt_tip"/>
 </LinearLayout>