Merge pull request #3 from NicosNicolaou16/updates_and_my_library

Updates and my library
NicosNicolaou16 · Aug 16, 2024 · 721ff21 · 721ff21
2 parents 099379b + 60ee165
commit 721ff21
Show file tree

Hide file tree

Showing 17 changed files with 217 additions and 124 deletions.
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/.idea/other.xml b/.idea/other.xml
diff --git a/README.md b/README.md
@@ -24,16 +24,16 @@ R8 enabled <br />
 # Examples
 <p align="left">
   <a title="simulator_image"><img src="examples/Screenshot_20240511_012335.png" height="500" width="200"></a>
-  <a title="simulator_image"><img src="examples/Screenshot_20240511_012348.png" height="500" width="200"></a>
-  <a title="simulator_image"><img src="examples/Screenshot_20240511_012400.png" height="500" width="200"></a>
-  <a title="simulator_image"><img src="examples/example_gif.gif" height="500" width="200"></a>
+  <a title="simulator_image"><img src="examples/Screenshot_20240816_221338.png" height="500" width="200"></a>
+  <a title="simulator_image"><img src="examples/Screenshot_20240816_221449.png" height="500" width="200"></a>
+  <a title="simulator_image"><img src="examples/example_gif1.gif" height="500" width="200"></a>
 </p>
 
 # Versioning
 Target SDK version: 34 <br />
 Minimum SDK version: 27 <br />
-Kotlin version: 2.0.0 <br />
-Gradle version: 8.5.1 <br />
+Kotlin version: 2.0.10 <br />
+Gradle version: 8.5.2 <br />
 
 # Feeds/Urls/End Point (parsing some data from the response)
 ## (Links References for Ends Points)
@@ -44,3 +44,4 @@ https://github.com/PokeAPI/sprites (GitHub) <br />
 https://fvilarino.medium.com/shared-element-transitions-in-jetpack-compose-8f553078101e <br />
 https://getstream.io/blog/shared-element-compose/  <br />
 https://medium.com/androiddevelopers/navigation-compose-meet-type-safety-e081fb3cf2f8  <br />
+https://dribbble.com/shots/6540871-Pokedex-App# - Get some UI - not completely use it (CHECK THE LINK FOR THE DESIGN)  <br />
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -65,6 +65,8 @@ android {
 
 dependencies {
 
+    // My Library - https://github.com/NicosNicolaou16/PercentagesWithAnimationCompose
+    implementation(libs.percentages.with.animation.compose)
     //Architecture
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.swipe.refresh.layout)

diff --git a/app/src/main/java/com/nicos/pokedex_compose/compose/MainActivity.kt b/app/src/main/java/com/nicos/pokedex_compose/compose/MainActivity.kt
@@ -3,6 +3,7 @@ package com.nicos.pokedex_compose.compose
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
@@ -23,7 +24,7 @@ class MainActivity : ComponentActivity() {
                     modifier = Modifier.fillMaxSize(),
                     color = MaterialTheme.colorScheme.background
                 ) {
-                    Navigation()
+                    Navigation({ enableEdgeToEdge() })
                 }
             }
         }

diff --git a/app/src/main/java/com/nicos/pokedex_compose/compose/generic_compose_views/Toolbar.kt b/app/src/main/java/com/nicos/pokedex_compose/compose/generic_compose_views/Toolbar.kt
@@ -1,20 +1,30 @@
 package com.nicos.pokedex_compose.compose.generic_compose_views
 
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.width
 import androidx.compose.material3.CenterAlignedTopAppBar
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.ColorFilter
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import com.nicos.pokedex_compose.R
 import com.nicos.pokedex_compose.ui.theme.GreenLight
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun CustomToolbar(title: Int) {
+fun CustomToolbar(title: Int, backButton: (() -> Unit)? = null) {
     CenterAlignedTopAppBar(
         title = {
             Text(
@@ -26,6 +36,19 @@ fun CustomToolbar(title: Int) {
                 )
             )
         },
+        navigationIcon = {
+            if (backButton != null)
+                Image(
+                    painter = painterResource(id = R.drawable.baseline_arrow_back_24),
+                    contentDescription = null,
+                    colorFilter = ColorFilter.tint(color = Color.White),
+                    contentScale = ContentScale.Inside,
+                    modifier = Modifier
+                        .clickable { backButton() }
+                        .fillMaxHeight()
+                        .width(width = 50.dp)
+                )
+        },
         colors = TopAppBarDefaults.centerAlignedTopAppBarColors(
             containerColor = GreenLight
         )
@@ -34,7 +57,7 @@ fun CustomToolbar(title: Int) {
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun CustomToolbar(title: String) {
+fun CustomToolbar(title: String, color: Color = GreenLight, backButton: (() -> Unit)? = null) {
     CenterAlignedTopAppBar(
         title = {
             Text(
@@ -46,8 +69,21 @@ fun CustomToolbar(title: String) {
                 )
             )
         },
+        navigationIcon = {
+            if (backButton != null)
+                Image(
+                    painter = painterResource(id = R.drawable.baseline_arrow_back_24),
+                    contentDescription = null,
+                    colorFilter = ColorFilter.tint(color = Color.White),
+                    contentScale = ContentScale.Inside,
+                    modifier = Modifier
+                        .clickable { backButton() }
+                        .fillMaxHeight()
+                        .width(width = 50.dp)
+                )
+        },
         colors = TopAppBarDefaults.centerAlignedTopAppBarColors(
-            containerColor = GreenLight
+            containerColor = color
         )
     )
 }
diff --git a/app/src/main/java/com/nicos/pokedex_compose/compose/navigation/Navigation.kt b/app/src/main/java/com/nicos/pokedex_compose/compose/navigation/Navigation.kt
@@ -1,5 +1,6 @@
 package com.nicos.pokedex_compose.compose.navigation
 
+import androidx.activity.SystemBarStyle
 import androidx.compose.animation.ExperimentalSharedTransitionApi
 import androidx.compose.animation.SharedTransitionLayout
 import androidx.compose.runtime.Composable
@@ -16,7 +17,7 @@ import com.nicos.pokedex_compose.utils.screen_routes.PokemonList
 
 @OptIn(ExperimentalSharedTransitionApi::class)
 @Composable
-fun Navigation() {
+fun Navigation(changeSystemBarStyle: (SystemBarStyle) -> Unit) {
     val navController = rememberNavController()
     SharedTransitionLayout {
         NavHost(
@@ -43,7 +44,11 @@ fun Navigation() {
                     url = pokemonDetailsScreen.url.decodeStringUrl(),
                     imageUrl = pokemonDetailsScreen.imageUrl.decodeStringUrl(),
                     name = pokemonDetailsScreen.name,
+                    changeSystemBarStyle = changeSystemBarStyle,
                     animatedVisibilityScope = this@composable,
+                    backButton = {
+                        navController.popBackStack()
+                    }
                 )
             }
         }