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

fix: Consider ordering list of sensors alphabetically #2597 #2599

Merged
merged 9 commits into from
Jan 12, 2025
Merged

fix: Consider ordering list of sensors alphabetically #2597 #2599

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1c27f92
Fix: Display all implemented sensors in SensorActivity #2584
samruddhi-Rahegaonkar Dec 18, 2024
4ff8ce3
fix: Display all implemented sensors in SensorActivity
samruddhi-Rahegaonkar Dec 25, 2024
584f6c9
Fixed display All Sensors
samruddhi-Rahegaonkar Dec 25, 2024
9321d17
Merge remote-tracking branch 'origin/fix-sensor-activity' into fix-se…
samruddhi-Rahegaonkar Dec 25, 2024
d1a92ae
Update SensorActivity.java
samruddhi-Rahegaonkar Dec 27, 2024
3a0e685
Fix:Alphabetical_order_sensor
samruddhi-Rahegaonkar Jan 10, 2025
b3abc3d
Merge branch 'development' into Alphabetical-order-sensors
AsCress Jan 10, 2025
ec28bb5
Fix : Rollback_changes
samruddhi-Rahegaonkar Jan 11, 2025
acf6e20
fix: general improvements
AsCress Jan 11, 2025
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
4 changes: 3 additions & 1 deletion app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,5 +118,7 @@ dependencies {

// OSS license plugin
implementation("com.google.android.gms:play-services-oss-licenses:17.1.0")
implementation ("com.github.warkiz:IndicatorSeekBar:2.1.1")
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Kindly rollback this whole file as discussed earlier.


}

}
2 changes: 1 addition & 1 deletion app/src/main/java/io/pslab/activity/SensorActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ protected void onPostExecute(Void aVoid) {
if (detectedSensors == null || detectedSensors.isEmpty()) {
tvSensorScan.setText(getString(R.string.not_connected));
}

dataName.sort(String::compareTo);
adapter.notifyDataSetChanged();
buttonSensorAutoScan.setClickable(true);
}
Expand Down
4 changes: 2 additions & 2 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ buildscript {
}

plugins {
id("com.android.application") version "8.7.3" apply false
}
id("com.android.application") version "8.5.1" apply false
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same for this.

}
Loading