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

App Dependencies Update #1271

Merged
merged 12 commits into from
Oct 21, 2024
Merged

App Dependencies Update #1271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c46332e
update google play service location
amrhossamdev Oct 17, 2024
54d41a4
update activity and fragment lib
amrhossamdev Oct 18, 2024
2b60925
update appcompat
amrhossamdev Oct 18, 2024
579d21f
remove duplicate lib
amrhossamdev Oct 18, 2024
1d3996c
update constraint layout
amrhossamdev Oct 18, 2024
79944e3
update google gson lib
amrhossamdev Oct 18, 2024
273c574
update test runner
amrhossamdev Oct 18, 2024
a4c879c
update core ktx
amrhossamdev Oct 18, 2024
0d58215
update work manager
amrhossamdev Oct 18, 2024
e3d20e6
update google firebase
amrhossamdev Oct 18, 2024
333b302
update material view
amrhossamdev Oct 18, 2024
f807523
refactor to new material lib
amrhossamdev Oct 18, 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
29 changes: 14 additions & 15 deletions onebusaway-android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,26 +318,25 @@ configurations {
dependencies {
// Firebase Analytics
implementation 'com.google.firebase:firebase-core:21.1.1'
implementation 'com.google.firebase:firebase-analytics:22.1.0'
implementation 'com.google.firebase:firebase-analytics:22.1.2'
// Cloud Firestore (for storing destination alert test data)
implementation 'com.google.firebase:firebase-firestore:25.1.0'
implementation 'com.google.firebase:firebase-auth:21.0.5'
implementation 'com.google.firebase:firebase-storage:21.0.0'
implementation 'com.google.firebase:firebase-storage:21.0.1'
// Firebase Crashlytics
implementation 'com.google.firebase:firebase-crashlytics:19.0.3'
implementation 'com.google.firebase:firebase-crashlytics:19.2.0'
implementation 'com.google.firebase:firebase-crashlytics-buildtools:3.0.2'
// Google Play Services Location
implementation 'com.google.android.gms:play-services-location:19.0.1'
implementation 'com.google.android.gms:play-services-location:21.3.0'
// OneSignal
implementation 'com.onesignal:OneSignal:[5.0.0, 5.99.99]'
// Support libraries
implementation 'androidx.activity:activity:1.4.0'
implementation 'androidx.fragment:fragment:1.4.1'
implementation 'androidx.activity:activity-ktx:1.9.3'
implementation 'androidx.fragment:fragment-ktx:1.8.4'
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'com.google.android.material:material:1.0.0'
implementation 'android.arch.lifecycle:extensions:1.1.1'
implementation 'android.arch.lifecycle:common-java8:1.1.1'
implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha3'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'commons-io:commons-io:2.4'
implementation 'org.apache.commons:commons-lang3:3.0'
// Open311 client library
Expand All @@ -358,25 +357,25 @@ dependencies {
implementation 'edu.usf.cutr.opentripplanner.android:opentripplanner-pojos:1.0.0-SNAPSHOT'
// Pelias for point-of-interest search and geocoding for trip planning origin and destination
implementation 'com.github.OneBusAway:pelias-client-library:v1.1.0'
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.appcompat:appcompat:1.7.0'
// Google Play Services Maps (only for Google flavor)
googleImplementation 'com.google.android.gms:play-services-maps:19.0.0'
// Google Play Services Places is required by ProprietaryMapHelpV2 (only for Google flavor)
googleImplementation 'com.google.android.libraries.places:places-compat:2.6.0'
// Autocomplete text views with clear button for trip planning
implementation 'com.google.android.material:material:1.1.0'
implementation 'com.google.android.material:material:1.12.0'
// Required to support multidex for minSdkVersion <= 20
implementation 'androidx.multidex:multidex:2.0.1'
// Explicit dependency on Gson is now apparently needed
implementation 'com.google.code.gson:gson:2.9.0'
implementation 'com.google.code.gson:gson:2.10.1'
// Unit tests - seems like this is still necessary w/ Android X even though useLibrary is declared earlier
androidTestImplementation 'androidx.test:runner:1.1.0'
androidTestImplementation 'androidx.test:runner:1.6.2'
// WorkManager (Java only)
implementation 'androidx.work:work-runtime:2.7.1'
implementation "androidx.concurrent:concurrent-futures:1.0.0-beta01"
implementation 'androidx.work:work-runtime:2.9.1'
implementation "androidx.concurrent:concurrent-futures:1.2.0"
implementation "androidx.concurrent:concurrent-listenablefuture:1.0.0-beta01"
implementation "androidx.concurrent:concurrent-listenablefuture-callback:1.0.0-beta01"
implementation "androidx.core:core-ktx:1.7.0"
implementation "androidx.core:core-ktx:1.13.1"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
// RoomDB
implementation "androidx.room:room-runtime:2.6.1"
Expand Down
2 changes: 1 addition & 1 deletion onebusaway-android/src/main/res/layout/activity_donation_learn_more.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
android:textSize="16sp" />

<Button
style="@style/Widget.MaterialComponents.Button.UnelevatedButton"
android:textSize="24sp"
android:backgroundTint="@color/theme_primary"
android:textColor="@color/quantum_white_100"
android:text="@string/donation_view_donate_now_button"
android:layout_width="match_parent"
Expand Down
5 changes: 3 additions & 2 deletions onebusaway-android/src/main/res/layout/donation_view.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,16 +70,17 @@
android:layout_height="wrap_content">

<Button
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
android:textSize="16sp"
android:textColor="@color/theme_primary"
android:backgroundTint="@android:color/white"
android:text="@string/donation_view_learn_more_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/btnDonationViewLearnMore"
android:layout_weight="1" />

<Button
style="@style/Widget.MaterialComponents.Button.UnelevatedButton"
android:backgroundTint="@color/theme_primary"
android:textSize="16sp"
android:textColor="@color/quantum_white_100"
android:text="@string/donation_view_donate_now_button"
Expand Down
Loading