From 0e31484172eba357f52cb5586fe507e037a6428d Mon Sep 17 00:00:00 2001
From: Javad Ahshamian <ham3da.j@gmail.com>
Date: Wed, 6 Apr 2022 22:26:58 +0430
Subject: [PATCH] Upgrade to version 2.8.5

---
 .idea/jarRepositories.xml                     | 10 +++
 .idea/misc.xml                                |  1 +
 app/build.gradle                              | 18 ++--
 app/src/main/assets/donate_en.htm             | 64 -------------
 app/src/main/assets/donate_fa.htm             | 62 -------------
 .../ham3da/darya/ActivityAudioCollection.java | 90 +++++++++----------
 .../ham3da/darya/admob/MainAdMobFragment.java | 47 ++++------
 .../darya/ganjoor/GanjoorDbBrowser.java       | 18 ++++
 .../ham3da/darya/utility/UtilFunctions.java   |  2 +-
 app/src/main/res/layout/donate_crypto.xml     | 45 ++++++----
 app/src/main/res/layout/fragment_admob.xml    | 21 +----
 app/src/main/res/values-fa/strings.xml        |  2 +-
 app/src/main/res/values/strings.xml           |  4 +-
 build.gradle                                  | 15 ++--
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 15 files changed, 144 insertions(+), 257 deletions(-)
 delete mode 100644 app/src/main/assets/donate_en.htm
 delete mode 100644 app/src/main/assets/donate_fa.htm

diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 0fdcd11..53dd05a 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -61,5 +61,15 @@
       <option name="name" value="maven4" />
       <option name="url" value="https://jcenter.bintray.com" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="https://repository.jboss.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven6" />
+      <option name="name" value="maven6" />
+      <option name="url" value="https://repo.spring.io/release" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 23089d7..963310c 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -14,6 +14,7 @@
         <entry key="..\:/Android/Android_Projects/darya/app/src/main/res/drawable/ic_baseline_payment_24.xml" value="0.27037037037037037" />
         <entry key="..\:/Android/Android_Projects/darya/app/src/main/res/drawable/ic_baseline_person_24.xml" value="0.2846153846153846" />
         <entry key="..\:/Android/Android_Projects/darya/app/src/main/res/layout/activity_audio_collection.xml" value="0.27291666666666664" />
+        <entry key="..\:/Android/Android_Projects/darya/app/src/main/res/layout/activity_donate_crypto.xml" value="0.1824074074074074" />
         <entry key="..\:/Android/Android_Projects/darya/app/src/main/res/layout/activity_login.xml" value="0.25" />
         <entry key="..\:/Android/Android_Projects/darya/app/src/main/res/layout/activity_web.xml" value="0.25" />
         <entry key="..\:/Android/Android_Projects/darya/app/src/main/res/layout/app_bar_main.xml" value="0.13272543059777103" />
