Merge remote-tracking branch 'upstream/dev' into dev

.github/workflows/pr.yml

@@ -3,6 +3,9 @@ name: Pull request
 on:
   pull_request:
     types: [opened, reopened, synchronize]
+    paths-ignore:
+      - '**.md'
+      - '**.xml'
 
 jobs:
   check:

TMessagesProj/src/main/AndroidManifest.xml

@@ -216,6 +216,70 @@
             <meta-data android:name="android.app.shortcuts" android:resource="@xml/shortcuts" />
         </activity-alias>
 
+        <activity-alias
+            android:enabled="false"
+            android:name="org.telegram.messenger.NielloIcon"
+            android:targetActivity="org.telegram.ui.LaunchActivity"
+            android:icon="@mipmap/ic_launcher_nagram_block_round_niello"
+            android:roundIcon="@mipmap/ic_launcher_nagram_block_round_niello_round"
+            android:exported="true">
+
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.MULTIWINDOW_LAUNCHER" />
+            </intent-filter>
+            <meta-data android:name="android.app.shortcuts" android:resource="@xml/shortcuts" />
+        </activity-alias>
+
+        <activity-alias
+            android:enabled="false"
+            android:name="org.telegram.messenger.BlueIcon"
+            android:targetActivity="org.telegram.ui.LaunchActivity"
+            android:icon="@mipmap/ic_launcher_nagram_block_round"
+            android:roundIcon="@mipmap/ic_launcher_nagram_block_round_round"
+            android:exported="true">
+
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.MULTIWINDOW_LAUNCHER" />
+            </intent-filter>
+            <meta-data android:name="android.app.shortcuts" android:resource="@xml/shortcuts" />
+        </activity-alias>
+
+        <activity-alias
+            android:enabled="false"
+            android:name="org.telegram.messenger.DarkBlueIcon"
+            android:targetActivity="org.telegram.ui.LaunchActivity"
+            android:icon="@mipmap/ic_launcher_nagram_block_round_blue"
+            android:roundIcon="@mipmap/ic_launcher_nagram_block_round_blue_round"
+            android:exported="true">
+
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.MULTIWINDOW_LAUNCHER" />
+            </intent-filter>
+            <meta-data android:name="android.app.shortcuts" android:resource="@xml/shortcuts" />
+        </activity-alias>
+
+        <activity-alias
+            android:enabled="false"
+            android:name="org.telegram.messenger.BlurBlueIcon"
+            android:targetActivity="org.telegram.ui.LaunchActivity"
+            android:icon="@mipmap/ic_launcher_nagram_blue"
+            android:roundIcon="@mipmap/ic_launcher_nagram_blue_round"
+            android:exported="true">
+
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.MULTIWINDOW_LAUNCHER" />
+            </intent-filter>
+            <meta-data android:name="android.app.shortcuts" android:resource="@xml/shortcuts" />
+        </activity-alias>
+
         <activity-alias
             android:enabled="false"
             android:name="org.telegram.messenger.PremiumIcon"

TMessagesProj/src/main/java/org/telegram/messenger/MessagesController.java

