diff --git a/app/build.gradle b/app/build.gradle index 2e83e6a..191ca50 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,132 +1,128 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' apply plugin: 'kotlin-kapt' android { compileSdkVersion 33 buildToolsVersion '33.0.2' + namespace "it.reyboz.bustorino" defaultConfig { applicationId "it.reyboz.bustorino" minSdkVersion 16 targetSdkVersion 33 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" } + gitpull{ + applicationIdSuffix ".gitdev" + versionNameSuffix "-gitdev" + } } lintOptions { abortOnError false } repositories { mavenCentral() mavenLocal() } dependencies { //new libraries } } 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.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' // remember to enable maven repo jitpack.io when wanting to use osmbonuspack //implementation 'com.github.MKergall:osmbonuspack:6.9.0' // 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" implementation "androidx.work:work-runtime-ktx:$work_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" } diff --git a/app/src/debug/AndroidManifest.xml b/app/src/debug/AndroidManifest.xml index 6b7101f..56aa65d 100644 --- a/app/src/debug/AndroidManifest.xml +++ b/app/src/debug/AndroidManifest.xml @@ -1,29 +1,28 @@ diff --git a/app/src/debug/AndroidManifest.xml b/app/src/gitpull/AndroidManifest.xml similarity index 76% copy from app/src/debug/AndroidManifest.xml copy to app/src/gitpull/AndroidManifest.xml index 6b7101f..0a456ce 100644 --- a/app/src/debug/AndroidManifest.xml +++ b/app/src/gitpull/AndroidManifest.xml @@ -1,29 +1,28 @@ diff --git a/app/AndroidManifest.xml b/app/src/main/AndroidManifest.xml similarity index 98% rename from app/AndroidManifest.xml rename to app/src/main/AndroidManifest.xml index 58daede..077f756 100644 --- a/app/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,125 +1,125 @@ + > \ No newline at end of file diff --git a/app/src/com/google/transit/realtime/GtfsRealtime.java b/app/src/main/java/com/google/transit/realtime/GtfsRealtime.java similarity index 100% rename from app/src/com/google/transit/realtime/GtfsRealtime.java rename to app/src/main/java/com/google/transit/realtime/GtfsRealtime.java diff --git a/app/src/com/google/zxing/integration/android/IntentIntegrator.java b/app/src/main/java/com/google/zxing/integration/android/IntentIntegrator.java similarity index 100% rename from app/src/com/google/zxing/integration/android/IntentIntegrator.java rename to app/src/main/java/com/google/zxing/integration/android/IntentIntegrator.java diff --git a/app/src/com/google/zxing/integration/android/IntentResult.java b/app/src/main/java/com/google/zxing/integration/android/IntentResult.java similarity index 100% rename from app/src/com/google/zxing/integration/android/IntentResult.java rename to app/src/main/java/com/google/zxing/integration/android/IntentResult.java diff --git a/app/src/it/reyboz/bustorino/ActivityAbout.java b/app/src/main/java/it/reyboz/bustorino/ActivityAbout.java similarity index 100% rename from app/src/it/reyboz/bustorino/ActivityAbout.java rename to app/src/main/java/it/reyboz/bustorino/ActivityAbout.java diff --git a/app/src/it/reyboz/bustorino/ActivityExperiments.java b/app/src/main/java/it/reyboz/bustorino/ActivityExperiments.java similarity index 100% rename from app/src/it/reyboz/bustorino/ActivityExperiments.java rename to app/src/main/java/it/reyboz/bustorino/ActivityExperiments.java diff --git a/app/src/it/reyboz/bustorino/ActivityPrincipal.java b/app/src/main/java/it/reyboz/bustorino/ActivityPrincipal.java similarity index 100% rename from app/src/it/reyboz/bustorino/ActivityPrincipal.java rename to app/src/main/java/it/reyboz/bustorino/ActivityPrincipal.java diff --git a/app/src/it/reyboz/bustorino/ActivitySettings.java b/app/src/main/java/it/reyboz/bustorino/ActivitySettings.java similarity index 100% rename from app/src/it/reyboz/bustorino/ActivitySettings.java rename to app/src/main/java/it/reyboz/bustorino/ActivitySettings.java diff --git a/app/src/it/reyboz/bustorino/BustoApp.java b/app/src/main/java/it/reyboz/bustorino/BustoApp.java similarity index 100% rename from app/src/it/reyboz/bustorino/BustoApp.java rename to app/src/main/java/it/reyboz/bustorino/BustoApp.java diff --git a/app/src/it/reyboz/bustorino/adapters/ArrivalsStopAdapter.java b/app/src/main/java/it/reyboz/bustorino/adapters/ArrivalsStopAdapter.java similarity index 100% rename from app/src/it/reyboz/bustorino/adapters/ArrivalsStopAdapter.java rename to app/src/main/java/it/reyboz/bustorino/adapters/ArrivalsStopAdapter.java diff --git a/app/src/it/reyboz/bustorino/adapters/NameCapitalize.java b/app/src/main/java/it/reyboz/bustorino/adapters/NameCapitalize.java similarity index 100% rename from app/src/it/reyboz/bustorino/adapters/NameCapitalize.java rename to app/src/main/java/it/reyboz/bustorino/adapters/NameCapitalize.java diff --git a/app/src/it/reyboz/bustorino/adapters/PalinaAdapter.java b/app/src/main/java/it/reyboz/bustorino/adapters/PalinaAdapter.java similarity index 100% rename from app/src/it/reyboz/bustorino/adapters/PalinaAdapter.java rename to app/src/main/java/it/reyboz/bustorino/adapters/PalinaAdapter.java diff --git a/app/src/it/reyboz/bustorino/adapters/SquareStopAdapter.java b/app/src/main/java/it/reyboz/bustorino/adapters/SquareStopAdapter.java similarity index 100% rename from app/src/it/reyboz/bustorino/adapters/SquareStopAdapter.java rename to app/src/main/java/it/reyboz/bustorino/adapters/SquareStopAdapter.java diff --git a/app/src/it/reyboz/bustorino/adapters/StopAdapter.java b/app/src/main/java/it/reyboz/bustorino/adapters/StopAdapter.java similarity index 100% rename from app/src/it/reyboz/bustorino/adapters/StopAdapter.java rename to app/src/main/java/it/reyboz/bustorino/adapters/StopAdapter.java diff --git a/app/src/it/reyboz/bustorino/adapters/StopAdapterListener.java b/app/src/main/java/it/reyboz/bustorino/adapters/StopAdapterListener.java similarity index 100% rename from app/src/it/reyboz/bustorino/adapters/StopAdapterListener.java rename to app/src/main/java/it/reyboz/bustorino/adapters/StopAdapterListener.java diff --git a/app/src/it/reyboz/bustorino/adapters/StopRecyclerAdapter.java b/app/src/main/java/it/reyboz/bustorino/adapters/StopRecyclerAdapter.java similarity index 100% rename from app/src/it/reyboz/bustorino/adapters/StopRecyclerAdapter.java rename to app/src/main/java/it/reyboz/bustorino/adapters/StopRecyclerAdapter.java diff --git a/app/src/it/reyboz/bustorino/backend/ArrivalsFetcher.java b/app/src/main/java/it/reyboz/bustorino/backend/ArrivalsFetcher.java similarity index 100% rename from app/src/it/reyboz/bustorino/backend/ArrivalsFetcher.java rename to app/src/main/java/it/reyboz/bustorino/backend/ArrivalsFetcher.java diff --git a/app/src/it/reyboz/bustorino/backend/DBStatusManager.java b/app/src/main/java/it/reyboz/bustorino/backend/DBStatusManager.java similarity index 100% rename from app/src/it/reyboz/bustorino/backend/DBStatusManager.java rename to app/src/main/java/it/reyboz/bustorino/backend/DBStatusManager.java diff --git a/app/src/it/reyboz/bustorino/backend/Fetcher.java b/app/src/main/java/it/reyboz/bustorino/backend/Fetcher.java similarity index 100% rename from app/src/it/reyboz/bustorino/backend/Fetcher.java rename to app/src/main/java/it/reyboz/bustorino/backend/Fetcher.java diff --git a/app/src/it/reyboz/bustorino/backend/FiveTAPIFetcher.java b/app/src/main/java/it/reyboz/bustorino/backend/FiveTAPIFetcher.java similarity index 100% rename from app/src/it/reyboz/bustorino/backend/FiveTAPIFetcher.java rename to app/src/main/java/it/reyboz/bustorino/backend/FiveTAPIFetcher.java diff --git a/app/src/it/reyboz/bustorino/backend/FiveTAPIVolleyRequest.java b/app/src/main/java/it/reyboz/bustorino/backend/FiveTAPIVolleyRequest.java similarity index 100% rename from app/src/it/reyboz/bustorino/backend/FiveTAPIVolleyRequest.java rename to app/src/main/java/it/reyboz/bustorino/backend/FiveTAPIVolleyRequest.java diff --git a/app/src/it/reyboz/bustorino/backend/FiveTNormalizer.java b/app/src/main/java/it/reyboz/bustorino/backend/FiveTNormalizer.java similarity index 100% rename from app/src/it/reyboz/bustorino/backend/FiveTNormalizer.java rename to app/src/main/java/it/reyboz/bustorino/backend/FiveTNormalizer.java diff --git a/app/src/it/reyboz/bustorino/backend/FiveTScraperFetcher.java b/app/src/main/java/it/reyboz/bustorino/backend/FiveTScraperFetcher.java similarity index 100% rename from app/src/it/reyboz/bustorino/backend/FiveTScraperFetcher.java rename to app/src/main/java/it/reyboz/bustorino/backend/FiveTScraperFetcher.java diff --git a/app/src/it/reyboz/bustorino/backend/FiveTStopsFetcher.java b/app/src/main/java/it/reyboz/bustorino/backend/FiveTStopsFetcher.java similarity index 100% rename from app/src/it/reyboz/bustorino/backend/FiveTStopsFetcher.java rename to app/src/main/java/it/reyboz/bustorino/backend/FiveTStopsFetcher.java diff --git a/app/src/it/reyboz/bustorino/backend/GTTJSONFetcher.java b/app/src/main/java/it/reyboz/bustorino/backend/GTTJSONFetcher.java similarity index 100% rename from app/src/it/reyboz/bustorino/backend/GTTJSONFetcher.java rename to app/src/main/java/it/reyboz/bustorino/backend/GTTJSONFetcher.java diff --git a/app/src/it/reyboz/bustorino/backend/GTTStopsFetcher.java b/app/src/main/java/it/reyboz/bustorino/backend/GTTStopsFetcher.java similarity index 100% rename from app/src/it/reyboz/bustorino/backend/GTTStopsFetcher.java rename to app/src/main/java/it/reyboz/bustorino/backend/GTTStopsFetcher.java diff --git a/app/src/it/reyboz/bustorino/backend/NetworkVolleyManager.java b/app/src/main/java/it/reyboz/bustorino/backend/NetworkVolleyManager.java similarity index 100% rename from app/src/it/reyboz/bustorino/backend/NetworkVolleyManager.java rename to app/src/main/java/it/reyboz/bustorino/backend/NetworkVolleyManager.java diff --git a/app/src/it/reyboz/bustorino/backend/Notifications.java b/app/src/main/java/it/reyboz/bustorino/backend/Notifications.java similarity index 100% rename from app/src/it/reyboz/bustorino/backend/Notifications.java rename to app/src/main/java/it/reyboz/bustorino/backend/Notifications.java diff --git a/app/src/it/reyboz/bustorino/backend/Palina.java b/app/src/main/java/it/reyboz/bustorino/backend/Palina.java similarity index 100% rename from app/src/it/reyboz/bustorino/backend/Palina.java rename to app/src/main/java/it/reyboz/bustorino/backend/Palina.java diff --git a/app/src/it/reyboz/bustorino/backend/Passaggio.java b/app/src/main/java/it/reyboz/bustorino/backend/Passaggio.java similarity index 100% rename from app/src/it/reyboz/bustorino/backend/Passaggio.java rename to app/src/main/java/it/reyboz/bustorino/backend/Passaggio.java diff --git a/app/src/it/reyboz/bustorino/backend/RealtimeVehicle.java b/app/src/main/java/it/reyboz/bustorino/backend/RealtimeVehicle.java similarity index 100% rename from app/src/it/reyboz/bustorino/backend/RealtimeVehicle.java rename to app/src/main/java/it/reyboz/bustorino/backend/RealtimeVehicle.java diff --git a/app/src/it/reyboz/bustorino/backend/Result.java b/app/src/main/java/it/reyboz/bustorino/backend/Result.java similarity index 100% rename from app/src/it/reyboz/bustorino/backend/Result.java rename to app/src/main/java/it/reyboz/bustorino/backend/Result.java diff --git a/app/src/it/reyboz/bustorino/backend/Route.java b/app/src/main/java/it/reyboz/bustorino/backend/Route.java similarity index 100% rename from app/src/it/reyboz/bustorino/backend/Route.java rename to app/src/main/java/it/reyboz/bustorino/backend/Route.java diff --git a/app/src/it/reyboz/bustorino/backend/ServiceType.java b/app/src/main/java/it/reyboz/bustorino/backend/ServiceType.java similarity index 100% rename from app/src/it/reyboz/bustorino/backend/ServiceType.java rename to app/src/main/java/it/reyboz/bustorino/backend/ServiceType.java diff --git a/app/src/it/reyboz/bustorino/backend/Stop.java b/app/src/main/java/it/reyboz/bustorino/backend/Stop.java similarity index 100% rename from app/src/it/reyboz/bustorino/backend/Stop.java rename to app/src/main/java/it/reyboz/bustorino/backend/Stop.java diff --git a/app/src/it/reyboz/bustorino/backend/StopsDBInterface.java b/app/src/main/java/it/reyboz/bustorino/backend/StopsDBInterface.java similarity index 100% rename from app/src/it/reyboz/bustorino/backend/StopsDBInterface.java rename to app/src/main/java/it/reyboz/bustorino/backend/StopsDBInterface.java diff --git a/app/src/it/reyboz/bustorino/backend/StopsFinderByName.java b/app/src/main/java/it/reyboz/bustorino/backend/StopsFinderByName.java similarity index 100% rename from app/src/it/reyboz/bustorino/backend/StopsFinderByName.java rename to app/src/main/java/it/reyboz/bustorino/backend/StopsFinderByName.java diff --git a/app/src/it/reyboz/bustorino/backend/StopsFinderByRoute.java b/app/src/main/java/it/reyboz/bustorino/backend/StopsFinderByRoute.java similarity index 100% rename from app/src/it/reyboz/bustorino/backend/StopsFinderByRoute.java rename to app/src/main/java/it/reyboz/bustorino/backend/StopsFinderByRoute.java diff --git a/app/src/it/reyboz/bustorino/backend/gtfs/GtfsDataParser.java b/app/src/main/java/it/reyboz/bustorino/backend/gtfs/GtfsDataParser.java similarity index 100% rename from app/src/it/reyboz/bustorino/backend/gtfs/GtfsDataParser.java rename to app/src/main/java/it/reyboz/bustorino/backend/gtfs/GtfsDataParser.java diff --git a/app/src/it/reyboz/bustorino/backend/gtfs/GtfsPositionUpdate.kt b/app/src/main/java/it/reyboz/bustorino/backend/gtfs/GtfsPositionUpdate.kt similarity index 100% rename from app/src/it/reyboz/bustorino/backend/gtfs/GtfsPositionUpdate.kt rename to app/src/main/java/it/reyboz/bustorino/backend/gtfs/GtfsPositionUpdate.kt diff --git a/app/src/it/reyboz/bustorino/backend/gtfs/GtfsRtPositionsRequest.kt b/app/src/main/java/it/reyboz/bustorino/backend/gtfs/GtfsRtPositionsRequest.kt similarity index 100% rename from app/src/it/reyboz/bustorino/backend/gtfs/GtfsRtPositionsRequest.kt rename to app/src/main/java/it/reyboz/bustorino/backend/gtfs/GtfsRtPositionsRequest.kt diff --git a/app/src/it/reyboz/bustorino/backend/gtfs/GtfsUtils.java b/app/src/main/java/it/reyboz/bustorino/backend/gtfs/GtfsUtils.java similarity index 100% rename from app/src/it/reyboz/bustorino/backend/gtfs/GtfsUtils.java rename to app/src/main/java/it/reyboz/bustorino/backend/gtfs/GtfsUtils.java diff --git a/app/src/it/reyboz/bustorino/backend/gtfs/PolylineParser.java b/app/src/main/java/it/reyboz/bustorino/backend/gtfs/PolylineParser.java similarity index 100% rename from app/src/it/reyboz/bustorino/backend/gtfs/PolylineParser.java rename to app/src/main/java/it/reyboz/bustorino/backend/gtfs/PolylineParser.java diff --git a/app/src/it/reyboz/bustorino/backend/mato/MapiArrivalRequest.java b/app/src/main/java/it/reyboz/bustorino/backend/mato/MapiArrivalRequest.java similarity index 100% rename from app/src/it/reyboz/bustorino/backend/mato/MapiArrivalRequest.java rename to app/src/main/java/it/reyboz/bustorino/backend/mato/MapiArrivalRequest.java diff --git a/app/src/it/reyboz/bustorino/backend/mato/MapiVolleyRequest.java b/app/src/main/java/it/reyboz/bustorino/backend/mato/MapiVolleyRequest.java similarity index 100% rename from app/src/it/reyboz/bustorino/backend/mato/MapiVolleyRequest.java rename to app/src/main/java/it/reyboz/bustorino/backend/mato/MapiVolleyRequest.java diff --git a/app/src/it/reyboz/bustorino/backend/mato/MatoAPIFetcher.kt b/app/src/main/java/it/reyboz/bustorino/backend/mato/MatoAPIFetcher.kt similarity index 100% rename from app/src/it/reyboz/bustorino/backend/mato/MatoAPIFetcher.kt rename to app/src/main/java/it/reyboz/bustorino/backend/mato/MatoAPIFetcher.kt diff --git a/app/src/it/reyboz/bustorino/backend/mato/MatoQueries.kt b/app/src/main/java/it/reyboz/bustorino/backend/mato/MatoQueries.kt similarity index 100% rename from app/src/it/reyboz/bustorino/backend/mato/MatoQueries.kt rename to app/src/main/java/it/reyboz/bustorino/backend/mato/MatoQueries.kt diff --git a/app/src/it/reyboz/bustorino/backend/mato/MatoVolleyJSONRequest.kt b/app/src/main/java/it/reyboz/bustorino/backend/mato/MatoVolleyJSONRequest.kt similarity index 100% rename from app/src/it/reyboz/bustorino/backend/mato/MatoVolleyJSONRequest.kt rename to app/src/main/java/it/reyboz/bustorino/backend/mato/MatoVolleyJSONRequest.kt diff --git a/app/src/it/reyboz/bustorino/backend/mato/ResponseParsing.kt b/app/src/main/java/it/reyboz/bustorino/backend/mato/ResponseParsing.kt similarity index 100% rename from app/src/it/reyboz/bustorino/backend/mato/ResponseParsing.kt rename to app/src/main/java/it/reyboz/bustorino/backend/mato/ResponseParsing.kt diff --git a/app/src/it/reyboz/bustorino/backend/mato/VolleyAllStopsRequest.kt b/app/src/main/java/it/reyboz/bustorino/backend/mato/VolleyAllStopsRequest.kt similarity index 100% rename from app/src/it/reyboz/bustorino/backend/mato/VolleyAllStopsRequest.kt rename to app/src/main/java/it/reyboz/bustorino/backend/mato/VolleyAllStopsRequest.kt diff --git a/app/src/it/reyboz/bustorino/backend/networkTools.java b/app/src/main/java/it/reyboz/bustorino/backend/networkTools.java similarity index 100% rename from app/src/it/reyboz/bustorino/backend/networkTools.java rename to app/src/main/java/it/reyboz/bustorino/backend/networkTools.java diff --git a/app/src/it/reyboz/bustorino/backend/utils.java b/app/src/main/java/it/reyboz/bustorino/backend/utils.java similarity index 100% rename from app/src/it/reyboz/bustorino/backend/utils.java rename to app/src/main/java/it/reyboz/bustorino/backend/utils.java diff --git a/app/src/it/reyboz/bustorino/data/AppDataProvider.java b/app/src/main/java/it/reyboz/bustorino/data/AppDataProvider.java similarity index 100% rename from app/src/it/reyboz/bustorino/data/AppDataProvider.java rename to app/src/main/java/it/reyboz/bustorino/data/AppDataProvider.java diff --git a/app/src/it/reyboz/bustorino/data/CustomAsyncQueryHandler.java b/app/src/main/java/it/reyboz/bustorino/data/CustomAsyncQueryHandler.java similarity index 100% rename from app/src/it/reyboz/bustorino/data/CustomAsyncQueryHandler.java rename to app/src/main/java/it/reyboz/bustorino/data/CustomAsyncQueryHandler.java diff --git a/app/src/it/reyboz/bustorino/data/DBUpdateWorker.java b/app/src/main/java/it/reyboz/bustorino/data/DBUpdateWorker.java similarity index 100% rename from app/src/it/reyboz/bustorino/data/DBUpdateWorker.java rename to app/src/main/java/it/reyboz/bustorino/data/DBUpdateWorker.java diff --git a/app/src/it/reyboz/bustorino/data/DatabaseUpdate.java b/app/src/main/java/it/reyboz/bustorino/data/DatabaseUpdate.java similarity index 100% rename from app/src/it/reyboz/bustorino/data/DatabaseUpdate.java rename to app/src/main/java/it/reyboz/bustorino/data/DatabaseUpdate.java diff --git a/app/src/it/reyboz/bustorino/data/FavoritesLiveData.java b/app/src/main/java/it/reyboz/bustorino/data/FavoritesLiveData.java similarity index 100% rename from app/src/it/reyboz/bustorino/data/FavoritesLiveData.java rename to app/src/main/java/it/reyboz/bustorino/data/FavoritesLiveData.java diff --git a/app/src/it/reyboz/bustorino/data/FavoritesViewModel.java b/app/src/main/java/it/reyboz/bustorino/data/FavoritesViewModel.java similarity index 100% rename from app/src/it/reyboz/bustorino/data/FavoritesViewModel.java rename to app/src/main/java/it/reyboz/bustorino/data/FavoritesViewModel.java diff --git a/app/src/it/reyboz/bustorino/data/GTTInfoInject.java b/app/src/main/java/it/reyboz/bustorino/data/GTTInfoInject.java similarity index 100% rename from app/src/it/reyboz/bustorino/data/GTTInfoInject.java rename to app/src/main/java/it/reyboz/bustorino/data/GTTInfoInject.java diff --git a/app/src/it/reyboz/bustorino/data/GtfsRepository.kt b/app/src/main/java/it/reyboz/bustorino/data/GtfsRepository.kt similarity index 100% rename from app/src/it/reyboz/bustorino/data/GtfsRepository.kt rename to app/src/main/java/it/reyboz/bustorino/data/GtfsRepository.kt diff --git a/app/src/it/reyboz/bustorino/data/MatoDownloadTripsWorker.kt b/app/src/main/java/it/reyboz/bustorino/data/MatoDownloadTripsWorker.kt similarity index 100% rename from app/src/it/reyboz/bustorino/data/MatoDownloadTripsWorker.kt rename to app/src/main/java/it/reyboz/bustorino/data/MatoDownloadTripsWorker.kt diff --git a/app/src/it/reyboz/bustorino/data/MatoRepository.kt b/app/src/main/java/it/reyboz/bustorino/data/MatoRepository.kt similarity index 100% rename from app/src/it/reyboz/bustorino/data/MatoRepository.kt rename to app/src/main/java/it/reyboz/bustorino/data/MatoRepository.kt diff --git a/app/src/it/reyboz/bustorino/data/NextGenDB.java b/app/src/main/java/it/reyboz/bustorino/data/NextGenDB.java similarity index 100% rename from app/src/it/reyboz/bustorino/data/NextGenDB.java rename to app/src/main/java/it/reyboz/bustorino/data/NextGenDB.java diff --git a/app/src/it/reyboz/bustorino/data/OldDB.java b/app/src/main/java/it/reyboz/bustorino/data/OldDB.java similarity index 100% rename from app/src/it/reyboz/bustorino/data/OldDB.java rename to app/src/main/java/it/reyboz/bustorino/data/OldDB.java diff --git a/app/src/it/reyboz/bustorino/data/OldDataRepository.java b/app/src/main/java/it/reyboz/bustorino/data/OldDataRepository.java similarity index 100% rename from app/src/it/reyboz/bustorino/data/OldDataRepository.java rename to app/src/main/java/it/reyboz/bustorino/data/OldDataRepository.java diff --git a/app/src/it/reyboz/bustorino/data/PreferencesHolder.java b/app/src/main/java/it/reyboz/bustorino/data/PreferencesHolder.java similarity index 100% rename from app/src/it/reyboz/bustorino/data/PreferencesHolder.java rename to app/src/main/java/it/reyboz/bustorino/data/PreferencesHolder.java diff --git a/app/src/it/reyboz/bustorino/data/UserDB.java b/app/src/main/java/it/reyboz/bustorino/data/UserDB.java similarity index 100% rename from app/src/it/reyboz/bustorino/data/UserDB.java rename to app/src/main/java/it/reyboz/bustorino/data/UserDB.java diff --git a/app/src/it/reyboz/bustorino/data/gtfs/Converters.kt b/app/src/main/java/it/reyboz/bustorino/data/gtfs/Converters.kt similarity index 100% rename from app/src/it/reyboz/bustorino/data/gtfs/Converters.kt rename to app/src/main/java/it/reyboz/bustorino/data/gtfs/Converters.kt diff --git a/app/src/it/reyboz/bustorino/data/gtfs/CsvTableInserter.kt b/app/src/main/java/it/reyboz/bustorino/data/gtfs/CsvTableInserter.kt similarity index 100% rename from app/src/it/reyboz/bustorino/data/gtfs/CsvTableInserter.kt rename to app/src/main/java/it/reyboz/bustorino/data/gtfs/CsvTableInserter.kt diff --git a/app/src/it/reyboz/bustorino/data/gtfs/GtfsAgency.kt b/app/src/main/java/it/reyboz/bustorino/data/gtfs/GtfsAgency.kt similarity index 100% rename from app/src/it/reyboz/bustorino/data/gtfs/GtfsAgency.kt rename to app/src/main/java/it/reyboz/bustorino/data/gtfs/GtfsAgency.kt diff --git a/app/src/it/reyboz/bustorino/data/gtfs/GtfsDBDao.kt b/app/src/main/java/it/reyboz/bustorino/data/gtfs/GtfsDBDao.kt similarity index 100% rename from app/src/it/reyboz/bustorino/data/gtfs/GtfsDBDao.kt rename to app/src/main/java/it/reyboz/bustorino/data/gtfs/GtfsDBDao.kt diff --git a/app/src/it/reyboz/bustorino/data/gtfs/GtfsDatabase.kt b/app/src/main/java/it/reyboz/bustorino/data/gtfs/GtfsDatabase.kt similarity index 100% rename from app/src/it/reyboz/bustorino/data/gtfs/GtfsDatabase.kt rename to app/src/main/java/it/reyboz/bustorino/data/gtfs/GtfsDatabase.kt diff --git a/app/src/it/reyboz/bustorino/data/gtfs/GtfsFeed.kt b/app/src/main/java/it/reyboz/bustorino/data/gtfs/GtfsFeed.kt similarity index 100% rename from app/src/it/reyboz/bustorino/data/gtfs/GtfsFeed.kt rename to app/src/main/java/it/reyboz/bustorino/data/gtfs/GtfsFeed.kt diff --git a/app/src/it/reyboz/bustorino/data/gtfs/GtfsMode.kt b/app/src/main/java/it/reyboz/bustorino/data/gtfs/GtfsMode.kt similarity index 100% rename from app/src/it/reyboz/bustorino/data/gtfs/GtfsMode.kt rename to app/src/main/java/it/reyboz/bustorino/data/gtfs/GtfsMode.kt diff --git a/app/src/it/reyboz/bustorino/data/gtfs/GtfsRoute.kt b/app/src/main/java/it/reyboz/bustorino/data/gtfs/GtfsRoute.kt similarity index 100% rename from app/src/it/reyboz/bustorino/data/gtfs/GtfsRoute.kt rename to app/src/main/java/it/reyboz/bustorino/data/gtfs/GtfsRoute.kt diff --git a/app/src/it/reyboz/bustorino/data/gtfs/GtfsService.kt b/app/src/main/java/it/reyboz/bustorino/data/gtfs/GtfsService.kt similarity index 100% rename from app/src/it/reyboz/bustorino/data/gtfs/GtfsService.kt rename to app/src/main/java/it/reyboz/bustorino/data/gtfs/GtfsService.kt diff --git a/app/src/it/reyboz/bustorino/data/gtfs/GtfsServiceDate.kt b/app/src/main/java/it/reyboz/bustorino/data/gtfs/GtfsServiceDate.kt similarity index 100% rename from app/src/it/reyboz/bustorino/data/gtfs/GtfsServiceDate.kt rename to app/src/main/java/it/reyboz/bustorino/data/gtfs/GtfsServiceDate.kt diff --git a/app/src/it/reyboz/bustorino/data/gtfs/GtfsShape.kt b/app/src/main/java/it/reyboz/bustorino/data/gtfs/GtfsShape.kt similarity index 100% rename from app/src/it/reyboz/bustorino/data/gtfs/GtfsShape.kt rename to app/src/main/java/it/reyboz/bustorino/data/gtfs/GtfsShape.kt diff --git a/app/src/it/reyboz/bustorino/data/gtfs/GtfsStop.kt b/app/src/main/java/it/reyboz/bustorino/data/gtfs/GtfsStop.kt similarity index 100% rename from app/src/it/reyboz/bustorino/data/gtfs/GtfsStop.kt rename to app/src/main/java/it/reyboz/bustorino/data/gtfs/GtfsStop.kt diff --git a/app/src/it/reyboz/bustorino/data/gtfs/GtfsStopTime.kt b/app/src/main/java/it/reyboz/bustorino/data/gtfs/GtfsStopTime.kt similarity index 100% rename from app/src/it/reyboz/bustorino/data/gtfs/GtfsStopTime.kt rename to app/src/main/java/it/reyboz/bustorino/data/gtfs/GtfsStopTime.kt diff --git a/app/src/it/reyboz/bustorino/data/gtfs/GtfsTable.java b/app/src/main/java/it/reyboz/bustorino/data/gtfs/GtfsTable.java similarity index 100% rename from app/src/it/reyboz/bustorino/data/gtfs/GtfsTable.java rename to app/src/main/java/it/reyboz/bustorino/data/gtfs/GtfsTable.java diff --git a/app/src/it/reyboz/bustorino/data/gtfs/GtfsTrip.kt b/app/src/main/java/it/reyboz/bustorino/data/gtfs/GtfsTrip.kt similarity index 100% rename from app/src/it/reyboz/bustorino/data/gtfs/GtfsTrip.kt rename to app/src/main/java/it/reyboz/bustorino/data/gtfs/GtfsTrip.kt diff --git a/app/src/it/reyboz/bustorino/data/gtfs/MatoPattern.kt b/app/src/main/java/it/reyboz/bustorino/data/gtfs/MatoPattern.kt similarity index 100% rename from app/src/it/reyboz/bustorino/data/gtfs/MatoPattern.kt rename to app/src/main/java/it/reyboz/bustorino/data/gtfs/MatoPattern.kt diff --git a/app/src/it/reyboz/bustorino/data/gtfs/WheelchairAccess.kt b/app/src/main/java/it/reyboz/bustorino/data/gtfs/WheelchairAccess.kt similarity index 100% rename from app/src/it/reyboz/bustorino/data/gtfs/WheelchairAccess.kt rename to app/src/main/java/it/reyboz/bustorino/data/gtfs/WheelchairAccess.kt diff --git a/app/src/it/reyboz/bustorino/fragments/ArrivalsFragment.java b/app/src/main/java/it/reyboz/bustorino/fragments/ArrivalsFragment.java similarity index 100% rename from app/src/it/reyboz/bustorino/fragments/ArrivalsFragment.java rename to app/src/main/java/it/reyboz/bustorino/fragments/ArrivalsFragment.java diff --git a/app/src/it/reyboz/bustorino/fragments/CommonFragmentListener.java b/app/src/main/java/it/reyboz/bustorino/fragments/CommonFragmentListener.java similarity index 100% rename from app/src/it/reyboz/bustorino/fragments/CommonFragmentListener.java rename to app/src/main/java/it/reyboz/bustorino/fragments/CommonFragmentListener.java diff --git a/app/src/it/reyboz/bustorino/fragments/CommonScrollListener.java b/app/src/main/java/it/reyboz/bustorino/fragments/CommonScrollListener.java similarity index 100% rename from app/src/it/reyboz/bustorino/fragments/CommonScrollListener.java rename to app/src/main/java/it/reyboz/bustorino/fragments/CommonScrollListener.java diff --git a/app/src/it/reyboz/bustorino/fragments/FavoritesFragment.java b/app/src/main/java/it/reyboz/bustorino/fragments/FavoritesFragment.java similarity index 100% rename from app/src/it/reyboz/bustorino/fragments/FavoritesFragment.java rename to app/src/main/java/it/reyboz/bustorino/fragments/FavoritesFragment.java diff --git a/app/src/it/reyboz/bustorino/fragments/FragmentHelper.java b/app/src/main/java/it/reyboz/bustorino/fragments/FragmentHelper.java similarity index 100% rename from app/src/it/reyboz/bustorino/fragments/FragmentHelper.java rename to app/src/main/java/it/reyboz/bustorino/fragments/FragmentHelper.java diff --git a/app/src/it/reyboz/bustorino/fragments/FragmentKind.java b/app/src/main/java/it/reyboz/bustorino/fragments/FragmentKind.java similarity index 100% rename from app/src/it/reyboz/bustorino/fragments/FragmentKind.java rename to app/src/main/java/it/reyboz/bustorino/fragments/FragmentKind.java diff --git a/app/src/it/reyboz/bustorino/fragments/FragmentListenerMain.java b/app/src/main/java/it/reyboz/bustorino/fragments/FragmentListenerMain.java similarity index 100% rename from app/src/it/reyboz/bustorino/fragments/FragmentListenerMain.java rename to app/src/main/java/it/reyboz/bustorino/fragments/FragmentListenerMain.java diff --git a/app/src/it/reyboz/bustorino/fragments/LinesDetailFragment.kt b/app/src/main/java/it/reyboz/bustorino/fragments/LinesDetailFragment.kt similarity index 100% rename from app/src/it/reyboz/bustorino/fragments/LinesDetailFragment.kt rename to app/src/main/java/it/reyboz/bustorino/fragments/LinesDetailFragment.kt diff --git a/app/src/it/reyboz/bustorino/fragments/LinesFragment.kt b/app/src/main/java/it/reyboz/bustorino/fragments/LinesFragment.kt similarity index 100% rename from app/src/it/reyboz/bustorino/fragments/LinesFragment.kt rename to app/src/main/java/it/reyboz/bustorino/fragments/LinesFragment.kt diff --git a/app/src/it/reyboz/bustorino/fragments/LinesViewModel.kt b/app/src/main/java/it/reyboz/bustorino/fragments/LinesViewModel.kt similarity index 100% rename from app/src/it/reyboz/bustorino/fragments/LinesViewModel.kt rename to app/src/main/java/it/reyboz/bustorino/fragments/LinesViewModel.kt diff --git a/app/src/it/reyboz/bustorino/fragments/MainScreenFragment.java b/app/src/main/java/it/reyboz/bustorino/fragments/MainScreenFragment.java similarity index 100% rename from app/src/it/reyboz/bustorino/fragments/MainScreenFragment.java rename to app/src/main/java/it/reyboz/bustorino/fragments/MainScreenFragment.java diff --git a/app/src/it/reyboz/bustorino/fragments/MapFragment.java b/app/src/main/java/it/reyboz/bustorino/fragments/MapFragment.java similarity index 100% rename from app/src/it/reyboz/bustorino/fragments/MapFragment.java rename to app/src/main/java/it/reyboz/bustorino/fragments/MapFragment.java diff --git a/app/src/it/reyboz/bustorino/fragments/MapViewModel.kt b/app/src/main/java/it/reyboz/bustorino/fragments/MapViewModel.kt similarity index 100% rename from app/src/it/reyboz/bustorino/fragments/MapViewModel.kt rename to app/src/main/java/it/reyboz/bustorino/fragments/MapViewModel.kt diff --git a/app/src/it/reyboz/bustorino/fragments/NearbyStopsFragment.java b/app/src/main/java/it/reyboz/bustorino/fragments/NearbyStopsFragment.java similarity index 100% rename from app/src/it/reyboz/bustorino/fragments/NearbyStopsFragment.java rename to app/src/main/java/it/reyboz/bustorino/fragments/NearbyStopsFragment.java diff --git a/app/src/it/reyboz/bustorino/fragments/ResultListFragment.java b/app/src/main/java/it/reyboz/bustorino/fragments/ResultListFragment.java similarity index 100% rename from app/src/it/reyboz/bustorino/fragments/ResultListFragment.java rename to app/src/main/java/it/reyboz/bustorino/fragments/ResultListFragment.java diff --git a/app/src/it/reyboz/bustorino/fragments/ScreenBaseFragment.java b/app/src/main/java/it/reyboz/bustorino/fragments/ScreenBaseFragment.java similarity index 100% rename from app/src/it/reyboz/bustorino/fragments/ScreenBaseFragment.java rename to app/src/main/java/it/reyboz/bustorino/fragments/ScreenBaseFragment.java diff --git a/app/src/it/reyboz/bustorino/fragments/SettingsFragment.java b/app/src/main/java/it/reyboz/bustorino/fragments/SettingsFragment.java similarity index 100% rename from app/src/it/reyboz/bustorino/fragments/SettingsFragment.java rename to app/src/main/java/it/reyboz/bustorino/fragments/SettingsFragment.java diff --git a/app/src/it/reyboz/bustorino/fragments/StopListFragment.java b/app/src/main/java/it/reyboz/bustorino/fragments/StopListFragment.java similarity index 100% rename from app/src/it/reyboz/bustorino/fragments/StopListFragment.java rename to app/src/main/java/it/reyboz/bustorino/fragments/StopListFragment.java diff --git a/app/src/it/reyboz/bustorino/fragments/TestRealtimeGtfsFragment.kt b/app/src/main/java/it/reyboz/bustorino/fragments/TestRealtimeGtfsFragment.kt similarity index 100% rename from app/src/it/reyboz/bustorino/fragments/TestRealtimeGtfsFragment.kt rename to app/src/main/java/it/reyboz/bustorino/fragments/TestRealtimeGtfsFragment.kt diff --git a/app/src/it/reyboz/bustorino/map/BusInfoWindow.kt b/app/src/main/java/it/reyboz/bustorino/map/BusInfoWindow.kt similarity index 100% rename from app/src/it/reyboz/bustorino/map/BusInfoWindow.kt rename to app/src/main/java/it/reyboz/bustorino/map/BusInfoWindow.kt diff --git a/app/src/it/reyboz/bustorino/map/CustomInfoWindow.java b/app/src/main/java/it/reyboz/bustorino/map/CustomInfoWindow.java similarity index 100% rename from app/src/it/reyboz/bustorino/map/CustomInfoWindow.java rename to app/src/main/java/it/reyboz/bustorino/map/CustomInfoWindow.java diff --git a/app/src/it/reyboz/bustorino/map/GeoPointInterpolator.java b/app/src/main/java/it/reyboz/bustorino/map/GeoPointInterpolator.java similarity index 100% rename from app/src/it/reyboz/bustorino/map/GeoPointInterpolator.java rename to app/src/main/java/it/reyboz/bustorino/map/GeoPointInterpolator.java diff --git a/app/src/it/reyboz/bustorino/map/LocationOverlay.java b/app/src/main/java/it/reyboz/bustorino/map/LocationOverlay.java similarity index 100% rename from app/src/it/reyboz/bustorino/map/LocationOverlay.java rename to app/src/main/java/it/reyboz/bustorino/map/LocationOverlay.java diff --git a/app/src/it/reyboz/bustorino/map/MarkerAnimation.java b/app/src/main/java/it/reyboz/bustorino/map/MarkerAnimation.java similarity index 100% rename from app/src/it/reyboz/bustorino/map/MarkerAnimation.java rename to app/src/main/java/it/reyboz/bustorino/map/MarkerAnimation.java diff --git a/app/src/it/reyboz/bustorino/middleware/AppLocationManager.java b/app/src/main/java/it/reyboz/bustorino/middleware/AppLocationManager.java similarity index 100% rename from app/src/it/reyboz/bustorino/middleware/AppLocationManager.java rename to app/src/main/java/it/reyboz/bustorino/middleware/AppLocationManager.java diff --git a/app/src/it/reyboz/bustorino/middleware/AsyncArrivalsSearcher.java b/app/src/main/java/it/reyboz/bustorino/middleware/AsyncArrivalsSearcher.java similarity index 100% rename from app/src/it/reyboz/bustorino/middleware/AsyncArrivalsSearcher.java rename to app/src/main/java/it/reyboz/bustorino/middleware/AsyncArrivalsSearcher.java diff --git a/app/src/it/reyboz/bustorino/middleware/AsyncStopFavoriteAction.java b/app/src/main/java/it/reyboz/bustorino/middleware/AsyncStopFavoriteAction.java similarity index 100% rename from app/src/it/reyboz/bustorino/middleware/AsyncStopFavoriteAction.java rename to app/src/main/java/it/reyboz/bustorino/middleware/AsyncStopFavoriteAction.java diff --git a/app/src/it/reyboz/bustorino/middleware/AsyncStopsSearcher.java b/app/src/main/java/it/reyboz/bustorino/middleware/AsyncStopsSearcher.java similarity index 100% rename from app/src/it/reyboz/bustorino/middleware/AsyncStopsSearcher.java rename to app/src/main/java/it/reyboz/bustorino/middleware/AsyncStopsSearcher.java diff --git a/app/src/it/reyboz/bustorino/middleware/AsyncWget.java b/app/src/main/java/it/reyboz/bustorino/middleware/AsyncWget.java similarity index 100% rename from app/src/it/reyboz/bustorino/middleware/AsyncWget.java rename to app/src/main/java/it/reyboz/bustorino/middleware/AsyncWget.java diff --git a/app/src/it/reyboz/bustorino/middleware/BarcodeScanContract.java b/app/src/main/java/it/reyboz/bustorino/middleware/BarcodeScanContract.java similarity index 100% rename from app/src/it/reyboz/bustorino/middleware/BarcodeScanContract.java rename to app/src/main/java/it/reyboz/bustorino/middleware/BarcodeScanContract.java diff --git a/app/src/it/reyboz/bustorino/middleware/BarcodeScanOptions.java b/app/src/main/java/it/reyboz/bustorino/middleware/BarcodeScanOptions.java similarity index 100% rename from app/src/it/reyboz/bustorino/middleware/BarcodeScanOptions.java rename to app/src/main/java/it/reyboz/bustorino/middleware/BarcodeScanOptions.java diff --git a/app/src/it/reyboz/bustorino/middleware/BarcodeScanUtils.java b/app/src/main/java/it/reyboz/bustorino/middleware/BarcodeScanUtils.java similarity index 100% rename from app/src/it/reyboz/bustorino/middleware/BarcodeScanUtils.java rename to app/src/main/java/it/reyboz/bustorino/middleware/BarcodeScanUtils.java diff --git a/app/src/it/reyboz/bustorino/middleware/GeneralActivity.java b/app/src/main/java/it/reyboz/bustorino/middleware/GeneralActivity.java similarity index 100% rename from app/src/it/reyboz/bustorino/middleware/GeneralActivity.java rename to app/src/main/java/it/reyboz/bustorino/middleware/GeneralActivity.java diff --git a/app/src/it/reyboz/bustorino/middleware/RecursionHelper.java b/app/src/main/java/it/reyboz/bustorino/middleware/RecursionHelper.java similarity index 100% rename from app/src/it/reyboz/bustorino/middleware/RecursionHelper.java rename to app/src/main/java/it/reyboz/bustorino/middleware/RecursionHelper.java diff --git a/app/src/it/reyboz/bustorino/middleware/SearchRequestType.java b/app/src/main/java/it/reyboz/bustorino/middleware/SearchRequestType.java similarity index 100% rename from app/src/it/reyboz/bustorino/middleware/SearchRequestType.java rename to app/src/main/java/it/reyboz/bustorino/middleware/SearchRequestType.java diff --git a/app/src/it/reyboz/bustorino/util/DrawableUtils.kt b/app/src/main/java/it/reyboz/bustorino/util/DrawableUtils.kt similarity index 100% rename from app/src/it/reyboz/bustorino/util/DrawableUtils.kt rename to app/src/main/java/it/reyboz/bustorino/util/DrawableUtils.kt diff --git a/app/src/it/reyboz/bustorino/util/LinesNameSorter.java b/app/src/main/java/it/reyboz/bustorino/util/LinesNameSorter.java similarity index 100% rename from app/src/it/reyboz/bustorino/util/LinesNameSorter.java rename to app/src/main/java/it/reyboz/bustorino/util/LinesNameSorter.java diff --git a/app/src/it/reyboz/bustorino/util/LocationCriteria.java b/app/src/main/java/it/reyboz/bustorino/util/LocationCriteria.java similarity index 100% rename from app/src/it/reyboz/bustorino/util/LocationCriteria.java rename to app/src/main/java/it/reyboz/bustorino/util/LocationCriteria.java diff --git a/app/src/it/reyboz/bustorino/util/PassaggiSorter.java b/app/src/main/java/it/reyboz/bustorino/util/PassaggiSorter.java similarity index 100% rename from app/src/it/reyboz/bustorino/util/PassaggiSorter.java rename to app/src/main/java/it/reyboz/bustorino/util/PassaggiSorter.java diff --git a/app/src/it/reyboz/bustorino/util/PatternWithStopsSorter.kt b/app/src/main/java/it/reyboz/bustorino/util/PatternWithStopsSorter.kt similarity index 100% rename from app/src/it/reyboz/bustorino/util/PatternWithStopsSorter.kt rename to app/src/main/java/it/reyboz/bustorino/util/PatternWithStopsSorter.kt diff --git a/app/src/it/reyboz/bustorino/util/Permissions.java b/app/src/main/java/it/reyboz/bustorino/util/Permissions.java similarity index 100% rename from app/src/it/reyboz/bustorino/util/Permissions.java rename to app/src/main/java/it/reyboz/bustorino/util/Permissions.java diff --git a/app/src/it/reyboz/bustorino/util/RoutePositionSorter.java b/app/src/main/java/it/reyboz/bustorino/util/RoutePositionSorter.java similarity index 100% rename from app/src/it/reyboz/bustorino/util/RoutePositionSorter.java rename to app/src/main/java/it/reyboz/bustorino/util/RoutePositionSorter.java diff --git a/app/src/it/reyboz/bustorino/util/RouteSorterByArrivalTime.kt b/app/src/main/java/it/reyboz/bustorino/util/RouteSorterByArrivalTime.kt similarity index 100% rename from app/src/it/reyboz/bustorino/util/RouteSorterByArrivalTime.kt rename to app/src/main/java/it/reyboz/bustorino/util/RouteSorterByArrivalTime.kt diff --git a/app/src/it/reyboz/bustorino/util/StopSorterByDistance.java b/app/src/main/java/it/reyboz/bustorino/util/StopSorterByDistance.java similarity index 100% rename from app/src/it/reyboz/bustorino/util/StopSorterByDistance.java rename to app/src/main/java/it/reyboz/bustorino/util/StopSorterByDistance.java diff --git a/app/res/drawable-hdpi/ic_center_map.png b/app/src/main/res/drawable-hdpi/ic_center_map.png similarity index 100% rename from app/res/drawable-hdpi/ic_center_map.png rename to app/src/main/res/drawable-hdpi/ic_center_map.png diff --git a/app/res/drawable-hdpi/ic_follow_me.png b/app/src/main/res/drawable-hdpi/ic_follow_me.png similarity index 100% rename from app/res/drawable-hdpi/ic_follow_me.png rename to app/src/main/res/drawable-hdpi/ic_follow_me.png diff --git a/app/res/drawable-hdpi/ic_follow_me_on.png b/app/src/main/res/drawable-hdpi/ic_follow_me_on.png similarity index 100% rename from app/res/drawable-hdpi/ic_follow_me_on.png rename to app/src/main/res/drawable-hdpi/ic_follow_me_on.png diff --git a/app/res/drawable-hdpi/ic_launcher.png b/app/src/main/res/drawable-hdpi/ic_launcher.png similarity index 100% rename from app/res/drawable-hdpi/ic_launcher.png rename to app/src/main/res/drawable-hdpi/ic_launcher.png diff --git a/app/res/drawable-hdpi/ic_star.png b/app/src/main/res/drawable-hdpi/ic_star.png similarity index 100% rename from app/res/drawable-hdpi/ic_star.png rename to app/src/main/res/drawable-hdpi/ic_star.png diff --git a/app/res/drawable-mdpi/ic_center_map.png b/app/src/main/res/drawable-mdpi/ic_center_map.png similarity index 100% rename from app/res/drawable-mdpi/ic_center_map.png rename to app/src/main/res/drawable-mdpi/ic_center_map.png diff --git a/app/res/drawable-mdpi/ic_follow_me.png b/app/src/main/res/drawable-mdpi/ic_follow_me.png similarity index 100% rename from app/res/drawable-mdpi/ic_follow_me.png rename to app/src/main/res/drawable-mdpi/ic_follow_me.png diff --git a/app/res/drawable-mdpi/ic_follow_me_on.png b/app/src/main/res/drawable-mdpi/ic_follow_me_on.png similarity index 100% rename from app/res/drawable-mdpi/ic_follow_me_on.png rename to app/src/main/res/drawable-mdpi/ic_follow_me_on.png diff --git a/app/res/drawable-mdpi/ic_launcher.png b/app/src/main/res/drawable-mdpi/ic_launcher.png similarity index 100% rename from app/res/drawable-mdpi/ic_launcher.png rename to app/src/main/res/drawable-mdpi/ic_launcher.png diff --git a/app/res/drawable-mdpi/ic_star.png b/app/src/main/res/drawable-mdpi/ic_star.png similarity index 100% rename from app/res/drawable-mdpi/ic_star.png rename to app/src/main/res/drawable-mdpi/ic_star.png diff --git a/app/res/drawable-xhdpi/ic_center_map.png b/app/src/main/res/drawable-xhdpi/ic_center_map.png similarity index 100% rename from app/res/drawable-xhdpi/ic_center_map.png rename to app/src/main/res/drawable-xhdpi/ic_center_map.png diff --git a/app/res/drawable-xhdpi/ic_follow_me.png b/app/src/main/res/drawable-xhdpi/ic_follow_me.png similarity index 100% rename from app/res/drawable-xhdpi/ic_follow_me.png rename to app/src/main/res/drawable-xhdpi/ic_follow_me.png diff --git a/app/res/drawable-xhdpi/ic_follow_me_on.png b/app/src/main/res/drawable-xhdpi/ic_follow_me_on.png similarity index 100% rename from app/res/drawable-xhdpi/ic_follow_me_on.png rename to app/src/main/res/drawable-xhdpi/ic_follow_me_on.png diff --git a/app/res/drawable-xhdpi/ic_launcher.png b/app/src/main/res/drawable-xhdpi/ic_launcher.png similarity index 100% rename from app/res/drawable-xhdpi/ic_launcher.png rename to app/src/main/res/drawable-xhdpi/ic_launcher.png diff --git a/app/res/drawable-xhdpi/ic_star.png b/app/src/main/res/drawable-xhdpi/ic_star.png similarity index 100% rename from app/res/drawable-xhdpi/ic_star.png rename to app/src/main/res/drawable-xhdpi/ic_star.png diff --git a/app/res/drawable-xxhdpi/ic_center_map.png b/app/src/main/res/drawable-xxhdpi/ic_center_map.png similarity index 100% rename from app/res/drawable-xxhdpi/ic_center_map.png rename to app/src/main/res/drawable-xxhdpi/ic_center_map.png diff --git a/app/res/drawable-xxhdpi/ic_follow_me.png b/app/src/main/res/drawable-xxhdpi/ic_follow_me.png similarity index 100% rename from app/res/drawable-xxhdpi/ic_follow_me.png rename to app/src/main/res/drawable-xxhdpi/ic_follow_me.png diff --git a/app/res/drawable-xxhdpi/ic_follow_me_on.png b/app/src/main/res/drawable-xxhdpi/ic_follow_me_on.png similarity index 100% rename from app/res/drawable-xxhdpi/ic_follow_me_on.png rename to app/src/main/res/drawable-xxhdpi/ic_follow_me_on.png diff --git a/app/res/drawable-xxhdpi/ic_launcher.png b/app/src/main/res/drawable-xxhdpi/ic_launcher.png similarity index 100% rename from app/res/drawable-xxhdpi/ic_launcher.png rename to app/src/main/res/drawable-xxhdpi/ic_launcher.png diff --git a/app/res/drawable-xxhdpi/ic_star.png b/app/src/main/res/drawable-xxhdpi/ic_star.png similarity index 100% rename from app/res/drawable-xxhdpi/ic_star.png rename to app/src/main/res/drawable-xxhdpi/ic_star.png diff --git a/app/res/drawable-xxxhdpi/alphabetical.png b/app/src/main/res/drawable-xxxhdpi/alphabetical.png similarity index 100% rename from app/res/drawable-xxxhdpi/alphabetical.png rename to app/src/main/res/drawable-xxxhdpi/alphabetical.png diff --git a/app/res/drawable-xxxhdpi/bus.png b/app/src/main/res/drawable-xxxhdpi/bus.png similarity index 100% rename from app/res/drawable-xxxhdpi/bus.png rename to app/src/main/res/drawable-xxxhdpi/bus.png diff --git a/app/res/drawable-xxxhdpi/city.png b/app/src/main/res/drawable-xxxhdpi/city.png similarity index 100% rename from app/res/drawable-xxxhdpi/city.png rename to app/src/main/res/drawable-xxxhdpi/city.png diff --git a/app/res/drawable-xxxhdpi/ic_center_map.png b/app/src/main/res/drawable-xxxhdpi/ic_center_map.png similarity index 100% rename from app/res/drawable-xxxhdpi/ic_center_map.png rename to app/src/main/res/drawable-xxxhdpi/ic_center_map.png diff --git a/app/res/drawable-xxxhdpi/ic_follow_me.png b/app/src/main/res/drawable-xxxhdpi/ic_follow_me.png similarity index 100% rename from app/res/drawable-xxxhdpi/ic_follow_me.png rename to app/src/main/res/drawable-xxxhdpi/ic_follow_me.png diff --git a/app/res/drawable-xxxhdpi/ic_follow_me_on.png b/app/src/main/res/drawable-xxxhdpi/ic_follow_me_on.png similarity index 100% rename from app/res/drawable-xxxhdpi/ic_follow_me_on.png rename to app/src/main/res/drawable-xxxhdpi/ic_follow_me_on.png diff --git a/app/res/drawable-xxxhdpi/ic_launcher.png b/app/src/main/res/drawable-xxxhdpi/ic_launcher.png similarity index 100% rename from app/res/drawable-xxxhdpi/ic_launcher.png rename to app/src/main/res/drawable-xxxhdpi/ic_launcher.png diff --git a/app/res/drawable-xxxhdpi/ic_star.png b/app/src/main/res/drawable-xxxhdpi/ic_star.png similarity index 100% rename from app/res/drawable-xxxhdpi/ic_star.png rename to app/src/main/res/drawable-xxxhdpi/ic_star.png diff --git a/app/res/drawable-xxxhdpi/keyboard.png b/app/src/main/res/drawable-xxxhdpi/keyboard.png similarity index 100% rename from app/res/drawable-xxxhdpi/keyboard.png rename to app/src/main/res/drawable-xxxhdpi/keyboard.png diff --git a/app/res/drawable-xxxhdpi/numeric.png b/app/src/main/res/drawable-xxxhdpi/numeric.png similarity index 100% rename from app/res/drawable-xxxhdpi/numeric.png rename to app/src/main/res/drawable-xxxhdpi/numeric.png diff --git a/app/res/drawable-xxxhdpi/qrcode_button_custom.xml b/app/src/main/res/drawable-xxxhdpi/qrcode_button_custom.xml similarity index 100% rename from app/res/drawable-xxxhdpi/qrcode_button_custom.xml rename to app/src/main/res/drawable-xxxhdpi/qrcode_button_custom.xml diff --git a/app/res/drawable-xxxhdpi/qrcode_button_default.png b/app/src/main/res/drawable-xxxhdpi/qrcode_button_default.png similarity index 100% rename from app/res/drawable-xxxhdpi/qrcode_button_default.png rename to app/src/main/res/drawable-xxxhdpi/qrcode_button_default.png diff --git a/app/res/drawable-xxxhdpi/qrcode_button_pressed.png b/app/src/main/res/drawable-xxxhdpi/qrcode_button_pressed.png similarity index 100% rename from app/res/drawable-xxxhdpi/qrcode_button_pressed.png rename to app/src/main/res/drawable-xxxhdpi/qrcode_button_pressed.png diff --git a/app/res/drawable-xxxhdpi/route_background_bus.xml b/app/src/main/res/drawable-xxxhdpi/route_background_bus.xml similarity index 100% rename from app/res/drawable-xxxhdpi/route_background_bus.xml rename to app/src/main/res/drawable-xxxhdpi/route_background_bus.xml diff --git a/app/res/drawable-xxxhdpi/route_background_bus_long_distance.xml b/app/src/main/res/drawable-xxxhdpi/route_background_bus_long_distance.xml similarity index 100% rename from app/res/drawable-xxxhdpi/route_background_bus_long_distance.xml rename to app/src/main/res/drawable-xxxhdpi/route_background_bus_long_distance.xml diff --git a/app/res/drawable-xxxhdpi/route_background_metro.xml b/app/src/main/res/drawable-xxxhdpi/route_background_metro.xml similarity index 100% rename from app/res/drawable-xxxhdpi/route_background_metro.xml rename to app/src/main/res/drawable-xxxhdpi/route_background_metro.xml diff --git a/app/res/drawable-xxxhdpi/search_button_custom.xml b/app/src/main/res/drawable-xxxhdpi/search_button_custom.xml similarity index 100% rename from app/res/drawable-xxxhdpi/search_button_custom.xml rename to app/src/main/res/drawable-xxxhdpi/search_button_custom.xml diff --git a/app/res/drawable-xxxhdpi/search_button_default.png b/app/src/main/res/drawable-xxxhdpi/search_button_default.png similarity index 100% rename from app/res/drawable-xxxhdpi/search_button_default.png rename to app/src/main/res/drawable-xxxhdpi/search_button_default.png diff --git a/app/res/drawable-xxxhdpi/search_button_pressed.png b/app/src/main/res/drawable-xxxhdpi/search_button_pressed.png similarity index 100% rename from app/res/drawable-xxxhdpi/search_button_pressed.png rename to app/src/main/res/drawable-xxxhdpi/search_button_pressed.png diff --git a/app/res/drawable-xxxhdpi/subway.png b/app/src/main/res/drawable-xxxhdpi/subway.png similarity index 100% rename from app/res/drawable-xxxhdpi/subway.png rename to app/src/main/res/drawable-xxxhdpi/subway.png diff --git a/app/res/drawable-xxxhdpi/tram.png b/app/src/main/res/drawable-xxxhdpi/tram.png similarity index 100% rename from app/res/drawable-xxxhdpi/tram.png rename to app/src/main/res/drawable-xxxhdpi/tram.png diff --git a/app/res/drawable/bus_marker.xml b/app/src/main/res/drawable/bus_marker.xml similarity index 100% rename from app/res/drawable/bus_marker.xml rename to app/src/main/res/drawable/bus_marker.xml diff --git a/app/res/drawable/bus_stop.xml b/app/src/main/res/drawable/bus_stop.xml similarity index 100% rename from app/res/drawable/bus_stop.xml rename to app/src/main/res/drawable/bus_stop.xml diff --git a/app/res/drawable/bus_stop_background.xml b/app/src/main/res/drawable/bus_stop_background.xml similarity index 100% rename from app/res/drawable/bus_stop_background.xml rename to app/src/main/res/drawable/bus_stop_background.xml diff --git a/app/res/drawable/bus_stop_background_pattern.xml b/app/src/main/res/drawable/bus_stop_background_pattern.xml similarity index 100% rename from app/res/drawable/bus_stop_background_pattern.xml rename to app/src/main/res/drawable/bus_stop_background_pattern.xml diff --git a/app/res/drawable/ic_angery_bus.xml b/app/src/main/res/drawable/ic_angery_bus.xml similarity index 100% rename from app/res/drawable/ic_angery_bus.xml rename to app/src/main/res/drawable/ic_angery_bus.xml diff --git a/app/res/drawable/ic_baseline_departure_board_24.xml b/app/src/main/res/drawable/ic_baseline_departure_board_24.xml similarity index 100% rename from app/res/drawable/ic_baseline_departure_board_24.xml rename to app/src/main/res/drawable/ic_baseline_departure_board_24.xml diff --git a/app/res/drawable/ic_baseline_info_24.xml b/app/src/main/res/drawable/ic_baseline_info_24.xml similarity index 100% rename from app/res/drawable/ic_baseline_info_24.xml rename to app/src/main/res/drawable/ic_baseline_info_24.xml diff --git a/app/res/drawable/ic_baseline_map_24.xml b/app/src/main/res/drawable/ic_baseline_map_24.xml similarity index 100% rename from app/res/drawable/ic_baseline_map_24.xml rename to app/src/main/res/drawable/ic_baseline_map_24.xml diff --git a/app/res/drawable/ic_baseline_settings_24.xml b/app/src/main/res/drawable/ic_baseline_settings_24.xml similarity index 100% rename from app/res/drawable/ic_baseline_settings_24.xml rename to app/src/main/res/drawable/ic_baseline_settings_24.xml diff --git a/app/res/drawable/ic_bus_orange.xml b/app/src/main/res/drawable/ic_bus_orange.xml similarity index 100% rename from app/res/drawable/ic_bus_orange.xml rename to app/src/main/res/drawable/ic_bus_orange.xml diff --git a/app/res/drawable/ic_favorite_heart.xml b/app/src/main/res/drawable/ic_favorite_heart.xml similarity index 100% rename from app/res/drawable/ic_favorite_heart.xml rename to app/src/main/res/drawable/ic_favorite_heart.xml diff --git a/app/res/drawable/ic_mars2020.xml b/app/src/main/res/drawable/ic_mars2020.xml similarity index 100% rename from app/res/drawable/ic_mars2020.xml rename to app/src/main/res/drawable/ic_mars2020.xml diff --git a/app/res/drawable/ic_moving.xml b/app/src/main/res/drawable/ic_moving.xml similarity index 100% rename from app/res/drawable/ic_moving.xml rename to app/src/main/res/drawable/ic_moving.xml diff --git a/app/res/drawable/ic_moving_emph.xml b/app/src/main/res/drawable/ic_moving_emph.xml similarity index 100% rename from app/res/drawable/ic_moving_emph.xml rename to app/src/main/res/drawable/ic_moving_emph.xml diff --git a/app/res/drawable/ic_outline_info_24.xml b/app/src/main/res/drawable/ic_outline_info_24.xml similarity index 100% rename from app/res/drawable/ic_outline_info_24.xml rename to app/src/main/res/drawable/ic_outline_info_24.xml diff --git a/app/res/drawable/ic_star_filled.xml b/app/src/main/res/drawable/ic_star_filled.xml similarity index 100% rename from app/res/drawable/ic_star_filled.xml rename to app/src/main/res/drawable/ic_star_filled.xml diff --git a/app/res/drawable/ic_star_filled_white.xml b/app/src/main/res/drawable/ic_star_filled_white.xml similarity index 100% rename from app/res/drawable/ic_star_filled_white.xml rename to app/src/main/res/drawable/ic_star_filled_white.xml diff --git a/app/res/drawable/ic_star_outline.xml b/app/src/main/res/drawable/ic_star_outline.xml similarity index 100% rename from app/res/drawable/ic_star_outline.xml rename to app/src/main/res/drawable/ic_star_outline.xml diff --git a/app/res/drawable/line.xml b/app/src/main/res/drawable/line.xml similarity index 100% rename from app/res/drawable/line.xml rename to app/src/main/res/drawable/line.xml diff --git a/app/res/drawable/line_drawable.xml b/app/src/main/res/drawable/line_drawable.xml similarity index 100% rename from app/res/drawable/line_drawable.xml rename to app/src/main/res/drawable/line_drawable.xml diff --git a/app/res/drawable/map.xml b/app/src/main/res/drawable/map.xml similarity index 100% rename from app/res/drawable/map.xml rename to app/src/main/res/drawable/map.xml diff --git a/app/res/drawable/point_heading_icon.xml b/app/src/main/res/drawable/point_heading_icon.xml similarity index 100% rename from app/res/drawable/point_heading_icon.xml rename to app/src/main/res/drawable/point_heading_icon.xml diff --git a/app/res/drawable/telegram_logo.xml b/app/src/main/res/drawable/telegram_logo.xml similarity index 100% rename from app/res/drawable/telegram_logo.xml rename to app/src/main/res/drawable/telegram_logo.xml diff --git a/app/res/drawable/telegram_logo_50.xml b/app/src/main/res/drawable/telegram_logo_50.xml similarity index 100% rename from app/res/drawable/telegram_logo_50.xml rename to app/src/main/res/drawable/telegram_logo_50.xml diff --git a/app/res/drawable/thumb.xml b/app/src/main/res/drawable/thumb.xml similarity index 100% rename from app/res/drawable/thumb.xml rename to app/src/main/res/drawable/thumb.xml diff --git a/app/res/drawable/thumb_drawable.xml b/app/src/main/res/drawable/thumb_drawable.xml similarity index 100% rename from app/res/drawable/thumb_drawable.xml rename to app/src/main/res/drawable/thumb_drawable.xml diff --git a/app/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml similarity index 100% rename from app/res/layout/activity_about.xml rename to app/src/main/res/layout/activity_about.xml diff --git a/app/res/layout/activity_experiments.xml b/app/src/main/res/layout/activity_experiments.xml similarity index 100% rename from app/res/layout/activity_experiments.xml rename to app/src/main/res/layout/activity_experiments.xml diff --git a/app/res/layout/activity_map.xml b/app/src/main/res/layout/activity_map.xml similarity index 100% rename from app/res/layout/activity_map.xml rename to app/src/main/res/layout/activity_map.xml diff --git a/app/res/layout/activity_principal.xml b/app/src/main/res/layout/activity_principal.xml similarity index 100% rename from app/res/layout/activity_principal.xml rename to app/src/main/res/layout/activity_principal.xml diff --git a/app/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml similarity index 100% rename from app/res/layout/activity_settings.xml rename to app/src/main/res/layout/activity_settings.xml diff --git a/app/res/layout/arrivals_nearby_card.xml b/app/src/main/res/layout/arrivals_nearby_card.xml similarity index 100% rename from app/res/layout/arrivals_nearby_card.xml rename to app/src/main/res/layout/arrivals_nearby_card.xml diff --git a/app/res/layout/bus_info_window.xml b/app/src/main/res/layout/bus_info_window.xml similarity index 100% rename from app/res/layout/bus_info_window.xml rename to app/src/main/res/layout/bus_info_window.xml diff --git a/app/res/layout/default_toobar.xml b/app/src/main/res/layout/default_toobar.xml similarity index 100% rename from app/res/layout/default_toobar.xml rename to app/src/main/res/layout/default_toobar.xml diff --git a/app/res/layout/entry_bus_line_passage.xml b/app/src/main/res/layout/entry_bus_line_passage.xml similarity index 100% rename from app/res/layout/entry_bus_line_passage.xml rename to app/src/main/res/layout/entry_bus_line_passage.xml diff --git a/app/res/layout/entry_bus_stop.xml b/app/src/main/res/layout/entry_bus_stop.xml similarity index 100% rename from app/res/layout/entry_bus_stop.xml rename to app/src/main/res/layout/entry_bus_stop.xml diff --git a/app/res/layout/fragment_arrivals.xml b/app/src/main/res/layout/fragment_arrivals.xml similarity index 100% rename from app/res/layout/fragment_arrivals.xml rename to app/src/main/res/layout/fragment_arrivals.xml diff --git a/app/res/layout/fragment_favorites.xml b/app/src/main/res/layout/fragment_favorites.xml similarity index 100% rename from app/res/layout/fragment_favorites.xml rename to app/src/main/res/layout/fragment_favorites.xml diff --git a/app/res/layout/fragment_lines.xml b/app/src/main/res/layout/fragment_lines.xml similarity index 100% rename from app/res/layout/fragment_lines.xml rename to app/src/main/res/layout/fragment_lines.xml diff --git a/app/res/layout/fragment_lines_detail.xml b/app/src/main/res/layout/fragment_lines_detail.xml similarity index 100% rename from app/res/layout/fragment_lines_detail.xml rename to app/src/main/res/layout/fragment_lines_detail.xml diff --git a/app/res/layout/fragment_list_view.xml b/app/src/main/res/layout/fragment_list_view.xml similarity index 100% rename from app/res/layout/fragment_list_view.xml rename to app/src/main/res/layout/fragment_list_view.xml diff --git a/app/res/layout/fragment_main_screen.xml b/app/src/main/res/layout/fragment_main_screen.xml similarity index 100% rename from app/res/layout/fragment_main_screen.xml rename to app/src/main/res/layout/fragment_main_screen.xml diff --git a/app/res/layout/fragment_nearby_stops.xml b/app/src/main/res/layout/fragment_nearby_stops.xml similarity index 100% rename from app/res/layout/fragment_nearby_stops.xml rename to app/src/main/res/layout/fragment_nearby_stops.xml diff --git a/app/res/layout/fragment_test_realtime_gtfs.xml b/app/src/main/res/layout/fragment_test_realtime_gtfs.xml similarity index 100% rename from app/res/layout/fragment_test_realtime_gtfs.xml rename to app/src/main/res/layout/fragment_test_realtime_gtfs.xml diff --git a/app/res/layout/map_popup.xml b/app/src/main/res/layout/map_popup.xml similarity index 100% rename from app/res/layout/map_popup.xml rename to app/src/main/res/layout/map_popup.xml diff --git a/app/res/layout/nav_header.xml b/app/src/main/res/layout/nav_header.xml similarity index 100% rename from app/res/layout/nav_header.xml rename to app/src/main/res/layout/nav_header.xml diff --git a/app/res/layout/rename_dialog.xml b/app/src/main/res/layout/rename_dialog.xml similarity index 100% rename from app/res/layout/rename_dialog.xml rename to app/src/main/res/layout/rename_dialog.xml diff --git a/app/res/layout/stop_card.xml b/app/src/main/res/layout/stop_card.xml similarity index 100% rename from app/res/layout/stop_card.xml rename to app/src/main/res/layout/stop_card.xml diff --git a/app/res/layout/stop_line_element.xml b/app/src/main/res/layout/stop_line_element.xml similarity index 100% rename from app/res/layout/stop_line_element.xml rename to app/src/main/res/layout/stop_line_element.xml diff --git a/app/res/menu/drawer_main.xml b/app/src/main/res/menu/drawer_main.xml similarity index 100% rename from app/res/menu/drawer_main.xml rename to app/src/main/res/menu/drawer_main.xml diff --git a/app/res/menu/menu_favourites_entry.xml b/app/src/main/res/menu/menu_favourites_entry.xml similarity index 100% rename from app/res/menu/menu_favourites_entry.xml rename to app/src/main/res/menu/menu_favourites_entry.xml diff --git a/app/res/menu/menu_line_item.xml b/app/src/main/res/menu/menu_line_item.xml similarity index 100% rename from app/res/menu/menu_line_item.xml rename to app/src/main/res/menu/menu_line_item.xml diff --git a/app/res/menu/menu_settings.xml b/app/src/main/res/menu/menu_settings.xml similarity index 100% rename from app/res/menu/menu_settings.xml rename to app/src/main/res/menu/menu_settings.xml diff --git a/app/res/menu/principal_menu.xml b/app/src/main/res/menu/principal_menu.xml similarity index 100% rename from app/res/menu/principal_menu.xml rename to app/src/main/res/menu/principal_menu.xml diff --git a/app/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from app/res/mipmap-anydpi-v26/ic_launcher.xml rename to app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/app/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from app/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/app/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from app/res/mipmap-hdpi/ic_launcher.png rename to app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/app/res/mipmap-hdpi/ic_launcher_background.png b/app/src/main/res/mipmap-hdpi/ic_launcher_background.png similarity index 100% rename from app/res/mipmap-hdpi/ic_launcher_background.png rename to app/src/main/res/mipmap-hdpi/ic_launcher_background.png diff --git a/app/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png similarity index 100% rename from app/res/mipmap-hdpi/ic_launcher_foreground.png rename to app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png diff --git a/app/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png similarity index 100% rename from app/res/mipmap-hdpi/ic_launcher_round.png rename to app/src/main/res/mipmap-hdpi/ic_launcher_round.png diff --git a/app/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from app/res/mipmap-mdpi/ic_launcher.png rename to app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/app/res/mipmap-mdpi/ic_launcher_background.png b/app/src/main/res/mipmap-mdpi/ic_launcher_background.png similarity index 100% rename from app/res/mipmap-mdpi/ic_launcher_background.png rename to app/src/main/res/mipmap-mdpi/ic_launcher_background.png diff --git a/app/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png similarity index 100% rename from app/res/mipmap-mdpi/ic_launcher_foreground.png rename to app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png diff --git a/app/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png similarity index 100% rename from app/res/mipmap-mdpi/ic_launcher_round.png rename to app/src/main/res/mipmap-mdpi/ic_launcher_round.png diff --git a/app/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from app/res/mipmap-xhdpi/ic_launcher.png rename to app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/app/res/mipmap-xhdpi/ic_launcher_background.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png similarity index 100% rename from app/res/mipmap-xhdpi/ic_launcher_background.png rename to app/src/main/res/mipmap-xhdpi/ic_launcher_background.png diff --git a/app/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png similarity index 100% rename from app/res/mipmap-xhdpi/ic_launcher_foreground.png rename to app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png diff --git a/app/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png similarity index 100% rename from app/res/mipmap-xhdpi/ic_launcher_round.png rename to app/src/main/res/mipmap-xhdpi/ic_launcher_round.png diff --git a/app/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from app/res/mipmap-xxhdpi/ic_launcher.png rename to app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/app/res/mipmap-xxhdpi/ic_launcher_background.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png similarity index 100% rename from app/res/mipmap-xxhdpi/ic_launcher_background.png rename to app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png diff --git a/app/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png similarity index 100% rename from app/res/mipmap-xxhdpi/ic_launcher_foreground.png rename to app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png diff --git a/app/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png similarity index 100% rename from app/res/mipmap-xxhdpi/ic_launcher_round.png rename to app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png diff --git a/app/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from app/res/mipmap-xxxhdpi/ic_launcher.png rename to app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/app/res/mipmap-xxxhdpi/ic_launcher_background.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png similarity index 100% rename from app/res/mipmap-xxxhdpi/ic_launcher_background.png rename to app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png diff --git a/app/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png similarity index 100% rename from app/res/mipmap-xxxhdpi/ic_launcher_foreground.png rename to app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png diff --git a/app/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png similarity index 100% rename from app/res/mipmap-xxxhdpi/ic_launcher_round.png rename to app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png diff --git a/app/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml similarity index 100% rename from app/res/values-it/strings.xml rename to app/src/main/res/values-it/strings.xml diff --git a/app/res/values-v19/styles.xml b/app/src/main/res/values-v19/styles.xml similarity index 100% rename from app/res/values-v19/styles.xml rename to app/src/main/res/values-v19/styles.xml diff --git a/app/res/values-w820dp/dimens.xml b/app/src/main/res/values-w820dp/dimens.xml similarity index 100% rename from app/res/values-w820dp/dimens.xml rename to app/src/main/res/values-w820dp/dimens.xml diff --git a/app/res/values/colors.xml b/app/src/main/res/values/colors.xml similarity index 100% rename from app/res/values/colors.xml rename to app/src/main/res/values/colors.xml diff --git a/app/res/values/dimens.xml b/app/src/main/res/values/dimens.xml similarity index 100% rename from app/res/values/dimens.xml rename to app/src/main/res/values/dimens.xml diff --git a/app/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml similarity index 100% rename from app/res/values/ic_launcher_background.xml rename to app/src/main/res/values/ic_launcher_background.xml diff --git a/app/res/values/keys.xml b/app/src/main/res/values/keys.xml similarity index 100% rename from app/res/values/keys.xml rename to app/src/main/res/values/keys.xml diff --git a/app/res/values/pref_keys.xml b/app/src/main/res/values/pref_keys.xml similarity index 100% rename from app/res/values/pref_keys.xml rename to app/src/main/res/values/pref_keys.xml diff --git a/app/res/values/strings.xml b/app/src/main/res/values/strings.xml similarity index 99% rename from app/res/values/strings.xml rename to app/src/main/res/values/strings.xml index 6c5c1c3..3eed7a5 100644 --- a/app/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,241 +1,242 @@ BusTO Libre BusTO BusTO dev + BusTO git You\'re using the latest in technology when it comes to respecting your privacy. Search Scan QR Code Yes No Install Barcode Scanner? This application requires an app to scan the QR codes. Would you like to install Barcode Scanner now? Bus stop number Bus stop name Insert bus stop number Insert bus stop name %1$s towards %2$s %s (unknown destination) Verify your Internet connection! Seems that no bus stop have this name No arrivals found for this stop Error parsing the 5T/GTT website (damn site!) Name too short, type more characters and retry Arrivals at: %1$s Choose the bus stop… Line Lines Lines: %1$s Line: %1$s No timetable found No QR code found, try using another app to scan Unexpected internal error, cannot extract data from GTT/5T website Help About More about Contribute https://gitpull.it/w/librebusto/en/ Source code Licence11 Meet the author Bus stop is now in your favorites Bus stop removed from your favorites Favorites Favorites Map No favorites? Arghh! Press on a bus stop star to populate this list! Delete Rename Rename the bus stop Reset About Tap the star to add the bus stop to the favourites\n\nHow to read timelines:\n   12:56* Real-time arrivals\n   12:56   Scheduled arrivals\n\nPull down to refresh the timetable \n Long press on Arrivals source to change the source of the arrival times GOT IT! Arrival times Welcome!

