merge changes

bttv-android · Jul 17, 2023 · c00380a · c00380a
1 parent 2a41a13
commit c00380a
Show file tree

Hide file tree

Showing 21 changed files with 50 additions and 52 deletions.
diff --git a/patches/AndroidManifest.xml.patch b/patches/AndroidManifest.xml.patch
@@ -25,8 +25,8 @@ diff --git a/AndroidManifest.xml b/AndroidManifest.xml
 +    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
      <uses-permission android:maxSdkVersion="32" android:name="android.permission.READ_EXTERNAL_STORAGE" android:required="false"/>
      <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:required="false"/>
-     <uses-feature android:name="android.hardware.camera" android:required="false"/>
-@@ -69,8 +81,8 @@
+     <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" android:required="false"/>
+@@ -70,8 +82,8 @@
      <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
      <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
      <uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE"/>
@@ -37,7 +37,7 @@ diff --git a/AndroidManifest.xml b/AndroidManifest.xml
      <application android:allowBackup="false" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:enabled="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:largeHeap="true" android:name="tv.twitch.android.app.consumer.TwitchApplication" android:networkSecurityConfig="@xml/default_security_config" android:requestLegacyExternalStorage="false" android:supportsRtl="true" android:theme="@style/Theme.TwitchApp">
          <profileable android:shell="true"/>
          <meta-data android:name="WindowManagerPreference:FreeformWindowSize" android:value="phone"/>
-@@ -176,15 +188,15 @@
+@@ -177,15 +189,15 @@
                  <action android:name="android.intent.action.MEDIA_BUTTON"/>
              </intent-filter>
          </service>
@@ -56,7 +56,7 @@ diff --git a/AndroidManifest.xml b/AndroidManifest.xml
          <meta-data android:name="io.branch.sdk.BranchKey" android:value="key_live_jgBdao5vVtyZ3hdckxy8jlkkzqooQltZ"/>
          <meta-data android:name="io.branch.sdk.BranchKey.test" android:value="key_test_ahupan1EKvF7XkpepyA3vpfivrdlOlMg"/>
          <meta-data android:name="io.branch.sdk.TestMode" android:value="false"/>
-@@ -287,7 +299,7 @@
+@@ -288,7 +300,7 @@
          <receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
          <service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementService"/>
          <service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
@@ -65,7 +65,7 @@ diff --git a/AndroidManifest.xml b/AndroidManifest.xml
          <meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
          <uses-library android:name="androidx.window.extensions" android:required="false"/>
          <uses-library android:name="androidx.window.sidecar" android:required="false"/>
-@@ -346,5 +358,18 @@
+@@ -347,5 +359,18 @@
                  <action android:name="com.amazon.dcp.sso.action.session.users.changed"/>
              </intent-filter>
          </receiver>

diff --git a/patches/anonchat/tv.twitch.android.shared.chat.ChatViewPresenter.smali.patch b/patches/anonchat/tv.twitch.android.shared.chat.ChatViewPresenter.smali.patch
@@ -19,7 +19,7 @@ diff --git a/smali_classes6/tv/twitch/android/shared/chat/ChatViewPresenter.smal
 
  .field private final chatDialogRouter:Ltv/twitch/android/shared/chat/pub/ChatDialogRouter;
 
-@@ -1262,6 +1262,10 @@
+@@ -1300,6 +1300,10 @@
 
      iput-object v1, v0, Ltv/twitch/android/shared/chat/ChatViewPresenter;->messageInputListener:Ltv/twitch/android/shared/chat/ChatViewPresenter$messageInputListener$1;
 
@@ -30,7 +30,7 @@ diff --git a/smali_classes6/tv/twitch/android/shared/chat/ChatViewPresenter.smal
      return-void
  .end method
 
-@@ -1753,6 +1757,13 @@
+@@ -1791,6 +1795,13 @@
      :cond_0
      return-void
  .end method

diff --git a/...es/devtools/tv.twitch.android.feature.viewer.main.navigation.ToolbarPresenter.smali.patch b/...es/devtools/tv.twitch.android.feature.viewer.main.navigation.ToolbarPresenter.smali.patch
@@ -1,8 +1,8 @@
 diff --git a/smali_classes5/tv/twitch/android/feature/viewer/main/navigation/ToolbarPresenter.smali b/smali_classes5/tv/twitch/android/feature/viewer/main/navigation/ToolbarPresenter.smali
 --- a/smali_classes5/tv/twitch/android/feature/viewer/main/navigation/ToolbarPresenter.smali
 +++ b/smali_classes5/tv/twitch/android/feature/viewer/main/navigation/ToolbarPresenter.smali
