Merge remote-tracking branch 'origin/master'

app/build.gradle

@@ -7,12 +7,12 @@ plugins {
 }
 
 android {
-    compileSdk 34
+    compileSdk 35
 
     defaultConfig {
         applicationId "com.quranapp.android"
         minSdkVersion 21
-        targetSdkVersion 34
+        targetSdkVersion 35
         // I don't know why I've used such a weird versioning scheme in the beginning,
         // but I can't change it now as the app is already in the Play Store
         versionCode 23_11_11_114
@@ -66,7 +66,6 @@ android {
     compileOptions {
         // Flag to enable support for the new language APIs
         coreLibraryDesugaringEnabled true
-        // Sets Java compatibility to Java 8
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
 

app/proguard-rules.pro

@@ -34,4 +34,5 @@
  # With R8 full mode generic signatures are stripped for classes that are not
  # kept. Suspend functions are wrapped in continuations where the type argument
  # is used.
--keep,allowobfuscation,allowshrinking class kotlin.coroutines.Continuation
+-keep,allowobfuscation,allowshrinking class kotlin.coroutines.Continuation
+-ignorewarnings

app/src/main/assets/verses/type0/ckb/type0.json

@@ -2,21 +2,21 @@
     "3": "دڵەڕاوکێ و دڵتەنگی",
     "5": "خەمۆکی و بێزاری",
     "6": "کاتی سەخت و ناخۆشی",
-    "4": "تووڕەیی و ئارامگرتن",
+    "4": "تووڕەیی",
     "7": "ئەستەمی دۆزینەوەی هاوبەشی گونجاو",
     "8": "دژی سەرزەنشت و سوکایەتی",
     "9": "گومانکردن",
-    "10": "ڕووبەڕوبونەوەی ئاستەنگ",
+    "10": "ڕووبەڕووبوونەوەی ئاستەنگ",
     "11": "هەستکردن بە ئیرەیی",
     "12": "بۆ مناڵی بێ گوێڕایەڵ",
-    "13": "بۆ کەسەبات",
-    "14": "بۆ کەسی خۆشەویست و هاوسەر",
+    "13": "بۆ کارکردن",
+    "14": "بۆ خۆشەویستی نێوان هاوسەران",
     "15": "بۆ سەرکەوتن لە تاقیکردنەوە",
     "16": "بۆ زیادبوونی بژێویی و ڕسق",
     "17": "سەرئێشە",
     "18": "تەنیایی",
     "19": "پێویستی بە هاوڕێ",
-    "20": "بێ هیوابوون لە مناڵبون",
+    "20": "بێ هیوابوون لە مناڵبوون",
     "1": "دژی چاوپیسی",
     "2": "دژی سیحر و جادوو",
     "21": "بێ بایەخ",
@@ -25,11 +25,11 @@
     "27": "گوناهبار",
     "28": "ئازاری گەدە",
     "29": "کۆشش و هەوڵدان",
-    "30": "بۆ نەمانی توڕەیی",
+    "30": "بۆ لابردنی تووڕەیی",
     "32": "مامەڵەی ڕەق و تووند",
-    "33": "متمانە بە خوا کردن لەکاتی بڕیاردان",
+    "33": "متمانە بە خودا کردن لەکاتی بڕیاردان",
     "37": "لەکاتی وونبونی شتێکدا",
     "25": "داوای لێخۆشبوون",
-    "31": "بۆ لاچونی سەختی و نەهامەتی",
+    "31": "بۆ لاچوونی سەختی و نەهامەتی",
     "34": "دڵەڕاوکێ و نا ئارامی"
 }

app/src/main/assets/verses/type0/fa/type0.json

@@ -1 +1,7 @@
-{}
+{
+    "3": "اضطراب",
+    "4": "عصبانیت",
+    "5": "افسردگی",
+    "6": "اوقات سخت",
+    "9": "شک"
+}

gradle/libs.versions.toml

@@ -1,20 +1,20 @@
 [versions]
-coreKtx = "1.12.0"
-gradle = "8.2.1"
+coreKtx = "1.15.0"
+gradle = "8.7.3"
 kotlinGradlePlugin = "1.8.0"
-lifecycle = "2.7.0"
-desugaring = "2.0.4"
-annotation = "1.7.1"
+lifecycle = "2.8.7"
+desugaring = "2.1.4"
+annotation = "1.9.1"
 legacySupport = "1.0.0"
-appcompat = "1.6.1"
-material = "1.11.0"
-constraintlayout = "2.1.4"
+appcompat = "1.7.0"
+material = "1.12.0"
+constraintlayout = "2.2.0"
 apacheCommons = "3.12.0"
-guava = "31.0.1-jre"
-webkit = "1.9.0"
+guava = "32.0.1-jre"
+webkit = "1.12.1"
 media = "1.7.0"
-viewbinding = "8.2.1"
-browser = "1.7.0"
+viewbinding = "8.7.3"
+browser = "1.8.0"
 exoplayer = "2.19.1"
 swipeRefreshLayout = "1.7.2.4"
 retrofit = "2.9.0"

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Sun Feb 05 09:53:30 IST 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

inventory/translations/available_translations_info.json

@@ -134,6 +134,15 @@
         "langName": "فارسی",
         "lastUpdated": 1678915800000,
         "downloadPath": "inventory/translations/fa/fa_islamhouse.json"
+      },
+      "fa_taji-kal-dari": {
+        "book": "حسين تاجي كله داري",
+        "author": "حسين تاجي كله داري",
+        "displayName": "حسين تاجي كله داري",
+        "langCode": "fa",
+        "langName": "فارسی",
+        "lastUpdated": 1729081462836,
+        "downloadPath": "inventory/translations/fa/fa_taji-kal-dari.json"
       }
     },
     "fr": {
@@ -229,6 +238,17 @@
         "downloadPath": "inventory/translations/ml/ml_karakunnu.json"
       }
     },
+    "pl": {
+      "pl_bielawski": {
+        "book": "Józef Bielawski",
+        "author": "Józef Bielawski",
+        "displayName": "Józef Bielawski",
+        "langCode": "pl",
+        "langName": "polski",
+        "lastUpdated": 1729081462836,
+        "downloadPath": "inventory/translations/pl/pl_bielawski.json"
+      }
+    },
     "ru": {
       "ru_elmir-kuliev": {
         "book": "Russian Translation (Elmir Kuliev)",

peacedesign/build.gradle

@@ -3,11 +3,11 @@ plugins {
     id 'kotlin-android'
 }
 android {
-    compileSdk 33
+    compileSdk 35
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 33
+        targetSdkVersion 35
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -38,10 +38,10 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 
-    implementation 'androidx.appcompat:appcompat:1.4.2'
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'com.google.android.material:material:1.6.1'
-    implementation "androidx.core:core-ktx:1.8.0"
+    implementation libs.androidx.appcompat
+    implementation libs.androidx.legacySupport
+    implementation libs.material
+    implementation libs.androidx.coreKtx
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 repositories {

peacedesign/proguard-rules.pro

@@ -20,4 +20,5 @@
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
 -keepattributes SourceFile,LineNumberTable        # Keep file names and line numbers.
--keep public class * extends java.lang.Exception  # Optional: Keep custom exceptions.
+-keep public class * extends java.lang.Exception  # Optional: Keep custom exceptions.
+-ignorewarnings