From bb736a5a0c189bf340401947b57daf765f0c1cc1 Mon Sep 17 00:00:00 2001 From: Prashan Kumar <114914556+sebesti0n@users.noreply.github.com> Date: Mon, 11 Mar 2024 05:47:18 +0530 Subject: [PATCH 1/9] AboutActivity UI enhancement. (#1148) Fixes #1138 * refactor: AboutActivity UI enhancement. * fix: remove commented lines --- .../onebusaway/android/ui/AboutActivity.java | 15 +- .../src/main/res/layout/content_about.xml | 15 +- .../src/main/res/values-es/strings.xml | 125 +++++++++------- .../src/main/res/values-fi/strings.xml | 116 +++++++++------ .../src/main/res/values-it/strings.xml | 79 ++++++++++- .../src/main/res/values-pl/strings.xml | 112 ++++++++++----- .../src/main/res/values/strings.xml | 133 +++++++++++------- 7 files changed, 415 insertions(+), 180 deletions(-) diff --git a/onebusaway-android/src/main/java/org/onebusaway/android/ui/AboutActivity.java b/onebusaway-android/src/main/java/org/onebusaway/android/ui/AboutActivity.java index 24542dfc2..d618ae58b 100644 --- a/onebusaway-android/src/main/java/org/onebusaway/android/ui/AboutActivity.java +++ b/onebusaway-android/src/main/java/org/onebusaway/android/ui/AboutActivity.java @@ -21,9 +21,13 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.os.Bundle; +import android.text.Html; +import android.text.Spannable; +import android.text.Spanned; import android.widget.TextView; import com.google.android.material.appbar.CollapsingToolbarLayout; +import com.google.android.material.textview.MaterialTextView; import org.onebusaway.android.R; @@ -53,6 +57,7 @@ protected void onCreate(Bundle savedInstanceState) { getSupportActionBar().setDisplayHomeAsUpEnabled(true); TextView tv = (TextView) findViewById(R.id.about_text); + MaterialTextView version= findViewById(R.id.version); String versionString = ""; int versionCode = 0; try { @@ -65,16 +70,14 @@ protected void onCreate(Bundle savedInstanceState) { StringBuilder builder = new StringBuilder(); // Version info - builder.append("v") + builder.append("Version:") .append(versionString) .append(" (") .append(versionCode) - .append(")\n\n"); + .append(")\n"); // Majority of content from string resource - builder.append(getString(R.string.about_text)); - builder.append("\n\n"); - - tv.setText(builder.toString()); + version.setText(builder.toString()); + tv.setText((Spannable) Html.fromHtml(getString(R.string.about_content))); } } diff --git a/onebusaway-android/src/main/res/layout/content_about.xml b/onebusaway-android/src/main/res/layout/content_about.xml index 74c105787..f9af6e424 100644 --- a/onebusaway-android/src/main/res/layout/content_about.xml +++ b/onebusaway-android/src/main/res/layout/content_about.xml @@ -8,12 +8,23 @@ android:layout_width="match_parent" android:layout_height="match_parent" tools:context="org.onebusaway.android.ui.AboutActivity"> - + + - + diff --git a/onebusaway-android/src/main/res/values-es/strings.xml b/onebusaway-android/src/main/res/values-es/strings.xml index f117e4e0d..62e39d6a3 100644 --- a/onebusaway-android/src/main/res/values-es/strings.xml +++ b/onebusaway-android/src/main/res/values-es/strings.xml @@ -782,55 +782,84 @@ Para hacer una copia de seguridad o restaurar sus datos, OneBusAway necesita permiso para acceder al almacenamiento de su dispositivo local. + " Versión" + + +

¡Bienvenido a OneBusAway!

+ +

+ En OneBusAway, estamos apasionados por crear soluciones innovadoras para simplificar tu experiencia de transporte. Nuestra aplicación para Android es un trabajo de amor, posible gracias al compromiso y talento de un grupo diverso de individuos y organizaciones. Aquí tienes un vistazo a los fantásticos colaboradores que han hecho de OneBusAway lo que es hoy: +

+

Colaboradores de Código:

+

+ Nuestros dedicados colaboradores mejoran la funcionalidad y la experiencia del usuario de la aplicación: +

+ + +

Traducciones:

+

+ Gracias a nuestros traductores, OneBusAway es accesible en todo el mundo: +

+ +

Créditos de Imágenes:

+

+ Gracias a los diseñadores que crearon las imágenes utilizadas en los iconos de vehículos, que se cargaron en Noun Project bajo la licencia CC BY 3.0 (https://creativecommons.org/licenses/by/3.0/us/): +

+ +

+ ¡Únete al Viaje: Contribuye a Nuestra Aplicación! +

+

+ Visita nuestro proyecto en GitHub en https://github.com/OneBusAway/onebusaway-android. +

+ Obtén más información sobre el proyecto de código abierto de OneBusAway en https://onebusaway.org .

+

+ Un agradecimiento especial a Google por los increíbles íconos de diseño de material (https://github.com/google/material-design-icons), + que añaden un toque de elegancia a nuestra aplicación. Su generosidad al licenciar + estos íconos bajo la licencia Apache v2.0 (https://www.apache.org/licenses/LICENSE-2.0) ha enriquecido enormemente nuestra experiencia de usuario. +

+

+ +

+ ¡Explora nuestra aplicación y emprende un viaje en transporte público sin contratiempos con OneBusAway! +

+ + + + ]]> Acerca de - - "Obtenga mas información sobre el proyecto de código abierto OneBusAway en http://onebusaway.org.\n\n" - - "*** Código ***\n\n" - - "Nos gustaría agradecer a las siguientes personas que han contribuido en el código para OneBusAway Android:\n\n" - - "* Paul Watts\n" - "* Brian Ferris\n" - "* Daniel Welsh\n" - "* Arno Hart\n" - "* Sean Barbeau\n" - "* York Region Transit\n" - "* Ben Du\n" - "* Cagri Cetin\n" - "* Mike Karabushin\n" - "* Aziz Batihk\n" - "* Charles Bond\n" - "* Hillsborough Area Regional Transit (por Simon Jacobs de Cambridge Systematics)\n" - "* Bridgette Eichelberger\n" - "* Rodrigo Carvalho (Google Summer of Code 2017)\n" - "* Steve Moritani\n\n" - - "¿Quieres contribuir a esta aplicación? Revísalo tú mismo en Github en - https://github.com/OneBusAway/onebusaway-android.\n\n" - - "*** Traducciones ***\n\n" - - "Nos gustaría agradecer a quienes han contribuido a las traducciones de OneBusAway Android:\n\n" - - "* Ari Rusakko\n" - "* Edgar Andrés Moncada Taborda\n\n" - - "*** Imágenes ***\n\n" - - "Gracias a los diseñadores que crearon las imágenes utilizadas en los iconos de vehículos, que fueron subidos " - "a el Noun Project bajo CC BY 3.0 (http://creativecommons.org/licenses/by/3.0/us/):\n\n" - - "* Flechas por Zlatko Najdenovski, MK\n" - "* Marcador en el Mapa por Housin Aziz, SE\n\n" - "* Incógnito por Christopher Schreiner\n" - "* Bandera Triángulo por Austin Andrews\n\n" - - "Gracias a Google por los iconos de material design - (https://github.com/google/material-design-icons), " - "licenciadas bajo Apache v2.0 (https://www.apache.org/licenses/LICENSE-2.0).\n\n" - - Planeador de Viajes (beta) diff --git a/onebusaway-android/src/main/res/values-fi/strings.xml b/onebusaway-android/src/main/res/values-fi/strings.xml index 1fd43f452..610f646a7 100644 --- a/onebusaway-android/src/main/res/values-fi/strings.xml +++ b/onebusaway-android/src/main/res/values-fi/strings.xml @@ -590,48 +590,84 @@ + Versio + + +

Tervetuloa OneBusAway-hankkeeseen!

+ +

+ OneBusAwayssa olemme intohimoisia luomaan innovatiivisia ratkaisuja, jotka yksinkertaistavat joukkoliikennekokemustasi. Android-sovelluksemme on rakkaudentyö, joka on mahdollista monien erilaisten yksilöiden ja organisaatioiden omistautumisen ja lahjakkuuden ansiosta. Tässä pieni kurkistus mahtaviin henkilöihin ja organisaatioihin, jotka ovat tehneet OneBusAwaysta sen, millainen se on tänään: +

+

Koodinkehittäjät:

+

+ Omistautuneet avustajamme parantavat sovelluksen toiminnallisuutta ja käyttäjäkokemusta: +

+ + +

Kääntäjät:

+

+ Kiitos kääntäjillemme, OneBusAway on saavutettavissa ympäri maailmaa: +

+ +

Kuvien tekijät:

+

+ Kiitos suunnittelijoille, jotka ovat luoneet kuvat, joita käytetään ajoneuvojen kuvakkeissa, ja jotka on ladattu Noun Projectiin CC BY -lisenssillä 3.0 (https://creativecommons.org/licenses/by/3.0/us/): +

+ +

+ Lähde mukaan matkalle: Osallistu sovelluksemme kehittämiseen! +

+

+ Tutustu projektiimme GitHubissa osoitteessa https://github.com/OneBusAway/onebusaway-android. +

+ Lue lisää OneBusAwayn avoimen lähdekoodin projektista osoitteessa https://onebusaway.org .

+

+ Erityiskiitos Googlen upeista materiaalisen suunnittelun ikoneista (https://github.com/google/material-design-icons), + jotka lisäävät eleganssia sovellukseemme. Heidän anteliaisuutensa lisensoida nämä ikonit Apache v2.0 -lisenssillä (https://www.apache.org/licenses/LICENSE-2.0) on rikastuttanut huomattavasti käyttäjäkokemustamme. +

+

+ +

+ Tutustu sovellukseemme ja aloita sujuva joukkoliikennematka OneBusAwayn kanssa! +

+ + + + ]]> Parantaaksesi kokemustasi, ota käyttöön sijainnin käyttö:\n - Näytä reaaliaikainen sijaintisi kartalla.\n - Aseta automaattisesti paikallinen liikennevirastosi.\n\nEmme kerää sijaintitietojasi. Vaihtoehtoisesti voit valita alueesi manuaalisesti ilman sijaintioikeuksien sallimista. Tietoja - - "Lisätietoja tästä avoimen lähdekoodin projektista: http://onebusaway.org.\n\n" - - "*** Ohjelmakoodi ***\n\n" - - "Haluaisimme kiittää seuraavia henkilöitä, jotka ovat osallistuneet OneBusAway Androidin kehittämiseen:\n\n" - - "* Paul Watts\n" - "* Brian Ferris\n" - "* Daniel Welsh\n" - "* Arno Hart\n" - "* Sean Barbeau\n" - "* York Region Transit\n" - "* Ari Rusakko\n" - "* Ben Du\n" - "* Cagri Cetin\n" - "* Mike Karabushin\n\n" - - "Haluaisitko osallistua sovelluksen kehittämiseen? Kurkkaa koodit Githubista - https://github.com/OneBusAway/onebusaway-android.\n\n" - - "*** Käännökset ***\n\n" - - "Kiitokset henkilöille, jotka ovat tehneet käännökset OneBusAway Androidiin:\n\n" - - "* Ari Rusakko\n" - "* Edgar Andrés Moncada Taborda\n\n" - - "*** Kuvat ***\n\n" - - "Kiitokset suunnittelijoille, jotka tekivät ajoneuvojen ikoneissa käytetyt kuvat, jotka " - "kuuluvat Noun Project under CC BY 3.0 (http://creativecommons.org/licenses/by/3.0/us/):\n\n" - - "* Arrow by Zlatko Najdenovski, MK\n" - "* Map Marker by Housin Aziz, SE\n\n" - - "Kiitokset Googlelle 'material design' ikoneista - (https://github.com/google/material-design-icons), " - "licensed under Apache v2.0 (https://www.apache.org/licenses/LICENSE-2.0).\n\n" - Lupa tarvitaan Sinun täytyy antaa sovellukselle lupa muistutuksen asettamiseen. Myönnä lupa diff --git a/onebusaway-android/src/main/res/values-it/strings.xml b/onebusaway-android/src/main/res/values-it/strings.xml index 076474b42..eb11cb20d 100644 --- a/onebusaway-android/src/main/res/values-it/strings.xml +++ b/onebusaway-android/src/main/res/values-it/strings.xml @@ -663,9 +663,84 @@ Per backup e ripristino dati, OneBusAway necessita dell\'autorizzazione ad accedere alla memoria locale del dispositivo. + Versione + + +

Benvenuti in OneBusAway!

+ +

+ In OneBusAway siamo appassionati nel creare soluzioni innovative per semplificare la tua esperienza di trasporto. La nostra app per Android è un lavoro d\'amore, reso possibile dall\'impegno e dal talento di un gruppo variegato di individui e organizzazioni. Ecco uno sguardo ai fantastici contributori che hanno reso OneBusAway quello che è oggi: +

+

Contributori al Codice:

+

+ I nostri dedicati contributori migliorano la funzionalità e l\'esperienza utente dell\'applicazione: +

+ + +

Traduttori:

+

+ Grazie ai nostri traduttori, OneBusAway è accessibile in tutto il mondo: +

+ +

Crediti delle Immagini:

+

+ Grazie ai designer che hanno creato le immagini utilizzate nelle icone dei veicoli, caricate su Noun Project con licenza CC BY 3.0 (https://creativecommons.org/licenses/by/3.0/us/): +

+ +

+ Unisciti al Viaggio: Contribuisci alla Nostra App! +

+

+ Visita il nostro progetto su GitHub su https://github.com/OneBusAway/onebusaway-android. +

+ Scopri di più sul progetto open-source di OneBusAway su https://onebusaway.org .

+

+ Un ringraziamento speciale a Google per le splendide icone di design materiale (https://github.com/google/material-design-icons), + che aggiungono un tocco di eleganza alla nostra app. La loro generosità nel concedere + queste icone con licenza Apache v2.0 (https://www.apache.org/licenses/LICENSE-2.0) ha arricchito notevolmente la nostra esperienza utente. +

+

+ +

+ Esplora la nostra app e intraprendi un viaggio nel trasporto pubblico senza intoppi con OneBusAway! +

+ + + + ]]> Informazioni - "Scopri di più sul progetto open-source OneBusAway su https://onebusaway.org.\n\n" "*** Codice ***\n\n" "Vogliamo ringraziare coloro che hanno contribuito a programmare l\'app OneBusAway Android:\n\n" "* Paul Watts\n" "* Brian Ferris\n" "* Daniel Welsh\n" "* Arno Hart\n" "* Sean Barbeau\n" "* York Region Transit\n" "* Ben Du\n" "* Cagri Cetin\n" "* Mike Karabushin\n" "* Aziz Batihk\n" "* Charles Bond\n" "* Hillsborough Area Regional Transit (tramite Simon Jacobs di Cambridge Systematics)\n" "* Bridgette Eichelberger\n" "* Rodrigo Carvalho (Google Summer of Code 2017)\n" "* Steve Moritani\n\n" "Vuoi contribuire a quest\'app? Scoprici su Github su https://github.com/OneBusAway/onebusaway-android.\n\n" "*** Traduzioni ***\n\n" "Vogliamo ringraziare coloro che hanno contribuito a tradurre l\'app OneBusAway Android:\n\n" "* Ari Rusakko\n" "* Edgar Andrés Moncada Taborda\n" "* Eleonora Fabbri\n" "* Paola Poletti\n\n" "*** Immagini ***\n\n" "Grazie ai designer che hanno creato le immagini utilizzate nelle icone dei veicoli, che sono state caricate" "sul Noun Project sotto licenza CC BY 3.0 (https://creativecommons.org/licenses/by/3.0/us/):\n\n" "* Freccia realizzata da Zlatko Najdenovski, MK\n" "* Marcatore mappa realizzato da Housin Aziz, SE\n" "* Incognito realizzato da Christopher Schreiner\n" "* Bandiera triangolare realizzata da Austin Andrews\n\n" "Grazie a Google per le icone (https://github.com/google/material-design-icons), " "sotto licenza Apache v2.0 (https://www.apache.org/licenses/LICENSE-2.0).\n\n" - Pianificatore di viaggio (beta) diff --git a/onebusaway-android/src/main/res/values-pl/strings.xml b/onebusaway-android/src/main/res/values-pl/strings.xml index cfcebb910..c53aaa53a 100644 --- a/onebusaway-android/src/main/res/values-pl/strings.xml +++ b/onebusaway-android/src/main/res/values-pl/strings.xml @@ -613,37 +613,83 @@ O KiedyBus - - "Dowiedz się więcej o naszej aplikacji KiedyBus na stronie http://www.kiedybus.pl\n\n" - - "Dzięki KiedyBus możesz zobaczyć za ile minut autobus przyjedzie na przystanek." - - "Rozpoczynamy w Środzie Wielkopolskiej, a już wkrótce w kolejnych miastach.\n\n" - - "Aplikacja KiedyBus nie powstałaby, gdyby nie projekt OneBusAway oraz następujące osoby:\n\n" - - "* Paul Watts\n" - "* Brian Ferris\n" - "* Daniel Welsh\n" - "* Arno Hart\n" - "* Sean Barbeau\n" - "* York Region Transit\n" - "* Ben Du\n" - "* Cagri Cetin\n" - "* Mike Karabushin\n\n" - - "Informacje o OneBusAway dostępne są na stronach: http://www.OneBusAway.org.\n\n" - - "*** Grafika ***\n\n" - - "Podziękowania dla projektantów ikonek pojazdów, które zostały umieszczone" - "w Noun Project w ramach CC BY 3.0 (http://creativecommons.org/licenses/by/3.0/us/):\n\n" - - "* Strzałki - Zlatko Najdenovski, MK\n" - "* Markery mapy - Housin Aziz, SE\n\n" - - "Podziękowania dla Google za ikony material design - (https://github.com/google/material-design-icons), " - "licencjonowane w ramach CC BY 4.0 (http://creativecommons.org/licenses/by/4.0/).\n\n" - + + +

Witaj w OneBusAway!

+ +

+ W OneBusAway pasjonujemy się tworzeniem innowacyjnych rozwiązań, które upraszczają Twoje doświadczenia z transportem publicznym. Nasza aplikacja na platformę Android to dzieło miłości, możliwe dzięki zaangażowaniu i talentowi różnorodnej grupy osób i organizacji. Oto przegląd fantastycznych współpracowników, którzy uczynili OneBusAway tym, czym jest dzisiaj: +

+

Współtwórcy Kodu:

+

+ Nasi oddani współpracownicy ciągle ulepszają funkcjonalność i doświadczenie użytkownika aplikacji: +

+ + +

Tłumaczenia:

+

+ Dzięki naszym tłumaczom, OneBusAway jest dostępne na całym świecie: +

+ +

Zdjęcia:

+

+ Dziękujemy projektantom, którzy stworzyli obrazy wykorzystywane + w ikonach pojazdów, które zostały przesłane do Noun Project na licencji CC BY + 3.0 (https://creativecommons.org/licenses/by/3.0/us/): +

+ +

+ Dołącz do podróży: Współtwórz naszą aplikację! +

+

+ Sprawdź nasz projekt na GitHubie pod adresem https://github.com/OneBusAway/onebusaway-android. +

+ Dowiedz się więcej o projekcie open-source OneBusAway na stronie https://onebusaway.org .

+

+ Szczególne podziękowania dla Google za wizualnie oszałamiające ikony designu materiałowego (https://github.com/google/material-design-icons), + które dodają elegancji naszej aplikacji. Ich hojność w udostępnieniu + tych ikon na licencji Apache v2.0 (https://www.apache.org/licenses/LICENSE-2.0) znacznie wzbogaciła nasze doświadczenie użytkownika. +

+

+ +

+ Odkrywaj naszą aplikację i rozpocznij płynną podróż z OneBusAway! +

+ + + + ]]> + Wersja \ 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 6464b8d07..b4b1d4c0d 100644 --- a/onebusaway-android/src/main/res/values/strings.xml +++ b/onebusaway-android/src/main/res/values/strings.xml @@ -890,56 +890,91 @@ To backup or restore your data, OneBusAway needs permission to access your local device storage. + Version About - - "Find out more about the OneBusAway open-source project at https://onebusaway.org.\n\n" - - "*** Code ***\n\n" - - "We'd like to thank the following who have contributed code to OneBusAway Android:\n\n" - - "* Paul Watts\n" - "* Brian Ferris\n" - "* Daniel Welsh\n" - "* Arno Hart\n" - "* Sean Barbeau\n" - "* York Region Transit\n" - "* Ben Du\n" - "* Cagri Cetin\n" - "* Mike Karabushin\n" - "* Aziz Batihk\n" - "* Charles Bond\n" - "* Hillsborough Area Regional Transit (via Simon Jacobs at Cambridge Systematics)\n" - "* Bridgette Eichelberger\n" - "* Rodrigo Carvalho (Google Summer of Code 2017)\n" - "* Steve Moritani\n" - "* Ellen Conley\n\n" - - "Want to contribute to this app? Check it out on Github at - https://github.com/OneBusAway/onebusaway-android.\n\n" - - "*** Translations ***\n\n" - - "We'd like to thank those who have contributed translations to OneBusAway Android:\n\n" - - "* Ari Rusakko\n" - "* Eleonora Fabbri\n" - "* Edgar Andrés Moncada Taborda\n\n" - - "*** Images ***\n\n" - - "Thanks to the designers who created images used in the vehicle icons, which were uploaded " - "to the Noun Project under CC BY 3.0 (https://creativecommons.org/licenses/by/3.0/us/):\n\n" - - "* Arrow by Zlatko Najdenovski, MK\n" - "* Map Marker by Housin Aziz, SE\n" - "* Incognito by Christopher Schreiner\n" - "* Flag Triangle by Austin Andrews\n\n" - - "Thanks to Google for the material design icons - (https://github.com/google/material-design-icons), " - "licensed under Apache v2.0 (https://www.apache.org/licenses/LICENSE-2.0).\n\n" - + + +

Welcome to OneBusAway!

+ +

+ At OneBusAway, we\'re passionate about creating innovative solutions to + simplify your transit experience. Our Android app is a labor of love, made + possible by the dedication and talent of a diverse group of individuals + and organizations. Here\'s a glimpse into the fantastic contributors who + have made OneBusAway what it is today: +

+

Code Contributors:

+

+ Our dedicated contributors improve the app\'s functionality and user + experience: +

+ + +

Translations:

+

+ Thanks to our translators, OneBusAway is + accessible worldwide: +

+ +

Image Credits:

+

+ Thanks to the designers who created images used + in the vehicle icons, which were uploaded to the Noun Project under CC BY + 3.0 (https://creativecommons.org/licenses/by/3.0/us/): +

+ +

+ Join the Journey: Contribute to Our App! +

+

+ Check out our project on GitHub at https://github.com/OneBusAway/onebusaway-android. +

+ Find out more about the OneBusAway open-source project at https://onebusaway.org .

+

+ Special thanks to Google for the visually stunning material design icons(https://github.com/google/material-design-icons), + which add a touch of elegance to our app. Their generosity in licensing + these icons under Apache v2.0(https://www.apache.org/licenses/LICENSE-2.0) has greatly enriched our user experience. +

+

+ +

+ Explore our app and embark on a seamless transit journey with OneBusAway! +

+ + + ]]> From 5f4dc8cd9c8a23a128a189a9c4d7d1fec60ea867 Mon Sep 17 00:00:00 2001 From: Aaron Brethorst Date: Sun, 10 Mar 2024 17:19:31 -0700 Subject: [PATCH 2/9] Tweak HTMLification of About content (#1160) * Remove an unused import * Spacing fixes in code and user-facing content * Remove `layout_margin` from the TextView that renders the HTML content so that it lines up with the version string. * Shorten the first paragraph of the about content. --- .../main/java/org/onebusaway/android/ui/AboutActivity.java | 7 +++---- onebusaway-android/src/main/res/layout/content_about.xml | 1 - onebusaway-android/src/main/res/values-es/strings.xml | 2 +- onebusaway-android/src/main/res/values-fi/strings.xml | 2 +- onebusaway-android/src/main/res/values-it/strings.xml | 2 +- onebusaway-android/src/main/res/values-pl/strings.xml | 2 +- onebusaway-android/src/main/res/values/strings.xml | 7 ++----- 7 files changed, 9 insertions(+), 14 deletions(-) diff --git a/onebusaway-android/src/main/java/org/onebusaway/android/ui/AboutActivity.java b/onebusaway-android/src/main/java/org/onebusaway/android/ui/AboutActivity.java index d618ae58b..9a59e214a 100644 --- a/onebusaway-android/src/main/java/org/onebusaway/android/ui/AboutActivity.java +++ b/onebusaway-android/src/main/java/org/onebusaway/android/ui/AboutActivity.java @@ -23,7 +23,6 @@ import android.os.Bundle; import android.text.Html; import android.text.Spannable; -import android.text.Spanned; import android.widget.TextView; import com.google.android.material.appbar.CollapsingToolbarLayout; @@ -57,7 +56,7 @@ protected void onCreate(Bundle savedInstanceState) { getSupportActionBar().setDisplayHomeAsUpEnabled(true); TextView tv = (TextView) findViewById(R.id.about_text); - MaterialTextView version= findViewById(R.id.version); + MaterialTextView version = findViewById(R.id.version); String versionString = ""; int versionCode = 0; try { @@ -70,13 +69,13 @@ protected void onCreate(Bundle savedInstanceState) { StringBuilder builder = new StringBuilder(); // Version info - builder.append("Version:") + builder.append("Version: ") .append(versionString) .append(" (") .append(versionCode) .append(")\n"); - // Majority of content from string resource + // Majority of content comes from a string resource: version.setText(builder.toString()); tv.setText((Spannable) Html.fromHtml(getString(R.string.about_content))); } diff --git a/onebusaway-android/src/main/res/layout/content_about.xml b/onebusaway-android/src/main/res/layout/content_about.xml index f9af6e424..efebaada0 100644 --- a/onebusaway-android/src/main/res/layout/content_about.xml +++ b/onebusaway-android/src/main/res/layout/content_about.xml @@ -24,7 +24,6 @@ android:id="@+id/about_text" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_margin="@dimen/text_margin" android:autoLink="web"/> diff --git a/onebusaway-android/src/main/res/values-es/strings.xml b/onebusaway-android/src/main/res/values-es/strings.xml index 62e39d6a3..977a86907 100644 --- a/onebusaway-android/src/main/res/values-es/strings.xml +++ b/onebusaway-android/src/main/res/values-es/strings.xml @@ -789,7 +789,7 @@

¡Bienvenido a OneBusAway!

- En OneBusAway, estamos apasionados por crear soluciones innovadoras para simplificar tu experiencia de transporte. Nuestra aplicación para Android es un trabajo de amor, posible gracias al compromiso y talento de un grupo diverso de individuos y organizaciones. Aquí tienes un vistazo a los fantásticos colaboradores que han hecho de OneBusAway lo que es hoy: + Esta aplicación ha sido creada por un equipo de voluntarios y depende de la dedicación, pasión y talentos de sus colaboradores de código abierto.

Colaboradores de Código:

diff --git a/onebusaway-android/src/main/res/values-fi/strings.xml b/onebusaway-android/src/main/res/values-fi/strings.xml index 610f646a7..0d1b404b4 100644 --- a/onebusaway-android/src/main/res/values-fi/strings.xml +++ b/onebusaway-android/src/main/res/values-fi/strings.xml @@ -597,7 +597,7 @@

Tervetuloa OneBusAway-hankkeeseen!

- OneBusAwayssa olemme intohimoisia luomaan innovatiivisia ratkaisuja, jotka yksinkertaistavat joukkoliikennekokemustasi. Android-sovelluksemme on rakkaudentyö, joka on mahdollista monien erilaisten yksilöiden ja organisaatioiden omistautumisen ja lahjakkuuden ansiosta. Tässä pieni kurkistus mahtaviin henkilöihin ja organisaatioihin, jotka ovat tehneet OneBusAwaysta sen, millainen se on tänään: + Tämä sovellus on vapaaehtoistiimin tekemä ja se nojaa sen avoimen lähdekoodin avustajien omistautumiseen, intohimoon ja kykyihin.

Koodinkehittäjät:

diff --git a/onebusaway-android/src/main/res/values-it/strings.xml b/onebusaway-android/src/main/res/values-it/strings.xml index eb11cb20d..6cbf60590 100644 --- a/onebusaway-android/src/main/res/values-it/strings.xml +++ b/onebusaway-android/src/main/res/values-it/strings.xml @@ -670,7 +670,7 @@

Benvenuti in OneBusAway!

- In OneBusAway siamo appassionati nel creare soluzioni innovative per semplificare la tua esperienza di trasporto. La nostra app per Android è un lavoro d\'amore, reso possibile dall\'impegno e dal talento di un gruppo variegato di individui e organizzazioni. Ecco uno sguardo ai fantastici contributori che hanno reso OneBusAway quello che è oggi: + Questa app è stata realizzata da un team di volontari e si basa sulla dedizione, passione e talenti dei suoi contributori open source.

Contributori al Codice:

diff --git a/onebusaway-android/src/main/res/values-pl/strings.xml b/onebusaway-android/src/main/res/values-pl/strings.xml index c53aaa53a..aa28db003 100644 --- a/onebusaway-android/src/main/res/values-pl/strings.xml +++ b/onebusaway-android/src/main/res/values-pl/strings.xml @@ -619,7 +619,7 @@

Witaj w OneBusAway!

- W OneBusAway pasjonujemy się tworzeniem innowacyjnych rozwiązań, które upraszczają Twoje doświadczenia z transportem publicznym. Nasza aplikacja na platformę Android to dzieło miłości, możliwe dzięki zaangażowaniu i talentowi różnorodnej grupy osób i organizacji. Oto przegląd fantastycznych współpracowników, którzy uczynili OneBusAway tym, czym jest dzisiaj: + Ta aplikacja została stworzona przez zespół wolontariuszy i opiera się na poświęceniu, pasji oraz talentach jej współtwórców open source.

Współtwórcy Kodu:

diff --git a/onebusaway-android/src/main/res/values/strings.xml b/onebusaway-android/src/main/res/values/strings.xml index b4b1d4c0d..6c5471e60 100644 --- a/onebusaway-android/src/main/res/values/strings.xml +++ b/onebusaway-android/src/main/res/values/strings.xml @@ -898,11 +898,8 @@

Welcome to OneBusAway!

- At OneBusAway, we\'re passionate about creating innovative solutions to - simplify your transit experience. Our Android app is a labor of love, made - possible by the dedication and talent of a diverse group of individuals - and organizations. Here\'s a glimpse into the fantastic contributors who - have made OneBusAway what it is today: + OneBusAway is made by a team of volunteers and relies upon + the dedication, passion, and talents of its open source contributors.

Code Contributors:

From 297a41a7c20bf5d2f0207f2cbb99791166618362 Mon Sep 17 00:00:00 2001 From: Amr Hossam Date: Mon, 11 Mar 2024 06:11:58 +0200 Subject: [PATCH 3/9] Fixed #1155 - Info Dialog Glitch (#1156) Signed-off-by: Amr Hossam --- .../map/googlemapsv2/VehicleOverlay.java | 48 +++---------------- 1 file changed, 7 insertions(+), 41 deletions(-) diff --git a/onebusaway-android/src/google/java/org/onebusaway/android/map/googlemapsv2/VehicleOverlay.java b/onebusaway-android/src/google/java/org/onebusaway/android/map/googlemapsv2/VehicleOverlay.java index bcaa2cc29..0551797af 100644 --- a/onebusaway-android/src/google/java/org/onebusaway/android/map/googlemapsv2/VehicleOverlay.java +++ b/onebusaway-android/src/google/java/org/onebusaway/android/map/googlemapsv2/VehicleOverlay.java @@ -175,9 +175,6 @@ public synchronized void clear() { mMarkerData.clear(); mMarkerData = null; } - if (mCustomInfoWindowAdapter != null) { - mCustomInfoWindowAdapter.cancelUpdates(); - } } /** @@ -532,17 +529,12 @@ public void onInfoWindowClick(Marker marker) { // Show trip details screen for the vehicle associated with this marker ObaTripStatus status = mMarkerData.getStatusFromMarker(marker); if (status != null) { - // Stop any callbacks to refresh the vehicle marker popup balloons - mCustomInfoWindowAdapter.cancelUpdates(); - - if (status != null) { - if (mController != null && mController.getFocusedStopId() != null) { - TripDetailsActivity.start(mActivity, status.getActiveTripId(), - mController.getFocusedStopId(), TripDetailsListFragment.SCROLL_MODE_VEHICLE); - } else { - TripDetailsActivity.start(mActivity, status.getActiveTripId(), - TripDetailsListFragment.SCROLL_MODE_VEHICLE); - } + if (mController != null && mController.getFocusedStopId() != null) { + TripDetailsActivity.start(mActivity, status.getActiveTripId(), + mController.getFocusedStopId(), TripDetailsListFragment.SCROLL_MODE_VEHICLE); + } else { + TripDetailsActivity.start(mActivity, status.getActiveTripId(), + TripDetailsListFragment.SCROLL_MODE_VEHICLE); } } } @@ -960,11 +952,6 @@ public View getInfoContents(Marker marker) { } lastUpdatedView.setText(lastUpdated); - if (mMarkerRefreshHandler != null) { - mMarkerRefreshHandler.removeCallbacks(mMarkerRefresh); - mMarkerRefreshHandler.postDelayed(mMarkerRefresh, MARKER_REFRESH_PERIOD); - } - if (status.getOccupancyStatus() != null) { // Real-time occupancy data UIUtils.setOccupancyVisibilityAndColor(occupancyView, status.getOccupancyStatus(), OccupancyState.REALTIME); @@ -978,27 +965,6 @@ public View getInfoContents(Marker marker) { return view; } - private final long MARKER_REFRESH_PERIOD = TimeUnit.SECONDS.toMillis(1); - - private final Handler mMarkerRefreshHandler = new Handler(); - private final Runnable mMarkerRefresh = new Runnable() { - public void run() { - if (mCurrentFocusVehicleMarker != null && - mCurrentFocusVehicleMarker.isInfoWindowShown()) { - // Force an update of the marker balloon, so "last updated" time ticks up - mCurrentFocusVehicleMarker.showInfoWindow(); - } - } - }; - - /** - * Cancels any pending updates of the marker balloon contents - */ - public void cancelUpdates() { - if (mMarkerRefreshHandler != null) { - mMarkerRefreshHandler.removeCallbacks(mMarkerRefresh); - } - } } -} +} \ No newline at end of file From 54940887ce31c86a130be74718f2789d58ce802e Mon Sep 17 00:00:00 2001 From: Amr Hossam Date: Sun, 10 Mar 2024 14:31:30 +0200 Subject: [PATCH 4/9] Fixed #1157 - Dialog crash Signed-off-by: Amr Hossam --- .../onebusaway/android/ui/SituationDialogFragment.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/onebusaway-android/src/main/java/org/onebusaway/android/ui/SituationDialogFragment.java b/onebusaway-android/src/main/java/org/onebusaway/android/ui/SituationDialogFragment.java index 4133138fd..c97bcce68 100644 --- a/onebusaway-android/src/main/java/org/onebusaway/android/ui/SituationDialogFragment.java +++ b/onebusaway-android/src/main/java/org/onebusaway/android/ui/SituationDialogFragment.java @@ -162,10 +162,12 @@ public void onClick(DialogInterface dialog, int which) { TextView title = (TextView) dialog.findViewById(R.id.alert_title); title.setText(args.getString(TITLE)); - TextView desc = (TextView) dialog.findViewById(R.id.alert_description); + TextView descTxtView = (TextView) dialog.findViewById(R.id.alert_description); - if (desc != null) { - desc.setText(Html.fromHtml(args.getString(DESCRIPTION))); + String desc = args.getString(DESCRIPTION); + + if (descTxtView != null &&!TextUtils.isEmpty(desc)) { + descTxtView.setText(Html.fromHtml(desc)); } TextView urlView = (TextView) dialog.findViewById(R.id.alert_url); From c1209a495123f167c697b72c0be8244a4435b243 Mon Sep 17 00:00:00 2001 From: Aaron Brethorst Date: Sun, 10 Mar 2024 22:06:52 -0700 Subject: [PATCH 5/9] Bump app version numbers --- onebusaway-android/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/onebusaway-android/build.gradle b/onebusaway-android/build.gradle index eede8b6ac..442789bd3 100644 --- a/onebusaway-android/build.gradle +++ b/onebusaway-android/build.gradle @@ -39,8 +39,8 @@ android { defaultConfig { minSdkVersion 21 targetSdkVersion 33 - versionCode 138 - versionName "2.12.1" + versionCode 139 + versionName "2.12.2" multiDexEnabled true From f5cc5efe58b60d03e564a5c8eeeb172b9d3970f4 Mon Sep 17 00:00:00 2001 From: Amr Hossam Date: Sat, 9 Mar 2024 13:49:36 +0200 Subject: [PATCH 6/9] Correctly populate recent routes list Fixes #895 Recent routes isn't populated as often as it should be * Allow saving for routes into the DB * Added HeadSign instead of empty route-name --- .../android/ui/ArrivalsListFragment.java | 6 +++ .../android/ui/SearchResultsFragment.java | 3 ++ .../org/onebusaway/android/util/DBUtil.java | 46 +++++++++++++++++++ 3 files changed, 55 insertions(+) diff --git a/onebusaway-android/src/main/java/org/onebusaway/android/ui/ArrivalsListFragment.java b/onebusaway-android/src/main/java/org/onebusaway/android/ui/ArrivalsListFragment.java index a3d363755..13b275ebb 100644 --- a/onebusaway-android/src/main/java/org/onebusaway/android/ui/ArrivalsListFragment.java +++ b/onebusaway-android/src/main/java/org/onebusaway/android/ui/ArrivalsListFragment.java @@ -829,6 +829,8 @@ public void showRouteOnMap(ArrivalInfo arrivalInfo) { if (mListener != null) { handled = mListener.onShowRouteOnMapSelected(arrivalInfo); } + // Save to recent routes + DBUtil.addRouteToDB(getActivity(),arrivalInfo); // If the event hasn't been handled by the listener, start a new activity if (!handled) { HomeActivity.start(getActivity(), arrivalInfo.getInfo().getRouteId()); @@ -1429,6 +1431,10 @@ private void goToTrip(ArrivalInfo stop) { } private void goToTripDetails(ArrivalInfo stop) { + + // Save to recent routes + DBUtil.addRouteToDB(getActivity(),stop); + TripDetailsActivity.start(getActivity(), stop.getInfo().getTripId(), stop.getInfo().getStopId(), TripDetailsListFragment.SCROLL_MODE_STOP); diff --git a/onebusaway-android/src/main/java/org/onebusaway/android/ui/SearchResultsFragment.java b/onebusaway-android/src/main/java/org/onebusaway/android/ui/SearchResultsFragment.java index 5d4f6af9f..f8c6403e8 100644 --- a/onebusaway-android/src/main/java/org/onebusaway/android/ui/SearchResultsFragment.java +++ b/onebusaway-android/src/main/java/org/onebusaway/android/ui/SearchResultsFragment.java @@ -44,6 +44,7 @@ import org.onebusaway.android.io.request.ObaStopsForLocationRequest; import org.onebusaway.android.io.request.ObaStopsForLocationResponse; import org.onebusaway.android.util.ArrayAdapter; +import org.onebusaway.android.util.DBUtil; import org.onebusaway.android.util.LocationUtils; import org.onebusaway.android.util.UIUtils; @@ -196,6 +197,7 @@ private void clickRoute(ObaRoute route) { builder.setItems(R.array.search_route_options, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { + DBUtil.addRouteToDB(getActivity(),route); switch (which) { case 0: // Show on list @@ -205,6 +207,7 @@ public void onClick(DialogInterface dialog, int which) { // Show on map HomeActivity.start(getActivity(), routeId); break; + } } }); diff --git a/onebusaway-android/src/main/java/org/onebusaway/android/util/DBUtil.java b/onebusaway-android/src/main/java/org/onebusaway/android/util/DBUtil.java index f49bd7bd2..fa19d8d83 100644 --- a/onebusaway-android/src/main/java/org/onebusaway/android/util/DBUtil.java +++ b/onebusaway-android/src/main/java/org/onebusaway/android/util/DBUtil.java @@ -1,10 +1,14 @@ package org.onebusaway.android.util; import org.onebusaway.android.app.Application; +import org.onebusaway.android.io.elements.ObaRoute; import org.onebusaway.android.io.elements.ObaStop; import org.onebusaway.android.provider.ObaContract; +import org.onebusaway.android.ui.ArrivalInfo; import android.content.ContentValues; +import android.content.Context; +import android.text.TextUtils; /** * Created by azizmb9494 on 2/20/16. @@ -25,4 +29,46 @@ public static void addToDB(ObaStop stop) { } ObaContract.Stops.insertOrUpdate(stop.getId(), values, true); } + + public static void addRouteToDB(Context ctx, ArrivalInfo arrivalInfo){ + if (Application.get().getCurrentRegion() == null) return; + + ContentValues routeValues = new ContentValues(); + + String shortName = arrivalInfo.getInfo().getShortName(); + String longName = arrivalInfo.getInfo().getRouteLongName(); + + if (TextUtils.isEmpty(longName)) { + longName = UIUtils.formatDisplayText(arrivalInfo.getInfo().getHeadsign()); + } + + routeValues.put(ObaContract.Routes.SHORTNAME, shortName); + routeValues.put(ObaContract.Routes.LONGNAME, longName); + routeValues.put(ObaContract.Routes.REGION_ID, Application.get().getCurrentRegion().getId()); + + ObaContract.Routes.insertOrUpdate(ctx, arrivalInfo.getInfo().getRouteId(), routeValues, true); + } + + public static void addRouteToDB(Context ctx, ObaRoute route){ + if (Application.get().getCurrentRegion() == null) return; + + ContentValues routeValues = new ContentValues(); + + String shortName = route.getShortName(); + String longName = route.getLongName(); + + if (TextUtils.isEmpty(shortName)) { + shortName = longName; + } + if (TextUtils.isEmpty(longName) || shortName.equals(longName)) { + longName = route.getDescription(); + } + + routeValues.put(ObaContract.Routes.SHORTNAME, shortName); + routeValues.put(ObaContract.Routes.LONGNAME, longName); + routeValues.put(ObaContract.Routes.URL, route.getUrl()); + routeValues.put(ObaContract.Routes.REGION_ID, Application.get().getCurrentRegion().getId()); + + ObaContract.Routes.insertOrUpdate(ctx, route.getId(), routeValues, true); + } } From 69827e752cfbd1b27fe3875834807d25b2f5d2d1 Mon Sep 17 00:00:00 2001 From: Amr Hossam Date: Mon, 11 Mar 2024 13:33:45 +0200 Subject: [PATCH 7/9] Fixed #1163 - Restoring backup crash. Signed-off-by: Amr Hossam --- .../java/org/onebusaway/android/ui/PreferencesActivity.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/onebusaway-android/src/main/java/org/onebusaway/android/ui/PreferencesActivity.java b/onebusaway-android/src/main/java/org/onebusaway/android/ui/PreferencesActivity.java index f8e28ff0c..7e1363c01 100644 --- a/onebusaway-android/src/main/java/org/onebusaway/android/ui/PreferencesActivity.java +++ b/onebusaway-android/src/main/java/org/onebusaway/android/ui/PreferencesActivity.java @@ -402,7 +402,9 @@ public void onRequestPermissionsResult( protected void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); if (requestCode == REQUEST_CODE_RESTORE_BACKUP) { - BackupUtils.restore(this, data.getData()); + if(data != null){ + BackupUtils.restore(this, data.getData()); + } } } From 44a33a5360b025e568ba160d79840c95ae988f77 Mon Sep 17 00:00:00 2001 From: Amr Hossam Date: Tue, 12 Mar 2024 12:40:17 +0200 Subject: [PATCH 8/9] Fixed #1165 - Trip planner crash Signed-off-by: Amr Hossam --- .../org/onebusaway/android/directions/tasks/TripRequest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/onebusaway-android/src/main/java/org/onebusaway/android/directions/tasks/TripRequest.java b/onebusaway-android/src/main/java/org/onebusaway/android/directions/tasks/TripRequest.java index 5f76c1a91..69042bb9f 100644 --- a/onebusaway-android/src/main/java/org/onebusaway/android/directions/tasks/TripRequest.java +++ b/onebusaway-android/src/main/java/org/onebusaway/android/directions/tasks/TripRequest.java @@ -104,7 +104,7 @@ protected void onPostExecute(Long result) { return; } - if (!mResponse.getPlan().getItinerary().isEmpty() && mResponse != null && mResponse.getPlan() != null + if (mResponse != null && mResponse.getPlan() != null && !mResponse.getPlan().getItinerary().isEmpty() && mResponse.getPlan().getItinerary().get(0) != null) { mCallback.onTripRequestComplete(mResponse.getPlan(), mRequestUrl); } else { From a18606f2318c4826cbf44182036db8d2ba24c834 Mon Sep 17 00:00:00 2001 From: Gourab Singha Date: Sat, 9 Mar 2024 22:08:57 +0530 Subject: [PATCH 9/9] Activity doesn't restart on switching modes --- .../src/main/AndroidManifest.xml | 119 ++++++++++-------- 1 file changed, 68 insertions(+), 51 deletions(-) diff --git a/onebusaway-android/src/main/AndroidManifest.xml b/onebusaway-android/src/main/AndroidManifest.xml index 98ace5da4..79f7d7456 100644 --- a/onebusaway-android/src/main/AndroidManifest.xml +++ b/onebusaway-android/src/main/AndroidManifest.xml @@ -63,7 +63,8 @@ + android:exported="true" + android:configChanges="orientation|keyboardHidden|screenSize"> @@ -73,43 +74,49 @@ + android:name="org.onebusaway.android.ui.HomeActivity" + android:exported="true" + android:configChanges="orientation|keyboardHidden|screenSize"> + android:name="org.onebusaway.android.ui.ArrivalsListActivity" + android:launchMode="singleTop" + android:exported="true" + android:configChanges="orientation|keyboardHidden|screenSize"> + android:name="com.joulespersecond.seattlebusbot.ArrivalsListActivity" + android:launchMode="singleTop" + android:exported="true" + android:configChanges="orientation|keyboardHidden|screenSize"> + android:exported="true" + android:configChanges="orientation|keyboardHidden|screenSize"> + android:exported="true" + android:configChanges="orientation|keyboardHidden|screenSize"> + android:exported="true" + android:configChanges="orientation|keyboardHidden|screenSize"> @@ -117,16 +124,18 @@ + android:exported="true" + android:configChanges="orientation|keyboardHidden|screenSize"> + android:name="org.onebusaway.android.ui.MyStopsActivity" + android:label="@string/stop_shortcut" + android:exported="true" + android:configChanges="orientation|keyboardHidden|screenSize"> @@ -134,52 +143,58 @@ + android:name="com.joulespersecond.seattlebusbot.MyStopsActivity" + android:label="@string/stop_shortcut" + android:exported="true" + android:configChanges="orientation|keyboardHidden|screenSize"> + android:name="org.onebusaway.android.ui.MyRecentStopsActivity" + android:label="@string/recent_stops_shortcut" + android:exported="true" + android:configChanges="orientation|keyboardHidden|screenSize"> + android:name="org.onebusaway.android.ui.MyStarredStopsActivity" + android:label="@string/starred_stops_shortcut" + android:exported="true" + android:configChanges="orientation|keyboardHidden|screenSize"> + android:name="org.onebusaway.android.ui.MyRoutesActivity" + android:label="@string/route_shortcut" + android:exported="true" + android:configChanges="orientation|keyboardHidden|screenSize"> + android:name="com.joulespersecond.seattlebusbot.MyRoutesActivity" + android:label="@string/route_shortcut" + android:exported="true" + android:configChanges="orientation|keyboardHidden|screenSize"> + android:name="org.onebusaway.android.ui.MyRecentRoutesActivity" + android:label="@string/recent_routes_shortcut" + android:exported="true" + android:configChanges="orientation|keyboardHidden|screenSize"> @@ -187,8 +202,8 @@ + android:name="org.onebusaway.android.ui.PreferencesActivity" + android:parentActivityName="org.onebusaway.android.ui.HomeActivity"> @@ -200,10 +215,11 @@ + android:name="org.onebusaway.android.ui.MyRecentStopsAndRoutesActivity" + android:label="@string/my_recent_title" + android:parentActivityName="org.onebusaway.android.ui.HomeActivity" + android:exported="true" + android:configChanges="orientation|keyboardHidden|screenSize"> @@ -214,11 +230,12 @@ android:value="org.onebusaway.android.ui.HomeActivity"/> + android:name="org.onebusaway.android.ui.NightLightActivity" + android:label="@string/stop_info_option_night_light" + android:parentActivityName="org.onebusaway.android.ui.HomeActivity" + android:screenOrientation="portrait" + android:exported="true" + android:configChanges="orientation|keyboardHidden|screenSize"> @@ -229,9 +246,9 @@ android:value="org.onebusaway.android.ui.HomeActivity"/> + android:name="org.onebusaway.android.ui.TripPlanActivity" + android:label="@string/title_activity_trip_plan" + android:parentActivityName="org.onebusaway.android.ui.HomeActivity"> @@ -253,8 +270,8 @@ android:authorities="${databaseAuthority}"/> @@ -263,7 +280,7 @@ + android:name=".directions.realtime.RealtimeService">