@@ -20664,7 +20664,8 @@ public void setSavedViewAs(boolean chats) {
     }
 
     public boolean isStoryQualityFullOnAccount() {
-        return getUserConfig().isPremium() && storyQualityFull;
+        return storyQualityFull;
+//        return getUserConfig().isPremium() && storyQualityFull;
     }
 
     public static boolean isStoryQualityFull() {

TMessagesProj/src/main/java/org/telegram/ui/LauncherIconController.java

@@ -39,6 +39,10 @@ public enum LauncherIcon {
         COLORFUL("ColorfulIcon", R.mipmap.icon_background_colorful, R.mipmap.icon_foreground_colorful, R.string.AppIconColorful),
         DARKGREEN("DarkGreenIcon", R.mipmap.icon_background_darkgreen, R.mipmap.icon_foreground_darkgreen, R.string.AppIconDarkGreen),
         NEON("NeonIcon", R.mipmap.icon_background_neon, R.mipmap.icon_foreground_neon, R.string.AppIconNeon),
+        NIELLO("NielloIcon", R.mipmap.ic_launcher_nagram_block_round_niello_background, R.mipmap.ic_launcher_nagram_block_round_niello_foreground, R.string.AppIconNiello),
+        BLUE("BlueIcon", R.mipmap.ic_launcher_nagram_block_round_background, R.mipmap.ic_launcher_nagram_block_round_foreground, R.string.AppIconBlue),
+        DARKBLUE("DarkBlueIcon", R.mipmap.ic_launcher_nagram_block_round_blue_background, R.mipmap.ic_launcher_nagram_block_round_blue_foreground, R.string.AppIconDarkBlue),
+        BLURBLUE("BlurBlueIcon", R.mipmap.ic_launcher_nagram_blue_background, R.mipmap.ic_launcher_nagram_blue_foreground, R.string.AppIconBlurBlue),
         NOX("PremiumIcon", R.drawable.icon_3_background_sa, R.mipmap.icon_3_foreground_sa, R.string.AppIconPremium);
 
         public final String key;

TMessagesProj/src/main/java/org/telegram/ui/Stories/PeerStoriesView.java

@@ -1824,7 +1824,7 @@ public void setColorFilter(ColorFilter colorFilter) {
 
     private void createQualityItem(ActionBarPopupWindow.ActionBarPopupWindowLayout popupLayout) {
         final boolean qualityFull = MessagesController.getInstance(currentAccount).storyQualityFull;
-        if (UserConfig.getInstance(currentAccount).isPremium()) {
+        if (UserConfig.getInstance(currentAccount).isPremium() || true) {
             ActionBarMenuItem.addItem(popupLayout, qualityFull ? R.drawable.menu_quality_sd : R.drawable.menu_quality_hd, LocaleController.getString(qualityFull ? R.string.StoryQualityDecrease : R.string.StoryQualityIncrease), false, resourcesProvider).setOnClickListener(v -> {
                 final boolean newQualityFull = !qualityFull;
                 MessagesController.getInstance(currentAccount).setStoryQuality(newQualityFull);

TMessagesProj/src/main/res/drawable-v24/ic_launcher_nagram_block_round_niello_foreground.xml

@@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="512"
+    android:viewportHeight="512">
+  <group android:scaleX="0.55"
+      android:scaleY="0.55"
+      android:translateX="115.2"
+      android:translateY="115.2">
+    <group>
+      <clip-path
+          android:pathData="M0,0h512v512h-512z"/>
+      <path
+          android:pathData="M285.75,373.46a36,36 0,0 1,-21.52 -46.14l60.88,-167.26a36,36 0,0 1,46.14 -21.52,36 36,0 0,1 21.52,46.14l-60.88,167.27a36.02,36.02 0,0 1,-33.83 23.7A35.92,35.92 0,0 1,285.75 373.46ZM140.74,373.46a36,36 0,0 1,-21.52 -46.14l60.88,-167.26a36,36 0,0 1,46.14 -21.52,36 36,0 0,1 21.52,46.14l-60.88,167.27a36.02,36.02 0,0 1,-33.83 23.7A35.93,35.93 0,0 1,140.74 373.46ZM232.73,287.09 L265.06,198.26 279.07,227 246.74,315.83Z">
+        <aapt:attr name="android:fillColor">
+          <gradient 
+              android:startX="191.27"
+              android:startY="171.07"
+              android:endX="318.49"
+              android:endY="356.7"
+              android:type="linear">
+            <item android:offset="0" android:color="#FFFFCC0F"/>
+            <item android:offset="1" android:color="#FFFFA51F"/>
+          </gradient>
+        </aapt:attr>
+      </path>
+    </group>
+  </group>
+</vector>

TMessagesProj/src/main/res/drawable/ic_launcher_nagram_block_round_blue_foreground.xml

@@ -0,0 +1,43 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="512"
+    android:viewportHeight="512">
+  <group android:scaleX="0.55"
+      android:scaleY="0.55"
+      android:translateX="115.2"
+      android:translateY="115.2">
+    <group>
+      <clip-path
+          android:pathData="M0,0h512v512h-512z"/>
+      <path
+          android:pathData="M256.14,157.17L260.53,166.16L328.04,304.57L332.42,313.56L323.43,317.94L262.31,347.75L253.33,352.14L248.94,343.15L181.43,204.73L177.05,195.75L186.04,191.36L247.15,161.55L256.14,157.17Z"
+          android:fillColor="#fff"
+          android:strokeColor="#00000000"/>
+      <path
+          android:pathData="M257.93,338.77L319.05,308.96L251.54,170.54L190.42,200.35L257.93,338.77M248.72,365.51L163.68,191.14L260.75,143.8L345.79,318.17L248.72,365.51Z"
+          android:fillColor="#0095ff"
+          android:strokeColor="#00000000"/>
+      <path
+          android:pathData="M226.25,138.54L226.25,138.54A36,36 64.52,0 1,247.76 184.68L186.88,351.94A36,36 58.44,0 1,140.74 373.46L140.74,373.46A36,36 58.44,0 1,119.22 327.32L180.1,160.05A36,36 64.52,0 1,226.25 138.54z"
+          android:strokeWidth="20"
+          android:fillColor="#fff"
+          android:strokeColor="#00000000"/>
+      <path
+          android:pathData="M229.67,129.14L229.67,129.14A46,46 55.09,0 1,257.16 188.1L196.28,355.36A46,46 0,0 1,137.32 382.86L137.32,382.86A46,46 0,0 1,109.83 323.9L170.71,156.63A46,46 55.09,0 1,229.67 129.14z"
+          android:strokeWidth="20"
+          android:fillColor="#00000000"
+          android:strokeColor="#0095ff"/>
+      <path
+          android:pathData="M371.26,138.54L371.26,138.54A36,36 53.79,0 1,392.77 184.68L331.89,351.94A36,36 58.44,0 1,285.75 373.46L285.75,373.46A36,36 58.44,0 1,264.24 327.32L325.12,160.05A36,36 53.79,0 1,371.26 138.54z"
+          android:strokeWidth="20"
+          android:fillColor="#fff"
+          android:strokeColor="#00000000"/>
+      <path
+          android:pathData="M374.68,129.14L374.68,129.14A46,46 120.56,0 1,402.17 188.1L341.29,355.36A46,46 0,0 1,282.33 382.86L282.33,382.86A46,46 0,0 1,254.84 323.9L315.72,156.63A46,46 120.56,0 1,374.68 129.14z"
+          android:strokeWidth="20"
+          android:fillColor="#00000000"
+          android:strokeColor="#0095ff"/>
+    </group>
+  </group>
+</vector>

TMessagesProj/src/main/res/drawable/ic_launcher_nagram_block_round_foreground.xml

@@ -0,0 +1,43 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="512"
+    android:viewportHeight="512">
+  <group android:scaleX="0.55"
+      android:scaleY="0.55"
+      android:translateX="115.2"
+      android:translateY="115.2">
+    <group>
+      <clip-path
+          android:pathData="M0,0h512v512h-512z"/>
+      <path
+          android:pathData="M256.14,157.17L260.53,166.16L328.04,304.57L332.42,313.56L323.43,317.94L262.31,347.75L253.33,352.14L248.94,343.15L181.43,204.73L177.05,195.75L186.04,191.36L247.15,161.55L256.14,157.17Z"
+          android:fillColor="#0095ff"
+          android:strokeColor="#00000000"/>
+      <path
+          android:pathData="M257.93,338.77L319.05,308.96L251.54,170.54L190.42,200.35L257.93,338.77M248.72,365.51L163.68,191.14L260.75,143.8L345.79,318.17L248.72,365.51Z"
+          android:fillColor="#fff"
+          android:strokeColor="#00000000"/>
+      <path
+          android:pathData="M226.25,138.54L226.25,138.54A36,36 64.52,0 1,247.76 184.68L186.88,351.94A36,36 58.44,0 1,140.74 373.46L140.74,373.46A36,36 58.44,0 1,119.22 327.32L180.1,160.05A36,36 64.52,0 1,226.25 138.54z"
+          android:strokeWidth="20"
+          android:fillColor="#0095ff"
+          android:strokeColor="#00000000"/>
+      <path
+          android:pathData="M229.67,129.14L229.67,129.14A46,46 55.09,0 1,257.16 188.1L196.28,355.36A46,46 0,0 1,137.32 382.86L137.32,382.86A46,46 0,0 1,109.83 323.9L170.71,156.63A46,46 55.09,0 1,229.67 129.14z"
+          android:strokeWidth="20"
+          android:fillColor="#00000000"
+          android:strokeColor="#fff"/>
+      <path
+          android:pathData="M371.26,138.54L371.26,138.54A36,36 53.79,0 1,392.77 184.68L331.89,351.94A36,36 58.44,0 1,285.75 373.46L285.75,373.46A36,36 58.44,0 1,264.24 327.32L325.12,160.05A36,36 53.79,0 1,371.26 138.54z"
+          android:strokeWidth="20"
+          android:fillColor="#0095ff"
+          android:strokeColor="#00000000"/>
+      <path
+          android:pathData="M374.68,129.14L374.68,129.14A46,46 120.56,0 1,402.17 188.1L341.29,355.36A46,46 0,0 1,282.33 382.86L282.33,382.86A46,46 0,0 1,254.84 323.9L315.72,156.63A46,46 120.56,0 1,374.68 129.14z"
+          android:strokeWidth="20"
+          android:fillColor="#00000000"
+          android:strokeColor="#fff"/>
+    </group>
+  </group>
+</vector>

TMessagesProj/src/main/res/mipmap-anydpi-v26/ic_launcher_nagram.xml

@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_nagram_background"/>
     <foreground android:drawable="@drawable/ic_launcher_nagram_foreground"/>
+    <monochrome android:drawable="@drawable/ic_launcher_nagram_foreground"/>
 </adaptive-icon>

TMessagesProj/src/main/res/mipmap-anydpi-v26/ic_launcher_nagram_block_round.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@mipmap/ic_launcher_nagram_block_round_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_nagram_block_round_foreground"/>
+    <monochrome android:drawable="@drawable/ic_launcher_nagram_block_round_foreground"/>
+</adaptive-icon>

TMessagesProj/src/main/res/mipmap-anydpi-v26/ic_launcher_nagram_block_round_blue.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@mipmap/ic_launcher_nagram_block_round_blue_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_nagram_block_round_blue_foreground"/>
+    <monochrome android:drawable="@drawable/ic_launcher_nagram_block_round_blue_foreground"/>
+</adaptive-icon>

TMessagesProj/src/main/res/mipmap-anydpi-v26/ic_launcher_nagram_block_round_blue_round.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@mipmap/ic_launcher_nagram_block_round_blue_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_nagram_block_round_blue_foreground"/>
+    <monochrome android:drawable="@drawable/ic_launcher_nagram_block_round_blue_foreground"/>
+</adaptive-icon>

TMessagesProj/src/main/res/mipmap-anydpi-v26/ic_launcher_nagram_block_round_niello.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@mipmap/ic_launcher_nagram_block_round_niello_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_nagram_block_round_niello_foreground"/>
+    <monochrome android:drawable="@drawable/ic_launcher_nagram_block_round_niello_foreground"/>
+</adaptive-icon>

TMessagesProj/src/main/res/mipmap-anydpi-v26/ic_launcher_nagram_block_round_niello_round.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@mipmap/ic_launcher_nagram_block_round_niello_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_nagram_block_round_niello_foreground"/>
+    <monochrome android:drawable="@drawable/ic_launcher_nagram_block_round_niello_foreground"/>
+</adaptive-icon>

TMessagesProj/src/main/res/mipmap-anydpi-v26/ic_launcher_nagram_block_round_round.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@mipmap/ic_launcher_nagram_block_round_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_nagram_block_round_foreground"/>
+    <monochrome android:drawable="@drawable/ic_launcher_nagram_block_round_foreground"/>
+</adaptive-icon>

TMessagesProj/src/main/res/mipmap-anydpi-v26/ic_launcher_nagram_blue.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@mipmap/ic_launcher_nagram_blue_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_nagram_blue_foreground"/>
+    <monochrome android:drawable="@mipmap/ic_launcher_nagram_blue_foreground"/>
+</adaptive-icon>

TMessagesProj/src/main/res/mipmap-anydpi-v26/ic_launcher_nagram_blue_round.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@mipmap/ic_launcher_nagram_blue_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_nagram_blue_foreground"/>
+    <monochrome android:drawable="@mipmap/ic_launcher_nagram_blue_foreground"/>
+</adaptive-icon>

TMessagesProj/src/main/res/mipmap-anydpi-v26/ic_launcher_nagram_colorful.xml

@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@drawable/ic_launcher_nagram_colorful_background"/>
     <foreground android:drawable="@drawable/ic_launcher_nagram_colorful_foreground"/>
+    <monochrome android:drawable="@drawable/ic_launcher_nagram_colorful_foreground"/>
 </adaptive-icon>

TMessagesProj/src/main/res/mipmap-anydpi-v26/ic_launcher_nagram_colorful_round.xml

@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@drawable/ic_launcher_nagram_colorful_background"/>
     <foreground android:drawable="@drawable/ic_launcher_nagram_colorful_foreground"/>
+    <monochrome android:drawable="@drawable/ic_launcher_nagram_colorful_foreground"/>
 </adaptive-icon>

TMessagesProj/src/main/res/mipmap-anydpi-v26/ic_launcher_nagram_darkgreen.xml

@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@drawable/ic_launcher_nagram_darkgreen_background"/>
     <foreground android:drawable="@mipmap/ic_launcher_nagram_darkgreen_foreground"/>
+    <monochrome android:drawable="@mipmap/ic_launcher_nagram_darkgreen_foreground"/>
 </adaptive-icon>

TMessagesProj/src/main/res/mipmap-anydpi-v26/ic_launcher_nagram_darkgreen_round.xml

@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@drawable/ic_launcher_nagram_darkgreen_background"/>
     <foreground android:drawable="@mipmap/ic_launcher_nagram_darkgreen_foreground"/>
+    <monochrome android:drawable="@mipmap/ic_launcher_nagram_darkgreen_foreground"/>
 </adaptive-icon>

TMessagesProj/src/main/res/mipmap-anydpi-v26/ic_launcher_nagram_google.xml

@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@drawable/ic_launcher_nagram_google_background"/>
     <foreground android:drawable="@drawable/ic_launcher_nagram_google_foreground"/>
+    <monochrome android:drawable="@drawable/ic_launcher_nagram_google_foreground"/>
 </adaptive-icon>

TMessagesProj/src/main/res/mipmap-anydpi-v26/ic_launcher_nagram_google_round.xml

@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@drawable/ic_launcher_nagram_google_background"/>
     <foreground android:drawable="@drawable/ic_launcher_nagram_google_foreground"/>
+    <monochrome android:drawable="@drawable/ic_launcher_nagram_google_foreground"/>
 </adaptive-icon>

TMessagesProj/src/main/res/mipmap-anydpi-v26/ic_launcher_nagram_neon.xml

@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@drawable/ic_launcher_nagram_neon_background"/>
     <foreground android:drawable="@mipmap/ic_launcher_nagram_neon_foreground"/>
+    <monochrome android:drawable="@mipmap/ic_launcher_nagram_neon_foreground"/>
 </adaptive-icon>

TMessagesProj/src/main/res/mipmap-anydpi-v26/ic_launcher_nagram_neon_round.xml

@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@drawable/ic_launcher_nagram_neon_background"/>
     <foreground android:drawable="@mipmap/ic_launcher_nagram_neon_foreground"/>
+    <monochrome android:drawable="@mipmap/ic_launcher_nagram_neon_foreground"/>
 </adaptive-icon>

TMessagesProj/src/main/res/mipmap-anydpi-v26/ic_launcher_nagram_round.xml

@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_nagram_background"/>
     <foreground android:drawable="@drawable/ic_launcher_nagram_foreground"/>
+    <monochrome android:drawable="@drawable/ic_launcher_nagram_foreground"/>
 </adaptive-icon>