Merge branch 'dev' into m_10.6.0

TeamPGM · Feb 7, 2024 · 9bd30e8 · 9bd30e8
2 parents 6b72c51 + 9e8ee63
commit 9bd30e8
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 7 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -2,7 +2,7 @@ name: Pull request
 
 on:
   pull_request:
-    types: [opened, reopened]
+    types: [opened, reopened, synchronize]
 
 jobs:
   check:

diff --git a/TMessagesProj/build.gradle b/TMessagesProj/build.gradle
@@ -4,7 +4,7 @@ apply plugin: "com.android.application"
 apply plugin: "kotlin-android"
 
 def verName = "10.6.1"
-def verCode = 1154
+def verCode = 1155
 
 
 def officialVer = "10.6.1"
@@ -226,7 +226,10 @@ android {
             java {
                 srcDirs "src/main/java", "src/gservcies/java"
             }
-            jni.srcDirs = ["./jni/"]
+            jni.srcDirs = []
+            jniLibs {
+                srcDir "src/main/libs"
+            }
             manifest {
                 srcFile "src/gservcies/AndroidManifest.xml"
             }

diff --git a/TMessagesProj/src/main/res/values-night-v31/styles.xml b/TMessagesProj/src/main/res/values-night-v31/styles.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="Theme.TMessages.Start" parent="@android:style/Theme.Material">
+        <item name="android:windowActionBar">false</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:actionBarStyle">@style/ActionBar.Transparent.TMessages.Start</item>
+        <item name="android:colorBackground">#1f2732</item>
+        <item name="android:windowBackground">#1f2732</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:colorPrimaryDark">#1c242e</item>
+        <item name="android:colorPrimary">#232d3a</item>
+        <item name="android:navigationBarColor">#000000</item>
+        <item name="android:forceDarkAllowed">false</item>
+        <!--        <item name="android:windowSplashScreenAnimatedIcon">@mipmap/ic_launcher</item>-->
+        <item name="android:windowSplashScreenAnimationDuration">@integer/splash_screen_duration</item>
+        <item name="android:windowSplashScreenBackground">?android:windowBackground</item>
+        <item name="android:windowSplashScreenAnimatedIcon">@drawable/ic_nagram_animated</item>
+    </style>
+</resources>
diff --git a/TMessagesProj/src/main/res/values-night/styles.xml b/TMessagesProj/src/main/res/values-night/styles.xml
@@ -21,10 +21,6 @@
         <item name="android:colorPrimaryDark">#1c242e</item>
         <item name="android:colorPrimary">#232d3a</item>
         <item name="android:navigationBarColor">#000000</item>
-        <item name="android:forceDarkAllowed">false</item>
-<!--        <item name="android:windowSplashScreenAnimatedIcon">@mipmap/ic_launcher</item>-->
-        <item name="android:windowSplashScreenAnimationDuration">@integer/splash_screen_duration</item>
-        <item name="android:windowSplashScreenBackground">?android:windowBackground</item>
     </style>
 
     <style name="ActionBar.Transparent.TMessages.Start" parent="android:style/Widget.Material.Light.ActionBar">