Thanks for using BusTO, a "politically" independent app useful to move around Torino using a Free/Libre software.

Why use this app?

- You\'ll never be tracked
- You\'ll never see boring ads
- We\'ll always respect your privacy
- Moreover, it\'s lightweight!

How does it work?

This app will show you bus timetables gathering data from www.gtt.to.it or www.5t.torino.it "for personal use".

Who worked on BusTO:
- Fabio Mazza current senior rockstar developer.
- Andrea Ugo current junior rockstar developer.
- Silviu Chiriac designer of the 2021 logo.
- Marco M rockstar tester and bug hunter.
- Ludovico Pavesi previous senior rockstar developer asd.
- Valerio Bozzolan maintainer and infrastructure sponsor.
- Marco Gagino contributor and icon creator.
- JSoup web scraper library.
- makovkastar floating buttons.
- Google Material Design icons.
- All the contributors!

Licenses

The app and the related source code are released by Valerio Bozzolan under the terms of the GNU General Public License v3+). So everyone is allowed to use, to study, to improve and to share this app by any kind of means and for any purpose: under the conditions of maintaining this rights and of attributing the original work to Valerio Bozzolan.

Notes

This app has been developed hoping to be useful to everyone but without ANY warranty.

This translation is kindly provided by Riccardo Caniato and Marco Gagino.