diff --git a/app/build.gradle b/app/build.gradle
index 504fcfd..c22cd6d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -14,8 +14,8 @@ android {
         applicationId "ir.ham3da.darya"
         minSdkVersion 21
         targetSdkVersion 31
-        versionCode 44
-        versionName "2.8.4"
+        versionCode 48
+        versionName "2.8.5"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -40,12 +40,12 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation "androidx.appcompat:appcompat:1.4.0"
+    implementation "androidx.appcompat:appcompat:1.4.1"
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'com.google.android.material:material:1.4.0'
+    implementation 'com.google.android.material:material:1.5.0'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
     implementation 'androidx.annotation:annotation:1.3.0'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
     implementation 'androidx.viewpager2:viewpager2:1.0.0'
@@ -56,8 +56,8 @@ dependencies {
     implementation 'com.google.firebase:firebase-analytics'
 
     implementation 'com.mindorks.android:prdownloader:0.6.0'
-    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.4.0'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0'
+    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.4.1'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1'
 
     //implementation group: 'commons-io', name: 'commons-io', version: '20030203.000550'
     testImplementation 'junit:junit:4.13.2'
@@ -65,7 +65,7 @@ dependencies {
     androidTestImplementation 'androidx.test:runner:1.4.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
     implementation 'com.github.koji-1009:ChronoDialogPreference:2.1.0'
-    implementation 'com.google.android.play:core:1.10.2'
+    implementation 'com.google.android.play:core:1.10.3'
     implementation 'com.android.volley:volley:1.2.1'
-    implementation 'androidx.preference:preference:1.1.1'
+    implementation 'androidx.preference:preference:1.2.0'
 }
\ No newline at end of file
diff --git a/app/src/main/assets/donate_en.htm b/app/src/main/assets/donate_en.htm
deleted file mode 100644
index 02238cc..0000000
--- a/app/src/main/assets/donate_en.htm
+++ /dev/null
@@ -1,64 +0,0 @@
-<html dir="ltr">
-<head>
-    <meta http-equiv="Content-Language" content="en">
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <title>About...</title>
-    <style type="text/css">
- @font-face
-{
-   font-family: "IRANSans";
-   src: url("file:///android_res/font/iran_sans_mobile_light.ttf");
-}
-
-a
-{
-   color: $link_color;
-   text-decoration: none;
-}
-.serif
-{
-   font-family: serif;
-}
-html
-{
-  background-color: $background_color;
-  color: $text_color;
-  font-family: "IRANSans", serif;
-  font-size: $fontSize;
-  line-height: normal;
-}
-body
-{
- margin: 10px;
-}
-p
-{
-    font-family: "IRANSans", serif;
-}
-h3
-{
-font-family: "IRANSans", serif;
-
-}
-.ltr
-{
-    direction:ltr;
-}
-
-</style>
-</head>
-<body>
-
-<p>Dear friend, we need your donation to further develop this application.</p>
-<h3>International donation</h3>
-<p><b>Bitcoin Address:</b> bc1qdrjpcxnnay42jfc56hze4vrpkrf5s5c45xd5va</p>
-	<p><b>Ethereum Address:</b> 0xcD7be5D82805f851CbeBBF67ea434cB02f6e2436</p>
-<p><b>Perfect Money Account:</b> U21873528</p>
-<h3>Donate in Iran</h3>
-<p><b>Sheba account number:</b> IR190120020000005006181561</p>
-<p><b>Bank card number:</b> 6104-3379-5124-7251</p>
-<p><b>Account number:</b> 5006181561</p>
-<p><b>Account holder name:</b> Javad Ahshamian</p>
-<p><b>Bank Name:</b> Bank Mellat</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/app/src/main/assets/donate_fa.htm b/app/src/main/assets/donate_fa.htm
deleted file mode 100644
index 7df70b7..0000000
--- a/app/src/main/assets/donate_fa.htm
+++ /dev/null
@@ -1,62 +0,0 @@
-<html dir="rtl">
-<head>
-    <meta http-equiv="Content-Language" content="fa">
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <title>درباره...</title>
-    <style type="text/css">
- @font-face
-{
-   font-family: 'IRANSans';
-   src: url('file:///android_res/font/iran_sans_mobile_light.ttf');
-}
-
-a
-{
-   color: $link_color;
-   text-decoration: none;
-}
-.serif
-{
-   font-family: serif;
-}
-html
-{
-  color: black;
-  background-color: $background_color;
-  color: $text_color;
-  font-family: 'IRANSans', serif;
-  font-size: $fontSize;
-}
-body
-{
- margin: 10px;
-}
-p
-{
-    font-family: 'IRANSans', serif;
-}
-h3
-{
-font-family: 'IRANSans', serif;
-
-}
-.ltr
-{
-    direction:ltr;
-}
-</style>
-</head>
-<body>
-
-<p>دوستان ارجمند برای توسعه هر چه بیشتر این نرم‌افزار می‌توانید با حمایت‌های مالی خود ما را 
-همراهی کنید.</p>
-<p><b>شماره حساب شبا:</b> <span dir="ltr">IR190120020000005006181561</span></p>
-<p><b>شماره کارت بانکی:</b> <span dir="ltr">6104-3379-5124-7251</span></p>
-<p><b>شماه حساب:</b> 5006181561</p>
-<p><b>نام صاحب حساب:</b> جواد احشامیان</p>
-<p><b>نام بانک:</b> بانک ملت</p>
-<p>&nbsp;</p>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/app/src/main/java/ir/ham3da/darya/ActivityAudioCollection.java b/app/src/main/java/ir/ham3da/darya/ActivityAudioCollection.java
index fb620c6..f4de8d2 100644
--- a/app/src/main/java/ir/ham3da/darya/ActivityAudioCollection.java
+++ b/app/src/main/java/ir/ham3da/darya/ActivityAudioCollection.java
@@ -58,7 +58,6 @@
 import ir.ham3da.darya.utility.AppSettings;
 
 
-
 import ir.ham3da.darya.ganjoor.GanjoorAudioInfo;
 import ir.ham3da.darya.utility.MyDialogs;
 import ir.ham3da.darya.utility.PoemAudio;
@@ -199,6 +198,7 @@ private void reloadItems()
         scrollListener.resetState();
         loadItems();
     }
+
     private void downloadMarkedAudio()
     {
         scheduleAudioList = new ArrayList<>();
@@ -684,23 +684,24 @@ public void loadItems()
         }
 
         this.page_number = calc_page_num();
-        Log.e(TAG, " this.page_number: "+ this.page_number);
+        Log.e(TAG, " this.page_number: " + this.page_number);
         downloadJsonPoemAudios(getAudioListUrl(dl_type));
     }
 
     private int calc_page_num()
     {
-        if(can_load_new_page())
+        if (can_load_new_page())
         {
-            double newPage = ((double) listXmlItems.size()  / page_size) +1;
+            double newPage = ((double) listXmlItems.size() / page_size) + 1;
             int newPage2 = (int) Math.ceil(newPage);
             return newPage2;
         }
         else
         {
-            return  1;
+            return 1;
         }
     }
