Skip to content

Develop - Your android minor improvements #258

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sameerasw merged 6 commits into from
Mar 2, 2026
Merged

Develop - Your android minor improvements #258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4794b40
feat: Improved your device detection and display
sameerasw Mar 2, 2026
e0d6797
feat: Improved your android api call and scraping
sameerasw Mar 2, 2026
bbd1326
feat: Remove beta tag from your android
sameerasw Mar 2, 2026
5e5b77d
feat: Your Android return animation
sameerasw Mar 2, 2026
b279146
feat: Expandable your android section improvements
sameerasw Mar 2, 2026
81b7429
feat: Update search placeholder
sameerasw Mar 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 32 additions & 10 deletions app/src/main/java/com/sameerasw/essentials/ui/activities/YourAndroidActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,19 +90,41 @@ class YourAndroidViewModel : ViewModel() {
viewModelScope.launch {
_isSpecsLoading.value = true
val specs = withContext(Dispatchers.IO) {
// Remove generic terms from the hardware name
val brand = deviceInfo.manufacturer.replace("Google", "")
.replace("samsung", "Samsung")
.trim()
val manufacturer = deviceInfo.manufacturer
val model = deviceInfo.model
.replace("Pixel", "")
.replace("Galaxy", "")
.trim()
val deviceName = deviceInfo.deviceName
val deviceCodename = deviceInfo.device

// Generate a prioritized list of search queries
val queries = mutableListOf<String>()

// 1. Marketing name (Manufacturer + Model)
if (model.contains(manufacturer, ignoreCase = true)) {
queries.add(model)
} else {
queries.add("$manufacturer $model")
}

// 2. Model number directly if it's different from marketing name
if (!queries.contains(model)) {
queries.add(model)
}

// Fallback to simpler search
val searchBrand = if(brand.isEmpty()) deviceInfo.manufacturer else brand
// 3. User-defined device name (sometimes it's the marketing name)
if (deviceName.isNotBlank() && !queries.contains(deviceName)) {
queries.add(deviceName)
}

GSMArenaService.fetchSpecs(brand = searchBrand, model = model)
// 4. Device codename (e.g., "shiba", "a51")
if (deviceCodename.isNotBlank() && !queries.contains(deviceCodename)) {
queries.add(deviceCodename)
}

GSMArenaService.fetchSpecs(
preferredName = manufacturer,
preferredModel = model,
queries = queries.toTypedArray()
)
}
_deviceSpecs.value = specs
_isSpecsLoading.value = false
Expand Down
251 changes: 118 additions & 133 deletions app/src/main/java/com/sameerasw/essentials/ui/components/DeviceHeroCard.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,12 @@ fun DeviceHeroCard(
modifier: Modifier = Modifier
) {
val imageUrls = deviceSpecs?.imageUrls ?: emptyList()
val pageCount = 1 + imageUrls.size
val isPixel = deviceInfo.manufacturer.contains("Google", ignoreCase = true)

// Only show the illustration page if it's a Pixel AND we have a mapping
val illustrationRes = DeviceImageMapper.getDeviceDrawable(deviceInfo.model)
val showIllustration = isPixel && illustrationRes != 0
val pageCount = (if (showIllustration) 1 else 0) + imageUrls.size
val pagerState = rememberPagerState(pageCount = { pageCount })

Column(
Expand All @@ -59,80 +64,79 @@ fun DeviceHeroCard(
.padding(16.dp),
horizontalAlignment = Alignment.CenterHorizontally
) {
Box(
modifier = Modifier
.graphicsLayer {
translationY = imageOffset().toPx()
}
.fillMaxWidth()
.height(480.dp)
.clip(MaterialTheme.shapes.medium),
contentAlignment = Alignment.Center
) {
HorizontalPager(
state = pagerState,
modifier = Modifier.fillMaxSize(),
verticalAlignment = Alignment.CenterVertically
) { page ->
Box(
if (pageCount > 0) {
Box(
modifier = Modifier
.graphicsLayer {
translationY = imageOffset().toPx()
}
.fillMaxWidth()
.height(480.dp)
.clip(MaterialTheme.shapes.medium),
contentAlignment = Alignment.Center
) {
HorizontalPager(
state = pagerState,
modifier = Modifier.fillMaxSize(),
contentAlignment = Alignment.Center
) {
if (page == 0) {
// stylized vector
Icon(
painter = painterResource(
id = DeviceImageMapper.getDeviceDrawable(
deviceInfo.model
)
),
contentDescription = null,
tint = MaterialTheme.colorScheme.primary,
modifier = Modifier
.fillMaxHeight(0.85f)
.fillMaxWidth(0.85f)
)
} else {
// real image from gsmarena
AsyncImage(
model = imageUrls[page - 1],
contentDescription = "Device Image",
contentScale = ContentScale.Fit,
modifier = Modifier
.fillMaxHeight(0.85f)
.fillMaxWidth(0.85f)
.clip(RoundedCornerShape(24.dp))
.shimmer()
)
verticalAlignment = Alignment.CenterVertically
) { page ->
Box(
modifier = Modifier.fillMaxSize(),
contentAlignment = Alignment.Center
) {
if (showIllustration && page == 0) {
// stylized vector
Icon(
painter = painterResource(id = illustrationRes),
contentDescription = null,
tint = MaterialTheme.colorScheme.primary,
modifier = Modifier
.fillMaxHeight(0.85f)
.fillMaxWidth(0.85f)
)
} else {
// real image from gsmarena
val imageIndex = if (showIllustration) page - 1 else page
AsyncImage(
model = imageUrls[imageIndex],
contentDescription = "Device Image",
contentScale = ContentScale.Fit,
modifier = Modifier
.fillMaxHeight(0.85f)
.fillMaxWidth(0.85f)
.clip(RoundedCornerShape(24.dp))
.shimmer()
)
}
}
}
}

// Page Indicator dots
if (pageCount > 1) {
Row(
Modifier
.align(Alignment.BottomCenter)
.padding(bottom = 16.dp),
horizontalArrangement = Arrangement.spacedBy(8.dp)
) {
repeat(pageCount) { iteration ->
val color = if (pagerState.currentPage == iteration)
MaterialTheme.colorScheme.primary
else
MaterialTheme.colorScheme.primary.copy(alpha = 0.2f)
Box(
modifier = Modifier
.size(8.dp)
.clip(MaterialTheme.shapes.small)
.background(color)
)
// Page Indicator dots
if (pageCount > 1) {
Row(
Modifier
.align(Alignment.BottomCenter)
.padding(bottom = 16.dp),
horizontalArrangement = Arrangement.spacedBy(8.dp)
) {
repeat(pageCount) { iteration ->
val color = if (pagerState.currentPage == iteration)
MaterialTheme.colorScheme.primary
else
MaterialTheme.colorScheme.primary.copy(alpha = 0.2f)
Box(
modifier = Modifier
.size(8.dp)
.clip(MaterialTheme.shapes.small)
.background(color)
)
}
}
}
}
}

Spacer(modifier = Modifier.height(24.dp))
Spacer(modifier = Modifier.height(24.dp))
}

// User-set Device Name
Text(
Expand Down Expand Up @@ -172,79 +176,60 @@ fun DeviceHeroCard(
},
) {


Row(
modifier = Modifier
.background(
MaterialTheme.colorScheme.surfaceContainerHighest,
shape = Shapes.extraSmall
)
.fillMaxWidth()
.padding(16.dp),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.Center
) {
val androidLogoRes = DeviceImageMapper.getAndroidLogo(deviceInfo)
if (isPixel && androidLogoRes != 0) {
Row(
modifier = Modifier
.background(
MaterialTheme.colorScheme.surfaceContainerHighest,
shape = Shapes.extraSmall
)
.fillMaxWidth()
.padding(16.dp),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(16.dp)
horizontalArrangement = Arrangement.Center
) {
Icon(
painter = painterResource(id = DeviceImageMapper.getAndroidLogo(deviceInfo)),
contentDescription = null,
tint = Color.Unspecified,
modifier = Modifier.size(56.dp)
)
Column(horizontalAlignment = Alignment.Start) {
Row(verticalAlignment = Alignment.CenterVertically) {
Row(
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(16.dp)
) {
Icon(
painter = painterResource(id = androidLogoRes),
contentDescription = null,
tint = Color.Unspecified,
modifier = Modifier.size(56.dp)
)
Column(horizontalAlignment = Alignment.Start) {
Row(verticalAlignment = Alignment.CenterVertically) {
Text(
text = "Android ${deviceInfo.androidVersion} (${
DeviceUtils.getOSName(
deviceInfo.sdkInt,
deviceInfo.osCodename
)
})",
style = MaterialTheme.typography.bodyLarge,
fontWeight = FontWeight.Bold,
color = MaterialTheme.colorScheme.primary
)
}
Text(
text = "Android ${deviceInfo.androidVersion} (${
DeviceUtils.getOSName(
deviceInfo.sdkInt,
deviceInfo.osCodename
text = "API ${deviceInfo.sdkInt} • Patch: ${
DeviceUtils.formatSecurityPatch(
deviceInfo.securityPatch
)
})",
style = MaterialTheme.typography.bodyLarge,
fontWeight = FontWeight.Bold,
color = MaterialTheme.colorScheme.primary
}",
style = MaterialTheme.typography.labelMedium,
fontWeight = FontWeight.Medium,
color = MaterialTheme.colorScheme.onSurfaceVariant
)
Text(
text = "Build: ${deviceInfo.display}",
style = MaterialTheme.typography.labelSmall,
fontWeight = FontWeight.Normal,
color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.8f)
)
val isBeta = deviceInfo.buildTag.lowercase().contains("beta")
val isCanary = deviceInfo.buildTag.lowercase().contains("canary")

if (isBeta || isCanary) {
Spacer(modifier = Modifier.size(8.dp))
Box(
modifier = Modifier
.background(
MaterialTheme.colorScheme.primary,
shape = MaterialTheme.shapes.large
)
.padding(horizontal = 6.dp, vertical = 2.dp)
) {
Text(
text = if (isCanary) "CANARY" else "BETA",
style = MaterialTheme.typography.labelSmall,
fontWeight = FontWeight.Bold,
color = MaterialTheme.colorScheme.onPrimary
)
}
}
}
Text(
text = "API ${deviceInfo.sdkInt} • Patch: ${
DeviceUtils.formatSecurityPatch(
deviceInfo.securityPatch
)
}",
style = MaterialTheme.typography.labelMedium,
fontWeight = FontWeight.Medium,
color = MaterialTheme.colorScheme.onSurfaceVariant
)
Text(
text = "Build: ${deviceInfo.display}",
style = MaterialTheme.typography.labelSmall,
fontWeight = FontWeight.Normal,
color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.8f)
)
}
}
}
Expand Down
Loading