changed NavigationBar icons

app/release/output-metadata.json

@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 7,
-      "versionName": "2.4",
+      "versionCode": 8,
+      "versionName": "3.0",
       "outputFile": "app-release.apk"
     }
   ],

app/src/main/java/com/Ounzy/OpenBl/NavigationBar/BottomBarScreen.kt

@@ -14,13 +14,13 @@ sealed class BottomBarScreen(
     object Bundesliga: BottomBarScreen(
         route = "bundesliga",
         title = "Bundesliga",
-        icon = R.drawable.ic_launcher_foreground
+        icon = R.drawable.bundesliga_black
     )
 
     object Premierleague: BottomBarScreen(
         route = "premierleague",
         title = "Premier League",
-        icon = R.drawable.ic_launcher_foreground
+        icon = R.drawable.premier_league
     )
 
 //    object Bundesliga: BottomBarScreen(

app/src/main/java/com/Ounzy/OpenBl/NavigationBar/BottomNav.kt

@@ -57,7 +57,7 @@ fun BottomBar(navController: NavHostController) {
                 },
                 icon = {
                     Icon(
-                        modifier = Modifier.size(24.dp),
+                        modifier = Modifier.size(30.dp),
                         painter = painterResource(id = screen.icon),
                         contentDescription = null
                     )
@@ -83,7 +83,7 @@ fun AddItem(
 
     Box(
         modifier = Modifier
-            .height(40.dp)
+            .height(10.dp)
             .clip(CircleShape)
             .background(background)
             .clickable(onClick = {
@@ -101,14 +101,8 @@ fun AddItem(
         ) {
             Icon(painter = painterResource(id = screen.icon),
                 contentDescription = "icon",
-                tint = contentColor
+                tint = MaterialTheme.colorScheme.background
             )
-            AnimatedVisibility(visible = selected) {
-                Text(
-                    text = screen.title,
-                    color = contentColor
-                )
-            }
         }
     }
 }

app/src/main/res/drawable/bundesliga.xml

@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="316dp"
+    android:height="316dp"
+    android:viewportWidth="75"
+    android:viewportHeight="75">
+  <path
+      android:pathData="M0.56,59.683h73.943V0.536H0.559z"
+      android:fillColor="#d10214"/>
+  <path
+      android:pathData="M66.28,21.544a4.115,4.115 0,0 0,-4.115 4.107,4.117 4.117,0 0,0 4.115,4.115 4.115,4.115 0,0 0,4.107 -4.115,4.114 4.114,0 0,0 -4.107,-4.107m-4.772,10.134c0.042,0.145 -0.094,0.24 -0.359,0.444l-0.162,0.086 0.06,0.11c0.034,0.06 -0.026,0.171 -0.137,0.223l-0.247,0.128c-0.111,0.051 -0.231,0.042 -0.265,-0.026l-0.051,-0.102 -0.308,0.153 0.052,0.103c0.034,0.068 -0.035,0.17 -0.146,0.222l-0.247,0.12c-0.12,0.05 -0.24,0.034 -0.273,-0.035l-0.043,-0.094c-0.948,0.444 -2.006,0.914 -3.1,1.426l0.06,0.145c0.035,0.06 -0.034,0.162 -0.145,0.222l-0.247,0.111c-0.111,0.051 -0.23,0.034 -0.265,-0.034l-0.06,-0.136 -0.358,0.17 0.068,0.137c0.034,0.077 -0.034,0.179 -0.145,0.23l-0.248,0.111c-0.11,0.052 -0.23,0.043 -0.264,-0.034l-0.06,-0.136c-0.504,0.204 -1.042,0.281 -1.434,-0.453 -0.171,-0.341 -0.18,-1.127 -0.308,-1.545 -0.068,-0.222 -0.324,-0.256 -0.324,-0.256 -4.815,-0.922 -6.446,0.102 -9.536,-0.658 -0.965,-0.239 -1.495,-1.135 -2.69,-1.144 -2.604,-0.077 -3.38,-0.042 -6.207,-0.153a9.39,9.39 0,0 0,-0.136 0.503l-9.938,-0.05 1.511,0.75 0.495,4.38s-0.4,0.12 -0.52,0.137c0.094,0.88 0.187,2.057 0.239,3.116 0.042,0.956 0.094,1.955 0.085,2.596 -0.009,0.196 -0.009,0.665 -0.282,1.178 -0.179,0.341 -0.495,0.623 -0.75,0.81 -0.086,0.069 -0.47,0.325 -0.914,0.59 -0.461,0.265 -0.974,0.538 -1.247,0.674 0.026,0.12 0.111,0.24 0.137,0.333 -6.045,2.92 -13.532,3.919 -15.957,8.563 -0.282,0.538 -1.272,0.257 -1.298,-0.324 -0.008,-0.265 -0.008,-0.7 0.01,-0.93l-0.095,-0.01c-0.077,0 -0.136,-0.11 -0.128,-0.23l0.009,-0.273c0.009,-0.128 0.077,-0.222 0.154,-0.222l0.102,0.009c0.034,-0.273 0.085,-0.538 0.154,-0.794l-0.094,-0.034c-0.069,-0.026 -0.094,-0.145 -0.051,-0.265l0.085,-0.256c0.051,-0.12 0.137,-0.188 0.214,-0.162l0.094,0.025c0.426,-1.007 1.263,-1.451 1.647,-2.399l-0.06,-0.025c-0.076,-0.026 -0.102,-0.146 -0.06,-0.265l0.086,-0.256c0.051,-0.111 0.145,-0.188 0.214,-0.162l0.068,0.017c0.06,-0.137 0.128,-0.29 0.205,-0.435l-0.086,-0.06c-0.068,-0.043 -0.068,-0.162 0,-0.265l0.146,-0.23c0.068,-0.103 0.179,-0.154 0.239,-0.111l0.034,0.017 0.042,0.009c0.018,0 0.026,-0.009 0.043,-0.017 0.043,-0.043 0.085,-0.086 0.128,-0.12 0.393,-0.307 0.88,-0.256 1.28,-0.018 0.376,0.231 1.862,1.076 3.288,-0.213 2.356,-2.109 5.113,-4.986 7.188,-5.08 -0.563,-1.22 -1.537,-3.756 -1.648,-4.695l-0.7,-0.145c-0.358,-0.777 -1.246,-4.38 -1.494,-7.087 0,0 -0.29,-2.92 -0.008,-3.944 -0.163,-0.017 -0.453,0.222 -0.538,0.222 -0.376,-0.93 0.853,-8.794 2.074,-11.082l1.87,-0.742c-0.196,-0.026 -1.545,-0.086 -5.097,-0.376 -1.98,1.75 -4.277,3.646 -5.438,4.678 -0.196,0.146 -0.53,1.264 -0.53,1.264s-0.589,0.52 -1.126,0.896c-0.726,0.513 -2.485,0.897 -2.86,0.3 -0.095,-0.146 -0.077,-0.214 0.008,-0.3 0.273,-0.281 1.298,-0.776 1.648,-1.425 -0.555,0.281 -1.187,0.58 -1.682,0.529 -0.213,-0.009 -0.316,-0.538 -0.043,-0.632 0.743,-0.316 1.34,-0.452 1.776,-1.075 0.427,-0.59 0.94,-0.99 1.622,-1.008 0,0 3.304,-4.311 5.25,-6.36 0.539,-0.564 1.538,-0.376 1.538,-0.376l0.17,-0.657s6.677,-0.794 9.784,0.239C24.9,7.842 25.753,5.34 28.7,5.34c1.52,0 3.756,1.34 4.055,2.97 0.094,0.505 -0.196,0.838 -0.35,1.47 -0.265,0.964 0.102,2.023 -0.009,2.356 -0.085,0.281 -0.401,0.256 -0.666,0.631 -0.29,0.402 -0.614,1.153 -0.614,1.153l-0.402,0.905 -2.083,-0.154c-0.76,1.64 -2.322,4.995 -2.868,8.307 1.639,0.145 9.04,1.213 9.04,1.213l0.18,0.606s3.125,0.375 5.677,1.588c0.572,0.136 2.007,-0.077 2.946,0.358 0.068,-0.042 0.222,-0.196 0.282,-0.239 3.33,1.025 6.078,2.766 9.297,3.543 0,0 1.494,0.368 2.006,0.47 1.187,0.23 1.947,0.282 2.57,0.333 1.033,0.077 1.605,0.06 2.356,0.102 0.53,0.035 1.178,-0.05 1.392,0.726"
+      android:fillColor="#fff"/>
+  <path
+      android:pathData="M70.651,67.77 L69.5,71.364h2.288zM72.188,72.798h-3.116l-0.555,1.665h-1.98l2.842,-7.948h2.536l2.826,7.948h-1.998zM65.708,69.87v4.32c-0.742,0.256 -1.724,0.419 -2.749,0.419 -2.766,0 -4.064,-1.23 -4.064,-4.124 0,-2.877 1.298,-4.115 4.064,-4.115 0.982,0 1.913,0.154 2.621,0.444v1.537a7.797,7.797 0,0 0,-2.467 -0.419c-1.665,0 -2.186,0.675 -2.186,2.553 0,1.964 0.547,2.613 2.118,2.613 0.358,0 0.708,-0.026 1.041,-0.069v-1.775L62.61,71.254L62.61,69.87zM55.498,66.515h1.989v7.948h-1.99zM48.864,66.515h1.98v6.437h3.415v1.511h-5.395zM41.607,74.155v-1.544c0.956,0.315 1.81,0.426 2.655,0.426 0.913,0 1.315,-0.239 1.315,-0.853 0,-0.538 -0.171,-0.692 -0.905,-0.845l-1.324,-0.274c-1.374,-0.281 -1.835,-0.845 -1.835,-2.202 0,-1.742 1.024,-2.493 3.09,-2.493 0.94,0 1.819,0.153 2.536,0.427v1.553a7.422,7.422 0,0 0,-2.416 -0.418c-0.982,0 -1.315,0.256 -1.315,0.88 0,0.512 0.23,0.657 0.871,0.793l1.28,0.274c1.503,0.324 1.913,0.828 1.913,2.245 0,1.708 -1.05,2.485 -3.193,2.485 -0.939,0 -1.844,-0.154 -2.672,-0.453m-6.822,-7.641h5.567v1.52h-3.586v1.673h2.98v1.494h-2.98v1.75h3.663v1.511h-5.643zM29.765,72.952c1.161,0 1.546,-0.606 1.546,-2.467 0,-1.844 -0.385,-2.45 -1.546,-2.45h-1.502v4.917zM26.274,66.515h3.551c2.783,0 3.51,1.144 3.51,3.97 0,2.749 -0.795,3.978 -3.51,3.978h-3.551zM24.643,66.515v7.948h-2.416l-3.381,-5.745v5.745h-1.844v-7.948h2.416l3.372,5.754v-5.754zM8.422,71.876v-5.361h1.98v5.302c0,0.88 0.402,1.212 1.477,1.212 1.067,0 1.469,-0.333 1.469,-1.212v-5.302h1.989v5.361c0,1.87 -1.084,2.732 -3.458,2.732s-3.457,-0.862 -3.457,-2.732m-3.228,0.231c0,-0.734 -0.29,-1.042 -0.964,-1.042L2.445,71.065v2.058L4.23,73.123c0.708,0 0.964,-0.299 0.964,-1.016m-2.749,-2.271L4.11,69.836c0.666,0 0.965,-0.29 0.965,-0.973 0,-0.717 -0.282,-1 -0.965,-1L2.445,67.863zM7.124,72.295c0,1.417 -0.657,2.168 -2.45,2.168L0.559,74.463v-7.948L4.52,66.515c1.853,0 2.493,0.734 2.493,2.075 0,1.033 -0.384,1.494 -1.486,1.767l-0.204,0.06 0.179,0.034c1.238,0.273 1.622,0.734 1.622,1.844"
+      android:fillColor="#191917"/>
+</vector>

app/src/main/res/drawable/bundesliga_black.xml

@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="82.575dp"
+    android:viewportHeight="82.575" android:viewportWidth="82.696"
+    android:width="82.696dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#000000" android:pathData="m67.944,26.079a4.587,4.587 0,0 0,-4.587 4.578,4.59 4.59,45 0,0 4.587,4.587 4.587,4.587 0,0 0,4.578 -4.587,4.586 4.586,45 0,0 -4.578,-4.578m-5.32,11.297c0.047,0.162 -0.105,0.268 -0.4,0.495l-0.181,0.096 0.067,0.123c0.038,0.067 -0.029,0.191 -0.153,0.249l-0.275,0.143c-0.124,0.057 -0.258,0.047 -0.295,-0.029l-0.057,-0.114 -0.343,0.171 0.058,0.115c0.038,0.076 -0.039,0.19 -0.163,0.247l-0.275,0.134c-0.134,0.056 -0.268,0.038 -0.304,-0.039L60.255,38.861c-1.057,0.495 -2.236,1.019 -3.456,1.59l0.067,0.162c0.039,0.067 -0.038,0.181 -0.162,0.247l-0.275,0.124c-0.124,0.057 -0.256,0.038 -0.295,-0.038l-0.067,-0.152 -0.399,0.19 0.076,0.153c0.038,0.086 -0.038,0.2 -0.162,0.256l-0.276,0.124c-0.123,0.058 -0.256,0.048 -0.294,-0.038l-0.067,-0.152c-0.562,0.227 -1.162,0.313 -1.599,-0.505 -0.191,-0.38 -0.201,-1.256 -0.343,-1.722 -0.076,-0.247 -0.361,-0.285 -0.361,-0.285 -5.368,-1.028 -7.186,0.114 -10.631,-0.734 -1.076,-0.266 -1.667,-1.265 -2.999,-1.275 -2.903,-0.086 -3.768,-0.047 -6.919,-0.171a10.468,10.468 0,0 0,-0.152 0.561l-11.079,-0.056 1.684,0.836 0.552,4.883c0,0 -0.446,0.134 -0.58,0.153 0.105,0.981 0.208,2.293 0.266,3.474 0.047,1.066 0.105,2.179 0.095,2.894 -0.01,0.218 -0.01,0.741 -0.314,1.313 -0.2,0.38 -0.552,0.695 -0.836,0.903 -0.096,0.077 -0.524,0.362 -1.019,0.658 -0.514,0.295 -1.086,0.6 -1.39,0.751 0.029,0.134 0.124,0.268 0.153,0.371C12.734,56.631 4.388,57.744 1.684,62.922 1.37,63.521 0.266,63.208 0.237,62.56c-0.009,-0.295 -0.009,-0.78 0.011,-1.037l-0.106,-0.011c-0.086,0 -0.152,-0.123 -0.143,-0.256L0.01,60.952c0.01,-0.143 0.086,-0.247 0.172,-0.247l0.114,0.01C0.333,60.41 0.39,60.114 0.467,59.829L0.362,59.791C0.285,59.762 0.257,59.63 0.305,59.496L0.4,59.21c0.057,-0.134 0.153,-0.21 0.239,-0.181l0.105,0.028C1.218,57.935 2.151,57.44 2.579,56.383L2.512,56.355C2.428,56.326 2.399,56.193 2.446,56.06L2.541,55.775C2.598,55.651 2.703,55.565 2.78,55.594l0.076,0.019c0.067,-0.153 0.143,-0.323 0.229,-0.485l-0.096,-0.067c-0.076,-0.048 -0.076,-0.181 0,-0.295l0.163,-0.256c0.076,-0.115 0.2,-0.172 0.266,-0.124l0.038,0.019 0.047,0.01c0.02,0 0.029,-0.01 0.048,-0.019 0.048,-0.048 0.095,-0.096 0.143,-0.134 0.438,-0.342 0.981,-0.285 1.427,-0.02 0.419,0.258 2.076,1.2 3.665,-0.237 2.626,-2.351 5.7,-5.558 8.013,-5.663 -0.628,-1.36 -1.713,-4.187 -1.837,-5.234l-0.78,-0.162c-0.399,-0.866 -1.389,-4.883 -1.665,-7.9 0,0 -0.323,-3.255 -0.009,-4.397 -0.182,-0.019 -0.505,0.247 -0.6,0.247 -0.419,-1.037 0.951,-9.803 2.312,-12.354l2.085,-0.827c-0.218,-0.029 -1.722,-0.096 -5.682,-0.419 -2.207,1.951 -4.768,4.064 -6.062,5.215 -0.218,0.163 -0.591,1.409 -0.591,1.409 0,0 -0.657,0.58 -1.255,0.999 -0.809,0.572 -2.77,1 -3.188,0.334 -0.106,-0.163 -0.086,-0.239 0.009,-0.334 0.304,-0.313 1.447,-0.865 1.837,-1.589 -0.619,0.313 -1.323,0.647 -1.875,0.59 -0.237,-0.01 -0.352,-0.6 -0.048,-0.705 0.828,-0.352 1.494,-0.504 1.98,-1.198 0.476,-0.658 1.048,-1.104 1.808,-1.124 0,0 3.683,-4.806 5.853,-7.09 0.601,-0.629 1.715,-0.419 1.715,-0.419l0.19,-0.732c0,0 7.443,-0.885 10.907,0.266C21.815,10.805 22.766,8.015 26.051,8.015c1.694,0 4.187,1.494 4.52,3.311 0.105,0.563 -0.218,0.934 -0.39,1.639 -0.295,1.075 0.114,2.255 -0.01,2.626 -0.095,0.313 -0.447,0.285 -0.742,0.703 -0.323,0.448 -0.684,1.285 -0.684,1.285l-0.448,1.009 -2.322,-0.172c-0.847,1.828 -2.589,5.568 -3.197,9.26 1.827,0.162 10.078,1.352 10.078,1.352l0.201,0.676c0,0 3.484,0.418 6.329,1.77 0.638,0.152 2.237,-0.086 3.284,0.399 0.076,-0.047 0.247,-0.218 0.314,-0.266 3.712,1.143 6.776,3.083 10.364,3.95 0,0 1.665,0.41 2.236,0.524 1.323,0.256 2.17,0.314 2.865,0.371 1.152,0.086 1.789,0.067 2.626,0.114 0.591,0.039 1.313,-0.056 1.552,0.809"/>
+</vector>

app/src/main/res/drawable/premier_league.xml

@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M11.176,0s-0.681,1.938 -0.867,2.527C9.844,2.202 8.386,1.194 7.78,0.775c0.14,0.806 0.356,2.124 0.403,2.403 -0.124,-0.093 -0.821,-0.698 -1.875,-1.194 0.589,0.682 1.008,1.736 1.271,2.588a10.566,10.566 0,0 1,5.238 -1.379c0.977,0 1.94,0.14 2.854,0.403 0.093,-0.884 0.279,-1.968 0.682,-2.758 -0.915,0.728 -1.474,1.503 -1.551,1.596 -0.031,-0.186 -0.093,-1.52 -0.17,-2.434 -0.372,0.403 -1.8,2.016 -2.063,2.264C12.384,1.938 11.176,0 11.176,0zM12.85,3.86c-1.674,0 -3.3,0.386 -4.696,1.115 0.713,0.046 1.224,0.668 1.395,1.164 -0.558,-0.45 -1.442,-0.667 -1.985,-0.078 -0.511,0.589 -0.464,1.688 0.047,2.572 -1.193,-0.605 -1.194,-2.185 -0.775,-2.867A10.392,10.392 0,0 0,3.61 9.594l1.07,0.172c-1.24,1.426 -2.107,3.953 -2.107,5.146l1.75,-0.543c-0.31,1.054 -0.401,4.602 0.653,6.385 0,0 1.38,-0.96 2.945,-3.363 0.65,2.17 0.356,3.985 0,5.767 2.82,1.581 6.09,0.696 8.012,-0.683l0.357,1.35c2.248,-1.489 3.488,-3.628 3.72,-6.124l0.837,0.93c1.286,-3.829 0.28,-6.883 -1.565,-9.502l-0.078,0.637 -0.79,-0.87s0.17,-0.077 0.31,-0.263c0.03,-0.078 -0.046,-0.495 -0.371,-0.774 -0.31,0.078 -0.56,0.264 -0.684,0.45a3.222,3.222 0,0 0,-0.93 -0.543c0.062,0.077 0.604,0.79 0.65,1.007 0.466,0.388 1.102,0.837 1.52,1.395 -0.34,-0.403 -1.984,-0.497 -2.728,-0.078 0,0 -0.744,-0.868 -1.426,-1.473 -0.14,-0.511 0.326,-0.96 0.326,-0.96s-0.48,-0.03 -0.93,0.42c-0.682,-0.512 -1.55,-0.745 -1.55,-0.745 -0.961,0.14 -1.612,0.82 -1.612,0.82 0.217,0.14 0.512,0.327 0.776,0.42 0.511,0.217 1.006,0.139 1.332,0.139 0.263,0 0.636,0.078 0.636,0.078s0.635,0.495 1.565,1.565c-1.426,-0.574 -2.915,0.062 -3.969,-0.45 -1.24,-0.62 -1.146,-1.595 -1.146,-1.595s-0.836,-0.11 -0.836,-0.141c0,0 0.618,-0.82 1.548,-1.1l-0.464,-0.402c0.558,-0.465 1.534,-1.085 3.115,-1.24 0,0 0.683,0.262 2.11,1.285 0.232,-0.326 0.308,-1.008 0.308,-1.008 0.728,0.248 2.217,1.333 2.806,1.984 -0.325,-0.759 -0.559,-1.223 -0.636,-2.013 -0.357,-0.357 -1.24,-1.101 -3.069,-1.551 0.295,0.605 0.264,1.115 0.264,1.115 -0.34,-0.45 -1.055,-1.146 -1.55,-1.332 -0.295,-0.015 -0.605,-0.047 -0.93,-0.047zM16.121,10.928a4.323,4.323 0,0 0,1.256 0.697v1.348c-0.465,0.403 -1.985,1.675 -3.008,1.566 -0.573,-1.1 -1.115,-2.107 -1.115,-2.107s1.565,-1.318 2.867,-1.504zM19.096,10.959c0.465,1.131 0.59,2.48 0.078,3.379 -0.28,-0.605 -0.636,-0.947 -1.008,-1.35v-1.347s0.418,-0.264 0.93,-0.682zM18.119,14.354c0.465,0.511 0.559,1.068 0.559,1.068 -0.202,1.131 -0.836,1.846 -1.301,2.14 0.046,-0.821 -0.172,-1.519 -0.172,-1.519 -0.34,0.372 -1.13,0.743 -1.596,0.836l-0.697,-1.3c0.822,-0.032 2.201,-1.194 2.201,-1.194l1.006,-0.031z"/>
+</vector>