Page MenuHomeGitPull.it
Files F13502330

D111.1782229216.diff
No OneTemporary
Actions

Authored By
Unknown
Size
63 KB
Referenced Files
None
Subscribers
None

D111.1782229216.diff
View Options

diff --git a/AndroidManifest.xml b/app/AndroidManifest.xml
rename from AndroidManifest.xml
rename to app/AndroidManifest.xml
diff --git a/assets/databases/stops.sqlite b/app/assets/databases/stops.sqlite
rename from assets/databases/stops.sqlite
rename to app/assets/databases/stops.sqlite
diff --git a/assets/schemas/it.reyboz.bustorino.data.gtfs.GtfsDatabase/1.json b/app/assets/schemas/it.reyboz.bustorino.data.gtfs.GtfsDatabase/1.json
rename from assets/schemas/it.reyboz.bustorino.data.gtfs.GtfsDatabase/1.json
rename to app/assets/schemas/it.reyboz.bustorino.data.gtfs.GtfsDatabase/1.json
diff --git a/assets/schemas/it.reyboz.bustorino.data.gtfs.GtfsDatabase/2.json b/app/assets/schemas/it.reyboz.bustorino.data.gtfs.GtfsDatabase/2.json
rename from assets/schemas/it.reyboz.bustorino.data.gtfs.GtfsDatabase/2.json
rename to app/assets/schemas/it.reyboz.bustorino.data.gtfs.GtfsDatabase/2.json
diff --git a/build.gradle b/app/build.gradle
copy from build.gradle
copy to app/build.gradle
--- a/build.gradle
+++ b/app/build.gradle
@@ -1,60 +1,15 @@
-buildscript {
- repositories {
- jcenter()
- maven { url 'https://maven.google.com' }
- google()
-
- }
-
- ext {
- androidXTestVersion = "1.4.0"
-
- //multidex
- multidex_version = "2.0.1"
- //libraries versions
- fragment_version = "1.4.1"
- activity_version = "1.4.0"
- appcompat_version = "1.4.1"
- preference_version = "1.2.0"
- work_version = "2.7.1"
-
- acra_version = "5.7.0"
- lifecycle_version = "2.4.1"
- arch_version = "2.1.0"
- room_version = "2.4.1"
- //kotlin
- kotlin_version = '1.6.0'
- coroutines_version = "1.5.0"
-
- }
- dependencies {
-
- classpath 'com.android.tools.build:gradle:4.2.2'
- classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21"
- }
-}
-allprojects {
- repositories {
- jcenter()
- maven { url 'https://maven.google.com' }
- google()
- mavenCentral()
-
- }
-}
-
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-kapt'
android {
- compileSdkVersion 31
- buildToolsVersion '30.0.3'
+ compileSdkVersion 33
+ buildToolsVersion '33.0.2'
defaultConfig {
applicationId "it.reyboz.bustorino"
minSdkVersion 16
- targetSdkVersion 31
+ targetSdkVersion 33
versionCode 46
versionName "1.18.4"
vectorDrawables.useSupportLibrary = true
@@ -97,13 +52,27 @@
}
repositories {
- jcenter()
+ mavenCentral()
mavenLocal()
}
dependencies {
//new libraries
- implementation "androidx.fragment:fragment-ktx:$fragment_version"
+
+ }
+}
+
+dependencies {
+
+
+ implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+ api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
+ api "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
+ implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+ implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.4.1'
+ implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1'
+
+ implementation "androidx.fragment:fragment-ktx:$fragment_version"
implementation "androidx.activity:activity:$activity_version"
implementation "androidx.annotation:annotation:1.3.0"
implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
@@ -159,20 +128,4 @@
androidTestImplementation "androidx.test:rules:$androidXTestVersion"
androidTestImplementation "androidx.room:room-testing:$room_version"
-
-
-
- }
-}
-
-dependencies {
-
-
- implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
- api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
- api "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
- implementation 'androidx.legacy:legacy-support-v4:1.0.0'
- implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.4.1'
- implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1'
-
}
diff --git a/res/drawable-hdpi/ic_center_map.png b/app/res/drawable-hdpi/ic_center_map.png
rename from res/drawable-hdpi/ic_center_map.png
rename to app/res/drawable-hdpi/ic_center_map.png
diff --git a/res/drawable-hdpi/ic_follow_me.png b/app/res/drawable-hdpi/ic_follow_me.png
rename from res/drawable-hdpi/ic_follow_me.png
rename to app/res/drawable-hdpi/ic_follow_me.png
diff --git a/res/drawable-hdpi/ic_follow_me_on.png b/app/res/drawable-hdpi/ic_follow_me_on.png
rename from res/drawable-hdpi/ic_follow_me_on.png
rename to app/res/drawable-hdpi/ic_follow_me_on.png
diff --git a/res/drawable-hdpi/ic_launcher.png b/app/res/drawable-hdpi/ic_launcher.png
rename from res/drawable-hdpi/ic_launcher.png
rename to app/res/drawable-hdpi/ic_launcher.png
diff --git a/res/drawable-hdpi/ic_star.png b/app/res/drawable-hdpi/ic_star.png
rename from res/drawable-hdpi/ic_star.png
rename to app/res/drawable-hdpi/ic_star.png
diff --git a/res/drawable-mdpi/ic_center_map.png b/app/res/drawable-mdpi/ic_center_map.png
rename from res/drawable-mdpi/ic_center_map.png
rename to app/res/drawable-mdpi/ic_center_map.png
diff --git a/res/drawable-mdpi/ic_follow_me.png b/app/res/drawable-mdpi/ic_follow_me.png
rename from res/drawable-mdpi/ic_follow_me.png
rename to app/res/drawable-mdpi/ic_follow_me.png
diff --git a/res/drawable-mdpi/ic_follow_me_on.png b/app/res/drawable-mdpi/ic_follow_me_on.png
rename from res/drawable-mdpi/ic_follow_me_on.png
rename to app/res/drawable-mdpi/ic_follow_me_on.png
diff --git a/res/drawable-mdpi/ic_launcher.png b/app/res/drawable-mdpi/ic_launcher.png
rename from res/drawable-mdpi/ic_launcher.png
rename to app/res/drawable-mdpi/ic_launcher.png
diff --git a/res/drawable-mdpi/ic_star.png b/app/res/drawable-mdpi/ic_star.png
rename from res/drawable-mdpi/ic_star.png
rename to app/res/drawable-mdpi/ic_star.png
diff --git a/res/drawable-xhdpi/ic_center_map.png b/app/res/drawable-xhdpi/ic_center_map.png
rename from res/drawable-xhdpi/ic_center_map.png
rename to app/res/drawable-xhdpi/ic_center_map.png
diff --git a/res/drawable-xhdpi/ic_follow_me.png b/app/res/drawable-xhdpi/ic_follow_me.png
rename from res/drawable-xhdpi/ic_follow_me.png
rename to app/res/drawable-xhdpi/ic_follow_me.png
diff --git a/res/drawable-xhdpi/ic_follow_me_on.png b/app/res/drawable-xhdpi/ic_follow_me_on.png
rename from res/drawable-xhdpi/ic_follow_me_on.png
rename to app/res/drawable-xhdpi/ic_follow_me_on.png
diff --git a/res/drawable-xhdpi/ic_launcher.png b/app/res/drawable-xhdpi/ic_launcher.png
rename from res/drawable-xhdpi/ic_launcher.png
rename to app/res/drawable-xhdpi/ic_launcher.png
diff --git a/res/drawable-xhdpi/ic_star.png b/app/res/drawable-xhdpi/ic_star.png
rename from res/drawable-xhdpi/ic_star.png
rename to app/res/drawable-xhdpi/ic_star.png
diff --git a/res/drawable-xxhdpi/ic_center_map.png b/app/res/drawable-xxhdpi/ic_center_map.png
rename from res/drawable-xxhdpi/ic_center_map.png
rename to app/res/drawable-xxhdpi/ic_center_map.png
diff --git a/res/drawable-xxhdpi/ic_follow_me.png b/app/res/drawable-xxhdpi/ic_follow_me.png
rename from res/drawable-xxhdpi/ic_follow_me.png
rename to app/res/drawable-xxhdpi/ic_follow_me.png
diff --git a/res/drawable-xxhdpi/ic_follow_me_on.png b/app/res/drawable-xxhdpi/ic_follow_me_on.png
rename from res/drawable-xxhdpi/ic_follow_me_on.png
rename to app/res/drawable-xxhdpi/ic_follow_me_on.png
diff --git a/res/drawable-xxhdpi/ic_launcher.png b/app/res/drawable-xxhdpi/ic_launcher.png
rename from res/drawable-xxhdpi/ic_launcher.png
rename to app/res/drawable-xxhdpi/ic_launcher.png
diff --git a/res/drawable-xxhdpi/ic_star.png b/app/res/drawable-xxhdpi/ic_star.png
rename from res/drawable-xxhdpi/ic_star.png
rename to app/res/drawable-xxhdpi/ic_star.png
diff --git a/res/drawable-xxxhdpi/alphabetical.png b/app/res/drawable-xxxhdpi/alphabetical.png
rename from res/drawable-xxxhdpi/alphabetical.png
rename to app/res/drawable-xxxhdpi/alphabetical.png
diff --git a/res/drawable-xxxhdpi/bus.png b/app/res/drawable-xxxhdpi/bus.png
rename from res/drawable-xxxhdpi/bus.png
rename to app/res/drawable-xxxhdpi/bus.png
diff --git a/res/drawable-xxxhdpi/city.png b/app/res/drawable-xxxhdpi/city.png
rename from res/drawable-xxxhdpi/city.png
rename to app/res/drawable-xxxhdpi/city.png
diff --git a/res/drawable-xxxhdpi/ic_center_map.png b/app/res/drawable-xxxhdpi/ic_center_map.png
rename from res/drawable-xxxhdpi/ic_center_map.png
rename to app/res/drawable-xxxhdpi/ic_center_map.png
diff --git a/res/drawable-xxxhdpi/ic_follow_me.png b/app/res/drawable-xxxhdpi/ic_follow_me.png
rename from res/drawable-xxxhdpi/ic_follow_me.png
rename to app/res/drawable-xxxhdpi/ic_follow_me.png
diff --git a/res/drawable-xxxhdpi/ic_follow_me_on.png b/app/res/drawable-xxxhdpi/ic_follow_me_on.png
rename from res/drawable-xxxhdpi/ic_follow_me_on.png
rename to app/res/drawable-xxxhdpi/ic_follow_me_on.png
diff --git a/res/drawable-xxxhdpi/ic_launcher.png b/app/res/drawable-xxxhdpi/ic_launcher.png
rename from res/drawable-xxxhdpi/ic_launcher.png
rename to app/res/drawable-xxxhdpi/ic_launcher.png
diff --git a/res/drawable-xxxhdpi/ic_star.png b/app/res/drawable-xxxhdpi/ic_star.png
rename from res/drawable-xxxhdpi/ic_star.png
rename to app/res/drawable-xxxhdpi/ic_star.png
diff --git a/res/drawable-xxxhdpi/keyboard.png b/app/res/drawable-xxxhdpi/keyboard.png
rename from res/drawable-xxxhdpi/keyboard.png
rename to app/res/drawable-xxxhdpi/keyboard.png
diff --git a/res/drawable-xxxhdpi/numeric.png b/app/res/drawable-xxxhdpi/numeric.png
rename from res/drawable-xxxhdpi/numeric.png
rename to app/res/drawable-xxxhdpi/numeric.png
diff --git a/res/drawable-xxxhdpi/qrcode_button_custom.xml b/app/res/drawable-xxxhdpi/qrcode_button_custom.xml
rename from res/drawable-xxxhdpi/qrcode_button_custom.xml
rename to app/res/drawable-xxxhdpi/qrcode_button_custom.xml
diff --git a/res/drawable-xxxhdpi/qrcode_button_default.png b/app/res/drawable-xxxhdpi/qrcode_button_default.png
rename from res/drawable-xxxhdpi/qrcode_button_default.png
rename to app/res/drawable-xxxhdpi/qrcode_button_default.png
diff --git a/res/drawable-xxxhdpi/qrcode_button_pressed.png b/app/res/drawable-xxxhdpi/qrcode_button_pressed.png
rename from res/drawable-xxxhdpi/qrcode_button_pressed.png
rename to app/res/drawable-xxxhdpi/qrcode_button_pressed.png
diff --git a/res/drawable-xxxhdpi/route_background_bus.xml b/app/res/drawable-xxxhdpi/route_background_bus.xml
rename from res/drawable-xxxhdpi/route_background_bus.xml
rename to app/res/drawable-xxxhdpi/route_background_bus.xml
diff --git a/res/drawable-xxxhdpi/route_background_bus_long_distance.xml b/app/res/drawable-xxxhdpi/route_background_bus_long_distance.xml
rename from res/drawable-xxxhdpi/route_background_bus_long_distance.xml
rename to app/res/drawable-xxxhdpi/route_background_bus_long_distance.xml
diff --git a/res/drawable-xxxhdpi/route_background_metro.xml b/app/res/drawable-xxxhdpi/route_background_metro.xml
rename from res/drawable-xxxhdpi/route_background_metro.xml
rename to app/res/drawable-xxxhdpi/route_background_metro.xml
diff --git a/res/drawable-xxxhdpi/search_button_custom.xml b/app/res/drawable-xxxhdpi/search_button_custom.xml
rename from res/drawable-xxxhdpi/search_button_custom.xml
rename to app/res/drawable-xxxhdpi/search_button_custom.xml
diff --git a/res/drawable-xxxhdpi/search_button_default.png b/app/res/drawable-xxxhdpi/search_button_default.png
rename from res/drawable-xxxhdpi/search_button_default.png
rename to app/res/drawable-xxxhdpi/search_button_default.png
diff --git a/res/drawable-xxxhdpi/search_button_pressed.png b/app/res/drawable-xxxhdpi/search_button_pressed.png
rename from res/drawable-xxxhdpi/search_button_pressed.png
rename to app/res/drawable-xxxhdpi/search_button_pressed.png
diff --git a/res/drawable-xxxhdpi/subway.png b/app/res/drawable-xxxhdpi/subway.png
rename from res/drawable-xxxhdpi/subway.png
rename to app/res/drawable-xxxhdpi/subway.png
diff --git a/res/drawable-xxxhdpi/tram.png b/app/res/drawable-xxxhdpi/tram.png
rename from res/drawable-xxxhdpi/tram.png
rename to app/res/drawable-xxxhdpi/tram.png
diff --git a/res/drawable/bus_marker.xml b/app/res/drawable/bus_marker.xml
rename from res/drawable/bus_marker.xml
rename to app/res/drawable/bus_marker.xml
diff --git a/res/drawable/bus_stop_background.xml b/app/res/drawable/bus_stop_background.xml
rename from res/drawable/bus_stop_background.xml
rename to app/res/drawable/bus_stop_background.xml
diff --git a/res/drawable/bus_stop_background_pattern.xml b/app/res/drawable/bus_stop_background_pattern.xml
rename from res/drawable/bus_stop_background_pattern.xml
rename to app/res/drawable/bus_stop_background_pattern.xml
diff --git a/res/drawable/ic_angery_bus.xml b/app/res/drawable/ic_angery_bus.xml
rename from res/drawable/ic_angery_bus.xml
rename to app/res/drawable/ic_angery_bus.xml
diff --git a/res/drawable/ic_baseline_departure_board_24.xml b/app/res/drawable/ic_baseline_departure_board_24.xml
rename from res/drawable/ic_baseline_departure_board_24.xml
rename to app/res/drawable/ic_baseline_departure_board_24.xml
diff --git a/res/drawable/ic_baseline_info_24.xml b/app/res/drawable/ic_baseline_info_24.xml
rename from res/drawable/ic_baseline_info_24.xml
rename to app/res/drawable/ic_baseline_info_24.xml
diff --git a/res/drawable/ic_baseline_map_24.xml b/app/res/drawable/ic_baseline_map_24.xml
rename from res/drawable/ic_baseline_map_24.xml
rename to app/res/drawable/ic_baseline_map_24.xml
diff --git a/res/drawable/ic_baseline_settings_24.xml b/app/res/drawable/ic_baseline_settings_24.xml
rename from res/drawable/ic_baseline_settings_24.xml
rename to app/res/drawable/ic_baseline_settings_24.xml
diff --git a/res/drawable/ic_bus_orange.xml b/app/res/drawable/ic_bus_orange.xml
rename from res/drawable/ic_bus_orange.xml
rename to app/res/drawable/ic_bus_orange.xml
diff --git a/res/drawable/ic_favorite_heart.xml b/app/res/drawable/ic_favorite_heart.xml
rename from res/drawable/ic_favorite_heart.xml
rename to app/res/drawable/ic_favorite_heart.xml
diff --git a/res/drawable/ic_mars2020.xml b/app/res/drawable/ic_mars2020.xml
rename from res/drawable/ic_mars2020.xml
rename to app/res/drawable/ic_mars2020.xml
diff --git a/res/drawable/ic_moving.xml b/app/res/drawable/ic_moving.xml
rename from res/drawable/ic_moving.xml
rename to app/res/drawable/ic_moving.xml
diff --git a/res/drawable/ic_moving_emph.xml b/app/res/drawable/ic_moving_emph.xml
rename from res/drawable/ic_moving_emph.xml
rename to app/res/drawable/ic_moving_emph.xml
diff --git a/res/drawable/ic_outline_info_24.xml b/app/res/drawable/ic_outline_info_24.xml
rename from res/drawable/ic_outline_info_24.xml
rename to app/res/drawable/ic_outline_info_24.xml
diff --git a/res/drawable/ic_star_filled.xml b/app/res/drawable/ic_star_filled.xml
rename from res/drawable/ic_star_filled.xml
rename to app/res/drawable/ic_star_filled.xml
diff --git a/res/drawable/ic_star_filled_white.xml b/app/res/drawable/ic_star_filled_white.xml
rename from res/drawable/ic_star_filled_white.xml
rename to app/res/drawable/ic_star_filled_white.xml
diff --git a/res/drawable/ic_star_outline.xml b/app/res/drawable/ic_star_outline.xml
rename from res/drawable/ic_star_outline.xml
rename to app/res/drawable/ic_star_outline.xml
diff --git a/res/drawable/line.xml b/app/res/drawable/line.xml
rename from res/drawable/line.xml
rename to app/res/drawable/line.xml
diff --git a/res/drawable/line_drawable.xml b/app/res/drawable/line_drawable.xml
rename from res/drawable/line_drawable.xml
rename to app/res/drawable/line_drawable.xml
diff --git a/res/drawable/map.xml b/app/res/drawable/map.xml
rename from res/drawable/map.xml
rename to app/res/drawable/map.xml
diff --git a/res/drawable/telegram_logo.xml b/app/res/drawable/telegram_logo.xml
rename from res/drawable/telegram_logo.xml
rename to app/res/drawable/telegram_logo.xml
diff --git a/res/drawable/telegram_logo_50.xml b/app/res/drawable/telegram_logo_50.xml
rename from res/drawable/telegram_logo_50.xml
rename to app/res/drawable/telegram_logo_50.xml
diff --git a/res/drawable/thumb.xml b/app/res/drawable/thumb.xml
rename from res/drawable/thumb.xml
rename to app/res/drawable/thumb.xml
diff --git a/res/drawable/thumb_drawable.xml b/app/res/drawable/thumb_drawable.xml
rename from res/drawable/thumb_drawable.xml
rename to app/res/drawable/thumb_drawable.xml
diff --git a/res/layout/activity_about.xml b/app/res/layout/activity_about.xml
rename from res/layout/activity_about.xml
rename to app/res/layout/activity_about.xml
diff --git a/res/layout/activity_experiments.xml b/app/res/layout/activity_experiments.xml
rename from res/layout/activity_experiments.xml
rename to app/res/layout/activity_experiments.xml
diff --git a/res/layout/activity_map.xml b/app/res/layout/activity_map.xml
rename from res/layout/activity_map.xml
rename to app/res/layout/activity_map.xml
diff --git a/res/layout/activity_principal.xml b/app/res/layout/activity_principal.xml
rename from res/layout/activity_principal.xml
rename to app/res/layout/activity_principal.xml
diff --git a/res/layout/activity_settings.xml b/app/res/layout/activity_settings.xml
rename from res/layout/activity_settings.xml
rename to app/res/layout/activity_settings.xml
diff --git a/res/layout/arrivals_nearby_card.xml b/app/res/layout/arrivals_nearby_card.xml
rename from res/layout/arrivals_nearby_card.xml
rename to app/res/layout/arrivals_nearby_card.xml
diff --git a/res/layout/default_toobar.xml b/app/res/layout/default_toobar.xml
rename from res/layout/default_toobar.xml
rename to app/res/layout/default_toobar.xml
diff --git a/res/layout/entry_bus_line_passage.xml b/app/res/layout/entry_bus_line_passage.xml
rename from res/layout/entry_bus_line_passage.xml
rename to app/res/layout/entry_bus_line_passage.xml
diff --git a/res/layout/entry_bus_stop.xml b/app/res/layout/entry_bus_stop.xml
rename from res/layout/entry_bus_stop.xml
rename to app/res/layout/entry_bus_stop.xml
diff --git a/res/layout/fragment_arrivals.xml b/app/res/layout/fragment_arrivals.xml
rename from res/layout/fragment_arrivals.xml
rename to app/res/layout/fragment_arrivals.xml
diff --git a/res/layout/fragment_favorites.xml b/app/res/layout/fragment_favorites.xml
rename from res/layout/fragment_favorites.xml
rename to app/res/layout/fragment_favorites.xml
diff --git a/res/layout/fragment_lines.xml b/app/res/layout/fragment_lines.xml
rename from res/layout/fragment_lines.xml
rename to app/res/layout/fragment_lines.xml
diff --git a/res/layout/fragment_lines_detail.xml b/app/res/layout/fragment_lines_detail.xml
rename from res/layout/fragment_lines_detail.xml
rename to app/res/layout/fragment_lines_detail.xml
diff --git a/res/layout/fragment_list_view.xml b/app/res/layout/fragment_list_view.xml
rename from res/layout/fragment_list_view.xml
rename to app/res/layout/fragment_list_view.xml
diff --git a/res/layout/fragment_main_screen.xml b/app/res/layout/fragment_main_screen.xml
rename from res/layout/fragment_main_screen.xml
rename to app/res/layout/fragment_main_screen.xml
diff --git a/res/layout/fragment_nearby_stops.xml b/app/res/layout/fragment_nearby_stops.xml
rename from res/layout/fragment_nearby_stops.xml
rename to app/res/layout/fragment_nearby_stops.xml
diff --git a/res/layout/fragment_test_realtime_gtfs.xml b/app/res/layout/fragment_test_realtime_gtfs.xml
rename from res/layout/fragment_test_realtime_gtfs.xml
rename to app/res/layout/fragment_test_realtime_gtfs.xml
diff --git a/res/layout/map_popup.xml b/app/res/layout/map_popup.xml
rename from res/layout/map_popup.xml
rename to app/res/layout/map_popup.xml
diff --git a/res/layout/nav_header.xml b/app/res/layout/nav_header.xml
rename from res/layout/nav_header.xml
rename to app/res/layout/nav_header.xml
diff --git a/res/layout/rename_dialog.xml b/app/res/layout/rename_dialog.xml
rename from res/layout/rename_dialog.xml
rename to app/res/layout/rename_dialog.xml
diff --git a/res/layout/stop_card.xml b/app/res/layout/stop_card.xml
rename from res/layout/stop_card.xml
rename to app/res/layout/stop_card.xml
diff --git a/res/layout/stop_line_element.xml b/app/res/layout/stop_line_element.xml
rename from res/layout/stop_line_element.xml
rename to app/res/layout/stop_line_element.xml
diff --git a/res/menu/drawer_main.xml b/app/res/menu/drawer_main.xml
rename from res/menu/drawer_main.xml
rename to app/res/menu/drawer_main.xml
diff --git a/res/menu/menu_favourites_entry.xml b/app/res/menu/menu_favourites_entry.xml
rename from res/menu/menu_favourites_entry.xml
rename to app/res/menu/menu_favourites_entry.xml
diff --git a/res/menu/menu_line_item.xml b/app/res/menu/menu_line_item.xml
rename from res/menu/menu_line_item.xml
rename to app/res/menu/menu_line_item.xml
diff --git a/res/menu/menu_settings.xml b/app/res/menu/menu_settings.xml
rename from res/menu/menu_settings.xml
rename to app/res/menu/menu_settings.xml
diff --git a/res/menu/principal_menu.xml b/app/res/menu/principal_menu.xml
rename from res/menu/principal_menu.xml
rename to app/res/menu/principal_menu.xml
diff --git a/res/mipmap-anydpi-v26/ic_launcher.xml b/app/res/mipmap-anydpi-v26/ic_launcher.xml
rename from res/mipmap-anydpi-v26/ic_launcher.xml
rename to app/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/res/mipmap-anydpi-v26/ic_launcher_round.xml
rename from res/mipmap-anydpi-v26/ic_launcher_round.xml
rename to app/res/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/res/mipmap-hdpi/ic_launcher.png b/app/res/mipmap-hdpi/ic_launcher.png
rename from res/mipmap-hdpi/ic_launcher.png
rename to app/res/mipmap-hdpi/ic_launcher.png
diff --git a/res/mipmap-hdpi/ic_launcher_background.png b/app/res/mipmap-hdpi/ic_launcher_background.png
rename from res/mipmap-hdpi/ic_launcher_background.png
rename to app/res/mipmap-hdpi/ic_launcher_background.png
diff --git a/res/mipmap-hdpi/ic_launcher_foreground.png b/app/res/mipmap-hdpi/ic_launcher_foreground.png
rename from res/mipmap-hdpi/ic_launcher_foreground.png
rename to app/res/mipmap-hdpi/ic_launcher_foreground.png
diff --git a/res/mipmap-hdpi/ic_launcher_round.png b/app/res/mipmap-hdpi/ic_launcher_round.png
rename from res/mipmap-hdpi/ic_launcher_round.png
rename to app/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/res/mipmap-mdpi/ic_launcher.png b/app/res/mipmap-mdpi/ic_launcher.png
rename from res/mipmap-mdpi/ic_launcher.png
rename to app/res/mipmap-mdpi/ic_launcher.png
diff --git a/res/mipmap-mdpi/ic_launcher_background.png b/app/res/mipmap-mdpi/ic_launcher_background.png
rename from res/mipmap-mdpi/ic_launcher_background.png
rename to app/res/mipmap-mdpi/ic_launcher_background.png
diff --git a/res/mipmap-mdpi/ic_launcher_foreground.png b/app/res/mipmap-mdpi/ic_launcher_foreground.png
rename from res/mipmap-mdpi/ic_launcher_foreground.png
rename to app/res/mipmap-mdpi/ic_launcher_foreground.png
diff --git a/res/mipmap-mdpi/ic_launcher_round.png b/app/res/mipmap-mdpi/ic_launcher_round.png
rename from res/mipmap-mdpi/ic_launcher_round.png
rename to app/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/res/mipmap-xhdpi/ic_launcher.png b/app/res/mipmap-xhdpi/ic_launcher.png
rename from res/mipmap-xhdpi/ic_launcher.png
rename to app/res/mipmap-xhdpi/ic_launcher.png
diff --git a/res/mipmap-xhdpi/ic_launcher_background.png b/app/res/mipmap-xhdpi/ic_launcher_background.png
rename from res/mipmap-xhdpi/ic_launcher_background.png
rename to app/res/mipmap-xhdpi/ic_launcher_background.png
diff --git a/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/res/mipmap-xhdpi/ic_launcher_foreground.png
rename from res/mipmap-xhdpi/ic_launcher_foreground.png
rename to app/res/mipmap-xhdpi/ic_launcher_foreground.png
diff --git a/res/mipmap-xhdpi/ic_launcher_round.png b/app/res/mipmap-xhdpi/ic_launcher_round.png
rename from res/mipmap-xhdpi/ic_launcher_round.png
rename to app/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/res/mipmap-xxhdpi/ic_launcher.png b/app/res/mipmap-xxhdpi/ic_launcher.png
rename from res/mipmap-xxhdpi/ic_launcher.png
rename to app/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/res/mipmap-xxhdpi/ic_launcher_background.png b/app/res/mipmap-xxhdpi/ic_launcher_background.png
rename from res/mipmap-xxhdpi/ic_launcher_background.png
rename to app/res/mipmap-xxhdpi/ic_launcher_background.png
diff --git a/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/res/mipmap-xxhdpi/ic_launcher_foreground.png
rename from res/mipmap-xxhdpi/ic_launcher_foreground.png
rename to app/res/mipmap-xxhdpi/ic_launcher_foreground.png
diff --git a/res/mipmap-xxhdpi/ic_launcher_round.png b/app/res/mipmap-xxhdpi/ic_launcher_round.png
rename from res/mipmap-xxhdpi/ic_launcher_round.png
rename to app/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/res/mipmap-xxxhdpi/ic_launcher.png b/app/res/mipmap-xxxhdpi/ic_launcher.png
rename from res/mipmap-xxxhdpi/ic_launcher.png
rename to app/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/res/mipmap-xxxhdpi/ic_launcher_background.png b/app/res/mipmap-xxxhdpi/ic_launcher_background.png
rename from res/mipmap-xxxhdpi/ic_launcher_background.png
rename to app/res/mipmap-xxxhdpi/ic_launcher_background.png
diff --git a/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/res/mipmap-xxxhdpi/ic_launcher_foreground.png
rename from res/mipmap-xxxhdpi/ic_launcher_foreground.png
rename to app/res/mipmap-xxxhdpi/ic_launcher_foreground.png
diff --git a/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/res/mipmap-xxxhdpi/ic_launcher_round.png
rename from res/mipmap-xxxhdpi/ic_launcher_round.png
rename to app/res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/res/values-it/strings.xml b/app/res/values-it/strings.xml
rename from res/values-it/strings.xml
rename to app/res/values-it/strings.xml
diff --git a/res/values-v19/styles.xml b/app/res/values-v19/styles.xml
rename from res/values-v19/styles.xml
rename to app/res/values-v19/styles.xml
diff --git a/res/values-w820dp/dimens.xml b/app/res/values-w820dp/dimens.xml
rename from res/values-w820dp/dimens.xml
rename to app/res/values-w820dp/dimens.xml
diff --git a/res/values/colors.xml b/app/res/values/colors.xml
rename from res/values/colors.xml
rename to app/res/values/colors.xml
diff --git a/res/values/dimens.xml b/app/res/values/dimens.xml
rename from res/values/dimens.xml
rename to app/res/values/dimens.xml
diff --git a/res/values/ic_launcher_background.xml b/app/res/values/ic_launcher_background.xml
rename from res/values/ic_launcher_background.xml
rename to app/res/values/ic_launcher_background.xml
diff --git a/res/values/keys.xml b/app/res/values/keys.xml
rename from res/values/keys.xml
rename to app/res/values/keys.xml
diff --git a/res/values/pref_keys.xml b/app/res/values/pref_keys.xml
rename from res/values/pref_keys.xml
rename to app/res/values/pref_keys.xml
diff --git a/res/values/strings.xml b/app/res/values/strings.xml
rename from res/values/strings.xml
rename to app/res/values/strings.xml
diff --git a/res/values/styles.xml b/app/res/values/styles.xml
rename from res/values/styles.xml
rename to app/res/values/styles.xml
diff --git a/res/values/theme.xml b/app/res/values/theme.xml
rename from res/values/theme.xml
rename to app/res/values/theme.xml
diff --git a/res/xml/networks_security_config.xml b/app/res/xml/networks_security_config.xml
rename from res/xml/networks_security_config.xml
rename to app/res/xml/networks_security_config.xml
diff --git a/res/xml/preferences.xml b/app/res/xml/preferences.xml
rename from res/xml/preferences.xml
rename to app/res/xml/preferences.xml
diff --git a/src/androidTest/java/it/reyboz/bustorino/data/gtfs/GtfsDBMigrationsTest.java b/app/src/androidTest/java/it/reyboz/bustorino/data/gtfs/GtfsDBMigrationsTest.java
rename from src/androidTest/java/it/reyboz/bustorino/data/gtfs/GtfsDBMigrationsTest.java
rename to app/src/androidTest/java/it/reyboz/bustorino/data/gtfs/GtfsDBMigrationsTest.java
diff --git a/src/com/google/transit/realtime/GtfsRealtime.java b/app/src/com/google/transit/realtime/GtfsRealtime.java
rename from src/com/google/transit/realtime/GtfsRealtime.java
rename to app/src/com/google/transit/realtime/GtfsRealtime.java
diff --git a/src/com/google/zxing/integration/android/IntentIntegrator.java b/app/src/com/google/zxing/integration/android/IntentIntegrator.java
rename from src/com/google/zxing/integration/android/IntentIntegrator.java
rename to app/src/com/google/zxing/integration/android/IntentIntegrator.java
diff --git a/src/com/google/zxing/integration/android/IntentResult.java b/app/src/com/google/zxing/integration/android/IntentResult.java
rename from src/com/google/zxing/integration/android/IntentResult.java
rename to app/src/com/google/zxing/integration/android/IntentResult.java
diff --git a/src/debug/AndroidManifest.xml b/app/src/debug/AndroidManifest.xml
rename from src/debug/AndroidManifest.xml
rename to app/src/debug/AndroidManifest.xml
diff --git a/src/it/reyboz/bustorino/ActivityAbout.java b/app/src/it/reyboz/bustorino/ActivityAbout.java
rename from src/it/reyboz/bustorino/ActivityAbout.java
rename to app/src/it/reyboz/bustorino/ActivityAbout.java
diff --git a/src/it/reyboz/bustorino/ActivityExperiments.java b/app/src/it/reyboz/bustorino/ActivityExperiments.java
rename from src/it/reyboz/bustorino/ActivityExperiments.java
rename to app/src/it/reyboz/bustorino/ActivityExperiments.java
diff --git a/src/it/reyboz/bustorino/ActivityPrincipal.java b/app/src/it/reyboz/bustorino/ActivityPrincipal.java
rename from src/it/reyboz/bustorino/ActivityPrincipal.java
rename to app/src/it/reyboz/bustorino/ActivityPrincipal.java
diff --git a/src/it/reyboz/bustorino/ActivitySettings.java b/app/src/it/reyboz/bustorino/ActivitySettings.java
rename from src/it/reyboz/bustorino/ActivitySettings.java
rename to app/src/it/reyboz/bustorino/ActivitySettings.java
diff --git a/src/it/reyboz/bustorino/BustoApp.java b/app/src/it/reyboz/bustorino/BustoApp.java
rename from src/it/reyboz/bustorino/BustoApp.java
rename to app/src/it/reyboz/bustorino/BustoApp.java
diff --git a/src/it/reyboz/bustorino/adapters/ArrivalsStopAdapter.java b/app/src/it/reyboz/bustorino/adapters/ArrivalsStopAdapter.java
rename from src/it/reyboz/bustorino/adapters/ArrivalsStopAdapter.java
rename to app/src/it/reyboz/bustorino/adapters/ArrivalsStopAdapter.java
diff --git a/src/it/reyboz/bustorino/adapters/NameCapitalize.java b/app/src/it/reyboz/bustorino/adapters/NameCapitalize.java
rename from src/it/reyboz/bustorino/adapters/NameCapitalize.java
rename to app/src/it/reyboz/bustorino/adapters/NameCapitalize.java
diff --git a/src/it/reyboz/bustorino/adapters/PalinaAdapter.java b/app/src/it/reyboz/bustorino/adapters/PalinaAdapter.java
rename from src/it/reyboz/bustorino/adapters/PalinaAdapter.java
rename to app/src/it/reyboz/bustorino/adapters/PalinaAdapter.java
diff --git a/src/it/reyboz/bustorino/adapters/SquareStopAdapter.java b/app/src/it/reyboz/bustorino/adapters/SquareStopAdapter.java
rename from src/it/reyboz/bustorino/adapters/SquareStopAdapter.java
rename to app/src/it/reyboz/bustorino/adapters/SquareStopAdapter.java
diff --git a/src/it/reyboz/bustorino/adapters/StopAdapter.java b/app/src/it/reyboz/bustorino/adapters/StopAdapter.java
rename from src/it/reyboz/bustorino/adapters/StopAdapter.java
rename to app/src/it/reyboz/bustorino/adapters/StopAdapter.java
diff --git a/src/it/reyboz/bustorino/adapters/StopAdapterListener.java b/app/src/it/reyboz/bustorino/adapters/StopAdapterListener.java
rename from src/it/reyboz/bustorino/adapters/StopAdapterListener.java
rename to app/src/it/reyboz/bustorino/adapters/StopAdapterListener.java
diff --git a/src/it/reyboz/bustorino/adapters/StopRecyclerAdapter.java b/app/src/it/reyboz/bustorino/adapters/StopRecyclerAdapter.java
rename from src/it/reyboz/bustorino/adapters/StopRecyclerAdapter.java
rename to app/src/it/reyboz/bustorino/adapters/StopRecyclerAdapter.java
diff --git a/src/it/reyboz/bustorino/backend/ArrivalsFetcher.java b/app/src/it/reyboz/bustorino/backend/ArrivalsFetcher.java
rename from src/it/reyboz/bustorino/backend/ArrivalsFetcher.java
rename to app/src/it/reyboz/bustorino/backend/ArrivalsFetcher.java
diff --git a/src/it/reyboz/bustorino/backend/DBStatusManager.java b/app/src/it/reyboz/bustorino/backend/DBStatusManager.java
rename from src/it/reyboz/bustorino/backend/DBStatusManager.java
rename to app/src/it/reyboz/bustorino/backend/DBStatusManager.java
diff --git a/src/it/reyboz/bustorino/backend/Fetcher.java b/app/src/it/reyboz/bustorino/backend/Fetcher.java
rename from src/it/reyboz/bustorino/backend/Fetcher.java
rename to app/src/it/reyboz/bustorino/backend/Fetcher.java
diff --git a/src/it/reyboz/bustorino/backend/FiveTAPIFetcher.java b/app/src/it/reyboz/bustorino/backend/FiveTAPIFetcher.java
rename from src/it/reyboz/bustorino/backend/FiveTAPIFetcher.java
rename to app/src/it/reyboz/bustorino/backend/FiveTAPIFetcher.java
diff --git a/src/it/reyboz/bustorino/backend/FiveTAPIVolleyRequest.java b/app/src/it/reyboz/bustorino/backend/FiveTAPIVolleyRequest.java
rename from src/it/reyboz/bustorino/backend/FiveTAPIVolleyRequest.java
rename to app/src/it/reyboz/bustorino/backend/FiveTAPIVolleyRequest.java
diff --git a/src/it/reyboz/bustorino/backend/FiveTNormalizer.java b/app/src/it/reyboz/bustorino/backend/FiveTNormalizer.java
rename from src/it/reyboz/bustorino/backend/FiveTNormalizer.java
rename to app/src/it/reyboz/bustorino/backend/FiveTNormalizer.java
diff --git a/src/it/reyboz/bustorino/backend/FiveTScraperFetcher.java b/app/src/it/reyboz/bustorino/backend/FiveTScraperFetcher.java
rename from src/it/reyboz/bustorino/backend/FiveTScraperFetcher.java
rename to app/src/it/reyboz/bustorino/backend/FiveTScraperFetcher.java
diff --git a/src/it/reyboz/bustorino/backend/FiveTStopsFetcher.java b/app/src/it/reyboz/bustorino/backend/FiveTStopsFetcher.java
rename from src/it/reyboz/bustorino/backend/FiveTStopsFetcher.java
rename to app/src/it/reyboz/bustorino/backend/FiveTStopsFetcher.java
diff --git a/src/it/reyboz/bustorino/backend/GTTJSONFetcher.java b/app/src/it/reyboz/bustorino/backend/GTTJSONFetcher.java
rename from src/it/reyboz/bustorino/backend/GTTJSONFetcher.java
rename to app/src/it/reyboz/bustorino/backend/GTTJSONFetcher.java
diff --git a/src/it/reyboz/bustorino/backend/GTTStopsFetcher.java b/app/src/it/reyboz/bustorino/backend/GTTStopsFetcher.java
rename from src/it/reyboz/bustorino/backend/GTTStopsFetcher.java
rename to app/src/it/reyboz/bustorino/backend/GTTStopsFetcher.java
diff --git a/src/it/reyboz/bustorino/backend/NetworkVolleyManager.java b/app/src/it/reyboz/bustorino/backend/NetworkVolleyManager.java
rename from src/it/reyboz/bustorino/backend/NetworkVolleyManager.java
rename to app/src/it/reyboz/bustorino/backend/NetworkVolleyManager.java
diff --git a/src/it/reyboz/bustorino/backend/Notifications.java b/app/src/it/reyboz/bustorino/backend/Notifications.java
rename from src/it/reyboz/bustorino/backend/Notifications.java
rename to app/src/it/reyboz/bustorino/backend/Notifications.java
diff --git a/src/it/reyboz/bustorino/backend/Palina.java b/app/src/it/reyboz/bustorino/backend/Palina.java
rename from src/it/reyboz/bustorino/backend/Palina.java
rename to app/src/it/reyboz/bustorino/backend/Palina.java
diff --git a/src/it/reyboz/bustorino/backend/Passaggio.java b/app/src/it/reyboz/bustorino/backend/Passaggio.java
rename from src/it/reyboz/bustorino/backend/Passaggio.java
rename to app/src/it/reyboz/bustorino/backend/Passaggio.java
diff --git a/src/it/reyboz/bustorino/backend/RealtimeVehicle.java b/app/src/it/reyboz/bustorino/backend/RealtimeVehicle.java
rename from src/it/reyboz/bustorino/backend/RealtimeVehicle.java
rename to app/src/it/reyboz/bustorino/backend/RealtimeVehicle.java
diff --git a/src/it/reyboz/bustorino/backend/Result.java b/app/src/it/reyboz/bustorino/backend/Result.java
rename from src/it/reyboz/bustorino/backend/Result.java
rename to app/src/it/reyboz/bustorino/backend/Result.java
diff --git a/src/it/reyboz/bustorino/backend/Route.java b/app/src/it/reyboz/bustorino/backend/Route.java
rename from src/it/reyboz/bustorino/backend/Route.java
rename to app/src/it/reyboz/bustorino/backend/Route.java
diff --git a/src/it/reyboz/bustorino/backend/Stop.java b/app/src/it/reyboz/bustorino/backend/Stop.java
rename from src/it/reyboz/bustorino/backend/Stop.java
rename to app/src/it/reyboz/bustorino/backend/Stop.java
diff --git a/src/it/reyboz/bustorino/backend/StopsDBInterface.java b/app/src/it/reyboz/bustorino/backend/StopsDBInterface.java
rename from src/it/reyboz/bustorino/backend/StopsDBInterface.java
rename to app/src/it/reyboz/bustorino/backend/StopsDBInterface.java
diff --git a/src/it/reyboz/bustorino/backend/StopsFinderByName.java b/app/src/it/reyboz/bustorino/backend/StopsFinderByName.java
rename from src/it/reyboz/bustorino/backend/StopsFinderByName.java
rename to app/src/it/reyboz/bustorino/backend/StopsFinderByName.java
diff --git a/src/it/reyboz/bustorino/backend/StopsFinderByRoute.java b/app/src/it/reyboz/bustorino/backend/StopsFinderByRoute.java
rename from src/it/reyboz/bustorino/backend/StopsFinderByRoute.java
rename to app/src/it/reyboz/bustorino/backend/StopsFinderByRoute.java
diff --git a/src/it/reyboz/bustorino/backend/gtfs/GtfsDataParser.java b/app/src/it/reyboz/bustorino/backend/gtfs/GtfsDataParser.java
rename from src/it/reyboz/bustorino/backend/gtfs/GtfsDataParser.java
rename to app/src/it/reyboz/bustorino/backend/gtfs/GtfsDataParser.java
diff --git a/src/it/reyboz/bustorino/backend/gtfs/GtfsRealtimeRequest.kt b/app/src/it/reyboz/bustorino/backend/gtfs/GtfsRealtimeRequest.kt
rename from src/it/reyboz/bustorino/backend/gtfs/GtfsRealtimeRequest.kt
rename to app/src/it/reyboz/bustorino/backend/gtfs/GtfsRealtimeRequest.kt
diff --git a/src/it/reyboz/bustorino/backend/gtfs/PolylineParser.java b/app/src/it/reyboz/bustorino/backend/gtfs/PolylineParser.java
rename from src/it/reyboz/bustorino/backend/gtfs/PolylineParser.java
rename to app/src/it/reyboz/bustorino/backend/gtfs/PolylineParser.java
diff --git a/src/it/reyboz/bustorino/backend/mato/MapiArrivalRequest.java b/app/src/it/reyboz/bustorino/backend/mato/MapiArrivalRequest.java
rename from src/it/reyboz/bustorino/backend/mato/MapiArrivalRequest.java
rename to app/src/it/reyboz/bustorino/backend/mato/MapiArrivalRequest.java
diff --git a/src/it/reyboz/bustorino/backend/mato/MapiVolleyRequest.java b/app/src/it/reyboz/bustorino/backend/mato/MapiVolleyRequest.java
rename from src/it/reyboz/bustorino/backend/mato/MapiVolleyRequest.java
rename to app/src/it/reyboz/bustorino/backend/mato/MapiVolleyRequest.java
diff --git a/src/it/reyboz/bustorino/backend/mato/MatoAPIFetcher.kt b/app/src/it/reyboz/bustorino/backend/mato/MatoAPIFetcher.kt
rename from src/it/reyboz/bustorino/backend/mato/MatoAPIFetcher.kt
rename to app/src/it/reyboz/bustorino/backend/mato/MatoAPIFetcher.kt
diff --git a/src/it/reyboz/bustorino/backend/mato/MatoQueries.kt b/app/src/it/reyboz/bustorino/backend/mato/MatoQueries.kt
rename from src/it/reyboz/bustorino/backend/mato/MatoQueries.kt
rename to app/src/it/reyboz/bustorino/backend/mato/MatoQueries.kt
diff --git a/src/it/reyboz/bustorino/backend/mato/MatoVolleyJSONRequest.kt b/app/src/it/reyboz/bustorino/backend/mato/MatoVolleyJSONRequest.kt
rename from src/it/reyboz/bustorino/backend/mato/MatoVolleyJSONRequest.kt
rename to app/src/it/reyboz/bustorino/backend/mato/MatoVolleyJSONRequest.kt
diff --git a/src/it/reyboz/bustorino/backend/mato/ResponseParsing.kt b/app/src/it/reyboz/bustorino/backend/mato/ResponseParsing.kt
rename from src/it/reyboz/bustorino/backend/mato/ResponseParsing.kt
rename to app/src/it/reyboz/bustorino/backend/mato/ResponseParsing.kt
diff --git a/src/it/reyboz/bustorino/backend/mato/VolleyAllStopsRequest.kt b/app/src/it/reyboz/bustorino/backend/mato/VolleyAllStopsRequest.kt
rename from src/it/reyboz/bustorino/backend/mato/VolleyAllStopsRequest.kt
rename to app/src/it/reyboz/bustorino/backend/mato/VolleyAllStopsRequest.kt
diff --git a/src/it/reyboz/bustorino/backend/networkTools.java b/app/src/it/reyboz/bustorino/backend/networkTools.java
rename from src/it/reyboz/bustorino/backend/networkTools.java
rename to app/src/it/reyboz/bustorino/backend/networkTools.java
diff --git a/src/it/reyboz/bustorino/backend/utils.java b/app/src/it/reyboz/bustorino/backend/utils.java
rename from src/it/reyboz/bustorino/backend/utils.java
rename to app/src/it/reyboz/bustorino/backend/utils.java
diff --git a/src/it/reyboz/bustorino/data/AppDataProvider.java b/app/src/it/reyboz/bustorino/data/AppDataProvider.java
rename from src/it/reyboz/bustorino/data/AppDataProvider.java
rename to app/src/it/reyboz/bustorino/data/AppDataProvider.java
diff --git a/src/it/reyboz/bustorino/data/CustomAsyncQueryHandler.java b/app/src/it/reyboz/bustorino/data/CustomAsyncQueryHandler.java
rename from src/it/reyboz/bustorino/data/CustomAsyncQueryHandler.java
rename to app/src/it/reyboz/bustorino/data/CustomAsyncQueryHandler.java
diff --git a/src/it/reyboz/bustorino/data/DBUpdateWorker.java b/app/src/it/reyboz/bustorino/data/DBUpdateWorker.java
rename from src/it/reyboz/bustorino/data/DBUpdateWorker.java
rename to app/src/it/reyboz/bustorino/data/DBUpdateWorker.java
diff --git a/src/it/reyboz/bustorino/data/DatabaseUpdate.java b/app/src/it/reyboz/bustorino/data/DatabaseUpdate.java
rename from src/it/reyboz/bustorino/data/DatabaseUpdate.java
rename to app/src/it/reyboz/bustorino/data/DatabaseUpdate.java
diff --git a/src/it/reyboz/bustorino/data/FavoritesLiveData.java b/app/src/it/reyboz/bustorino/data/FavoritesLiveData.java
rename from src/it/reyboz/bustorino/data/FavoritesLiveData.java
rename to app/src/it/reyboz/bustorino/data/FavoritesLiveData.java
diff --git a/src/it/reyboz/bustorino/data/FavoritesViewModel.java b/app/src/it/reyboz/bustorino/data/FavoritesViewModel.java
rename from src/it/reyboz/bustorino/data/FavoritesViewModel.java
rename to app/src/it/reyboz/bustorino/data/FavoritesViewModel.java
diff --git a/src/it/reyboz/bustorino/data/GTTInfoInject.java b/app/src/it/reyboz/bustorino/data/GTTInfoInject.java
rename from src/it/reyboz/bustorino/data/GTTInfoInject.java
rename to app/src/it/reyboz/bustorino/data/GTTInfoInject.java
diff --git a/src/it/reyboz/bustorino/data/GtfsRepository.kt b/app/src/it/reyboz/bustorino/data/GtfsRepository.kt
rename from src/it/reyboz/bustorino/data/GtfsRepository.kt
rename to app/src/it/reyboz/bustorino/data/GtfsRepository.kt
diff --git a/src/it/reyboz/bustorino/data/NextGenDB.java b/app/src/it/reyboz/bustorino/data/NextGenDB.java
rename from src/it/reyboz/bustorino/data/NextGenDB.java
rename to app/src/it/reyboz/bustorino/data/NextGenDB.java
diff --git a/src/it/reyboz/bustorino/data/OldDB.java b/app/src/it/reyboz/bustorino/data/OldDB.java
rename from src/it/reyboz/bustorino/data/OldDB.java
rename to app/src/it/reyboz/bustorino/data/OldDB.java
diff --git a/src/it/reyboz/bustorino/data/OldDataRepository.java b/app/src/it/reyboz/bustorino/data/OldDataRepository.java
rename from src/it/reyboz/bustorino/data/OldDataRepository.java
rename to app/src/it/reyboz/bustorino/data/OldDataRepository.java
diff --git a/src/it/reyboz/bustorino/data/PreferencesHolder.java b/app/src/it/reyboz/bustorino/data/PreferencesHolder.java
rename from src/it/reyboz/bustorino/data/PreferencesHolder.java
rename to app/src/it/reyboz/bustorino/data/PreferencesHolder.java
diff --git a/src/it/reyboz/bustorino/data/UserDB.java b/app/src/it/reyboz/bustorino/data/UserDB.java
rename from src/it/reyboz/bustorino/data/UserDB.java
rename to app/src/it/reyboz/bustorino/data/UserDB.java
diff --git a/src/it/reyboz/bustorino/data/gtfs/Converters.kt b/app/src/it/reyboz/bustorino/data/gtfs/Converters.kt
rename from src/it/reyboz/bustorino/data/gtfs/Converters.kt
rename to app/src/it/reyboz/bustorino/data/gtfs/Converters.kt
diff --git a/src/it/reyboz/bustorino/data/gtfs/CsvTableInserter.kt b/app/src/it/reyboz/bustorino/data/gtfs/CsvTableInserter.kt
rename from src/it/reyboz/bustorino/data/gtfs/CsvTableInserter.kt
rename to app/src/it/reyboz/bustorino/data/gtfs/CsvTableInserter.kt
diff --git a/src/it/reyboz/bustorino/data/gtfs/GtfsAgency.kt b/app/src/it/reyboz/bustorino/data/gtfs/GtfsAgency.kt
rename from src/it/reyboz/bustorino/data/gtfs/GtfsAgency.kt
rename to app/src/it/reyboz/bustorino/data/gtfs/GtfsAgency.kt
diff --git a/src/it/reyboz/bustorino/data/gtfs/GtfsDBDao.kt b/app/src/it/reyboz/bustorino/data/gtfs/GtfsDBDao.kt
rename from src/it/reyboz/bustorino/data/gtfs/GtfsDBDao.kt
rename to app/src/it/reyboz/bustorino/data/gtfs/GtfsDBDao.kt
diff --git a/src/it/reyboz/bustorino/data/gtfs/GtfsDatabase.kt b/app/src/it/reyboz/bustorino/data/gtfs/GtfsDatabase.kt
rename from src/it/reyboz/bustorino/data/gtfs/GtfsDatabase.kt
rename to app/src/it/reyboz/bustorino/data/gtfs/GtfsDatabase.kt
diff --git a/src/it/reyboz/bustorino/data/gtfs/GtfsFeed.kt b/app/src/it/reyboz/bustorino/data/gtfs/GtfsFeed.kt
rename from src/it/reyboz/bustorino/data/gtfs/GtfsFeed.kt
rename to app/src/it/reyboz/bustorino/data/gtfs/GtfsFeed.kt
diff --git a/src/it/reyboz/bustorino/data/gtfs/GtfsMode.kt b/app/src/it/reyboz/bustorino/data/gtfs/GtfsMode.kt
rename from src/it/reyboz/bustorino/data/gtfs/GtfsMode.kt
rename to app/src/it/reyboz/bustorino/data/gtfs/GtfsMode.kt
diff --git a/src/it/reyboz/bustorino/data/gtfs/GtfsRoute.kt b/app/src/it/reyboz/bustorino/data/gtfs/GtfsRoute.kt
rename from src/it/reyboz/bustorino/data/gtfs/GtfsRoute.kt
rename to app/src/it/reyboz/bustorino/data/gtfs/GtfsRoute.kt
diff --git a/src/it/reyboz/bustorino/data/gtfs/GtfsService.kt b/app/src/it/reyboz/bustorino/data/gtfs/GtfsService.kt
rename from src/it/reyboz/bustorino/data/gtfs/GtfsService.kt
rename to app/src/it/reyboz/bustorino/data/gtfs/GtfsService.kt
diff --git a/src/it/reyboz/bustorino/data/gtfs/GtfsServiceDate.kt b/app/src/it/reyboz/bustorino/data/gtfs/GtfsServiceDate.kt
rename from src/it/reyboz/bustorino/data/gtfs/GtfsServiceDate.kt
rename to app/src/it/reyboz/bustorino/data/gtfs/GtfsServiceDate.kt
diff --git a/src/it/reyboz/bustorino/data/gtfs/GtfsShape.kt b/app/src/it/reyboz/bustorino/data/gtfs/GtfsShape.kt
rename from src/it/reyboz/bustorino/data/gtfs/GtfsShape.kt
rename to app/src/it/reyboz/bustorino/data/gtfs/GtfsShape.kt
diff --git a/src/it/reyboz/bustorino/data/gtfs/GtfsStop.kt b/app/src/it/reyboz/bustorino/data/gtfs/GtfsStop.kt
rename from src/it/reyboz/bustorino/data/gtfs/GtfsStop.kt
rename to app/src/it/reyboz/bustorino/data/gtfs/GtfsStop.kt
diff --git a/src/it/reyboz/bustorino/data/gtfs/GtfsStopTime.kt b/app/src/it/reyboz/bustorino/data/gtfs/GtfsStopTime.kt
rename from src/it/reyboz/bustorino/data/gtfs/GtfsStopTime.kt
rename to app/src/it/reyboz/bustorino/data/gtfs/GtfsStopTime.kt
diff --git a/src/it/reyboz/bustorino/data/gtfs/GtfsTable.java b/app/src/it/reyboz/bustorino/data/gtfs/GtfsTable.java
rename from src/it/reyboz/bustorino/data/gtfs/GtfsTable.java
rename to app/src/it/reyboz/bustorino/data/gtfs/GtfsTable.java
diff --git a/src/it/reyboz/bustorino/data/gtfs/GtfsTrip.kt b/app/src/it/reyboz/bustorino/data/gtfs/GtfsTrip.kt
rename from src/it/reyboz/bustorino/data/gtfs/GtfsTrip.kt
rename to app/src/it/reyboz/bustorino/data/gtfs/GtfsTrip.kt
diff --git a/src/it/reyboz/bustorino/data/gtfs/MatoPattern.kt b/app/src/it/reyboz/bustorino/data/gtfs/MatoPattern.kt
rename from src/it/reyboz/bustorino/data/gtfs/MatoPattern.kt
rename to app/src/it/reyboz/bustorino/data/gtfs/MatoPattern.kt
diff --git a/src/it/reyboz/bustorino/fragments/ArrivalsFragment.java b/app/src/it/reyboz/bustorino/fragments/ArrivalsFragment.java
rename from src/it/reyboz/bustorino/fragments/ArrivalsFragment.java
rename to app/src/it/reyboz/bustorino/fragments/ArrivalsFragment.java
diff --git a/src/it/reyboz/bustorino/fragments/CommonFragmentListener.java b/app/src/it/reyboz/bustorino/fragments/CommonFragmentListener.java
rename from src/it/reyboz/bustorino/fragments/CommonFragmentListener.java
rename to app/src/it/reyboz/bustorino/fragments/CommonFragmentListener.java
diff --git a/src/it/reyboz/bustorino/fragments/CommonScrollListener.java b/app/src/it/reyboz/bustorino/fragments/CommonScrollListener.java
rename from src/it/reyboz/bustorino/fragments/CommonScrollListener.java
rename to app/src/it/reyboz/bustorino/fragments/CommonScrollListener.java
diff --git a/src/it/reyboz/bustorino/fragments/FavoritesFragment.java b/app/src/it/reyboz/bustorino/fragments/FavoritesFragment.java
rename from src/it/reyboz/bustorino/fragments/FavoritesFragment.java
rename to app/src/it/reyboz/bustorino/fragments/FavoritesFragment.java
diff --git a/src/it/reyboz/bustorino/fragments/FragmentHelper.java b/app/src/it/reyboz/bustorino/fragments/FragmentHelper.java
rename from src/it/reyboz/bustorino/fragments/FragmentHelper.java
rename to app/src/it/reyboz/bustorino/fragments/FragmentHelper.java
diff --git a/src/it/reyboz/bustorino/fragments/FragmentKind.java b/app/src/it/reyboz/bustorino/fragments/FragmentKind.java
rename from src/it/reyboz/bustorino/fragments/FragmentKind.java
rename to app/src/it/reyboz/bustorino/fragments/FragmentKind.java
diff --git a/src/it/reyboz/bustorino/fragments/FragmentListenerMain.java b/app/src/it/reyboz/bustorino/fragments/FragmentListenerMain.java
rename from src/it/reyboz/bustorino/fragments/FragmentListenerMain.java
rename to app/src/it/reyboz/bustorino/fragments/FragmentListenerMain.java
diff --git a/src/it/reyboz/bustorino/fragments/LinesDetailFragment.kt b/app/src/it/reyboz/bustorino/fragments/LinesDetailFragment.kt
rename from src/it/reyboz/bustorino/fragments/LinesDetailFragment.kt
rename to app/src/it/reyboz/bustorino/fragments/LinesDetailFragment.kt
diff --git a/src/it/reyboz/bustorino/fragments/LinesFragment.kt b/app/src/it/reyboz/bustorino/fragments/LinesFragment.kt
rename from src/it/reyboz/bustorino/fragments/LinesFragment.kt
rename to app/src/it/reyboz/bustorino/fragments/LinesFragment.kt
diff --git a/src/it/reyboz/bustorino/fragments/LinesViewModel.kt b/app/src/it/reyboz/bustorino/fragments/LinesViewModel.kt
rename from src/it/reyboz/bustorino/fragments/LinesViewModel.kt
rename to app/src/it/reyboz/bustorino/fragments/LinesViewModel.kt
diff --git a/src/it/reyboz/bustorino/fragments/MainScreenFragment.java b/app/src/it/reyboz/bustorino/fragments/MainScreenFragment.java
rename from src/it/reyboz/bustorino/fragments/MainScreenFragment.java
rename to app/src/it/reyboz/bustorino/fragments/MainScreenFragment.java
diff --git a/src/it/reyboz/bustorino/fragments/MapFragment.java b/app/src/it/reyboz/bustorino/fragments/MapFragment.java
rename from src/it/reyboz/bustorino/fragments/MapFragment.java
rename to app/src/it/reyboz/bustorino/fragments/MapFragment.java
diff --git a/src/it/reyboz/bustorino/fragments/NearbyStopsFragment.java b/app/src/it/reyboz/bustorino/fragments/NearbyStopsFragment.java
rename from src/it/reyboz/bustorino/fragments/NearbyStopsFragment.java
rename to app/src/it/reyboz/bustorino/fragments/NearbyStopsFragment.java
diff --git a/src/it/reyboz/bustorino/fragments/ResultListFragment.java b/app/src/it/reyboz/bustorino/fragments/ResultListFragment.java
rename from src/it/reyboz/bustorino/fragments/ResultListFragment.java
rename to app/src/it/reyboz/bustorino/fragments/ResultListFragment.java
diff --git a/src/it/reyboz/bustorino/fragments/ScreenBaseFragment.java b/app/src/it/reyboz/bustorino/fragments/ScreenBaseFragment.java
rename from src/it/reyboz/bustorino/fragments/ScreenBaseFragment.java
rename to app/src/it/reyboz/bustorino/fragments/ScreenBaseFragment.java
diff --git a/src/it/reyboz/bustorino/fragments/SettingsFragment.java b/app/src/it/reyboz/bustorino/fragments/SettingsFragment.java
rename from src/it/reyboz/bustorino/fragments/SettingsFragment.java
rename to app/src/it/reyboz/bustorino/fragments/SettingsFragment.java
diff --git a/src/it/reyboz/bustorino/fragments/StopListFragment.java b/app/src/it/reyboz/bustorino/fragments/StopListFragment.java
rename from src/it/reyboz/bustorino/fragments/StopListFragment.java
rename to app/src/it/reyboz/bustorino/fragments/StopListFragment.java
diff --git a/src/it/reyboz/bustorino/fragments/TestRealtimeGtfsFragment.kt b/app/src/it/reyboz/bustorino/fragments/TestRealtimeGtfsFragment.kt
rename from src/it/reyboz/bustorino/fragments/TestRealtimeGtfsFragment.kt
rename to app/src/it/reyboz/bustorino/fragments/TestRealtimeGtfsFragment.kt
diff --git a/src/it/reyboz/bustorino/map/CustomInfoWindow.java b/app/src/it/reyboz/bustorino/map/CustomInfoWindow.java
rename from src/it/reyboz/bustorino/map/CustomInfoWindow.java
rename to app/src/it/reyboz/bustorino/map/CustomInfoWindow.java
diff --git a/src/it/reyboz/bustorino/map/LocationOverlay.java b/app/src/it/reyboz/bustorino/map/LocationOverlay.java
rename from src/it/reyboz/bustorino/map/LocationOverlay.java
rename to app/src/it/reyboz/bustorino/map/LocationOverlay.java
diff --git a/src/it/reyboz/bustorino/middleware/AppLocationManager.java b/app/src/it/reyboz/bustorino/middleware/AppLocationManager.java
rename from src/it/reyboz/bustorino/middleware/AppLocationManager.java
rename to app/src/it/reyboz/bustorino/middleware/AppLocationManager.java
diff --git a/src/it/reyboz/bustorino/middleware/AsyncArrivalsSearcher.java b/app/src/it/reyboz/bustorino/middleware/AsyncArrivalsSearcher.java
rename from src/it/reyboz/bustorino/middleware/AsyncArrivalsSearcher.java
rename to app/src/it/reyboz/bustorino/middleware/AsyncArrivalsSearcher.java
diff --git a/src/it/reyboz/bustorino/middleware/AsyncStopFavoriteAction.java b/app/src/it/reyboz/bustorino/middleware/AsyncStopFavoriteAction.java
rename from src/it/reyboz/bustorino/middleware/AsyncStopFavoriteAction.java
rename to app/src/it/reyboz/bustorino/middleware/AsyncStopFavoriteAction.java
diff --git a/src/it/reyboz/bustorino/middleware/AsyncStopsSearcher.java b/app/src/it/reyboz/bustorino/middleware/AsyncStopsSearcher.java
rename from src/it/reyboz/bustorino/middleware/AsyncStopsSearcher.java
rename to app/src/it/reyboz/bustorino/middleware/AsyncStopsSearcher.java
diff --git a/src/it/reyboz/bustorino/middleware/AsyncWget.java b/app/src/it/reyboz/bustorino/middleware/AsyncWget.java
rename from src/it/reyboz/bustorino/middleware/AsyncWget.java
rename to app/src/it/reyboz/bustorino/middleware/AsyncWget.java
diff --git a/src/it/reyboz/bustorino/middleware/BarcodeScanContract.java b/app/src/it/reyboz/bustorino/middleware/BarcodeScanContract.java
rename from src/it/reyboz/bustorino/middleware/BarcodeScanContract.java
rename to app/src/it/reyboz/bustorino/middleware/BarcodeScanContract.java
diff --git a/src/it/reyboz/bustorino/middleware/BarcodeScanOptions.java b/app/src/it/reyboz/bustorino/middleware/BarcodeScanOptions.java
rename from src/it/reyboz/bustorino/middleware/BarcodeScanOptions.java
rename to app/src/it/reyboz/bustorino/middleware/BarcodeScanOptions.java
diff --git a/src/it/reyboz/bustorino/middleware/BarcodeScanUtils.java b/app/src/it/reyboz/bustorino/middleware/BarcodeScanUtils.java
rename from src/it/reyboz/bustorino/middleware/BarcodeScanUtils.java
rename to app/src/it/reyboz/bustorino/middleware/BarcodeScanUtils.java
diff --git a/src/it/reyboz/bustorino/middleware/GeneralActivity.java b/app/src/it/reyboz/bustorino/middleware/GeneralActivity.java
rename from src/it/reyboz/bustorino/middleware/GeneralActivity.java
rename to app/src/it/reyboz/bustorino/middleware/GeneralActivity.java
diff --git a/src/it/reyboz/bustorino/middleware/RecursionHelper.java b/app/src/it/reyboz/bustorino/middleware/RecursionHelper.java
rename from src/it/reyboz/bustorino/middleware/RecursionHelper.java
rename to app/src/it/reyboz/bustorino/middleware/RecursionHelper.java
diff --git a/src/it/reyboz/bustorino/middleware/SearchRequestType.java b/app/src/it/reyboz/bustorino/middleware/SearchRequestType.java
rename from src/it/reyboz/bustorino/middleware/SearchRequestType.java
rename to app/src/it/reyboz/bustorino/middleware/SearchRequestType.java
diff --git a/src/it/reyboz/bustorino/util/LinesNameSorter.java b/app/src/it/reyboz/bustorino/util/LinesNameSorter.java
rename from src/it/reyboz/bustorino/util/LinesNameSorter.java
rename to app/src/it/reyboz/bustorino/util/LinesNameSorter.java
diff --git a/src/it/reyboz/bustorino/util/LocationCriteria.java b/app/src/it/reyboz/bustorino/util/LocationCriteria.java
rename from src/it/reyboz/bustorino/util/LocationCriteria.java
rename to app/src/it/reyboz/bustorino/util/LocationCriteria.java
diff --git a/src/it/reyboz/bustorino/util/PassaggiSorter.java b/app/src/it/reyboz/bustorino/util/PassaggiSorter.java
rename from src/it/reyboz/bustorino/util/PassaggiSorter.java
rename to app/src/it/reyboz/bustorino/util/PassaggiSorter.java
diff --git a/src/it/reyboz/bustorino/util/PatternWithStopsSorter.kt b/app/src/it/reyboz/bustorino/util/PatternWithStopsSorter.kt
rename from src/it/reyboz/bustorino/util/PatternWithStopsSorter.kt
rename to app/src/it/reyboz/bustorino/util/PatternWithStopsSorter.kt
diff --git a/src/it/reyboz/bustorino/util/Permissions.java b/app/src/it/reyboz/bustorino/util/Permissions.java
rename from src/it/reyboz/bustorino/util/Permissions.java
rename to app/src/it/reyboz/bustorino/util/Permissions.java
diff --git a/src/it/reyboz/bustorino/util/RoutePositionSorter.java b/app/src/it/reyboz/bustorino/util/RoutePositionSorter.java
rename from src/it/reyboz/bustorino/util/RoutePositionSorter.java
rename to app/src/it/reyboz/bustorino/util/RoutePositionSorter.java
diff --git a/src/it/reyboz/bustorino/util/RouteSorterByArrivalTime.kt b/app/src/it/reyboz/bustorino/util/RouteSorterByArrivalTime.kt
rename from src/it/reyboz/bustorino/util/RouteSorterByArrivalTime.kt
rename to app/src/it/reyboz/bustorino/util/RouteSorterByArrivalTime.kt
diff --git a/src/it/reyboz/bustorino/util/StopSorterByDistance.java b/app/src/it/reyboz/bustorino/util/StopSorterByDistance.java
rename from src/it/reyboz/bustorino/util/StopSorterByDistance.java
rename to app/src/it/reyboz/bustorino/util/StopSorterByDistance.java
diff --git a/src/test/java/it/reyboz/bustorino/util/LinesNameSorterTest.java b/app/src/test/java/it/reyboz/bustorino/util/LinesNameSorterTest.java
rename from src/test/java/it/reyboz/bustorino/util/LinesNameSorterTest.java
rename to app/src/test/java/it/reyboz/bustorino/util/LinesNameSorterTest.java
diff --git a/build.gradle b/build.gradle
--- a/build.gradle
+++ b/build.gradle
@@ -1,3 +1,5 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
buildscript {
repositories {
jcenter()
@@ -5,8 +7,14 @@
google()
}
+ dependencies {
- ext {
+ classpath 'com.android.tools.build:gradle:7.3.1'
+ classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21"
+ }
+}
+
+ext {
androidXTestVersion = "1.4.0"
//multidex
@@ -27,12 +35,7 @@
coroutines_version = "1.5.0"
}
- dependencies {
- classpath 'com.android.tools.build:gradle:4.2.2'
- classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21"
- }
-}
allprojects {
repositories {
jcenter()
@@ -42,137 +45,3 @@
}
}
-
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-kapt'
-
-android {
- compileSdkVersion 31
- buildToolsVersion '30.0.3'
-
- defaultConfig {
- applicationId "it.reyboz.bustorino"
- minSdkVersion 16
- targetSdkVersion 31
- versionCode 46
- versionName "1.18.4"
- vectorDrawables.useSupportLibrary = true
- multiDexEnabled true
- javaCompileOptions {
- annotationProcessorOptions {
- arguments = ["room.schemaLocation": "$projectDir/assets/schemas/".toString()]
- }
- }
- testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
- }
-
- compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_8
- targetCompatibility JavaVersion.VERSION_1_8
- }
-
- sourceSets {
- androidTest.assets.srcDirs += files("$projectDir/assets/schemas/".toString())
-
- main {
- manifest.srcFile 'AndroidManifest.xml'
- java.srcDirs = ['src']
- resources.srcDirs = ['src']
- aidl.srcDirs = ['src']
- renderscript.srcDirs = ['src']
- res.srcDirs = ['res']
- assets.srcDirs = ['assets']
- }
- }
- buildTypes {
- debug {
- applicationIdSuffix ".debug"
- versionNameSuffix "-dev"
- }
- }
-
- lintOptions {
- abortOnError false
- }
-
- repositories {
- jcenter()
- mavenLocal()
- }
-
- dependencies {
- //new libraries
- implementation "androidx.fragment:fragment-ktx:$fragment_version"
- implementation "androidx.activity:activity:$activity_version"
- implementation "androidx.annotation:annotation:1.3.0"
- implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
- implementation "androidx.appcompat:appcompat:$appcompat_version"
- implementation "androidx.appcompat:appcompat-resources:$appcompat_version"
- implementation "androidx.preference:preference:$preference_version"
- implementation "androidx.work:work-runtime:$work_version"
-
- implementation "com.google.android.material:material:1.5.0"
- implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
- implementation "androidx.coordinatorlayout:coordinatorlayout:1.2.0"
-
-
- implementation 'org.jsoup:jsoup:1.13.1'
- implementation 'com.readystatesoftware.sqliteasset:sqliteassethelper:2.0.1'
- implementation 'com.android.volley:volley:1.2.1'
-
- implementation 'org.osmdroid:osmdroid-android:6.1.10'
- // ACRA
- implementation "ch.acra:acra-mail:$acra_version"
- implementation "ch.acra:acra-dialog:$acra_version"
- // google transit realtime
- implementation 'com.google.protobuf:protobuf-java:3.14.0'
-
- // ViewModel
- implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
- // LiveData
- implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
- // Lifecycles only (without ViewModel or LiveData)
- implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
- // Legacy
- implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-
- // Room components
- implementation "androidx.room:room-ktx:$room_version"
- kapt "androidx.room:room-compiler:$room_version"
- //multidex - we need this to build the app
- implementation "androidx.multidex:multidex:$multidex_version"
-
- implementation 'de.siegmar:fastcsv:2.0.0'
-
- testImplementation 'junit:junit:4.12'
- implementation 'junit:junit:4.12'
-
- implementation "androidx.test.ext:junit:1.1.3"
- implementation "androidx.test:core:$androidXTestVersion"
- implementation "androidx.test:runner:$androidXTestVersion"
- implementation "androidx.room:room-testing:$room_version"
-
- androidTestImplementation "androidx.test.ext:junit:1.1.3"
- androidTestImplementation "androidx.test:core:$androidXTestVersion"
- androidTestImplementation "androidx.test:runner:$androidXTestVersion"
- androidTestImplementation "androidx.test:rules:$androidXTestVersion"
- androidTestImplementation "androidx.room:room-testing:$room_version"
-
-
-
-
- }
-}
-
-dependencies {
-
-
- implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
- api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
- api "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
- implementation 'androidx.legacy:legacy-support-v4:1.0.0'
- implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.4.1'
- implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1'
-
-}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
#Sat Apr 24 16:03:07 CEST 2021
distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1 @@
+include ':app'

File Metadata

Mime Type
text/plain
Expires
Tue, Jun 23, 17:40 (22 h, 5 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1975386
Default Alt Text
D111.1782229216.diff (63 KB)

Event Timeline

Public contents are in Creative Commons Attribution-ShareAlike 4.0 (CC-BY-SA) or GNU Free Documentation License (at your option) unless otherwise noted. · Contact / Register