Merge pull request #95 from fingerprintjs/feature/show_version_name

Show app version name inside the nav drawer

app/src/main/java/com/fingerprintjs/android/playground/ui/foundation/theme/Color.kt

@@ -68,6 +68,7 @@ class ExtendedColorScheme(
  onSurfaceHighlighted: Color,
  onSurfaceLight: Color,
  onBackgroundLight: Color,
+ onSurfaceLightLight: Color,
 ) {
  var primaryDark by mutableStateOf(primaryDark, structuralEqualityPolicy())
  internal set
@@ -77,13 +78,16 @@ class ExtendedColorScheme(
  internal set
  var onBackgroundLight by mutableStateOf(onBackgroundLight, structuralEqualityPolicy())
  internal set
+ var onSurfaceLightLight by mutableStateOf(onSurfaceLightLight, structuralEqualityPolicy())
+ internal set
 }
 
 val LightExtendedColorScheme = ExtendedColorScheme(
  primaryDark = PaletteTokens.Primary50,
  onSurfaceHighlighted = PaletteTokens.Primary30,
  onSurfaceLight = PaletteTokens.Neutral40,
  onBackgroundLight = PaletteTokens.Neutral40,
+ onSurfaceLightLight = PaletteTokens.Neutral40.copy(alpha = 0.6f),
 )
 
 @Preview

app/src/main/java/com/fingerprintjs/android/playground/ui/screens/main/nav_drawer/MainDrawer.kt

@@ -16,6 +16,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Devices
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import com.fingerprintjs.android.playground.BuildConfig
 import com.fingerprintjs.android.playground.R
 import com.fingerprintjs.android.playground.ui.foundation.theme.AppTheme
 
@@ -71,7 +72,7 @@ fun MainDrawer(
  start = 12.dp,
  top = 56.dp,
  end = 12.dp,
- bottom = 40.dp
+ bottom = 8.dp
  ),
  verticalArrangement = Arrangement.SpaceBetween
  ) {
@@ -101,29 +102,35 @@ fun MainDrawer(
  onClick = onFpProAccuracyClicked,
  )
  }
- Row(
+ Column(
  modifier = Modifier
  .fillMaxWidth()
  .padding(start = 16.dp, end = 32.dp),
- horizontalArrangement = Arrangement.SpaceBetween,
  ) {
- Row {
- BottomIconedLink(
- icon = { Icon(painter = painterResource(R.drawable.ic_github), contentDescription = "Github link") },
- onClick = onGithubClicked,
- )
- Spacer(Modifier.width(24.dp))
- BottomIconedLink(
- icon = { Icon(painter = painterResource(R.drawable.ic_linkedin), contentDescription = "Linkedin link") },
- onClick = onLinkedinClicked,
- )
- Spacer(Modifier.width(24.dp))
- BottomIconedLink(
- icon = { Icon(painter = painterResource(R.drawable.ic_twitter), contentDescription = "Twitter link") },
- onClick = onTwitterClicked,
- )
+ Row(
+ modifier = Modifier.fillMaxWidth(),
+ horizontalArrangement = Arrangement.SpaceBetween,
+ ) {
+ Row {
+ BottomIconedLink(
+ icon = { Icon(painter = painterResource(R.drawable.ic_github), contentDescription = "Github link") },
+ onClick = onGithubClicked,
+ )
+ Spacer(Modifier.width(24.dp))
+ BottomIconedLink(
+ icon = { Icon(painter = painterResource(R.drawable.ic_linkedin), contentDescription = "Linkedin link") },
+ onClick = onLinkedinClicked,
+ )
+ Spacer(Modifier.width(24.dp))
+ BottomIconedLink(
+ icon = { Icon(painter = painterResource(R.drawable.ic_twitter), contentDescription = "Twitter link") },
+ onClick = onTwitterClicked,
+ )
+ }
+ FingerprintLink(onClick = onFingerprintComClicked)
  }
- FingerprintLink(onClick = onFingerprintComClicked)
+ Spacer(modifier = Modifier.height(8.dp))
+ AppVersion(modifier = Modifier.align(Alignment.End))
  }
  }
  }
@@ -217,3 +224,15 @@ private fun FingerprintLink(
  fontWeight = FontWeight.W500,
  )
 }
+
+@Composable
+private fun AppVersion(
+ modifier: Modifier = Modifier,
+) {
+ Text(
+ text = "Version: ${BuildConfig.VERSION_NAME}",
+ style = MaterialTheme.typography.bodySmall,
+ color = AppTheme.extendedColorScheme.onSurfaceLightLight,
+ modifier = modifier,
+ )
+}