Merge branch 'master' into retrofit-intercept-errors

app/src/main/res/layout/layout_profile_details.xml

@@ -326,6 +326,7 @@
     <androidx.constraintlayout.widget.Barrier
         android:id="@+id/highlights_barrier"
         android:layout_width="wrap_content"
+        app:constraint_referenced_ids="mainPostCount, mainFollowers, mainFollowing"
         android:layout_height="wrap_content"
         app:barrierDirection="bottom" />
 

app/src/main/res/menu/story_menu.xml

@@ -5,13 +5,18 @@
     <item
         android:id="@+id/action_dms"
         android:icon="@drawable/ic_round_send_24"
-        android:title="@string/action_dms"
-        android:titleCondensed="@string/action_dms"
-        app:showAsAction="always" />
+        android:title="@string/reply_story"
+        android:titleCondensed="@string/reply_story"
+        app:showAsAction="never" />
+    <item
+        android:id="@+id/action_profile"
+        android:title="@string/open_profile"
+        android:titleCondensed="@string/open_profile"
+        app:showAsAction="never" />
     <item
         android:id="@+id/action_download"
         android:icon="@drawable/ic_download"
         android:title="@string/action_download"
         android:titleCondensed="@string/action_download"
-        app:showAsAction="always" />
+        app:showAsAction="never" />
 </menu>

app/src/main/res/navigation/notification_viewer_nav_graph.xml

@@ -5,24 +5,16 @@
     android:id="@+id/notification_viewer_nav_graph"
     app:startDestination="@id/notificationsViewer">
 
-    <fragment
-        android:id="@+id/notificationsViewer"
-        android:name="awais.instagrabber.fragments.NotificationsViewerFragment"
-        android:label="@string/title_notifications"
-        tools:layout="@layout/fragment_notifications_viewer">
+    <include app:graph="@navigation/profile_nav_graph" />
+
+    <action
+        android:id="@+id/action_global_profileFragment"
+        app:destination="@id/profile_nav_graph">
         <argument
-            android:name="type"
+            android:name="username"
             app:argType="string"
-            app:nullable="false"
-            android:defaultValue="notif"/>
-        <argument
-            android:name="targetId"
-            android:defaultValue="0L"
-            app:argType="long" />
-        <action
-            android:id="@+id/action_notificationsViewerFragment_to_storyViewerFragment"
-            app:destination="@id/storyViewerFragment" />
-    </fragment>
+            app:nullable="true" />
+    </action>
 
     <action
         android:id="@+id/action_global_notificationsViewerFragment"
@@ -89,4 +81,23 @@
             android:name="options"
             app:argType="awais.instagrabber.repositories.requests.StoryViewerOptions" />
     </fragment>
+
+    <fragment
+        android:id="@+id/notificationsViewer"
+        android:name="awais.instagrabber.fragments.NotificationsViewerFragment"
+        android:label="@string/title_notifications"
+        tools:layout="@layout/fragment_notifications_viewer">
+        <argument
+            android:name="type"
+            app:argType="string"
+            app:nullable="false"
+            android:defaultValue="notif"/>
+        <argument
+            android:name="targetId"
+            android:defaultValue="0L"
+            app:argType="long" />
+        <action
+            android:id="@+id/action_notifications_to_story"
+            app:destination="@id/storyViewerFragment" />
+    </fragment>
 </navigation>

app/src/main/res/navigation/profile_nav_graph.xml

@@ -71,11 +71,9 @@
             app:argType="long" />
     </action>
 
-    <include app:graph="@navigation/notification_viewer_nav_graph" />
-
     <action
         android:id="@+id/action_global_notificationsViewerFragment"
-        app:destination="@id/notification_viewer_nav_graph">
+        app:destination="@id/notificationsViewer">
         <argument
             android:name="type"
             app:argType="string"
@@ -86,6 +84,22 @@
             app:argType="long" />
     </action>
 
+    <fragment
+        android:id="@+id/notificationsViewer"
+        android:name="awais.instagrabber.fragments.NotificationsViewerFragment"
+        android:label="@string/title_notifications"
+        tools:layout="@layout/fragment_notifications_viewer">
+        <argument
+            android:name="type"
+            app:argType="string"
+            app:nullable="false"
+            android:defaultValue="notif"/>
+        <argument
+            android:name="targetId"
+            android:defaultValue="0L"
+            app:argType="long" />
+    </fragment>
+
     <include app:graph="@navigation/saved_nav_graph" />
 
     <action

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