+
     private boolean can_load_new_page()
     {
         return (listXmlItems != null && listXmlItems.size() >= page_size);
@@ -715,28 +716,28 @@ private boolean can_load_new_page()
     private boolean checkExistAudio(GanjoorAudioInfo ganjoorAudioInfo)
     {
         boolean result = false;
-        if (dl_type == GanjoorAudioInfo.DOWNLOAD_POEM)
+        boolean existInDatabase = _DbBrowser.IsSoundExist(ganjoorAudioInfo.audio_fchecksum);
+        boolean fileExist = _DbBrowser.checkAudioFileExist(ganjoorAudioInfo.audio_fchecksum, dl_path);
+
+        if (existInDatabase)
         {
-            for (PoemAudio PoemAudio1 : existAudioList)
+            if (fileExist)
             {
-                if (PoemAudio1.poemID == ganjoorAudioInfo.audio_post_ID && ganjoorAudioInfo.audio_fchecksum.equals(PoemAudio1.fchksum))
-                {
-                    result = true;
-                     break;
-                }
-
+                result = true;
             }
-            if(!result)
+            else
             {
-                reAddSoundData(ganjoorAudioInfo);
+                _DbBrowser.deleteSound(ganjoorAudioInfo.audio_fchecksum);
+                result = false;
             }
+
         }
         else
         {
-            result = _DbBrowser.checkAudioFileExist(ganjoorAudioInfo.audio_fchecksum, dl_path);
-            if(result)
+            if (fileExist)
             {
                 reAddSoundData(ganjoorAudioInfo);
+                result = true;
             }
         }
 
@@ -746,14 +747,13 @@ private boolean checkExistAudio(GanjoorAudioInfo ganjoorAudioInfo)
 
     private void reAddSoundData(GanjoorAudioInfo ganjoorAudioInfo)
     {
-        if(!_DbBrowser.IsSoundExist(ganjoorAudioInfo.audio_fchecksum))
+        if (!_DbBrowser.IsSoundExist(ganjoorAudioInfo.audio_fchecksum))
         {
             _DbBrowser.addToSound(ganjoorAudioInfo);
         }
     }
 
 
-
     private void downloadJsonPoemAudios(String jsonUrl)
     {
 
@@ -785,13 +785,13 @@ private void parseAudioListJsonData(String JsonString)
         try
         {
             JSONArray jsonArray = new JSONArray(JsonString);
-            if(jsonArray.length() > 0)
+            if (jsonArray.length() > 0)
             {
                 List<GanjoorAudioInfo> ganjoorAudioInfos1 = new ArrayList<>();
                 int new_index = 0;
-                if(listXmlItems != null)
+                if (listXmlItems != null)
                 {
-                    new_index =  listXmlItems.size();
+                    new_index = listXmlItems.size();
                 }
 
                 for (int i = 0; i < jsonArray.length(); i++)
@@ -827,7 +827,7 @@ private void parseAudioListJsonData(String JsonString)
 
                     new_index++;
                     GanjoorAudioInfo ganjoorAudioInfo1 = new GanjoorAudioInfo(audio_post_ID, audio_order,
-                            audio_xml,null, audio_mp3, audio_title, audio_artist,
+                            audio_xml, null, audio_mp3, audio_title, audio_artist,
                             audio_artist_url, audio_src, audio_src_url, audio_guid,
                             audio_fchecksum, audio_mp3bsize, audio_oggbsize, audio_date, false,
                             new_index, false);
@@ -861,32 +861,32 @@ private void parseAudioListJsonData(String JsonString)
                 }
 
 
-                        no_item_textview.setVisibility(View.GONE);
-
-                        if (listXmlItems == null)
-                        {
-                            Log.e(TAG, "parseAudioListJsonData: listXmlItems is null");
-                            listXmlItems = ganjoorAudioInfos1;
-                            GanjoorPoet ganjoorPoet = null;
-                            if (dl_type == GanjoorAudioInfo.DOWNLOAD_POET_POEMS)
-                            {
-                                ganjoorPoet = _DbBrowser.getPoet(poet_id);
-                            }
-                            adaptorAudio = new AdaptorAudio(listXmlItems, this, dl_type, ganjoorPoet);
-                            recycler_audio.setAdapter(adaptorAudio);
-                            recycler_audio.scrollToPosition(0);
-                        }
-                        else
-                        {
-                            Log.e(TAG, "parseAudioListJsonData: listXmlItems is not null");
-                            listXmlItems.addAll(ganjoorAudioInfos1);
-                            this.adaptorAudio.notifyItemRangeInserted(this.listXmlItems.size(), this.listXmlItems.size() - 1);
-                        }
+                no_item_textview.setVisibility(View.GONE);
 
+                if (listXmlItems == null)
+                {
+                    Log.e(TAG, "parseAudioListJsonData: listXmlItems is null");
+                    listXmlItems = ganjoorAudioInfos1;
+                    GanjoorPoet ganjoorPoet = null;
+                    if (dl_type == GanjoorAudioInfo.DOWNLOAD_POET_POEMS)
+                    {
+                        ganjoorPoet = _DbBrowser.getPoet(poet_id);
+                    }
+                    adaptorAudio = new AdaptorAudio(listXmlItems, this, dl_type, ganjoorPoet);
+                    recycler_audio.setAdapter(adaptorAudio);
+                    recycler_audio.scrollToPosition(0);
+                }
+                else
+                {
+                    Log.e(TAG, "parseAudioListJsonData: listXmlItems is not null");
+                    listXmlItems.addAll(ganjoorAudioInfos1);
+                    this.adaptorAudio.notifyItemRangeInserted(this.listXmlItems.size(), this.listXmlItems.size() - 1);
+                }
 
 
             }
-            else{
+            else
+            {
                 Toast.makeText(this, getString(R.string.nothing_found), Toast.LENGTH_SHORT).show();
             }
 
diff --git a/app/src/main/java/ir/ham3da/darya/admob/MainAdMobFragment.java b/app/src/main/java/ir/ham3da/darya/admob/MainAdMobFragment.java
index 96266ca..79b8aff 100644
--- a/app/src/main/java/ir/ham3da/darya/admob/MainAdMobFragment.java
+++ b/app/src/main/java/ir/ham3da/darya/admob/MainAdMobFragment.java
@@ -38,7 +38,7 @@ public class MainAdMobFragment extends Fragment
     Context mContext;
     Button btn_view_ad;
 
-//    InterstitialAd mInterstitialAd;
+    //    InterstitialAd mInterstitialAd;
     ProgressBar progress_bar;
     String TAG = "MainAdMobFragment";
     UtilFunctions UtilFunctions1;
@@ -79,23 +79,23 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
         Button btn_donate_github = root.findViewById(R.id.btn_donate_github);
         Button btn_donate_collections = root.findViewById(R.id.btn_donate_collections);
 
-        Button btn_donate_pay = root.findViewById(R.id.btn_donate_pay);
         Button btn_donate_crypto = root.findViewById(R.id.btn_donate_crypto);
 
         View rv_pay = root.findViewById(R.id.rv_pay);
 
-        if (UtilFunctions.isGooglePlayVersion())
-        {
-            rv_pay.setVisibility(View.VISIBLE);
-        }
-        else
-        {
-            rv_pay.setVisibility(View.GONE);
-        }
+//        if (UtilFunctions.isGooglePlayVersion())
+//        {
+//            rv_pay.setVisibility(View.VISIBLE);
+//        }
+//        else
+//        {
+//            rv_pay.setVisibility(View.GONE);
+//        }
 
+        rv_pay.setVisibility(View.GONE);
         btn_view_ad.setOnClickListener(v ->
         {
-           // displayInterstitial();
+            // displayInterstitial();
             displayCustomAdWeb();
         });
 
@@ -109,15 +109,6 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
 
         });
 
-        btn_donate_pay.setOnClickListener(v ->
-        {
-            String title = getString(R.string.donation);
-            String file_name = "donate_" + CurrentLang + ".htm";
-            String text = UtilFunctions.getHtmlFromAssetsFile(mContext, file_name);
-            UtilFunctions.showWebAct(mContext, title, text);
-
-        });
-
         btn_donate_crypto.setOnClickListener(v ->
         {
             Intent intent = new Intent(mContext, ActivityDonateCrypto.class);
@@ -130,16 +121,16 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
     }
 
 
-
     public void displayCustomAdWeb()
     {
-        Intent intent = new Intent(mContext, ActivityWeb.class);
-        intent.putExtra("title", getString(R.string.our_products));
-        intent.putExtra("fromUrl", true);
-        intent.putExtra("url",  getString(R.string.our_products_url));
-
-        startActivity(intent);
-        Bungee.card(mContext);
+        UtilFunctions1.openUrl(getString(R.string.our_products_url));
+//        Intent intent = new Intent(mContext, ActivityWeb.class);
+//        intent.putExtra("title", getString(R.string.our_products));
+//        intent.putExtra("fromUrl", true);
+//        intent.putExtra("url",  getString(R.string.our_products_url));
+//
+//        startActivity(intent);
+//        Bungee.card(mContext);
     }
 
 
diff --git a/app/src/main/java/ir/ham3da/darya/ganjoor/GanjoorDbBrowser.java b/app/src/main/java/ir/ham3da/darya/ganjoor/GanjoorDbBrowser.java
index 5e15ffd..43d8ca3 100644
--- a/app/src/main/java/ir/ham3da/darya/ganjoor/GanjoorDbBrowser.java
+++ b/app/src/main/java/ir/ham3da/darya/ganjoor/GanjoorDbBrowser.java
@@ -1462,6 +1462,24 @@ public void deleteSound(int PoemID, int id)
         }
     }
 
+    /**
+     *
+     * @param fchecksum String checksum
+      */
+    public void deleteSound(String fchecksum)
+    {
+        if (getIsConnected())
+        {
+            try
+            {
+                _db.delete("poemsnd", "fchksum = ?", new String[]{String.valueOf(fchecksum)});
+            } catch (Exception ex)
+            {
+                Log.e("addToSound", "err: " + ex.getMessage());
+            }
+        }
+    }
+
     public void addToFavorites(int PoemId)
     {
         addToFavorites(PoemId, -1);
diff --git a/app/src/main/java/ir/ham3da/darya/utility/UtilFunctions.java b/app/src/main/java/ir/ham3da/darya/utility/UtilFunctions.java
index 40a4a6e..c24fbe4 100644
--- a/app/src/main/java/ir/ham3da/darya/utility/UtilFunctions.java
+++ b/app/src/main/java/ir/ham3da/darya/utility/UtilFunctions.java
@@ -92,7 +92,7 @@ public void openMyTelegram()
     public static boolean isGooglePlayVersion()
     {
         return (getAppStoreCode() == VarTypes.GOOGLE_PLAY_VER);
-    }
+}
 
     /**
      * get AppStore Code
diff --git a/app/src/main/res/layout/donate_crypto.xml b/app/src/main/res/layout/donate_crypto.xml
index 9b11ce0..fa20db2 100644
--- a/app/src/main/res/layout/donate_crypto.xml
+++ b/app/src/main/res/layout/donate_crypto.xml
@@ -26,6 +26,7 @@
                 android:layout_centerVertical="true"
                 android:background="@drawable/circle"
                 app:tooltipText="@string/bitcoin"
+                android:contentDescription="@string/bitcoin"
                 android:scaleType="fitCenter"
                 app:srcCompat="@drawable/ic_btc_24" />
 
@@ -48,14 +49,15 @@
                 android:id="@+id/address_btc_copy"
                 android:layout_width="48dp"
                 android:layout_height="48dp"
-                android:layout_centerHorizontal="true"
                 android:layout_alignParentRight="true"
+                android:layout_centerHorizontal="true"
+                android:background="@drawable/circle"
                 android:backgroundTint="@color/btnColor"
+                android:contentDescription="@string/copy1"
                 android:padding="10dp"
-                app:tooltipText="@string/copy1"
                 android:src="@drawable/ic_content_copy_white_24dp"
-                android:background="@drawable/circle"
-                android:textColor="@color/primaryTextColor" />
+                android:textColor="@color/primaryTextColor"
+                app:tooltipText="@string/copy1" />
 
 
         </RelativeLayout>
@@ -77,12 +79,14 @@
                 android:id="@+id/avatar_eth"
                 android:layout_width="48dp"
                 android:layout_height="48dp"
-                app:tooltipText="@string/ethereum"
                 android:layout_alignParentLeft="true"
                 android:layout_centerVertical="true"
                 android:background="@drawable/circle"
                 android:scaleType="fitCenter"
-                app:srcCompat="@drawable/ic_eth_24" />
+                app:srcCompat="@drawable/ic_eth_24"
+                app:tooltipText="@string/ethereum"
+                android:contentDescription="@string/ethereum"
+                />
 
             <TextView
                 android:id="@+id/address_eth_txt"
@@ -107,6 +111,7 @@
                 android:layout_centerHorizontal="true"
                 android:background="@drawable/circle"
                 android:backgroundTint="@color/btnColor"
+                android:contentDescription="@string/copy1"
                 android:padding="10dp"
                 android:src="@drawable/ic_content_copy_white_24dp"
                 android:textColor="@color/primaryTextColor"
@@ -125,16 +130,18 @@
             android:background="@drawable/rounded_border_tv"
             android:layoutDirection="ltr"
             android:padding="5dp">
+
             <ImageView
                 android:id="@+id/avatar_pm"
                 android:layout_width="48dp"
                 android:layout_height="48dp"
-                app:tooltipText="@string/perfect_money"
                 android:layout_alignParentLeft="true"
                 android:layout_centerVertical="true"
                 android:background="@drawable/circle"
                 android:scaleType="fitCenter"
-                app:srcCompat="@drawable/ic_pm_24" />
+                app:srcCompat="@drawable/ic_pm_24"
+                android:contentDescription="@string/perfect_money"
+                app:tooltipText="@string/perfect_money" />
 
             <TextView
                 android:id="@+id/address_perfect_txt"
@@ -155,15 +162,15 @@
                 android:id="@+id/address_perfect_copy"
                 android:layout_width="48dp"
                 android:layout_height="48dp"
+                android:layout_alignParentRight="true"
+                android:layout_centerHorizontal="true"
+                android:background="@drawable/circle"
                 android:backgroundTint="@color/btnColor"
-                android:src="@drawable/ic_content_copy_white_24dp"
                 android:padding="10dp"
-                app:tooltipText="@string/copy1"
-                android:background="@drawable/circle"
+                android:src="@drawable/ic_content_copy_white_24dp"
                 android:textColor="@color/primaryTextColor"
-                android:layout_centerHorizontal="true"
-                android:layout_alignParentRight="true"
-                />
+                app:tooltipText="@string/copy1"
+                android:contentDescription="@string/copy1"/>
 
         </RelativeLayout>
 
@@ -178,16 +185,18 @@
             android:background="@drawable/rounded_border_tv"
             android:layoutDirection="ltr"
             android:padding="5dp">
+
             <ImageView
                 android:id="@+id/avatar_trx"
                 android:layout_width="48dp"
                 android:layout_height="48dp"
-                app:tooltipText="@string/tron"
                 android:layout_alignParentLeft="true"
                 android:layout_centerVertical="true"
                 android:background="@drawable/circle"
                 android:scaleType="fitCenter"
-                app:srcCompat="@drawable/ic_trx" />
+                app:srcCompat="@drawable/ic_trx"
+                android:contentDescription="@string/tron"
+                app:tooltipText="@string/tron" />
 
             <TextView
                 android:id="@+id/address_trx_txt"
@@ -212,10 +221,12 @@
                 android:layout_centerHorizontal="true"
                 android:background="@drawable/circle"
                 android:backgroundTint="@color/btnColor"
+                android:contentDescription="@string/copy1"
                 android:padding="10dp"
                 android:src="@drawable/ic_content_copy_white_24dp"
                 android:textColor="@color/primaryTextColor"
-                app:tooltipText="@string/copy1" />
+                app:tooltipText="@string/copy1"
+                />
 
         </RelativeLayout>
 
diff --git a/app/src/main/res/layout/fragment_admob.xml b/app/src/main/res/layout/fragment_admob.xml
index 97cc933..d2a2da8 100644
--- a/app/src/main/res/layout/fragment_admob.xml
+++ b/app/src/main/res/layout/fragment_admob.xml
@@ -81,12 +81,13 @@
                 android:layout_below="@+id/btn_donate_collections"
                 android:layout_marginTop="10dp"
                 android:lineSpacingExtra="8sp"
-                android:text="@string/donate_with"
+                android:text="@string/our_products"
                 android:textColor="@color/textColor"
                 android:textSize="16sp" />
 
             <RelativeLayout
                 android:id="@+id/rv_pay"
+                android:visibility="gone"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_below="@+id/admob_des">
@@ -109,24 +110,6 @@
                     android:textSize="16sp"
                     app:drawableTint="@color/white" />
 
-                <Button
-                    android:id="@+id/btn_donate_pay"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@+id/btn_donate_crypto"
-                    android:layout_centerHorizontal="true"
-                    android:layout_marginTop="15dp"
-                    android:backgroundTint="@color/btnColor"
-                    android:drawableEnd="@drawable/ic_baseline_payment_24"
-                    android:drawablePadding="5dp"
-                    android:minWidth="200dp"
-                    android:padding="15dp"
-                    android:text="@string/bank_transfer"
-                    android:textAllCaps="false"
-                    android:textColor="@color/primaryTextColor"
-                    android:textSize="16sp"
-                    app:drawableTint="@color/white" />
-
             </RelativeLayout>
 
             <Button
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index 37a46c1..fce9b02 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -234,7 +234,7 @@
     <string name="account_copied">شماره حساب پرفکت مانی کپی شد.</string>
     <string name="bank_transfer">حواله بانکی</string>
     <string name="in_collections">همکاری در مجموعه‌ها:</string>
-    <string name="our_products">محصولات ما</string>
+    <string name="our_products">محصولات ما:</string>
     <string name="view_our_products">مشاهده محصولات ما</string>
     <string name="title_activity_login">ورود</string>
     <string name="login_google">ورود از طریق گوگل</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5c55b5c..4628cdd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -4,7 +4,7 @@
     <string name="new_collection_url" translatable="false">https://daryaye-sokhan.ir/add-new-collection/</string>
 
     <string name="address_btc" translatable="false">bc1qdrjpcxnnay42jfc56hze4vrpkrf5s5c45xd5va</string>
-    <string name="address_eth" translatable="false">0x8425d6010C12D0781D87D9cAaDA3bDedd15c9347(BSC)</string>
+    <string name="address_eth" translatable="false">0x8425d6010C12D0781D87D9cAaDA3bDedd15c9347(BEP20)</string>
     <string name="address_eth_copy" translatable="false">0x8425d6010C12D0781D87D9cAaDA3bDedd15c9347</string>
     <string name="address_perfect" translatable="false">U21873528</string>
     <string name="address_trx" translatable="false">TTahPYiMfWygFALi2Ew3aQK8jF7rGPTk5b</string>
@@ -275,7 +275,7 @@
     <string name="account_copied">Perfect Money account number copied.</string>
     <string name="bank_transfer">Bank Transfer</string>
     <string name="in_collections">Collaboration in collections:</string>
-    <string name="our_products">Our products</string>
+    <string name="our_products">Our products:</string>
     <string name="our_products_url" translatable="false">https://ads.daryaye-sokhan.ir/</string>
     <string name="view_our_products">View our products</string>
     <string name="title_activity_login">Login</string>
diff --git a/build.gradle b/build.gradle
index e5cd749..cc111ac 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,15 +3,14 @@ buildscript {
     repositories {
         google()
         mavenCentral()
-
-
-        maven { url 'https://maven.google.com' }
+        maven { url "https://jcenter.bintray.com" }
         maven { url "https://jitpack.io" }
+        maven { url 'https://maven.google.com' }
         maven { url "https://dl.google.com" }
-        maven { url "https://jcenter.bintray.com" }
+
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.3'
+        classpath 'com.android.tools.build:gradle:7.0.4'
         classpath 'com.google.gms:google-services:4.3.10'
     }
 
@@ -22,11 +21,11 @@ allprojects {
     repositories {
         google()
         mavenCentral()
-
-        maven { url 'https://maven.google.com' }
+        maven { url "https://jcenter.bintray.com" }
         maven { url "https://jitpack.io" }
+        maven { url 'https://maven.google.com' }
         maven { url "https://dl.google.com" }
-        maven { url "https://jcenter.bintray.com" }
+
 
     }
     tasks.withType(JavaCompile) {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 52dfccb..4ce3637 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip