Update prayers db, dependencies and fixed new lint errors

arashpayan · arashpayan · commit 29f549532346 · 2022-05-31T19:32:06.000-07:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,15 +1,17 @@
-apply plugin: 'com.android.application'
+plugins {
+    id 'com.android.application'
+}
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 32
     buildFeatures.dataBinding = true
 
     defaultConfig {
         applicationId 'com.arashpayan.prayerbook'
-        minSdkVersion 19
-        targetSdkVersion 30
-        versionCode 21
-        versionName '2.1.2'
+        minSdkVersion 23
+        targetSdkVersion 32
+        versionCode 22
+        versionName '2.2.0'
         vectorDrawables.useSupportLibrary = true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -24,27 +26,19 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-}
-
-gradle.projectsEvaluated {
-    tasks.withType(JavaCompile) {
-        options.deprecation = true
-    }
-}
 
-repositories {
-    mavenCentral()
+    namespace 'com.arashpayan.prayerbook'
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation 'androidx.appcompat:appcompat:1.4.1'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
-    implementation 'com.google.android.material:material:1.4.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
+    implementation 'com.google.android.material:material:1.6.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'com.samskivert:jmustache:1.14'
 
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test:rules:1.4.0'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.arashpayan.prayerbook">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <application
         android:allowBackup="true"
@@ -13,7 +12,8 @@
         tools:ignore="GoogleAppIndexingWarning">
         <activity
             android:name=".MainActivity"
-            android:label="@string/app_name" >
+            android:label="@string/app_name"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/app/src/main/assets/pbdb.jet b/app/src/main/assets/pbdb.jet
diff --git a/app/src/main/java/com/arashpayan/prayerbook/App.java b/app/src/main/java/com/arashpayan/prayerbook/App.java
@@ -32,7 +32,7 @@ public class App extends Application {
     private ExecutorService mExecutor;
 
     private static volatile App app;
-    private static final int LatestDatabaseVersion = 22;
+    private static final int LatestDatabaseVersion = 23;
 
     @Override
     public void onCreate() {
@@ -45,7 +45,6 @@ public void onCreate() {
 
         Prefs.init(this);
         UserDB.set(new UserDB(this, false));
-        UserDB.get().addBookmark(44);
         copyDatabaseFile();
 
         // Load as much of the webview libraries as much as possible in the background
diff --git a/app/src/main/java/com/arashpayan/prayerbook/BookmarksAdapter.java b/app/src/main/java/com/arashpayan/prayerbook/BookmarksAdapter.java
@@ -87,7 +87,7 @@ public PrayerSummaryViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int
         itemView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                int pos = holder.getAdapterPosition();
+                int pos = holder.getAbsoluteAdapterPosition();
                 listener.onPrayerSelected(bookmarks.get(pos));
             }
         });
diff --git a/app/src/main/java/com/arashpayan/prayerbook/CategoriesAdapter.java b/app/src/main/java/com/arashpayan/prayerbook/CategoriesAdapter.java
@@ -51,7 +51,7 @@ public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int
             itemView.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    int pos = holder.getAdapterPosition();
+                    int pos = holder.getAbsoluteAdapterPosition();
                     CategoryItem item = items.get(pos);
                     listener.onCategorySelected(item.text, item.language);
                 }