@@ -23,6 +23,7 @@
     <string name="update_check">Cerca actualitzacions a l\'inici</string>
     <string name="flag_secure">Block screenshots &amp; app preview</string>
     <string name="download_user_folder">Descarrega les publicacions a carpetes de nom d\'usuari</string>
+    <string name="download_prepend_username">Prepend Username to Filename</string>
     <string name="mark_as_seen_setting">Marca les històries com a vistes després de visualitzar-es</string>
     <string name="mark_as_seen_setting_summary">L\'autor de la història sabrà que l\'has vista</string>
     <string name="dm_mark_as_seen_setting">Marca els missatges com a vists després de visualitzar-los</string>

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

@@ -23,6 +23,7 @@
     <string name="update_check">Zkontrolovat aktualizace při spuštění</string>
     <string name="flag_secure">Block screenshots &amp; app preview</string>
     <string name="download_user_folder">Stáhnout příspěvky do složek s uživatelským jménem</string>
+    <string name="download_prepend_username">Prepend Username to Filename</string>
     <string name="mark_as_seen_setting">Označit příběhy po zhlédnutí jako zobrazené</string>
     <string name="mark_as_seen_setting_summary">Autor příběhu bude vědět, že jsi si ho zobrazili</string>
     <string name="dm_mark_as_seen_setting">Označovat přímou zprávu po zobrazení jako zobrazenou</string>

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

@@ -23,6 +23,7 @@
     <string name="update_check">Beim Start auf Aktualisierungen prüfen</string>
     <string name="flag_secure">Block screenshots &amp; app preview</string>
     <string name="download_user_folder">Beiträge in Benutzernamen-Ordner herunterladen</string>
+    <string name="download_prepend_username">Prepend Username to Filename</string>
     <string name="mark_as_seen_setting">Stories nach dem Ansehen als gesehen markieren</string>
     <string name="mark_as_seen_setting_summary">Die Person wird wissen, dass du dir die Story angesehen hast</string>
     <string name="dm_mark_as_seen_setting">Direktnachrichten nach dem Ansehen als gesehen markieren</string>

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

@@ -23,6 +23,7 @@
     <string name="update_check">Έλεγχος για ενημερώσεις στο ξεκίνημα</string>
     <string name="flag_secure">Block screenshots &amp; app preview</string>
     <string name="download_user_folder">Λήψη δημοσίευσης στους φακέλους με ονόματα χρηστών</string>
+    <string name="download_prepend_username">Prepend Username to Filename</string>
     <string name="mark_as_seen_setting">Επισήμανση ιστοριών ως προβληθέντων μετά την προβολή</string>
     <string name="mark_as_seen_setting_summary">Ο συντάκτης της ιστορίας θα ξέρει ότι την προβάλατε</string>
     <string name="dm_mark_as_seen_setting">Σήμανση ΠΜ ως αναγνωσμένου μετά την προβολή</string>

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

@@ -23,6 +23,7 @@
     <string name="update_check">Buscar actualizaciones al inicio</string>
     <string name="flag_secure">Bloquea capturas de pantalla &amp; vista previa de aplicaciones</string>
     <string name="download_user_folder">Usar subcarpetas con el nombre de usuario</string>
+    <string name="download_prepend_username">Prepend Username to Filename</string>
     <string name="mark_as_seen_setting">Marcar historias como vistas después de verlas</string>
     <string name="mark_as_seen_setting_summary">El autor de la historia sabrá que lo has visto</string>
     <string name="dm_mark_as_seen_setting">Marcar Mensaje Directo como visto después de verlo</string>

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

@@ -23,6 +23,7 @@
     <string name="update_check">Bilatu eguneratzeak abioan</string>
     <string name="flag_secure">Block screenshots &amp; app preview</string>
     <string name="download_user_folder">Deskargatu bidalketak erabiltzaile-izena duten karpetetara</string>
+    <string name="download_prepend_username">Prepend Username to Filename</string>
     <string name="mark_as_seen_setting">Markatu istorioak ikusita gisa ikusi ondoren</string>
     <string name="mark_as_seen_setting_summary">Istorioaren egileak ikusi duzula jakingo du</string>
     <string name="dm_mark_as_seen_setting">Markatu MZ ikusita gisa ikusi ondoren</string>

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

@@ -23,6 +23,7 @@
     <string name="update_check">بررسی بروزرسانی هنگام آغاز برنامه</string>
     <string name="flag_secure">Block screenshots &amp; app preview</string>
     <string name="download_user_folder">بارگیری پست ها در پوشه های به نام کاربر</string>