-@@ -2480,6 +2480,10 @@
-     .line 410
+@@ -2491,6 +2491,10 @@
+     .line 412
      invoke-direct {p0, p1}, Ltv/twitch/android/feature/viewer/main/navigation/ToolbarPresenter;->updateSearchVisibilityForCreatorMode(Landroid/view/Menu;)V
 
 +    # BTTV

diff --git a/patches/emotes/tv.twitch.android.sdk.ChatController.smali.patch b/patches/emotes/tv.twitch.android.sdk.ChatController.smali.patch
@@ -1,7 +1,7 @@
 diff --git a/smali_classes5/tv/twitch/android/sdk/ChatController.smali b/smali_classes5/tv/twitch/android/sdk/ChatController.smali
 --- a/smali_classes5/tv/twitch/android/sdk/ChatController.smali
 +++ b/smali_classes5/tv/twitch/android/sdk/ChatController.smali
-@@ -341,6 +341,13 @@
+@@ -332,6 +332,13 @@
 
      move-result p1
 

diff --git a/patches/emotes/tv.twitch.android.shared.chat.messagefactory.ChatMessageFactory.smali.patch b/patches/emotes/tv.twitch.android.shared.chat.messagefactory.ChatMessageFactory.smali.patch
@@ -1,7 +1,7 @@
 diff --git a/smali_classes6/tv/twitch/android/shared/chat/messagefactory/ChatMessageFactory.smali b/smali_classes6/tv/twitch/android/shared/chat/messagefactory/ChatMessageFactory.smali
 --- a/smali_classes6/tv/twitch/android/shared/chat/messagefactory/ChatMessageFactory.smali
 +++ b/smali_classes6/tv/twitch/android/shared/chat/messagefactory/ChatMessageFactory.smali
-@@ -667,6 +667,21 @@
+@@ -676,6 +676,21 @@
 
      invoke-static {v15, v1}, Lkotlin/jvm/internal/Intrinsics;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 

diff --git a/...es/emotes/tv.twitch.android.shared.chat.messagefactory.ChatMessageSpanFactory.smali.patch b/...es/emotes/tv.twitch.android.shared.chat.messagefactory.ChatMessageSpanFactory.smali.patch
@@ -1,7 +1,7 @@
 diff --git a/smali_classes6/tv/twitch/android/shared/chat/messagefactory/ChatMessageSpanFactory.smali b/smali_classes6/tv/twitch/android/shared/chat/messagefactory/ChatMessageSpanFactory.smali
 --- a/smali_classes6/tv/twitch/android/shared/chat/messagefactory/ChatMessageSpanFactory.smali
 +++ b/smali_classes6/tv/twitch/android/shared/chat/messagefactory/ChatMessageSpanFactory.smali
-@@ -2261,6 +2261,12 @@
+@@ -2286,6 +2286,12 @@
      goto :goto_2
 
      :cond_3
@@ -13,4 +13,4 @@ diff --git a/smali_classes6/tv/twitch/android/shared/chat/messagefactory/ChatMes
 +
      if-eqz p12, :cond_4
 
-     .line 111
+     .line 113
diff --git a/patches/emotes/tv.twitch.android.util.EmoteUrlUtil.smali.patch b/patches/emotes/tv.twitch.android.util.EmoteUrlUtil.smali.patch
@@ -20,7 +20,7 @@ diff --git a/smali_classes7/tv/twitch/android/util/EmoteUrlUtil.smali b/smali_cl
 @@ -703,7 +712,7 @@
  .end method
 
- .method public static final getEmoteUrl(Landroid/content/Context;Ljava/lang/String;)Ljava/lang/String;
+ .method public static final getEmoteUrl(Landroid/content/Context;Ljava/lang/String;Ljava/lang/Float;)Ljava/lang/String;
 -    .locals 1
 +    .locals 2
 
@@ -38,6 +38,6 @@ diff --git a/smali_classes7/tv/twitch/android/util/EmoteUrlUtil.smali b/smali_cl
 +    :dont_return
 +    # /BTTV
 +
