fix merge conflict

app/src/main/res/values/attrs.xml

@@ -41,6 +41,7 @@
     <attr name="ic_list" format="reference"/>
     <attr name="ic_grid" format="reference"/>
     <attr name="ic_delete" format="reference"/>
+    <attr name="ic_settings_update" format="reference"/>
 
     <!-- Can't refer to colors directly in drawable's xml-->
     <attr name="toolbar_shadow_drawable" format="reference"/>

app/src/main/res/values/settings_keys.xml

@@ -222,6 +222,10 @@
         <item>@string/always_ask_open_action_key</item>
     </string-array>
 
+    <!-- Updates -->
+    <string name="update_app_key" translatable="false">update_app_key</string>
+    <string name="update_pref_screen_key" translatable="false">update_pref_screen_key</string>
+
     <!-- alternatively, load these from some local android data store -->
     <string-array name="language_codes" translatable="false">
         <item>af</item>

app/src/main/res/values/strings.xml

@@ -112,6 +112,7 @@
     <string name="settings_category_appearance_title">Appearance</string>
     <string name="settings_category_other_title">Other</string>
     <string name="settings_category_debug_title">Debug</string>
+    <string name="settings_category_updates_title">Updates</string>
     <string name="background_player_playing_toast">Playing in background</string>
     <string name="popup_playing_toast">Playing in popup mode</string>
     <string name="background_player_append">Queued on background player</string>
@@ -153,6 +154,10 @@
     <string name="notification_channel_name">NewPipe Notification</string>
     <string name="notification_channel_description">Notifications for NewPipe background and popup players</string>
 
+    <string name="app_update_notification_channel_id" translatable="false">newpipeAppUpdate</string>
+    <string name="app_update_notification_channel_name">App Update Notification</string>
+    <string name="app_update_notification_channel_description">Notifications for new NewPipe version</string>
+
     <string name="unknown_content">[Unknown]</string>
 
     <string name="toggle_orientation">Toggle Orientation</string>
@@ -513,6 +518,10 @@
         <item>144p</item>
     </string-array>
 
+    <!-- Updates Settings -->
+    <string name="updates_setting_title">Updates</string>
+    <string name="updates_setting_description">Show a notification to prompt app update when a new version is available</string>
+
     <!-- Minimize to exit action -->
     <string name="minimize_on_exit_title">Minimize on app switch</string>
     <string name="minimize_on_exit_summary">Action when switching to other app from main video player — %s</string>
@@ -525,16 +534,21 @@
 	  <string name="auto">Auto</string>
     <string name="switch_view">Switch View</string>
 
+    <!-- App update notification -->
+    <string name="app_update_notification_content_title">NewPipe Update Available!</string>
+    <string name="app_update_notification_content_text">Tap to download</string>
+
+
 
     <string name="missions_header_finished">Finished</string>
     <string name="missions_header_pending">In queue</string>
-    
+
     <string name="paused">paused</string>
     <string name="queued">queued</string>
     <string name="post_processing">post-processing</string>
-    
+
     <string name="enqueue">Queue</string>
-    
+
     <string name="permission_denied">Action denied by the system</string>
 
     <!-- download notifications -->

app/src/main/res/values/styles.xml

@@ -56,6 +56,7 @@
         <item name="ic_list">@drawable/ic_list_black_24dp</item>
         <item name="ic_grid">@drawable/ic_grid_black_24dp</item>
         <item name="ic_delete">@drawable/ic_delete_black_24dp</item>
+        <item name="ic_settings_update">@drawable/ic_settings_update_black</item>
 
         <item name="separator_color">@color/light_separator_color</item>
         <item name="contrast_background_color">@color/light_contrast_background_color</item>
@@ -118,6 +119,7 @@
         <item name="ic_list">@drawable/ic_list_white_24dp</item>
         <item name="ic_grid">@drawable/ic_grid_white_24dp</item>
         <item name="ic_delete">@drawable/ic_delete_white_24dp</item>
+        <item name="ic_settings_update">@drawable/ic_settings_update_white</item>
 
         <item name="separator_color">@color/dark_separator_color</item>
         <item name="contrast_background_color">@color/dark_contrast_background_color</item>