+    <string name="download_prepend_username">Prepend Username to Filename</string>
     <string name="mark_as_seen_setting">نشان کرد استوری ها به عنوان دیده شده بعد از دیدن</string>
     <string name="mark_as_seen_setting_summary">نویسنده استوری می داند که شما آن را دیده اید</string>
     <string name="dm_mark_as_seen_setting">نشان کردن پیام خصوصی بعنوان دیده شده بعد از دیدن</string>

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

@@ -23,6 +23,7 @@
     <string name="update_check">Rechercher les mises à jours au démarrage</string>
     <string name="flag_secure">Bloquer les captures d\'écran &amp; l\'aperçu de l\'application</string>
     <string name="download_user_folder">Télécharger les messages dans les dossiers des noms d\'utilisateurs</string>
+    <string name="download_prepend_username">Prepend Username to Filename</string>
     <string name="mark_as_seen_setting">Marquer les stories comme vues après consultation</string>
     <string name="mark_as_seen_setting_summary">L\'auteur de la story saura que vous l\'avez vue</string>
     <string name="dm_mark_as_seen_setting">Marquer les messages privés comme vus après consultation</string>

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

@@ -23,6 +23,7 @@
     <string name="update_check">खुलने पर अपडेट के लिए जाँच करें</string>
     <string name="flag_secure">Block screenshots &amp; app preview</string>
     <string name="download_user_folder">पोस्ट को ब्यबहारकारी के नाम पर किये फोल्डरस में रखें</string>
+    <string name="download_prepend_username">Prepend Username to Filename</string>
     <string name="mark_as_seen_setting">स्टोरि को दिखने के बाद \"दिखा गया\" दिखादें</string>
     <string name="mark_as_seen_setting_summary">सटोरि के लेखक जानेगा कि तुम देखे हो इसको</string>
     <string name="dm_mark_as_seen_setting">तुम देखने के बाद सीधा संदेश को \"दिखागया\" लिखा जाएगा</string>

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

@@ -23,6 +23,7 @@
     <string name="update_check">Cek pembaruan saat memulai</string>
     <string name="flag_secure">Block screenshots &amp; app preview</string>
     <string name="download_user_folder">Unduh kiriman ke folder nama pengguna</string>
+    <string name="download_prepend_username">Prepend Username to Filename</string>
     <string name="mark_as_seen_setting">Tandai cerita dibaca setelah melihat</string>
     <string name="mark_as_seen_setting_summary">Pembuat cerita akan tahu Anda melihatnya</string>
     <string name="dm_mark_as_seen_setting">Tandai DM dibaca setelah melihat</string>

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

@@ -23,6 +23,7 @@
     <string name="update_check">Verifica per aggiornamenti all\'avvio</string>
     <string name="flag_secure">Blocca screenshot &amp; anteprima app</string>
     <string name="download_user_folder">Scarica i post nelle cartelle del nome utente</string>
+    <string name="download_prepend_username">Prepend Username to Filename</string>
     <string name="mark_as_seen_setting">Segna le storie come viste dopo la visualizzazione</string>
     <string name="mark_as_seen_setting_summary">L\'autore della storia saprà che l\'hai visualizzata</string>
     <string name="dm_mark_as_seen_setting">Segna il DM come visto dopo la visualizzazione</string>

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

@@ -23,6 +23,7 @@
     <string name="update_check">起動時にアップデートを確認</string>
     <string name="flag_secure">Block screenshots &amp; app preview</string>
     <string name="download_user_folder">ユーザ名のフォルダに投稿をダウンロード</string>
+    <string name="download_prepend_username">Prepend Username to Filename</string>
     <string name="mark_as_seen_setting">ストーリーズを表示後に既読にする</string>
     <string name="mark_as_seen_setting_summary">ストーリーの作成者は、あなたが閲覧したことを知ることができます。</string>
     <string name="dm_mark_as_seen_setting">DMを表示後に既読にする</string>

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

@@ -23,6 +23,7 @@
     <string name="update_check">Check for updates at startup</string>
     <string name="flag_secure">Block screenshots &amp; app preview</string>
     <string name="download_user_folder">Download posts to username folders</string>
+    <string name="download_prepend_username">Prepend Username to Filename</string>
     <string name="mark_as_seen_setting">Mark stories as seen after viewing</string>
     <string name="mark_as_seen_setting_summary">Story author will know you viewed it</string>
     <string name="dm_mark_as_seen_setting">Mark DM as seen after viewing</string>

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

