Update 1.3_r1.

Author: MihaiCristianCondrea

.idea/misc.xml

@@ -1,3 +1,13 @@
+# Version 1.3_r1:
+- Target SDK now is 26;
+- Removed unused resources;
+- Added mail to dev;
+- Changed themes;
+- Changed colors;
+- Added launcher shortcuts;
+- Added license in more menu;
+- Maybe is more but I forget.
+
 # Version 1.2_r1:
 - Fixed theme settings;
 - Reduced app size;

CHANGELOG.md

@@ -9,43 +9,43 @@
 ![GitHub Pull Requests](https://img.shields.io/github/issues-pr/D4rK7355608/com.d4rk.englishwithlidia.plus?style=for-the-badge&logo=github)
 ![GitHub License](https://img.shields.io/github/license/D4rK7355608/com.d4rk.englishwithlidia.plus?style=for-the-badge&logo=github)
 
-## English with Lidia Plus
+## 📚 English with Lidia Plus 📚
 
 - ╔╦╦╦═╦╗╔═╦═╦══╦═╗
 - ║║║║╩╣╚╣═╣║║║║║╩╣
 - ╚══╩═╩═╩═╩═╩╩╩╩═╝
 
-## Learn english and relax in the same time!
+## Learn english and relax in the same time! 📚
 
 Learn English by reading our blog. 📗 Or, instead you can listen to us. 📻 This is the official app developed by D4rK for Lidia, our English teacher who want to give us best lessons. 📖
 This app is made with love and passion for everyone! 💖
 
 🌐 Official website/blog is [here](https://sites.google.com/view/englishwithlidia/home).
 
-Bugs can be reported here.
+## ⚠ Opening Issues ⚠
 
-## Opening Issues :warning:
+Bugs can be reported [here](https://github.com/D4rK7355608/com.d4rk.englishwithlidia.plus/issues).
 
 > Only use the GitHub Issues section if you discovered issues with the code itself. Do not mistake the Issues page as a help desk.
 > For support, informations and requests, please contact <d4rk7355608@gmail.com>.
 
 - Create an audio/text/general bug. 🐞
 
-__English with Lidia Plus is 100% free, open source, ad free, and have a clean design!__
+__🖤 English with Lidia Plus is 100% free, open source, ad free, and have a clean design! 🖤__
 
-## 💿 Features!
+## 🛠️ Features!
 - ⭐️ No internet required.
+- ⭐️ Play audio instead of reading.
 - ⭐️ Adaptive themes + Material-You.
 - ⭐️ Simple and easy to use.
 - ⭐️ Fast and lightweight.
-- ⭐️ Play audio instead of reading.
 - ⭐️ Free Open source & secure.
 
 __❗️Note❗️__ Some features are still in progress or needs more improvements and investigations.
 
 ## Changelog [here](https://raw.githubusercontent.com/D4rK7355608/com.d4rk.englishwithlidia.plus/master/CHANGELOG.md)!
 
-## Screenshots:
+## 🖼️ App preview:
 
 <img src="/app/src/main/play/listings/en-US/graphics/phone-screenshots/1-screenshot_main.png"  width="400">
 
@@ -77,4 +77,4 @@ height="90">](https://play.google.com/store/apps/details?id=com.d4rk.englishwith
 __Privacy Policy__ [here](https://sites.google.com/view/d4rk7355608/more/apps/music-sleep-timer/privacy-policy).
 __Terms of Service__ [here](https://sites.google.com/view/d4rk7355608/more/apps/music-sleep-timer/terms-of-service).
 
-![license](https://imgur.com/QQlcEVT.png)
+![license](https://imgur.com/QQlcEVT.png)

README.md

@@ -7,12 +7,12 @@ plugins {
 }
 android {
     compileSdk 32
-    def tagName = '1.2_r1'
+    def tagName = '1.3_r1'
     defaultConfig {
         applicationId "com.d4rk.englishwithlidia.plus"
-        minSdk 23
+        minSdk 26
         targetSdk 32
-        versionCode 15
+        versionCode 17
         versionName tagName
         archivesBaseName = "com.d4rk.englishwithlidia.plus-v${tagName}"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -47,7 +47,7 @@ android {
     }
 }
 dependencies {
-    implementation platform('com.google.firebase:firebase-bom:30.1.0')
+    implementation platform('com.google.firebase:firebase-bom:30.2.0')
     implementation 'com.google.firebase:firebase-crashlytics-ktx:18.2.11'
     implementation 'com.google.firebase:firebase-analytics-ktx:21.0.0'
     implementation 'com.google.firebase:firebase-perf:20.1.0'

app/build.gradle

@@ -18,7 +18,6 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:logo="@drawable/ic_launcher_foreground"
-        android:roundIcon="@mipmap/ic_launcher_round"
         android:screenOrientation="fullSensor"
         android:supportsRtl="true"
         android:theme="@style/AppThemeActionBar"
@@ -85,6 +84,9 @@
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".MainActivity"/>
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/shortcuts"/>
         </activity>
         <meta-data
             android:name="firebase_performance_logcat_enabled"

app/src/main/AndroidManifest.xml

@@ -1,6 +1,7 @@
 package com.d4rk.englishwithlidia.plus
 import android.content.DialogInterface
 import android.content.Intent
+import android.graphics.drawable.Icon
 import android.net.Uri
 import android.os.Bundle
 import android.view.Menu
@@ -9,7 +10,11 @@ import android.view.View
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
+import androidx.core.content.pm.ShortcutInfoCompat
+import androidx.core.content.pm.ShortcutManagerCompat
+import androidx.core.graphics.drawable.IconCompat
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
+import androidx.core.view.GravityCompat
 import androidx.drawerlayout.widget.DrawerLayout
 import androidx.navigation.fragment.NavHostFragment
 import androidx.navigation.ui.AppBarConfiguration
@@ -25,6 +30,7 @@ import com.google.android.material.textview.MaterialTextView
 class MainActivity : AppCompatActivity() {
     private lateinit var appBarConfiguration: AppBarConfiguration
     private lateinit var binding: ActivityMainBinding
+    val context: MainActivity = this
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         @Suppress("UNUSED_VARIABLE")
@@ -45,13 +51,21 @@ class MainActivity : AppCompatActivity() {
             val navHostFragment = supportFragmentManager.findFragmentById(R.id.nav_host_fragment_content_main) as NavHostFragment
             navHostFragment.navController
         }
+        val shortcut = ShortcutInfoCompat.Builder(context, "website")
+            .setShortLabel(getString(R.string.website))
+            .setLongLabel(getString(R.string.website_tooltip))
+            .setIcon(IconCompat.createFromIcon(Icon.createWithResource(context, R.mipmap.ic_shortcut_website)))
+            .setIntent(Intent(Intent.ACTION_VIEW, Uri.parse("https://sites.google.com/view/englishwithlidia")))
+            .build()
+        ShortcutManagerCompat.pushDynamicShortcut(context, shortcut)
         appBarConfiguration = AppBarConfiguration(setOf(R.id.nav_home, R.id.nav_settings, R.id.nav_about, R.id.nav_lessons, R.id.nav_lesson1, R.id.nav_lesson2), drawerLayout)
         setupActionBarWithNavController(navController, appBarConfiguration)
         navView.setupWithNavController(navController)
         navController.setGraph(R.navigation.mobile_navigation)
+        drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED, GravityCompat.END)
     }
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
-        menuInflater.inflate(R.menu.more_menu, menu)
+        menuInflater.inflate(R.menu.menu_main, menu)
         return true
     }
     override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) {
@@ -70,6 +84,11 @@ class MainActivity : AppCompatActivity() {
             startActivity(newIntent)
             true
         }
+        R.id.license -> {
+            val newIntent = Intent(Intent.ACTION_VIEW, Uri.parse("https://www.gnu.org/licenses/gpl-3.0"))
+            startActivity(newIntent)
+            true
+        }
         R.id.permissions -> {
             val intent = Intent(this, PermissionsActivity::class.java)
             startActivity(intent)
@@ -92,9 +111,9 @@ class MainActivity : AppCompatActivity() {
             val alertDialog: AlertDialog.Builder = AlertDialog.Builder(this)
             alertDialog.setTitle(R.string.more_apps)
             val view: View = layoutInflater.inflate(R.layout.fragment_dialog, null)
-            val musicSleepTimerString: MaterialTextView = view.findViewById(R.id.musicSleepTimerString)
             alertDialog.setView(view)
             alertDialog.create()
+            val musicSleepTimerString: MaterialTextView = view.findViewById(R.id.musicSleepTimerString)
             view.findViewById<View?>(R.id.musicSleepTimer)?.setOnClickListener {
                 val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://play.google.com/store/apps/details?id=com.d4rk.musicsleeptimer.plus"))
                 startActivity(intent)
@@ -103,6 +122,24 @@ class MainActivity : AppCompatActivity() {
                 val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://play.google.com/store/apps/details?id=com.d4rk.musicsleeptimer.plus"))
                 startActivity(intent)
             }
+            val qrCodeScannerString: MaterialTextView = view.findViewById(R.id.qrCodeScannerString)
+            view.findViewById<View?>(R.id.qrCodeScanner)?.setOnClickListener {
+                val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://play.google.com/store/apps/details?id=com.d4rk.qrcodescanner.plus"))
+                startActivity(intent)
+            }
+            qrCodeScannerString.setOnClickListener {
+                val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://play.google.com/store/apps/details?id=com.d4rk.qrcodescanner.plus"))
+                startActivity(intent)
+            }
+            val androidStudioTutorialsString: MaterialTextView = view.findViewById(R.id.androidStudioTutorialsString)
+            view.findViewById<View?>(R.id.androidStudioTutorials)?.setOnClickListener {
+                val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://play.google.com/store/apps/details?id=com.d4rk.androidtutorials"))
+                startActivity(intent)
+            }
+            androidStudioTutorialsString.setOnClickListener {
+                val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://play.google.com/store/apps/details?id=com.d4rk.androidtutorials"))
+                startActivity(intent)
+            }
             alertDialog.setNegativeButton(R.string.cool, null)
             alertDialog.show()
             true