-     .line 73
-     sget-object v0, Ltv/twitch/android/util/EmoteUrlUtil;->INSTANCE:Ltv/twitch/android/util/EmoteUrlUtil;
+     if-eqz p2, :cond_0
 
+     .line 74
diff --git a/patches/res.values.colors.xml.patch b/patches/res.values.colors.xml.patch
@@ -1,7 +1,7 @@
 diff --git a/res/values/colors.xml b/res/values/colors.xml
 --- a/res/values/colors.xml
 +++ b/res/values/colors.xml
-@@ -624,4 +624,6 @@
+@@ -656,4 +656,6 @@
      <color name="yellow_8">#ff60600b</color>
      <color name="yellow_9">#ff7a7a00</color>
      <color name="youtube">#ffcd201f</color>

diff --git a/patches/res.values.ids.xml.patch b/patches/res.values.ids.xml.patch
@@ -1,7 +1,7 @@
 diff --git a/res/values/ids.xml b/res/values/ids.xml
 --- a/res/values/ids.xml
 +++ b/res/values/ids.xml
-@@ -4332,4 +4332,8 @@
+@@ -4401,4 +4401,8 @@
      <item type="id" name="ximg" />
      <item type="id" name="year_published" />
      <item type="id" name="zero_corner_chip" />

diff --git a/patches/res.values.public.xml.patch b/patches/res.values.public.xml.patch
@@ -1,7 +1,7 @@
 diff --git a/res/values/public.xml b/res/values/public.xml
 --- a/res/values/public.xml
 +++ b/res/values/public.xml
-@@ -16786,4 +16786,98 @@
+@@ -17012,4 +17012,98 @@
      <public type="xml" name="standalone_badge_gravity_top_start" id="0x7f160007" />
      <public type="xml" name="standalone_badge_offset" id="0x7f160008" />
      <public type="xml" name="splits0" id="0x7f160009" />

diff --git a/...ngs/tv.twitch.android.app.consumer.dagger.DaggerAppComponent$AppComponentImpl.smali.patch b/...ngs/tv.twitch.android.app.consumer.dagger.DaggerAppComponent$AppComponentImpl.smali.patch
@@ -1,7 +1,7 @@
 diff --git a/smali_classes4/tv/twitch/android/app/consumer/dagger/DaggerAppComponent$AppComponentImpl.smali b/smali_classes4/tv/twitch/android/app/consumer/dagger/DaggerAppComponent$AppComponentImpl.smali
 --- a/smali_classes4/tv/twitch/android/app/consumer/dagger/DaggerAppComponent$AppComponentImpl.smali
 +++ b/smali_classes4/tv/twitch/android/app/consumer/dagger/DaggerAppComponent$AppComponentImpl.smali
-@@ -14507,6 +14507,13 @@
+@@ -14629,6 +14629,13 @@
 
      iput-object v4, v0, Ltv/twitch/android/app/consumer/dagger/DaggerAppComponent$AppComponentImpl;->pageViewTrackerProvider:Ljavax/inject/Provider;
 
@@ -12,6 +12,6 @@ diff --git a/smali_classes4/tv/twitch/android/app/consumer/dagger/DaggerAppCompo
 +    invoke-static {v4}, Lbttv/settings/SettingsFragmentBindingFactory;->setPageViewTrackerProvider(Ljavax/inject/Provider;)V
 +    # /BTTV
 +
-     .line 55929
+     .line 56859
      iget-object v5, v0, Ltv/twitch/android/app/consumer/dagger/DaggerAppComponent$AppComponentImpl;->provideTwitchAccountManagerProvider:Ljavax/inject/Provider;
 
diff --git a/...droid.app.consumer.dagger.DaggerAppComponent$SettingsActivitySubcomponentImpl.smali.patch b/...droid.app.consumer.dagger.DaggerAppComponent$SettingsActivitySubcomponentImpl.smali.patch
@@ -2,7 +2,7 @@ diff --git a/smali_classes4/tv/twitch/android/app/consumer/dagger/DaggerAppCompo
 --- a/smali_classes4/tv/twitch/android/app/consumer/dagger/DaggerAppComponent$SettingsActivitySubcomponentImpl.smali
 +++ b/smali_classes4/tv/twitch/android/app/consumer/dagger/DaggerAppComponent$SettingsActivitySubcomponentImpl.smali
 @@ -919,10 +919,25 @@