@@ -23,6 +23,7 @@
     <string name="update_check">Провери за ажурирање</string>
     <string name="flag_secure">Block screenshots &amp; app preview</string>
     <string name="download_user_folder">Превземи објави во папката со кориснички имиња</string>
+    <string name="download_prepend_username">Prepend Username to Filename</string>
     <string name="mark_as_seen_setting">Означи ги приказните како видени</string>
     <string name="mark_as_seen_setting_summary">Авторот на приказната ќе знае дека сте ја погледнале приказната</string>
     <string name="dm_mark_as_seen_setting">Означи порака како видена</string>

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

@@ -23,6 +23,7 @@
     <string name="update_check">Controleer op updates bij het opstarten</string>
     <string name="flag_secure">Block screenshots &amp; app preview</string>
     <string name="download_user_folder">Download berichten naar gebruikersnaam mappen</string>
+    <string name="download_prepend_username">Prepend Username to Filename</string>
     <string name="mark_as_seen_setting">Markeer verhalen als gelezen na bekijken</string>
     <string name="mark_as_seen_setting_summary">Verhaalmaker zal het weten als je het bekeken hebt</string>
     <string name="dm_mark_as_seen_setting">Markeer privéberichten als gelezen na bekijken</string>

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

@@ -23,6 +23,7 @@
     <string name="update_check">ଖୋଲିବା ସମୟରେ ଅପଡେଟ ପାଇଁ ଯାଞ୍ଚ କରନ୍ତୁ</string>
     <string name="flag_secure">Block screenshots &amp; app preview</string>
     <string name="download_user_folder">ଡାଉନଲୋଡ ପୋଷ୍ଟକୁ ବ୍ୟବହାରକାରୀଙ୍କ ନାମରେ ହୋଇଥିବା ସ୍ଥାନ ରେ ରଖ</string>
+    <string name="download_prepend_username">Prepend Username to Filename</string>
     <string name="mark_as_seen_setting">କାହାଣୀଗୁଡିକ ଦେଖିବା ପରେ \'ଦେଖାଗଲା\' ଚିହ୍ନିତ କରନ୍ତୁ |</string>
     <string name="mark_as_seen_setting_summary">କାହାଣୀ ପ୍ରେରକ ଜାଣିବେ ତୁମେ ଏହାକୁ ଦେଖିଛ</string>
     <string name="dm_mark_as_seen_setting">ବାର୍ତା ଦେଖିବା ପରେ \'ଦେଖାଗଲା\' ଚିହ୍ନିତ କରନ୍ତୁ |</string>

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

@@ -23,6 +23,7 @@
     <string name="update_check">Sprawdź aktualizacje przy starcie</string>
     <string name="flag_secure">Blokuj zrzuty ekranu &amp; podgląd aplikacji</string>
     <string name="download_user_folder">Pobierz posty do folderów o nazwie użytkownika</string>
+    <string name="download_prepend_username">Prepend Username to Filename</string>
     <string name="mark_as_seen_setting">Oznacz relacje jako widoczne po wyświetleniu</string>
     <string name="mark_as_seen_setting_summary">Autor relacji będzie widział, że to wyświetliłeś</string>
     <string name="dm_mark_as_seen_setting">Oznacz wiadomość jako przeczytaną</string>

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

@@ -23,6 +23,7 @@
     <string name="update_check">Verificar se há atualizações ao iniciar</string>
     <string name="flag_secure">Block screenshots &amp; app preview</string>
     <string name="download_user_folder">Baixar publicações para pastas com o nome de usuário</string>
+    <string name="download_prepend_username">Prepend Username to Filename</string>
     <string name="mark_as_seen_setting">Marcar stories como vistos após a visualização</string>
     <string name="mark_as_seen_setting_summary">O autor do story saberá que você viu</string>
     <string name="dm_mark_as_seen_setting">Marcar DM como vista após a visualização</string>

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

@@ -23,6 +23,7 @@
     <string name="update_check">Проверять наличие обновлений при запуске</string>
     <string name="flag_secure">Block screenshots &amp; app preview</string>
     <string name="download_user_folder">Скачать публикации в папки с именем пользователя</string>
+    <string name="download_prepend_username">Prepend Username to Filename</string>
     <string name="mark_as_seen_setting">Отметить истории как увиденные после просмотра</string>
     <string name="mark_as_seen_setting_summary">Автор истории узнает, что вы просмотрели её</string>
     <string name="dm_mark_as_seen_setting">Отметить ЛС как увиденные после просмотра</string>

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

@@ -23,6 +23,7 @@
     <string name="update_check">Kontrolovať aktualizácie pri štarte</string>
     <string name="flag_secure">Block screenshots &amp; app preview</string>
     <string name="download_user_folder">Ukľadať do priečinkov podľa mena</string>
