Merge pull request #16 from D4rK7355608/tmp

Update 3.0_r1

Author: MihaiCristianCondrea

.idea/.name

@@ -1,3 +1,6 @@
+# Version 3.0_r2:
+- Made minor under-the-hood improvements for a better overall app experience.
+
 # Version 3.0_r1:
 - Added a new startup screen for new users.
 - Added a new GDPR message to comply with Google Play policy.

CHANGELOG.md

@@ -17,8 +17,6 @@
 
 ## The perfect QR code scanner for anyone who wants a fast and versatile app. 📷
 
-[![YouTube Trailer](https://yt-embed.herokuapp.com/embed?v=CgX31Oy2etM)](https://youtu.be/CgX31Oy2etM)
-
 Scan and Generate QR/Bar Codes with Ease! 🌐
 
 Introducing D4rK QR & Bar Code Scanner Plus, the reliable and user-friendly app that streamlines QR code scanning and generation on Android devices. Powered by the trusted ZXing scanning library, our app offers a secure and seamless experience. 🔐
@@ -29,6 +27,8 @@ Embrace QR and bar codes with QR & Bar Code Scanner Plus. The ultimate free scan
 
 Furthermore, D4rK QR & Bar Code Scanner Plus supports a wide range of barcode formats, including QR, Data Matrix, Aztec, UPC, EAN, and more. Discover hidden details, such as Wi-Fi connections, geolocations, calendar events, and product information, with just a scan. 🛡️
 
+[<img src="https://img.youtube.com/vi/CgX31Oy2etM/maxresdefault.jpg" alt="Watch the trailer">](https://youtu.be/CgX31Oy2etM)
+
 ## ⚠ Opening Issues!
 Bugs can be reported [here](https://github.com/D4rK7355608/com.d4rk.netprobe/issues).
 

README.md

@@ -60,11 +60,8 @@
         <activity
             android:name=".ui.settings.help.HelpActivity"
             android:label="@string/help"
-            android:exported="false">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".ui.settings.help.HelpActivity"/>
-        </activity>
+            android:exported="false"
+            android:parentActivityName=".ui.settings.help.HelpActivity"/>
         <activity
             android:name=".ui.settings.SettingsActivity"
             android:exported="false"

app/src/main/AndroidManifest.xml

@@ -8,6 +8,7 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleObserver
 import androidx.lifecycle.OnLifecycleEvent
 import androidx.lifecycle.ProcessLifecycleOwner
+import androidx.multidex.MultiDexApplication
 import com.google.android.gms.ads.AdError
 import com.google.android.gms.ads.AdRequest
 import com.google.android.gms.ads.FullScreenContentCallback
@@ -16,13 +17,13 @@ import com.google.android.gms.ads.MobileAds
 import com.google.android.gms.ads.appopen.AppOpenAd
 import java.util.Date
 private const val AD_UNIT_ID = "ca-app-pub-5294151573817700/8044468099"
-class AppOpenAdManager : Application(), Application.ActivityLifecycleCallbacks, LifecycleObserver {
+class AppOpenAdManager : MultiDexApplication(), Application.ActivityLifecycleCallbacks, LifecycleObserver {
   private lateinit var appOpenAdManager: AppOpenAdManager
   private var currentActivity: Activity? = null
   override fun onCreate() {
     super.onCreate()
     registerActivityLifecycleCallbacks(this)
-      MobileAds.initialize(this)
+    MobileAds.initialize(this)
     ProcessLifecycleOwner.get().lifecycle.addObserver(this)
     appOpenAdManager = AppOpenAdManager()
   }
@@ -41,10 +42,6 @@ class AppOpenAdManager : Application(), Application.ActivityLifecycleCallbacks,
   override fun onActivityStopped(activity: Activity) {}
   override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {}
   override fun onActivityDestroyed(activity: Activity) {}
-  @Suppress("unused")
-  fun showAdIfAvailable(activity: Activity, onShowAdCompleteListener: OnShowAdCompleteListener) {
-    appOpenAdManager.showAdIfAvailable(activity, onShowAdCompleteListener)
-  }
   interface OnShowAdCompleteListener {
     fun onShowAdComplete()
   }
@@ -59,39 +56,32 @@ class AppOpenAdManager : Application(), Application.ActivityLifecycleCallbacks,
       }
       isLoadingAd = true
       val request = AdRequest.Builder().build()
-        AppOpenAd.load(
-            context,
-            AD_UNIT_ID,
-            request,
-            AppOpenAd.APP_OPEN_AD_ORIENTATION_PORTRAIT,
-            object : AppOpenAd.AppOpenAdLoadCallback() {
-                override fun onAdLoaded(ad: AppOpenAd) {
-                    appOpenAd = ad
-                    isLoadingAd = false
-                    loadTime = Date().time
-                }
-
-                override fun onAdFailedToLoad(loadAdError: LoadAdError) {
-                    isLoadingAd = false
-                }
-            }
-        )
+      AppOpenAd.load(context, AD_UNIT_ID, request, AppOpenAd.APP_OPEN_AD_ORIENTATION_PORTRAIT, object : AppOpenAd.AppOpenAdLoadCallback() {
+        override fun onAdLoaded(ad: AppOpenAd) {
+          appOpenAd = ad
+          isLoadingAd = false
+          loadTime = Date().time
+        }
+        override fun onAdFailedToLoad(loadAdError: LoadAdError) {
+          isLoadingAd = false
+        }
+      })
     }
-    private fun wasLoadTimeLessThanNHoursAgo(@Suppress("SameParameterValue") numHours: Long): Boolean {
+    @Suppress("SameParameterValue")
+    private fun wasLoadTimeLessThanNHoursAgo(numHours: Long): Boolean {
       val dateDifference: Long = Date().time - loadTime
       val numMilliSecondsPerHour: Long = 3600000
       return dateDifference < numMilliSecondsPerHour * numHours
     }
+    @Suppress("BooleanMethodIsAlwaysInverted")
     private fun isAdAvailable(): Boolean {
       return appOpenAd != null && wasLoadTimeLessThanNHoursAgo(4)
     }
     fun showAdIfAvailable(activity: Activity) {
-      showAdIfAvailable(
-        activity,
-        object : OnShowAdCompleteListener {
-          override fun onShowAdComplete() {
-          }
+      showAdIfAvailable(activity, object: OnShowAdCompleteListener {
+        override fun onShowAdComplete() {
         }
+      }
       )
     }
     fun showAdIfAvailable(activity: Activity, onShowAdCompleteListener: OnShowAdCompleteListener) {
@@ -105,16 +95,16 @@ class AppOpenAdManager : Application(), Application.ActivityLifecycleCallbacks,
       }
       appOpenAd!!.fullScreenContentCallback = object : FullScreenContentCallback() {
         override fun onAdDismissedFullScreenContent() {
-              appOpenAd = null
-              isShowingAd = false
-              onShowAdCompleteListener.onShowAdComplete()
-              loadAd(activity)
+          appOpenAd = null
+          isShowingAd = false
+          onShowAdCompleteListener.onShowAdComplete()
+          loadAd(activity)
         }
         override fun onAdFailedToShowFullScreenContent(adError: AdError) {
-              appOpenAd = null
-              isShowingAd = false
-              onShowAdCompleteListener.onShowAdComplete()
-              loadAd(activity)
+          appOpenAd = null
+          isShowingAd = false
+          onShowAdCompleteListener.onShowAdComplete()
+          loadAd(activity)
         }
         override fun onAdShowedFullScreenContent() {
         }

app/src/main/kotlin/com/d4rk/qrcodescanner/plus/ads/managers/AppOpenAdManager.kt

@@ -144,7 +144,7 @@ class SettingsActivity : AppCompatActivity(), SharedPreferences.OnSharedPreferen
                     putExtra(Intent.EXTRA_TEXT, "https://play.google.com/store/apps/details?id=" + BuildConfig.APPLICATION_ID)
                     putExtra(Intent.EXTRA_SUBJECT, R.string.share_subject)
                 }
-                startActivity(Intent.createChooser(sharingIntent, getString(R.string.share)))
+                startActivity(Intent.createChooser(sharingIntent, getString(R.string.share_using)))
                 true
             }
             val ossPreference = findPreference<Preference>(getString(R.string.key_open_source_licenses))