-     .line 14422
+     .line 14560
      iput-object p2, p0, Ltv/twitch/android/app/consumer/dagger/DaggerAppComponent$SettingsActivitySubcomponentImpl;->settingsActivityModule:Ltv/twitch/android/settings/dagger/SettingsActivityModule;
 
 +    # BTTV
@@ -12,7 +12,7 @@ diff --git a/smali_classes4/tv/twitch/android/app/consumer/dagger/DaggerAppCompo
 +    invoke-static {p2}, Lbttv/settings/SettingsFragmentBindingFactory;->setSettingsActivityModule(Ltv/twitch/android/settings/dagger/SettingsActivityModule;)V
 +    # /BTTV
 +
-     .line 14423
+     .line 14561
      iput-object p3, p0, Ltv/twitch/android/app/consumer/dagger/DaggerAppComponent$SettingsActivitySubcomponentImpl;->activityModule:Ltv/twitch/android/app/core/dagger/modules/ActivityModule;
 
 +    # BTTV
@@ -22,7 +22,7 @@ diff --git a/smali_classes4/tv/twitch/android/app/consumer/dagger/DaggerAppCompo
 +    invoke-static {p3}, Lbttv/settings/SettingsFragmentBindingFactory;->setActivityModule(Ltv/twitch/android/app/core/dagger/modules/ActivityModule;)V
 +    # /BTTV
 +
-     .line 14424
+     .line 14562
 +
      invoke-direct {p0, p2, p3, p4}, Ltv/twitch/android/app/consumer/dagger/DaggerAppComponent$SettingsActivitySubcomponentImpl;->initialize(Ltv/twitch/android/settings/dagger/SettingsActivityModule;Ltv/twitch/android/app/core/dagger/modules/ActivityModule;Ltv/twitch/android/settings/SettingsActivity;)V
 
@@ -38,7 +38,7 @@ diff --git a/smali_classes4/tv/twitch/android/app/consumer/dagger/DaggerAppCompo
 +    invoke-static {p3}, Lbttv/settings/SettingsFragmentBindingFactory;->setFragmentActivityProvider(Ljavax/inject/Provider;)V
 +    # /BTTV
 
-     .line 14826
+     .line 14964
      invoke-static {}, Ltv/twitch/android/shared/billing/postalcodecapture/PostalCodeEventDispatcher_Factory;->create()Ltv/twitch/android/shared/billing/postalcodecapture/PostalCodeEventDispatcher_Factory;
 @@ -2031,6 +2052,19 @@
 

diff --git a/patches/sleeptimer/res.layout-v22.bottom_player_overlay_controls.xml.patch b/patches/sleeptimer/res.layout-v22.bottom_player_overlay_controls.xml.patch
@@ -1,11 +1,10 @@
 diff --git a/res/layout-v22/bottom_player_overlay_controls.xml b/res/layout-v22/bottom_player_overlay_controls.xml
 --- a/res/layout-v22/bottom_player_overlay_controls.xml
 +++ b/res/layout-v22/bottom_player_overlay_controls.xml
-@@ -7,6 +7,22 @@
+@@ -7,6 +7,20 @@
      <TextView android:gravity="center_vertical" android:id="@id/stream_stats_text" android:background="@drawable/viewer_count_background" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:includeFontPadding="false" android:drawablePadding="@dimen/default_margin_half" android:paddingEnd="@dimen/default_margin" app:drawableStartCompat="@drawable/ic_user_placeholder" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/stream_uptime_label" app:layout_constraintTop_toTopOf="parent" app:layout_goneMarginStart="@dimen/default_margin_quarter" style="@style/LiveIndicatorText" />
