mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-29 13:53:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resolves #2239 by adding a compass arrow for direction of nearest item (#5433)

Browse source 
* Resolves issue #2239 by adding an arrow for direction

* Removed unnecessary change in styles.xml

* spacing

* javadoc

---------

Co-authored-by: Nicolas Raoul <nicolas.raoul@gmail.com>
This commit is contained in:
Shashwat Kedia 2024-01-15 10:27:44 +05:30 • committed by GitHub
parent e99ff1c044
commit e5c789e874
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 105 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

21
app/src/main/java/fr/free/nrw/commons/nearby/NearbyNotificationCardView.java
View file

@ -27,6 +27,7 @@ public class NearbyNotificationCardView extends SwipableCardView {
private TextView notificationTitle;
private TextView notificationDistance;
private ImageView notificationIcon;
private ImageView notificationCompass;
private ProgressBar progressBar;
public CardViewVisibilityState cardViewVisibilityState;
@ -64,6 +65,7 @@ public class NearbyNotificationCardView extends SwipableCardView {
notificationDistance = rootView.findViewById(R.id.nearby_distance);
notificationIcon = rootView.findViewById(R.id.nearby_icon);
notificationCompass = rootView.findViewById(R.id.nearby_compass);
progressBar = rootView.findViewById(R.id.progressBar);
@ -111,10 +113,11 @@ public class NearbyNotificationCardView extends SwipableCardView {
}
/**
* Pass place information to views.
* Pass place information to views and set compass arrow direction
* @param place Closes place where we will get information from
* @param direction Direction in which compass arrow needs to be set
*/
public void updateContent(Place place) {
public void updateContent(Place place, float direction) {
Timber.d("Update nearby card notification content");
this.setVisibility(VISIBLE);
cardViewVisibilityState = CardViewVisibilityState.READY;
@ -129,7 +132,7 @@ public class NearbyNotificationCardView extends SwipableCardView {
notificationIcon.setVisibility(VISIBLE);
notificationTitle.setText(place.name);
notificationDistance.setText(place.distance);
notificationCompass.setRotation(direction);
}
@Override
@ -151,6 +154,7 @@ public class NearbyNotificationCardView extends SwipableCardView {
notificationTitle.setVisibility(VISIBLE);
notificationDistance.setVisibility(VISIBLE);
notificationIcon.setVisibility(VISIBLE);
notificationCompass.setVisibility(VISIBLE);
break;
case LOADING:
permissionRequestButton.setVisibility(GONE);
@ -160,6 +164,7 @@ public class NearbyNotificationCardView extends SwipableCardView {
notificationTitle.setVisibility(GONE);
notificationDistance.setVisibility(GONE);
notificationIcon.setVisibility(GONE);
notificationCompass.setVisibility(GONE);
permissionRequestButton.setVisibility(GONE);
break;
case ASK_PERMISSION:
@ -192,4 +197,14 @@ public class NearbyNotificationCardView extends SwipableCardView {
ENABLE_LOCATION_PERMISSION, // For only after Marshmallow
NO_PERMISSION_NEEDED
}
/**
* Rotates the compass arrow in tandem with the rotation of device
*
* @param rotateDegree Degree by which device was rotated
* @param direction Direction in which arrow has to point
*/
public void rotateCompass(float rotateDegree, float direction){
notificationCompass.setRotation(-(rotateDegree-direction));
}
}