Ploishing the project

D4rK7355608 · Jul 24, 2024 · 51750c0 · 51750c0
1 parent 743eba7
commit 51750c0
Show file tree

Hide file tree

Showing 5 changed files with 76 additions and 110 deletions.
diff --git a/README.md b/README.md
@@ -1,81 +1,56 @@
-<p align="center">
-<img src="/app/src/main/play/listings/en-US/graphics/ic_launcher-playstore.png" width="300">
-</p>
+![English with Lidia Plus](/app/src/main/play/listings/en-US/graphics/feature-graphic/play_store_feature_graphic.png "English with Lidia Plus")
 
-![Works with Android](https://img.shields.io/badge/Made%20for-Android-lime?style=for-the-badge&logo=android)
-![GitHub Downloads](https://img.shields.io/github/downloads/D4rK7355608/com.d4rk.englishwithlidia.plus/total?color=green&style=for-the-badge&logo=github)
-![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/D4rK7355608/com.d4rk.englishwithlidia.plus/android.yml?style=for-the-badge)
-![GitHub Issues](https://img.shields.io/github/issues/D4rK7355608/com.d4rk.englishwithlidia.plus?style=for-the-badge&logo=github)
-![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)
+<a href="https://play.google.com/store/apps/details?id=com.d4rk.englishwithlidia.plus"><img src="https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png" height="70"></a>
 
-## 📚 English with Lidia Plus 📚
+English with Lidia Plus
+==================
 
-╔╦╦╦═╦╗╔═╦═╦══╦═╗ \
-║║║║╩╣╚╣═╣║║║║║╩╣ \
-╚══╩═╩═╩═╩═╩╩╩╩═╝
-
-## Learning English can be relaxing with our friendly and supportive teacher. 📚
+**Learning English can be relaxing with our friendly and supportive teacher. 📚**
 
 English with Lidia Plus is the app for you!
 
 English with Lidia Plus is a comprehensive app designed for learners of all levels seeking a fun and engaging approach to mastering the English language.
 
 Developed by Lidia, a professional English teacher, this app provides a wealth of resources and interactive features to enhance your English skills.
 
-Key features include:
+Our app is designed to be simple and easy to use, while also being fast and lightweight. Plus, it's free and open-source software!
 
-- Access to Lidia's blog, offering insightful articles on various aspects of the English language and culture, enriched with new vocabulary and expressions.
-- Engaging podcasts hosted by Lidia, designed to improve your listening and pronunciation abilities, while expanding your knowledge of English culture and idioms.
-- Exclusive content and resources, including clear explanations and examples, to strengthen your grasp of English grammar, vocabulary, and more.
-- A visually appealing and user-friendly interface, incorporating interactive quizzes, games, and feedback to make learning enjoyable.
+# Features
 
-English with Lidia Plus transcends the limitations of a typical app, offering a holistic learning journey that empowers you to achieve your language goals while enjoying the process.
+- Play audio instead of reading.
+- Simple and easy to use.
+- Exclusive content and resources.
 
-For more information, visit the official [website/blog](https://sites.google.com/view/englishwithlidia/home) to learn more.
+# Benefits
 
-## ⚠ Opening Issues!
-Bugs can be reported [here](https://github.com/D4rK7355608/com.d4rk.englishwithlidia.plus/issues).
+- Fun and interesting lessons.
+- Engaging podcasts hosted by Lidia, designed to improve your listening and pronunciation abilities, while expanding your knowledge of English culture and idioms.
 
-- Create an audio/text/general bug. 🐞
+# Screenshots
 
-## 🛠️ Features!
-⭐️ Play audio instead of reading. \
-⭐️ Adaptive themes + Material-You. \
-⭐️ Simple and easy to use. \
-⭐️ Fast and lightweight. \
-⭐️ Free Open source & secure.
+<table>
+  <tr>
+    <td><img src="/app/src/main/play/listings/en-US/graphics/phone-screenshots/1-screenshot_main.png" width="300"></td>
+    <td><img src="/app/src/main/play/listings/en-US/graphics/phone-screenshots/2-screenshot_lesson1.png" width="300"></td>
+    <td><img src="/app/src/main/play/listings/en-US/graphics/phone-screenshots/3-screenshot_lesson2.png" width="300"></td>
+  </tr>
+</table>
 
-## Changelog [here](https://raw.githubusercontent.com/D4rK7355608/com.d4rk.englishwithlidia.plus/master/CHANGELOG.md)!
+# How it works
 
-## 🖼️ App preview:
+English with Lidia Plus offers a seamless learning experience. Simply dive into the world of English. Progress through engaging lessons, listen to captivating podcasts, and practice your skills.
 
-<img src="/app/src/main/play/listings/en-US/graphics/phone-screenshots/1-screenshot_main.png"  width="400">
+# Get started today
 
-## 🛑 Disclaimer!
-- This Application is made only for Education Purpose.
-- English with Lidia Plus is a blog type app witch can help you learn English with relaxing and easy to understand lessons for everyone.
-- We acknowledge the ownership of some of the music in our audios and credit Lidia Melinte as the main voice.
-- Only use the GitHub Issues section if you discover issues with the code itself. Do not mistake the Issues page as a help desk. For support, information and requests, please contact [email protected].
+Unlock your English potential with English with Lidia Plus. Download the app now and start your language learning journey today. Whether you're a beginner or looking to refine your advanced skills, our app provides the tools and support you need to succeed.\
 
-## 💬 Feedback!
-We are constantly updating and improving English with Lidia Plus to give you the best possible experience. If you have any suggested features or improvements, please leave a review. In case something is not working correctly please let me know. When posting a low rating please describe what is wrong to give the possibility to fix that issue.
+# Feedback
 
-Thank you for choosing English with Lidia Plus. We hope you enjoy using our app as much as we enjoyed creating it for you! Rate us 5 stars ⭐⭐⭐⭐⭐ if you are happy with the app! ❤
+We are constantly updating and improving English with Lidia Plus app to give you the best possible experience. If you have any suggested features or improvements, please leave a review. In case something is not working correctly please let me know. When posting a low rating please describe what is wrong to give the possibility to fix that issue.
 
-## 👨🏻‍💻 &nbsp;More About Me:
-<a href="mailto:[email protected]"><img src="https://img.shields.io/badge/[email protected]?style=for-the-badge&logo=gmail&logoColor=white"/></a>
-<a href="https://developers.google.com/profile/u/D4rK7355608"><img src="https://img.shields.io/badge/Android%20Developers-white?style=for-the-badge&logo=android"/></a>
-<a href="https://forum.xda-developers.com/m/d4rk7355608.10095012/"><img src="https://img.shields.io/badge/XDA%20Developers-grey?style=for-the-badge&logo=xdadevelopers"/></a>
-<a href="https://www.deviantart.com/d4rk7355608"><img src="https://img.shields.io/badge/DeviantArt-default?style=for-the-badge&logo=deviantart&logoColor=white"/></a>
-<a href="https://gamejolt.com/@D4rK_S-A-D"><img src="https://img.shields.io/badge/GameJolt-grey?style=for-the-badge&logo=gamejolt&logoColor=white"/></a>
-<a href="https://patreon.com/D4rK7355608"><img src="https://img.shields.io/endpoint.svg?url=https%3A%2F%2Fshieldsio-patreon.vercel.app%2Fapi%3Fusername%3DD4rK7355608%26type%3Dpatrons&style=for-the-badge"/></a>
-<a href="https://www.paypal.me/d4rkmichaeltutorials"><img src="https://img.shields.io/badge/Paypal-white?style=for-the-badge&logo=paypal"/></a>
-<a href="https://twitter.com/D4rK7355608/"><img src="https://img.shields.io/twitter/follow/D4rK7355608?color=blue&label=Twitter&logo=Twitter&style=for-the-badge"/></a>
-<a href="https://www.youtube.com/c/D4rK7355608/"><img src="https://img.shields.io/youtube/channel/subscribers/UCLDi-rmSRry0pNL-oVvGJAw?color=darkred&label=D4rK&logo=youtube&logoColor=darkred&style=for-the-badge"/></a>
-<a href="https://github.com/D4rK7355608/"><img src="https://img.shields.io/github/followers/D4rK7355608?color=white&logo=GitHub&style=for-the-badge"/></a>
+Thank you for choosing English with Lidia! We hope you enjoy using our app as much as we enjoyed creating it for you!
 
-[<img src="https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png" alt="Get it on Google Play" height="90">](https://play.google.com/store/apps/details?id=com.d4rk.englishwithlidia.plus)
+# License
 
 __Privacy Policy__ [here](https://sites.google.com/view/englishwithlidia/more/privacy-policy).
 __Terms of Service__ [here](https://sites.google.com/view/englishwithlidia/more/terms-of-service).

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -16,7 +16,7 @@ android {
         applicationId = "com.d4rk.englishwithlidia.plus"
         minSdk = 26
         targetSdk = 34
-        versionCode = 57
+        versionCode = 59
         versionName = "5.0.0"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         resourceConfigurations += listOf(

diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/display/theme/style/Type.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/display/theme/style/Type.kt
@@ -1,6 +1,7 @@
 package com.d4rk.englishwithlidia.plus.ui.settings.display.theme.style
 
 import androidx.compose.material3.Typography
+import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.buildAnnotatedString
@@ -22,43 +23,38 @@ val Typography = Typography(
 
 fun String.annotatedStringHtmlParser(
     boldTag: String = "<b>",
-    underlineTag: String = "<i>",
-    italicTag: String = "\n",
-) =
-    buildAnnotatedString {
-        val pattern =
-            "(${Regex.escape(boldTag)}|${Regex.escape(underlineTag)}|${Regex.escape(italicTag)})(.*?)(\\1|$)".toRegex()
-        var lastIndex = 0
-        val text = this@annotatedStringHtmlParser
-        pattern.findAll(text).forEach { result ->
-            val (tag, content) = result.destructured
-            append(text.substring(lastIndex, result.range.first))
-            val start = length
-            append(content)
-            val end = length
-            when (tag) {
-                boldTag -> addStyle(
-                    style = SpanStyle(fontWeight = FontWeight.Bold),
-                    start = start,
-                    end = end,
-                )
+    underlineTag: String = "<u>",
+    italicTag: String = "<i>",
+): AnnotatedString = buildAnnotatedString {
+    val pattern =
+        "(${Regex.escape(boldTag)}|${Regex.escape(underlineTag)}|${Regex.escape(italicTag)})(.*?)(\\1|$)".toRegex()
+    var lastIndex = 0
+    val text = this@annotatedStringHtmlParser.replace("\\n", "\n")
 
-                underlineTag -> addStyle(
-                    style = SpanStyle(textDecoration = TextDecoration.Underline),
-                    start = start,
-                    end = end,
-                )
+    pattern.findAll(text).forEach { result ->
+        val (tag, content) = result.destructured
+        append(text.substring(lastIndex, result.range.first))
 
-                italicTag -> addStyle(
-                    style = SpanStyle(fontStyle = FontStyle.Italic),
-                    start = start,
-                    end = end,
-                )
-            }
-            lastIndex = result.range.last + 1
-            if (tag != italicTag && lastIndex < text.length && text[lastIndex] == '\n') {
-                lastIndex++
-            }
+        val start = length
+        append(content)
+        val end = length
+
+        when (tag) {
+            boldTag -> addStyle(SpanStyle(fontWeight = FontWeight.Bold), start, end)
+            underlineTag -> addStyle(
+                SpanStyle(textDecoration = TextDecoration.Underline),
+                start,
+                end
+            )
+
+            italicTag -> addStyle(SpanStyle(fontStyle = FontStyle.Italic), start, end)
         }
-        append(text.substring(lastIndex, text.length))
-    }
+
+        lastIndex = result.range.last + 1
+        if (tag != italicTag && lastIndex < text.length && text[lastIndex] == '\n') {
+            lastIndex++
+        }
+    }
+
+    append(text.substring(lastIndex, text.length))
+}
diff --git a/app/src/main/play/listings/en-US/full-description.txt b/app/src/main/play/listings/en-US/full-description.txt
@@ -1,32 +1,27 @@
-The Cart Calculator app is a convenient and simple tool that helps you to manage your shopping cart easily and efficiently. Whether you are grocery shopping or just buying household items, this app helps you to keep track of everything in one place.
+English with Lidia Plus is the app for you!
 
-With the Cart Calculator app, you can add items to the cart, set the quantity, and calculate the total cost of your purchase. You can also update the quantity of each item and see the updated total cost in real-time. The app is user-friendly and easy to navigate, making it a perfect choice for people of all ages.
+English with Lidia Plus is a comprehensive app designed for learners of all levels seeking a fun and engaging approach to mastering the English language.
 
-The Cart Calculator app features a simple and intuitive interface that allows you to add and manage items quickly and easily. It also provides a detailed list of your purchases, including the name, price, and quantity of each item. You can customize the list according to your preferences, and the app will calculate the total cost for you automatically.
-
-In addition to managing your shopping cart, the Cart Calculator app also allows you to track your expenses and monitor your spending. This feature helps you to stick to your budget and avoid overspending.
-
-Overall, the Cart Calculator app is an essential tool for anyone who wants to manage their shopping cart efficiently and stay on top of their expenses. Whether you are a busy mom or a student on a budget, this app is perfect for you. Download it now and start managing your shopping cart like a pro!
+Developed by Lidia, a professional English teacher, this app provides a wealth of resources and interactive features to enhance your English skills.
 
 Our app is designed to be simple and easy to use, while also being fast and lightweight. Plus, it's free and open-source software!
 
 Features
-• Calculate the total amount of your cart
-• Add or remove items from cart
-• Create multiple carts
+• Play audio instead of reading.
+• Simple and easy to use.
+• Exclusive content and resources.
 
 Benefits
-• Efficient shopping
-• Budget management
-• Expense tracking
+• Fun and interesting lessons.
+• Engaging podcasts hosted by Lidia, designed to improve your listening and pronunciation abilities, while expanding your knowledge of English culture and idioms.
 
 How it works
-Cart Calculator streamlines your shopping experience by allowing you to effortlessly manage your shopping cart. It provides a real-time calculation of your total purchase cost as you add or update item quantities. This user-friendly app is designed for shoppers of all ages, ensuring that managing your cart is a breeze.
+English with Lidia Plus offers a seamless learning experience. Simply dive into the world of English. Progress through engaging lessons, listen to captivating podcasts, and practice your skills.
 
 Get started today
-Embark on a smarter shopping journey with Cart Calculator. Download it from the Google Play Store now and take the first step towards efficient shopping management. It’s free, open-source, and incredibly easy to use—perfect for enhancing your shopping efficiency. Enjoy a seamless shopping experience today!
+Unlock your English potential with English with Lidia Plus. Download the app now and start your language learning journey today. Whether you're a beginner or looking to refine your advanced skills, our app provides the tools and support you need to succeed.\
 
 Feedback
-We are constantly updating and improving Cart Calculator to give you the best possible experience. If you have any suggested features or improvements, please leave a review. In case something is not working correctly please let me know. When posting a low rating please describe what is wrong to give the possibility to fix that issue.
+We are constantly updating and improving English with Lidia Plus app to give you the best possible experience. If you have any suggested features or improvements, please leave a review. In case something is not working correctly please let me know. When posting a low rating please describe what is wrong to give the possibility to fix that issue.
 
-Thank you for choosing Cart Calculator! We hope you enjoy using our app as much as we enjoyed creating it for you!
+Thank you for choosing English with Lidia! We hope you enjoy using our app as much as we enjoyed creating it for you!
diff --git a/app/src/main/play/listings/en-US/short-description.txt b/app/src/main/play/listings/en-US/short-description.txt
@@ -1 +1 @@
-Cart Calculator helps you to manage your shopping cart in an easy and fast.
+Learning English can be relaxing with our friendly and supportive teacher. 📚
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Cart Calculator helps you to manage your shopping cart in an easy and fast.
		Learning English can be relaxing with our friendly and supportive teacher. 📚