From de88d7d7a898377fc731ef181e61e80f7f9868e1 Mon Sep 17 00:00:00 2001 From: Amr Hossam Date: Sat, 19 Oct 2024 08:58:32 +0300 Subject: [PATCH 1/4] feat: snackbar to notify the users when they star stop or route. Signed-off-by: Amr Hossam --- .../android/ui/ArrivalsListHeader.java | 20 +++++++++++++++++++ .../src/main/res/values-es/strings.xml | 4 ++++ .../src/main/res/values-fi/strings.xml | 4 ++++ .../src/main/res/values-it/strings.xml | 4 ++++ .../src/main/res/values-pl/strings.xml | 4 ++++ .../src/main/res/values/strings.xml | 4 ++++ 6 files changed, 40 insertions(+) diff --git a/onebusaway-android/src/main/java/org/onebusaway/android/ui/ArrivalsListHeader.java b/onebusaway-android/src/main/java/org/onebusaway/android/ui/ArrivalsListHeader.java index d7a512cef..15910cd65 100644 --- a/onebusaway-android/src/main/java/org/onebusaway/android/ui/ArrivalsListHeader.java +++ b/onebusaway-android/src/main/java/org/onebusaway/android/ui/ArrivalsListHeader.java @@ -52,6 +52,7 @@ import androidx.fragment.app.FragmentManager; +import com.google.android.material.snackbar.Snackbar; import com.google.firebase.analytics.FirebaseAnalytics; import org.onebusaway.android.R; @@ -437,6 +438,7 @@ public void onClick(View v) { mStopFavorite.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { + notifyStopFavoriteChanged(mController.isFavoriteStop()); mController.setFavoriteStop(!mController.isFavoriteStop()); refreshStopFavorite(); } @@ -1008,6 +1010,7 @@ public void onClick(View v) { @Override public void onSelectionComplete(boolean savedFavorite) { if (savedFavorite) { + notifyRouteFavoriteChanged(isRouteFavorite); mController.refreshLocal(); } } @@ -1073,6 +1076,7 @@ public void onClick(View v) { @Override public void onSelectionComplete(boolean savedFavorite) { if (savedFavorite) { + notifyRouteFavoriteChanged(isRouteFavorite2); mController.refreshLocal(); } } @@ -1470,4 +1474,20 @@ public void showProgress(boolean visibility) { mProgressBar.setVisibility(View.GONE); } } + + private void notifyRouteFavoriteChanged(boolean isRouteSaved) { + if(isRouteSaved){ + Snackbar.make(mView, R.string.route_removed_from_favorites, Snackbar.LENGTH_SHORT).show(); + }else{ + Snackbar.make(mView, R.string.route_added_to_favorites, Snackbar.LENGTH_SHORT).show(); + } + } + + private void notifyStopFavoriteChanged(boolean isStopSaved){ + if(isStopSaved) { + Snackbar.make(mView, R.string.stop_removed_from_favorites, Snackbar.LENGTH_SHORT).show(); + } else { + Snackbar.make(mView, R.string.stop_added_to_favorites, Snackbar.LENGTH_SHORT).show(); + } + } } diff --git a/onebusaway-android/src/main/res/values-es/strings.xml b/onebusaway-android/src/main/res/values-es/strings.xml index f2ae25369..115ec0520 100644 --- a/onebusaway-android/src/main/res/values-es/strings.xml +++ b/onebusaway-android/src/main/res/values-es/strings.xml @@ -1121,4 +1121,8 @@ Mostrar la vista del clima en el mapa Error al establecer el recordatorio Recordatorio no habilitado + Parada añadida a favoritos + Parada eliminada de favoritos + Ruta añadida a favoritos + Ruta eliminada de favoritos diff --git a/onebusaway-android/src/main/res/values-fi/strings.xml b/onebusaway-android/src/main/res/values-fi/strings.xml index e67407512..345bc6436 100644 --- a/onebusaway-android/src/main/res/values-fi/strings.xml +++ b/onebusaway-android/src/main/res/values-fi/strings.xml @@ -718,4 +718,8 @@ Näytä säätiedot kartalla Muistutuksen asettaminen epäonnistui Muistutus ei ole käytössä + Pysäkki lisätty suosikkeihin + Pysäkki poistettu suosikeista + Reitti lisätty suosikkeihin + Reitti poistettu suosikeista diff --git a/onebusaway-android/src/main/res/values-it/strings.xml b/onebusaway-android/src/main/res/values-it/strings.xml index df3fa6a13..a3591ed9c 100644 --- a/onebusaway-android/src/main/res/values-it/strings.xml +++ b/onebusaway-android/src/main/res/values-it/strings.xml @@ -1032,4 +1032,8 @@ Mostra la vista del meteo sulla mappa Impossibile impostare il promemoria Promemoria non abilitato + Fermata aggiunta ai preferiti + Fermata rimossa dai preferiti + Percorso aggiunto ai preferiti + Percorso rimosso dai preferiti \ No newline at end of file diff --git a/onebusaway-android/src/main/res/values-pl/strings.xml b/onebusaway-android/src/main/res/values-pl/strings.xml index 8adca4f2d..c6c535694 100644 --- a/onebusaway-android/src/main/res/values-pl/strings.xml +++ b/onebusaway-android/src/main/res/values-pl/strings.xml @@ -738,4 +738,8 @@ Wyświetl widok pogody na mapie Nie udało się ustawić przypomnienia Lembrete não ativado + Przystanek dodany do ulubionych + Przystanek usunięty z ulubionych + Trasa dodana do ulubionych + Trasa usunięta z ulubionych \ No newline at end of file diff --git a/onebusaway-android/src/main/res/values/strings.xml b/onebusaway-android/src/main/res/values/strings.xml index 4fc069688..70ae7c6b3 100644 --- a/onebusaway-android/src/main/res/values/strings.xml +++ b/onebusaway-android/src/main/res/values/strings.xml @@ -1270,4 +1270,8 @@ Display the weather view on the map Failed to set reminder Reminder not enabled + Stop added to favorites + Stop removed from favorites + Route added to favorites + Route removed from favorites From c131fcbe8ecfb1f74f22d38bfa581c969a097711 Mon Sep 17 00:00:00 2001 From: Amr Hossam Date: Sat, 19 Oct 2024 09:39:30 +0300 Subject: [PATCH 2/4] fix: star button overlapping with warning icon Signed-off-by: Amr Hossam --- .../src/main/res/layout/arrivals_list_header.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/onebusaway-android/src/main/res/layout/arrivals_list_header.xml b/onebusaway-android/src/main/res/layout/arrivals_list_header.xml index ce30a7c96..047e4b0e9 100644 --- a/onebusaway-android/src/main/res/layout/arrivals_list_header.xml +++ b/onebusaway-android/src/main/res/layout/arrivals_list_header.xml @@ -147,8 +147,8 @@ android:orientation="horizontal" android:layout_alignParentBottom="true" android:layout_centerInParent="true" - android:layout_marginLeft="@dimen/keyline_1" - android:layout_marginRight="@dimen/keyline_1" + android:layout_marginLeft="32dp" + android:layout_marginRight="32dp" android:paddingRight="@dimen/keyline_1" android:layout_marginTop="8dp" android:layout_marginBottom="@dimen/arrival_header_bottom_margin"> @@ -276,7 +276,7 @@ android:layout_marginBottom="@dimen/arrival_header_bottom_margin_expand_collapse" android:layout_alignParentBottom="true" android:layout_alignParentLeft="true" - android:layout_marginLeft="@dimen/keyline_1" + android:layout_marginLeft="6dp" android:visibility="gone"/> From 1c5fa7431edd9ce12871d847cee9e12df208cadc Mon Sep 17 00:00:00 2001 From: Amr Hossam Date: Sat, 19 Oct 2024 09:43:13 +0300 Subject: [PATCH 3/4] formatting Signed-off-by: Amr Hossam --- .../main/res/layout/arrivals_list_header.xml | 140 +++++++++--------- 1 file changed, 74 insertions(+), 66 deletions(-) diff --git a/onebusaway-android/src/main/res/layout/arrivals_list_header.xml b/onebusaway-android/src/main/res/layout/arrivals_list_header.xml index 047e4b0e9..0a41db25e 100644 --- a/onebusaway-android/src/main/res/layout/arrivals_list_header.xml +++ b/onebusaway-android/src/main/res/layout/arrivals_list_header.xml @@ -1,5 +1,4 @@ - - + android:id="@+id/arrivals_list_header" + android:layout_width="match_parent" + android:layout_height="@dimen/arrival_header_height_two_arrivals" + android:orientation="vertical"> - + + android:imeOptions="actionDone" /> + android:layout_weight="1" />