Skip to content
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

Release 0.22.4-beta #98

Merged
merged 3 commits into from
Jan 22, 2024
Merged

Release 0.22.4-beta #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
28d8f5e
Update README.md
Semper-Viventem Jan 22, 2024
33e6ca2
Fix active scanner mode UI
Semper-Viventem Jan 22, 2024
c1081da
Merge remote-tracking branch 'origin/master'
Semper-Viventem Jan 22, 2024
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
2 changes: 2 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
<img src='/metadata/en-US/images/header.png'/>

# Bluetooth Radar

<a href='https://play.google.com/store/apps/details?id=f.cking.software&pcampaignid=pcampaignidMKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'><img alt='Get it on Google Play' src='https://github.com/Semper-Viventem/MetaRadar/assets/18288554/dd3fc41a-9b51-4747-9a2c-57b37d4706aa' width='200'/></a>
Expand Down
4 changes: 2 additions & 2 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ android {

// This version code will be applied only for F-Droid builds, for other builds version code will be generated by gradle dynamically
// For some reason F-Droid requires version code to be hardcoded in the build.gradle file
versionCode = 1705859017
versionName = "0.22.3-beta"
versionCode = 1705859018
versionName = "0.22.4-beta"

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/f/cking/software/ui/devicelist/DeviceListScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,8 +213,8 @@ object DeviceListScreen {
private fun ExpandIcon(viewModel: DeviceListViewModel) {
val state = viewModel.activeScannerExpandedState
val icon = when (state) {
DeviceListViewModel.ActiveScannerExpandedState.COLLAPSED -> painterResource(id = R.drawable.ic_show_less)
DeviceListViewModel.ActiveScannerExpandedState.EXPANDED -> painterResource(id = R.drawable.ic_show_more)
DeviceListViewModel.ActiveScannerExpandedState.COLLAPSED -> painterResource(id = R.drawable.ic_show_more)
DeviceListViewModel.ActiveScannerExpandedState.EXPANDED -> painterResource(id = R.drawable.ic_show_less)
}
IconButton(onClick = { viewModel.activeScannerExpandedState = state.next() }) {
Icon(
Expand Down
6 changes: 1 addition & 5 deletions app/src/main/java/f/cking/software/utils/graphic/ComposeFunctions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,11 +334,7 @@ fun DeviceListItem(
)
}
Text(
text = stringResource(
R.string.lifetime_data,
device.firstDetectionPeriod(LocalContext.current),
device.lastDetectionPeriod(LocalContext.current)
),
text = updateStr,
fontWeight = FontWeight.Light,
)
}
Expand Down