Merge pull request #81 from TheXtremeLabs/develop

Develop
TheXtremeLabs · Dec 31, 2023 · 5fa6aa8 · 5fa6aa8
2 parents 2be3636 + 71b86a0
commit 5fa6aa8
Show file tree

Hide file tree

Showing 12 changed files with 52 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -1,52 +1,74 @@
-# TheLab
+![WelcomeToTheLab](docs/images/the_lab_banner.png)
 
 [![Kotools Types][kotools-types-badge]][kotools-types-project]
 [![Kotlin][kotlin-badge]][kotlin]
 [![kotlinx.serialization][kotlinx.serialization-badge]][kotlinx.serialization]
 
 TheLab is the third version of ***Material Design***, an *Android* application originally developed
 to show several use-cases of Google's Android Material Design components such as (CardView,
-RecyclerView, so on and so forth), it's implementing now the new Jetpack Compose.
+RecyclerView, so on and so forth), it's implementing the new Jetpack Compose.
 
 It turns out to a "Lab App", where multiples libraries and use-cases are developed and tested in
 this app (biometric section, speech-to-text, floating widgets, file downloading, notifications and more)
 
 ## Libraries
 
-TheLab uses multiple libraries for UI as much as for network, image loading, dependency injection,
-serialization and so on
+TheLab uses multiple libraries for UI as much as for network, image loading, dependency injection, serialization and so on
 
 - [AndroidX Jetpack Compose][jetpack-compose]
 - [Coil][coil]
 - [Lottie][lottie]
 - [Media and Exoplayer][exoplayer]
-- [Google APIs][jetpack-compose]
+- [Google APIs][google-apis]
 - [Hilt][dagger-hilt]
 - [Kotlin Serialization][kotlinx-serialization]
 - [Retrofit][retrofit]
 - [OkHttp][okhttp]
 - [Timber][timber]
 
+## Migrations
+
+TheLab was originally developed in Java and XML layouts and view bindings for UI Layouts. Now it's in full Kotlin and, currently, we are migrating all the layouts to Jetpack Compose. Here's a few examples
+
+***Home***
+<p>
+  <img src="docs/images/Screenshot_home_1.png" alt="home_1" width="300"/>
+</p>
+
+***Home with dark mode***
+<p>
+  <img src="docs/images/Screenshot_home_3_dark.png" alt="home_3_dark" width="300"/>
+</p>
+
+***Palette***
+<p>
+  <img src="docs/images/Screenshot_palette_1_dark.png" alt="palette_1" width="300"/>
+</p>
+
+***Settings***
+<p>
+  <img src="docs/images/Screenshot_settings_1_light.png" alt="settings_1" width="300"/>
+</p>
+
+
 ## Versioning
 