-     <ImageView android:id="@id/fullscreen_button" android:background="?selectableItemBackgroundBorderless" android:padding="@dimen/default_margin" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/default_margin_half" android:layout_marginRight="@dimen/default_margin_half" android:src="@drawable/ic_fullscreen_enter" android:scaleType="fitCenter" android:contentDescription="@string/fullscreen_talkback" android:layout_marginHorizontal="@dimen/default_margin_half" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/show_chat_overlay_button" app:layout_constraintTop_toTopOf="parent" app:tint="@color/white" />
+     <ImageView android:id="@id/fullscreen_button" android:background="?selectableItemBackgroundBorderless" android:padding="@dimen/default_margin" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/default_margin_half" android:layout_marginRight="@dimen/default_margin_half" android:src="@drawable/ic_fullscreen_enter" android:scaleType="fitCenter" android:contentDescription="@string/fullscreen_talkback" android:layout_marginHorizontal="@dimen/default_margin_half" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/chat_mode_button" app:layout_constraintTop_toTopOf="parent" app:tint="@color/white" />
      <ImageView android:id="@id/video_debug_info_button" android:background="?selectableItemBackgroundBorderless" android:padding="@dimen/default_margin" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/default_margin_half" android:layout_marginRight="@dimen/default_margin_half" android:src="@drawable/ic_info" android:scaleType="fitCenter" android:contentDescription="@string/fullscreen_talkback" android:layout_marginHorizontal="@dimen/default_margin_half" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/fullscreen_button" app:layout_constraintTop_toTopOf="parent" app:tint="@color/white" />
-+
 +    <ImageView
 +      android:id="@id/bttv_sleep_timer_button"
 +      android:background="?selectableItemBackgroundBorderless"
@@ -20,7 +19,6 @@ diff --git a/res/layout-v22/bottom_player_overlay_controls.xml b/res/layout-v22/
 +      android:contentDescription="@string/bttv_sleep_timer_button_descr"
 +      app:layout_constraintEnd_toStartOf="@+id/video_debug_info_button"
 +      app:tint="@color/white" />
-+
-     <ImageView android:id="@id/show_chat_overlay_button" android:background="?selectableItemBackgroundBorderless" android:padding="@dimen/default_margin" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/default_margin_half" android:layout_marginRight="@dimen/default_margin_half" android:src="@drawable/show_chat_selector" android:contentDescription="@string/show_chat" android:layout_marginHorizontal="@dimen/default_margin_half" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/rotate_button" app:layout_constraintTop_toTopOf="parent" app:tint="@color/white" />
+     <ImageView android:id="@id/chat_mode_button" android:background="?selectableItemBackgroundBorderless" android:padding="@dimen/default_margin" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/default_margin_half" android:layout_marginRight="@dimen/default_margin_half" android:contentDescription="@string/show_chat" android:layout_marginHorizontal="@dimen/default_margin_half" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/rotate_button" app:layout_constraintTop_toTopOf="parent" app:tint="@color/white" />
      <TextView android:textSize="@dimen/font_small" android:textColor="@color/white" android:gravity="center_vertical" android:layout_gravity="center_vertical" android:id="@id/player_mode_label" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="@dimen/default_margin" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/toggle_player_mode" app:layout_constraintTop_toTopOf="parent" />
      <androidx.appcompat.widget.SwitchCompat android:layout_gravity="center_vertical" android:id="@id/toggle_player_mode" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="@dimen/default_margin_large" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" app:theme="@style/SettingsSwitch" />
diff --git a/patches/sleeptimer/res.layout.bottom_player_control_overlay_widget.xml.patch b/patches/sleeptimer/res.layout.bottom_player_control_overlay_widget.xml.patch
@@ -17,6 +17,6 @@ diff --git a/res/layout/bottom_player_control_overlay_widget.xml b/res/layout/bo
 +            android:scaleType="fitCenter"
 +            android:contentDescription="@string/bttv_sleep_timer_button_descr"
 +            app:tint="@color/white" />
-         <ImageView android:id="@id/show_chat_overlay_button" android:background="?selectableItemBackgroundBorderless" android:padding="@dimen/default_margin" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/default_margin" android:src="@drawable/show_chat_selector" android:contentDescription="@string/show_chat" app:tint="@color/white" />
+         <ImageView android:id="@id/chat_mode_button" android:background="?selectableItemBackgroundBorderless" android:padding="@dimen/default_margin" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/default_margin" android:src="@drawable/show_chat_selector" android:contentDescription="@string/show_chat" app:tint="@color/white" />
          <ImageView android:id="@id/rotate_button" android:background="?selectableItemBackgroundBorderless" android:padding="@dimen/default_margin" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/default_margin" android:layout_marginRight="@dimen/default_margin_half" android:src="@drawable/ic_rotate" android:scaleType="fitCenter" android:contentDescription="@string/rotate_device" app:tint="@color/white" />
          <FrameLayout android:id="@id/subscribe_button_container" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/default_margin_half" android:layout_marginTop="@dimen/default_margin_half" android:layout_marginRight="@dimen/default_margin" android:layout_marginBottom="@dimen/default_margin" />