Get involved! :)

]]> Cannot add to favorites (storage full or corrupted database?)! View on a map Cannot find any application to show it in Cannot find the position of the stop ListFragment - BusTO it.reyboz.bustorino.preferences db_is_updating Nearby stops Nearby connections App version The number of stops to show in the recents is invalid Invalid value, put a valid number Finding the position… No stops nearby Minimum number of stops Preferences Settings Settings General Experimental features Maximum distance (meters) Recent stops General settings Database management Launch manual database update Allow access to position to show it on the map Please enable GPS Database update in progress… Updating the database Force database update Touch to update the app database now is arriving at at the stop %1$s - %2$s Show arrivals Show stops Join Telegram channel Center on my location Follow me Arrivals source: %1$s GTT App GTT Website 5T Torino website Muoversi a Torino app Undetermined Changing arrival times source… Long press to change the source of arrivals @string/source_mato @string/fivetapifetcher @string/gttjsonfetcher @string/fivetscraper Sources of arrival times Select which sources of arrival times to use Default Default channel for notifications Database Notifications on the update of the database Downloading trips from MaTO server Asked for %1$s permission too many times Cannot use the map with the storage permission! storage The application has crashed because you encountered a bug. \nIf you want, you can help the developers by sending the crash report via email. \nNote that no sensitive data is contained in the report, just small bits of info on your phone and app configuration/state. The application crashed and the crash report is in the attachments. Please describe what you were doing before the crash: \n Arrivals Map Favorites Open navigation drawer Close navigation drawer Experiments Buy us a coffee Map Search by stop Launching database update Capitalize directions Do not change arrivals directions Capitalize everything Capitalize only first letter KEEP CAPITALIZE_ALL CAPITALIZE_FIRST Section to show on startup Touch to change it Show arrivals touching on stop Enable experiments Long press the stop for options @string/nav_arrivals_text @string/nav_favorites_text @string/nav_map_text @string/lines Hello blank fragment diff --git a/app/res/values/styles.xml b/app/src/main/res/values/styles.xml similarity index 100% rename from app/res/values/styles.xml rename to app/src/main/res/values/styles.xml diff --git a/app/res/values/theme.xml b/app/src/main/res/values/theme.xml similarity index 100% rename from app/res/values/theme.xml rename to app/src/main/res/values/theme.xml diff --git a/app/res/xml/networks_security_config.xml b/app/src/main/res/xml/networks_security_config.xml similarity index 100% rename from app/res/xml/networks_security_config.xml rename to app/src/main/res/xml/networks_security_config.xml diff --git a/app/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml similarity index 100% rename from app/res/xml/preferences.xml rename to app/src/main/res/xml/preferences.xml