-This repository use *Git* as the main versioning tool and follows [*Semantic Versioning*][sem-ver]
-principles.
+This repository use *Git* as the main versioning tool and follows [*Semantic Versioning*][sem-ver] principles.
 
 ## Related Apps
 
 * [***Material Design***](https://github.com/MichaelStH/MaterialDesignFeatures)
 * [***Testing***](https://github.com/MichaelStH/Testing/tree/develop)
-* [***TheKoLab***](https://github.com/TheXtremeLabs/TheKoLab) (
-  Repository created and maintained by LAMARQUE Loïc ([*@LVMVRQUXL*](https://github.com/LVMVRQUXL)
-  on *Github*))
+* [***TheKoLab***](https://github.com/TheXtremeLabs/TheKoLab) (Repository created and maintained by LAMARQUE Loïc ([*@LVMVRQUXL*](https://github.com/LVMVRQUXL) on *Github*))
 
 ## Authors
 
-Repository created and maintained by Saint-Honoré Michaël ([
-*@MichaelStH*](https://github.com/MichaelStH/) on *Github*).
+Repository created and maintained by Saint-Honoré Michaël([*@MichaelStH*](https://github.com/MichaelStH/) on *Github*).
+
+![HotCoffeeLoading](docs/gif/lottie_hot_coffee.gif)
 
 [sem-ver]: https://semver.org/
-[kotools-types-badge]: https://img.shields.io/static/v1?label=version&message=12.10.3&color=blue
+[kotools-types-badge]: https://img.shields.io/static/v1?label=version&message=12.10.4&color=blue
 [kotools-types-project]: https://github.com/kotools/types
 [kotlin]: https://kotlinlang.org
 [kotlin-badge]: https://img.shields.io/badge/kotlin-1.9.21-blue?logo=kotlin
@@ -55,6 +77,7 @@ Repository created and maintained by Saint-Honoré Michaël ([
 [kotlinx.serialization-badge]: https://img.shields.io/badge/kotlinx.serialization-1.6.0-blue?logo=kotlin
 [total-functions]: https://xlinux.nist.gov/dads/HTML/totalfunc.html
 [jetpack-compose]: https://developer.android.com/jetpack/compose?hl=fr
+[google-apis]: https://console.cloud.google.com/apis/library?hl=fr
 [coil]: https://coil-kt.github.io/coil/
 [lottie]: https://airbnb.io/lottie/#/
 [exoplayer]: https://developer.android.com/guide/topics/media/exoplayer/hello-world

diff --git a/build-logic/config/src/main/kotlin/AndroidConfiguration.kt b/build-logic/config/src/main/kotlin/AndroidConfiguration.kt
@@ -10,7 +10,7 @@ object AndroidConfiguration {
 
     object Application {
         const val code: Int = 1
-        val version: Version = Version(major = 12, minor = 10, patch = 2)
+        val version: Version = Version(major = 12, minor = 10, patch = 4)
     }
 }
 

diff --git a/docs/gif/lottie_hot_coffee.gif b/docs/gif/lottie_hot_coffee.gif
diff --git a/docs/images/Screenshot_home_1.png b/docs/images/Screenshot_home_1.png
diff --git a/docs/images/Screenshot_home_2_light.png b/docs/images/Screenshot_home_2_light.png
diff --git a/docs/images/Screenshot_home_3_dark.png b/docs/images/Screenshot_home_3_dark.png
diff --git a/docs/images/Screenshot_home_4_dark.png b/docs/images/Screenshot_home_4_dark.png
diff --git a/docs/images/Screenshot_palette_1_dark.png b/docs/images/Screenshot_palette_1_dark.png
diff --git a/docs/images/Screenshot_settings_1_light.png b/docs/images/Screenshot_settings_1_light.png
diff --git a/docs/images/the_lab_banner.png b/docs/images/the_lab_banner.png
diff --git a/feature/settings/src/main/java/com/riders/thelab/feature/settings/PreviewAppSection.kt b/feature/settings/src/main/java/com/riders/thelab/feature/settings/PreviewAppSection.kt
@@ -136,7 +136,7 @@ fun AppThemeCardRowItem(
                     .width(with(LocalDensity.current) {
                         textFieldSize.width.toDp()
                     }
-                ),
+                    ),
                 expanded = expanded.value,
                 onDismissRequest = { expanded.value = false }
             ) {
@@ -230,6 +230,19 @@ fun AppSettingsSection(viewModel: SettingsViewModel) {
                     .padding(horizontal = 8.dp)
             ) {
                 Column(modifier = Modifier.fillMaxWidth()) {
+
+                    Row(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .height(40.dp)
+                            .padding(horizontal = 12.dp),
+                        horizontalArrangement = Arrangement.SpaceBetween,
+                        verticalAlignment = Alignment.CenterVertically
+                    ) {
+                        Text(text = "App version")
+                        Text(text = viewModel.version)
+                    }
+
                     AppThemeCardRowItem(
                         preselectedThemeOptions = if (viewModel.isDarkMode) viewModel.themeOptions.first {
                             it.contains(

diff --git a/feature/settings/src/main/java/com/riders/thelab/feature/settings/SettingsActivity.kt b/feature/settings/src/main/java/com/riders/thelab/feature/settings/SettingsActivity.kt
@@ -46,6 +46,7 @@ class SettingsActivity : BaseComponentActivity() {
     override fun onStart() {
         super.onStart()
 
+        mViewModel.retrieveAppVersion(this@SettingsActivity)
         mViewModel.fetchDeviceInformation(this@SettingsActivity)
     }