+    <string name="download_prepend_username">Prepend Username to Filename</string>
     <string name="mark_as_seen_setting">Označiť príbehy po videní ako videné</string>
     <string name="mark_as_seen_setting_summary">Autor príbehu bude vedieť že ste ho videli</string>
     <string name="dm_mark_as_seen_setting">Po prečítaní, označiť správu ako prečítanú</string>

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

@@ -23,6 +23,7 @@
     <string name="update_check">Güncellemeleri başlangıçta kontrol et</string>
     <string name="flag_secure">Block screenshots &amp; app preview</string>
     <string name="download_user_folder">İndirmeleri kullanıcı adından oluşan bir alt klasörün içine yap</string>
+    <string name="download_prepend_username">Prepend Username to Filename</string>
     <string name="mark_as_seen_setting">Hikayeleri gördükten sonra görüldü olarak işaretle</string>
     <string name="mark_as_seen_setting_summary">Hikayeyi paylaşan gördüğünüzü bilecek</string>
     <string name="dm_mark_as_seen_setting">DM\'leri gördükten sonra görüldü olarak işaretle</string>

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

@@ -23,6 +23,7 @@
     <string name="update_check">Kiểm tra cập nhật khi khởi động</string>
     <string name="flag_secure">Block screenshots &amp; app preview</string>
     <string name="download_user_folder">Tải bài viết xuống theo thư mục tên người dùng trong Downloads</string>
+    <string name="download_prepend_username">Prepend Username to Filename</string>
     <string name="mark_as_seen_setting">Đánh dấu story là đã xem sau khi xem</string>
     <string name="mark_as_seen_setting_summary">Người đăng story sẽ biết bạn đã xem nó</string>
     <string name="dm_mark_as_seen_setting">Đánh dấu DM là đã xem sau khi xem</string>

app/src/main/res/values-zh-rCN/strings.xml

@@ -23,6 +23,7 @@
     <string name="update_check">启动时检查更新</string>
     <string name="flag_secure">屏蔽截图及应用预览</string>
     <string name="download_user_folder">下载帖子到用户名文件夹</string>
+    <string name="download_prepend_username">Prepend Username to Filename</string>
     <string name="mark_as_seen_setting">查看快拍后将其标记为已读</string>
     <string name="mark_as_seen_setting_summary">快拍作者会知道您已看过</string>
     <string name="dm_mark_as_seen_setting">查看私信后将其标记为已读</string>

app/src/main/res/values-zh-rTW/strings.xml

@@ -23,6 +23,7 @@
     <string name="update_check">啟動時檢查更新</string>
     <string name="flag_secure">Block screenshots &amp; app preview</string>
     <string name="download_user_folder">將貼文下載到用戶名資料夾</string>
+    <string name="download_prepend_username">Prepend Username to Filename</string>
     <string name="mark_as_seen_setting">檢視完限時動態後標記為已讀</string>
     <string name="mark_as_seen_setting_summary">限時動態的作者會知道您已查看了此限時動態</string>
     <string name="dm_mark_as_seen_setting">檢視完訊息後標記為已讀</string>

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

@@ -26,8 +26,10 @@
     <string name="update_check">Check for updates at startup</string>
     <string name="flag_secure">Block screenshots &amp; app preview</string>
     <string name="download_user_folder">Download posts to username folders</string>
+    <string name="download_prepend_username">Prepend Username to Filename</string>
     <string name="mark_as_seen_setting">Mark stories as seen after viewing</string>
     <string name="mark_as_seen_setting_summary">Story author will know you viewed it</string>
+    <string name="hide_muted_reels_setting">Hide muted stories from feed</string>
     <string name="dm_mark_as_seen_setting">Mark DM as seen after viewing</string>
     <string name="dm_mark_as_seen_setting_summary">Other members will know you viewed it</string>
     <string name="activity_setting">Enable activity notifications</string>
@@ -483,6 +485,8 @@
     <string name="crash_report_title">Select an email app to send crash logs</string>
     <string name="not_found">Not found!</string>
     <string name="rate_limit">Your IP has been rate limited by Instagram. Wait for an hour and try again.</string>
+    <string name="skip_update">Skip this update</string>
+    <string name="on_latest_version">You\'re already on the latest version</string>
     <string name="tab_order">Screen order</string>
     <string name="other_tabs">Other tabs</string>
     <string name="tab_order_start_next_launch">The tab order will be reflected on next launch</string>