@@ -77,6 +77,13 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int positi
             App.runInBackground(new WorkerRunnable() {
                 @Override
                 public void run() {
+                    // This only executes for actual category view holders, but because the headers
+                    // are also represented by CategoryItems, the 'text' property can be null.
+                    // To keep the linter quiet, we'll check that the 'text' property is not null.
+                    // When we eventually switch to Jetpack Compose, this problem should disappear.
+                    if (item.text == null) {
+                        return;
+                    }
                     int count = PrayersDB.get().getPrayerCountForCategory(item.text, item.language.code);
                     App.runOnUiThread(new UiRunnable() {
                         @Override
diff --git a/app/src/main/java/com/arashpayan/prayerbook/CategoryPrayersAdapter.java b/app/src/main/java/com/arashpayan/prayerbook/CategoryPrayersAdapter.java
@@ -46,7 +46,7 @@ public PrayerSummaryViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int
         itemView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                int pos = holder.getAdapterPosition();
+                int pos = holder.getAbsoluteAdapterPosition();
                 listener.onPrayerSelected(getItemId(pos));
             }
         });
diff --git a/app/src/main/java/com/arashpayan/prayerbook/Language.java b/app/src/main/java/com/arashpayan/prayerbook/Language.java
@@ -5,7 +5,6 @@
  */
 package com.arashpayan.prayerbook;
 
-import android.os.Build;
 import android.os.Parcel;
 import android.os.Parcelable;
 
@@ -37,25 +36,7 @@ public enum Language implements Parcelable {
         this.code = code;
         this.humanName = humanName;
         this.rightToLeft = rightToLeft;
-
-        final Locale[] availableLocales = Locale.getAvailableLocales();
-        Locale matchingLocale = null;
-        if (Build.VERSION.SDK_INT >= 21) {
-            matchingLocale = Locale.forLanguageTag(code);
-        } else {
-            for (Locale l : availableLocales) {
-                if (l.getLanguage().equals(code)) {
-                    matchingLocale = l;
-                    break;
-                }
-            }
-        }
-
-        if (matchingLocale != null) {
-            this.locale = matchingLocale;
-        } else {
-            this.locale = Locale.US;
-        }
+        this.locale = Locale.forLanguageTag(code);
     }
 
     public static Language get(String code) {
diff --git a/app/src/main/java/com/arashpayan/prayerbook/LanguagesAdapter.java b/app/src/main/java/com/arashpayan/prayerbook/LanguagesAdapter.java
@@ -38,7 +38,7 @@ public LanguagesFragment.LanguageViewHolder onCreateViewHolder(@NonNull ViewGrou
         itemView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                int pos = holder.getAdapterPosition();
+                int pos = holder.getAbsoluteAdapterPosition();
                 boolean shouldEnable = !holder.checkBox.isChecked();
                 holder.checkBox.setChecked(shouldEnable);
                 prefs.setLanguageEnabled(languages[pos], shouldEnable);
@@ -47,7 +47,7 @@ public void onClick(View v) {
         holder.checkBox.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                int pos = holder.getAdapterPosition();
+                int pos = holder.getAbsoluteAdapterPosition();
                 // by the time onClick is called, the check box state has already changed,
                 // so we don't need to ! (not) the isChecked value
                 boolean shouldEnable = holder.checkBox.isChecked();
diff --git a/app/src/main/java/com/arashpayan/prayerbook/MainActivity.java b/app/src/main/java/com/arashpayan/prayerbook/MainActivity.java
@@ -32,7 +32,7 @@ public void onCreate(Bundle savedInstanceState) {
         int headerColor = ContextCompat.getColor(this, R.color.task_header);
         if (Build.VERSION.SDK_INT > 27) {
             setTaskDescription(new ActivityManager.TaskDescription(appName, R.mipmap.ic_launcher, headerColor));
-        } else if (Build.VERSION.SDK_INT > 20) {
+        } else {
             Bitmap appIcon = BitmapFactory.decodeResource(getResources(), R.mipmap.ic_launcher);
             setTaskDescription(new ActivityManager.TaskDescription(appName, appIcon, headerColor));
         }
diff --git a/app/src/main/java/com/arashpayan/prayerbook/PrayerActivity.java b/app/src/main/java/com/arashpayan/prayerbook/PrayerActivity.java
@@ -46,7 +46,7 @@ public void onCreate(Bundle state) {
         int headerColor = ContextCompat.getColor(this, R.color.task_header);
         if (Build.VERSION.SDK_INT > 27) {
             setTaskDescription(new ActivityManager.TaskDescription(appName, R.mipmap.ic_launcher, headerColor));
-        } else if (Build.VERSION.SDK_INT > 20) {
+        } else {
             Bitmap appIcon = BitmapFactory.decodeResource(getResources(), R.mipmap.ic_launcher);
             setTaskDescription(new ActivityManager.TaskDescription(appName, appIcon, headerColor));
         }
diff --git a/app/src/main/java/com/arashpayan/prayerbook/PrayerFragment.java b/app/src/main/java/com/arashpayan/prayerbook/PrayerFragment.java
@@ -1,11 +1,9 @@
 package com.arashpayan.prayerbook;
 
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
-import android.os.Build;
 import android.os.Bundle;
 import android.print.PrintAttributes;
 import android.print.PrintDocumentAdapter;
@@ -33,7 +31,6 @@
 import com.arashpayan.prayerbook.database.UserDB;
 import com.arashpayan.prayerbook.thread.UiRunnable;
 import com.arashpayan.prayerbook.thread.WorkerRunnable;
-import com.arashpayan.util.L;
 import com.samskivert.mustache.Mustache;
 
 import java.io.InputStream;
@@ -270,7 +267,6 @@ private String getPrayerText() {
         return prayer.searchText + "\n\n" + prayer.author;
     }
 
-    @TargetApi(19)
     private void printPrayer() {
         if (mWebView == null) {
             // shouldn't happen, but just in case
@@ -281,12 +277,7 @@ private void printPrayer() {
         if (manager == null) {
             throw new RuntimeException("Where's the print manager?");
         }
-        PrintDocumentAdapter adapter;
-        if (Build.VERSION.SDK_INT >= 21) {
-            adapter = mWebView.createPrintDocumentAdapter("Prayer");
-        } else {
-            adapter = mWebView.createPrintDocumentAdapter();
-        }
+        PrintDocumentAdapter adapter = mWebView.createPrintDocumentAdapter("Prayer");
         
         String jobName = getString(R.string.app_name) + " " + getString(R.string.document);
         manager.print(jobName, adapter, new PrintAttributes.Builder().build());
diff --git a/app/src/main/java/com/arashpayan/prayerbook/RecentsAdapter.java b/app/src/main/java/com/arashpayan/prayerbook/RecentsAdapter.java
@@ -78,7 +78,7 @@ public PrayerSummaryViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int
         itemView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                int pos = holder.getAdapterPosition();
+                int pos = holder.getAbsoluteAdapterPosition();
                 listener.onPrayerSelected(recentIds.get(pos));
             }
         });
diff --git a/app/src/main/java/com/arashpayan/prayerbook/SearchAdapter.java b/app/src/main/java/com/arashpayan/prayerbook/SearchAdapter.java
@@ -32,7 +32,7 @@ public void onClick(View v) {
                     return;
                 }
 
-                mListener.onPrayerSelected(getItemId(holder.getAdapterPosition()));
+                mListener.onPrayerSelected(getItemId(holder.getAbsoluteAdapterPosition()));
             }
         });
 
diff --git a/app/src/main/res/raw/about.html b/app/src/main/res/raw/about.html
@@ -23,6 +23,14 @@
 <body>
     <p><strong>Changes</strong></p>
 
+    <p>Version 2.2.0 (2022-05-31)</p>
+    <ul>
+        <li>Added all the newly translated English prayers from the past 2 years from <a href="https://www.bahai.org/library/authoritative-texts/prayers/">bahai.org</a>. All the new prayers and prayers that were previously under the 'Recently Added' category have been moved to specific categories.</li>
+        <li>Added the Spanish version of the prayer for America</li>
+        <li>The app requires Android 6 (Marshmallow) or newer</li>
+        <li></li>
+    </ul>
+
     <p>Version 2.1.0 (2020-09-05)</p>
     <ul>
         <li>Many more and updated Spanish translations from the Panel Internacional de Traducción de Literatura Bahá’í al Español</li>
diff --git a/build.gradle b/build.gradle
@@ -1,21 +1,9 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
-
-buildscript {
-    repositories {
-        jcenter()
-        google()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.2'
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-    }
+plugins {
+    id 'com.android.application' version '7.2.1' apply false
+    id 'com.android.library' version '7.2.1' apply false
 }
 
-allprojects {
-    repositories {
-        jcenter()
-        google()
-    }
-}
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}
diff --git a/gradle.properties b/gradle.properties
@@ -1,20 +1,21 @@
 # Project-wide Gradle settings.
-
 # IDE (e.g. Android Studio) users:
-# Settings specified in this file will override any Gradle settings
-# configured through the IDE.
-
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
 # For more details on how to configure your build environment visit
 # http://www.gradle.org/docs/current/userguide/build_environment.html
-
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-# Default value: -Xmx10248m -XX:MaxPermSize=256m
-# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
-
+org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-android.enableJetifier=true
-android.useAndroidX=true
+# AndroidX package structure to make it clearer which packages are bundled with the
+# Android operating system, and which are packaged with your app"s APK
+# https://developer.android.com/topic/libraries/support-library/androidx-rn
+android.useAndroidX=true
+# Enables namespacing of each library's R class so that its R class includes only the
+# resources declared in the library itself and none from the library's dependencies,
+# thereby reducing the size of the R class for that library
+#android.nonTransitiveRClass=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Mar 08 21:30:41 PST 2021
+#Mon Feb 07 10:09:14 PST 2022
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+zipStoreBase=GRADLE_USER_HOME
diff --git a/settings.gradle b/settings.gradle
@@ -1 +1,16 @@
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        google()
+        mavenCentral()
+    }
+}
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+rootProject.name = "Prayer Book"
 include ':app'

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ public PrayerSummaryViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int`
`87`	`87`	`itemView.setOnClickListener(new View.OnClickListener() {`
`88`	`88`	`@Override`
`89`	`89`	`public void onClick(View v) {`
`90`		`- int pos = holder.getAdapterPosition();`
	`90`	`+ int pos = holder.getAbsoluteAdapterPosition();`
`91`	`91`	`listener.onPrayerSelected(bookmarks.get(pos));`
`92`	`92`	`}`
`93`	`93`	`});`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public PrayerSummaryViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int`
`46`	`46`	`itemView.setOnClickListener(new View.OnClickListener() {`
`47`	`47`	`@Override`
`48`	`48`	`public void onClick(View v) {`
`49`		`- int pos = holder.getAdapterPosition();`
	`49`	`+ int pos = holder.getAbsoluteAdapterPosition();`
`50`	`50`	`listener.onPrayerSelected(getItemId(pos));`
`51`	`51`	`}`
`52`	`52`	`});`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public void onCreate(Bundle savedInstanceState) {`
`32`	`32`	`int headerColor = ContextCompat.getColor(this, R.color.task_header);`
`33`	`33`	`if (Build.VERSION.SDK_INT > 27) {`
`34`	`34`	`setTaskDescription(new ActivityManager.TaskDescription(appName, R.mipmap.ic_launcher, headerColor));`
`35`		`- } else if (Build.VERSION.SDK_INT > 20) {`
	`35`	`+ } else {`
`36`	`36`	`Bitmap appIcon = BitmapFactory.decodeResource(getResources(), R.mipmap.ic_launcher);`
`37`	`37`	`setTaskDescription(new ActivityManager.TaskDescription(appName, appIcon, headerColor));`
`38`	`38`	`}`