diff --git a/app/build.gradle b/app/build.gradle index f58e10d..920fcd7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,7 +14,7 @@ android { compileSdkVersion 30 buildToolsVersion '30.0.0' defaultConfig { - applicationId "com.example.ithaca_transit_android_v2" + applicationId "com.cornellappdev.android.ithaca_transit" minSdkVersion 23 targetSdkVersion 30 versionCode 1 diff --git a/app/release/app-release.aab b/app/release/app-release.aab new file mode 100644 index 0000000..fa644fd Binary files /dev/null and b/app/release/app-release.aab differ diff --git a/app/src/androidTest/java/com/example/ithaca_transit_android_v2/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/cornellappdev/android/ithaca_transit/ExampleInstrumentedTest.kt similarity index 93% rename from app/src/androidTest/java/com/example/ithaca_transit_android_v2/ExampleInstrumentedTest.kt rename to app/src/androidTest/java/com/cornellappdev/android/ithaca_transit/ExampleInstrumentedTest.kt index 71808ea..1e875ef 100644 --- a/app/src/androidTest/java/com/example/ithaca_transit_android_v2/ExampleInstrumentedTest.kt +++ b/app/src/androidTest/java/com/cornellappdev/android/ithaca_transit/ExampleInstrumentedTest.kt @@ -1,4 +1,4 @@ -package com.example.ithaca_transit_android_v2 +package com.cornellappdev.android.ithaca_transit import androidx.test.platform.app.InstrumentationRegistry import androidx.test.ext.junit.runners.AndroidJUnit4 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 158ba68..a412ae7 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="com.cornellappdev.android.ithaca_transit"> diff --git a/app/src/main/java/com/example/ithaca_transit_android_v2/MainActivity.kt b/app/src/main/java/com/cornellappdev/android/ithaca_transit/MainActivity.kt similarity index 83% rename from app/src/main/java/com/example/ithaca_transit_android_v2/MainActivity.kt rename to app/src/main/java/com/cornellappdev/android/ithaca_transit/MainActivity.kt index 018d8c4..7abaa5c 100644 --- a/app/src/main/java/com/example/ithaca_transit_android_v2/MainActivity.kt +++ b/app/src/main/java/com/cornellappdev/android/ithaca_transit/MainActivity.kt @@ -1,4 +1,4 @@ -package com.example.ithaca_transit_android_v2 +package com.cornellappdev.android.ithaca_transit import android.content.Context import android.content.pm.PackageManager @@ -7,20 +7,18 @@ import android.os.Bundle import androidx.appcompat.app.AppCompatActivity import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.example.ithaca_transit_android_v2.models.Location -import com.example.ithaca_transit_android_v2.models.Route -import com.example.ithaca_transit_android_v2.presenters.MapPresenter -import com.example.ithaca_transit_android_v2.presenters.RouteOptionsPresenter -import com.example.ithaca_transit_android_v2.presenters.SearchPresenter -import com.example.ithaca_transit_android_v2.ui_adapters.RouteDetailAdapter -import com.example.ithaca_transit_android_v2.ui_adapters.SearchViewAdapter +import com.cornellappdev.android.ithaca_transit.models.Location +import com.cornellappdev.android.ithaca_transit.presenters.MapPresenter +import com.cornellappdev.android.ithaca_transit.presenters.RouteOptionsPresenter +import com.cornellappdev.android.ithaca_transit.presenters.SearchPresenter +import com.cornellappdev.android.ithaca_transit.ui_adapters.RouteDetailAdapter +import com.cornellappdev.android.ithaca_transit.ui_adapters.SearchViewAdapter -import com.example.ithaca_transit_android_v2.util.CurrLocationManager -import com.example.ithaca_transit_android_v2.ui_adapters.RouteListViewAdapter +import com.cornellappdev.android.ithaca_transit.util.CurrLocationManager +import com.cornellappdev.android.ithaca_transit.ui_adapters.RouteListViewAdapter import com.google.android.gms.maps.GoogleMap import com.google.android.gms.maps.OnMapReadyCallback -import com.google.android.material.bottomsheet.BottomSheetBehavior import io.reactivex.disposables.Disposable import kotlinx.android.synthetic.main.activity_main.* import kotlinx.android.synthetic.main.routes_holder.* diff --git a/app/src/main/java/com/example/ithaca_transit_android_v2/MapFragment.kt b/app/src/main/java/com/cornellappdev/android/ithaca_transit/MapFragment.kt similarity index 77% rename from app/src/main/java/com/example/ithaca_transit_android_v2/MapFragment.kt rename to app/src/main/java/com/cornellappdev/android/ithaca_transit/MapFragment.kt index e9f54dd..d99c8dc 100644 --- a/app/src/main/java/com/example/ithaca_transit_android_v2/MapFragment.kt +++ b/app/src/main/java/com/cornellappdev/android/ithaca_transit/MapFragment.kt @@ -1,30 +1,16 @@ -package com.example.ithaca_transit_android_v2 +package com.cornellappdev.android.ithaca_transit -import android.Manifest -import android.content.pm.PackageManager -import android.graphics.Color import android.os.Bundle -import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import androidx.core.app.ActivityCompat import androidx.fragment.app.Fragment -import com.example.ithaca_transit_android_v2.R.id.start -import com.example.ithaca_transit_android_v2.models.* -import com.example.ithaca_transit_android_v2.presenters.MapPresenter -import com.example.ithaca_transit_android_v2.presenters.SearchPresenter -import com.google.android.gms.common.GooglePlayServicesRepairableException +import com.cornellappdev.android.ithaca_transit.presenters.MapPresenter import com.google.android.gms.maps.GoogleMap import com.google.android.gms.maps.MapView -import com.google.android.gms.maps.CameraUpdateFactory import com.google.android.gms.maps.OnMapReadyCallback import com.google.android.gms.maps.model.* -import java.util.* -import com.google.android.gms.maps.model.LatLng -import com.google.android.gms.maps.model.MarkerOptions import io.reactivex.disposables.Disposable -import kotlinx.android.synthetic.main.search_main.* class MapFragment: Fragment() , OnMapReadyCallback, GoogleMap.OnPolylineClickListener{ override fun onPolylineClick(p0: Polyline?) { diff --git a/app/src/main/java/com/example/ithaca_transit_android_v2/NetworkUtils.kt b/app/src/main/java/com/cornellappdev/android/ithaca_transit/NetworkUtils.kt similarity index 96% rename from app/src/main/java/com/example/ithaca_transit_android_v2/NetworkUtils.kt rename to app/src/main/java/com/cornellappdev/android/ithaca_transit/NetworkUtils.kt index d5d30dd..4f28390 100644 --- a/app/src/main/java/com/example/ithaca_transit_android_v2/NetworkUtils.kt +++ b/app/src/main/java/com/cornellappdev/android/ithaca_transit/NetworkUtils.kt @@ -1,7 +1,7 @@ -package com.example.ithaca_transit_android_v2 +package com.cornellappdev.android.ithaca_transit import android.util.Log -import com.example.ithaca_transit_android_v2.models.* -import com.example.ithaca_transit_android_v2.models.tracking.BusInformation +import com.cornellappdev.android.ithaca_transit.models.* +import com.cornellappdev.android.ithaca_transit.models.tracking.BusInformation import com.squareup.moshi.JsonAdapter import com.squareup.moshi.Moshi import com.squareup.moshi.Types.newParameterizedType diff --git a/app/src/main/java/com/example/ithaca_transit_android_v2/NetworkingAdapters.kt b/app/src/main/java/com/cornellappdev/android/ithaca_transit/NetworkingAdapters.kt similarity index 96% rename from app/src/main/java/com/example/ithaca_transit_android_v2/NetworkingAdapters.kt rename to app/src/main/java/com/cornellappdev/android/ithaca_transit/NetworkingAdapters.kt index b75a80c..6decf20 100644 --- a/app/src/main/java/com/example/ithaca_transit_android_v2/NetworkingAdapters.kt +++ b/app/src/main/java/com/cornellappdev/android/ithaca_transit/NetworkingAdapters.kt @@ -1,7 +1,6 @@ -package com.example.ithaca_transit_android_v2 +package com.cornellappdev.android.ithaca_transit -import android.util.Log -import com.example.ithaca_transit_android_v2.models.* +import com.cornellappdev.android.ithaca_transit.models.* import com.squareup.moshi.* import java.lang.Exception import java.text.SimpleDateFormat diff --git a/app/src/main/java/com/example/ithaca_transit_android_v2/Repository.kt b/app/src/main/java/com/cornellappdev/android/ithaca_transit/Repository.kt similarity index 75% rename from app/src/main/java/com/example/ithaca_transit_android_v2/Repository.kt rename to app/src/main/java/com/cornellappdev/android/ithaca_transit/Repository.kt index f8fd7b5..ffd8cc6 100644 --- a/app/src/main/java/com/example/ithaca_transit_android_v2/Repository.kt +++ b/app/src/main/java/com/cornellappdev/android/ithaca_transit/Repository.kt @@ -1,9 +1,9 @@ -package com.example.ithaca_transit_android_v2 +package com.cornellappdev.android.ithaca_transit -import com.example.ithaca_transit_android_v2.models.Coordinate -import com.example.ithaca_transit_android_v2.models.Location -import com.example.ithaca_transit_android_v2.models.LocationType -import com.example.ithaca_transit_android_v2.models.Route +import com.cornellappdev.android.ithaca_transit.models.Coordinate +import com.cornellappdev.android.ithaca_transit.models.Location +import com.cornellappdev.android.ithaca_transit.models.LocationType +import com.cornellappdev.android.ithaca_transit.models.Route object Repository { init { diff --git a/app/src/main/java/com/example/ithaca_transit_android_v2/models/ActionType.kt b/app/src/main/java/com/cornellappdev/android/ithaca_transit/models/ActionType.kt similarity index 75% rename from app/src/main/java/com/example/ithaca_transit_android_v2/models/ActionType.kt rename to app/src/main/java/com/cornellappdev/android/ithaca_transit/models/ActionType.kt index 29f0987..3d2a6f7 100644 --- a/app/src/main/java/com/example/ithaca_transit_android_v2/models/ActionType.kt +++ b/app/src/main/java/com/cornellappdev/android/ithaca_transit/models/ActionType.kt @@ -1,4 +1,4 @@ -package com.example.ithaca_transit_android_v2.models +package com.cornellappdev.android.ithaca_transit.models /* Represents the types of action a user can take while on their Trip. diff --git a/app/src/main/java/com/example/ithaca_transit_android_v2/models/Coordinate.kt b/app/src/main/java/com/cornellappdev/android/ithaca_transit/models/Coordinate.kt similarity index 84% rename from app/src/main/java/com/example/ithaca_transit_android_v2/models/Coordinate.kt rename to app/src/main/java/com/cornellappdev/android/ithaca_transit/models/Coordinate.kt index 0652b34..5169e54 100644 --- a/app/src/main/java/com/example/ithaca_transit_android_v2/models/Coordinate.kt +++ b/app/src/main/java/com/cornellappdev/android/ithaca_transit/models/Coordinate.kt @@ -1,4 +1,4 @@ -package com.example.ithaca_transit_android_v2.models +package com.cornellappdev.android.ithaca_transit.models import com.squareup.moshi.Json diff --git a/app/src/main/java/com/example/ithaca_transit_android_v2/models/Direction.kt b/app/src/main/java/com/cornellappdev/android/ithaca_transit/models/Direction.kt similarity index 92% rename from app/src/main/java/com/example/ithaca_transit_android_v2/models/Direction.kt rename to app/src/main/java/com/cornellappdev/android/ithaca_transit/models/Direction.kt index f6aa556..c1455b7 100644 --- a/app/src/main/java/com/example/ithaca_transit_android_v2/models/Direction.kt +++ b/app/src/main/java/com/cornellappdev/android/ithaca_transit/models/Direction.kt @@ -1,4 +1,4 @@ -package com.example.ithaca_transit_android_v2.models +package com.cornellappdev.android.ithaca_transit.models import com.squareup.moshi.Json import com.squareup.moshi.JsonClass import java.util.Date diff --git a/app/src/main/java/com/example/ithaca_transit_android_v2/models/DirectionType.kt b/app/src/main/java/com/cornellappdev/android/ithaca_transit/models/DirectionType.kt similarity index 77% rename from app/src/main/java/com/example/ithaca_transit_android_v2/models/DirectionType.kt rename to app/src/main/java/com/cornellappdev/android/ithaca_transit/models/DirectionType.kt index e4b0668..d4ed84f 100644 --- a/app/src/main/java/com/example/ithaca_transit_android_v2/models/DirectionType.kt +++ b/app/src/main/java/com/cornellappdev/android/ithaca_transit/models/DirectionType.kt @@ -1,4 +1,4 @@ -package com.example.ithaca_transit_android_v2.models +package com.cornellappdev.android.ithaca_transit.models import com.squareup.moshi.Json diff --git a/app/src/main/java/com/example/ithaca_transit_android_v2/models/Location.kt b/app/src/main/java/com/cornellappdev/android/ithaca_transit/models/Location.kt similarity index 68% rename from app/src/main/java/com/example/ithaca_transit_android_v2/models/Location.kt rename to app/src/main/java/com/cornellappdev/android/ithaca_transit/models/Location.kt index 80608e9..70494b3 100644 --- a/app/src/main/java/com/example/ithaca_transit_android_v2/models/Location.kt +++ b/app/src/main/java/com/cornellappdev/android/ithaca_transit/models/Location.kt @@ -1,8 +1,6 @@ -package com.example.ithaca_transit_android_v2.models +package com.cornellappdev.android.ithaca_transit.models -import android.os.Parcelable import com.squareup.moshi.JsonClass -import kotlinx.android.parcel.Parcelize //Location. - Represents either a bus stop or a google place. @JsonClass(generateAdapter = true) diff --git a/app/src/main/java/com/example/ithaca_transit_android_v2/models/LocationType.kt b/app/src/main/java/com/cornellappdev/android/ithaca_transit/models/LocationType.kt similarity index 72% rename from app/src/main/java/com/example/ithaca_transit_android_v2/models/LocationType.kt rename to app/src/main/java/com/cornellappdev/android/ithaca_transit/models/LocationType.kt index dd998ec..373e45a 100644 --- a/app/src/main/java/com/example/ithaca_transit_android_v2/models/LocationType.kt +++ b/app/src/main/java/com/cornellappdev/android/ithaca_transit/models/LocationType.kt @@ -1,4 +1,4 @@ -package com.example.ithaca_transit_android_v2.models +package com.cornellappdev.android.ithaca_transit.models import com.squareup.moshi.Json diff --git a/app/src/main/java/com/example/ithaca_transit_android_v2/models/Route.kt b/app/src/main/java/com/cornellappdev/android/ithaca_transit/models/Route.kt similarity index 96% rename from app/src/main/java/com/example/ithaca_transit_android_v2/models/Route.kt rename to app/src/main/java/com/cornellappdev/android/ithaca_transit/models/Route.kt index 9288eaf..d16e542 100644 --- a/app/src/main/java/com/example/ithaca_transit_android_v2/models/Route.kt +++ b/app/src/main/java/com/cornellappdev/android/ithaca_transit/models/Route.kt @@ -1,6 +1,5 @@ -package com.example.ithaca_transit_android_v2.models +package com.cornellappdev.android.ithaca_transit.models -import android.util.Log import com.squareup.moshi.Json import com.squareup.moshi.JsonClass import java.text.SimpleDateFormat diff --git a/app/src/main/java/com/example/ithaca_transit_android_v2/models/RouteOptions.kt b/app/src/main/java/com/cornellappdev/android/ithaca_transit/models/RouteOptions.kt similarity index 80% rename from app/src/main/java/com/example/ithaca_transit_android_v2/models/RouteOptions.kt rename to app/src/main/java/com/cornellappdev/android/ithaca_transit/models/RouteOptions.kt index 2107ea7..5362070 100644 --- a/app/src/main/java/com/example/ithaca_transit_android_v2/models/RouteOptions.kt +++ b/app/src/main/java/com/cornellappdev/android/ithaca_transit/models/RouteOptions.kt @@ -1,6 +1,5 @@ -package com.example.ithaca_transit_android_v2.models +package com.cornellappdev.android.ithaca_transit.models -import com.squareup.moshi.Json import com.squareup.moshi.JsonClass /* diff --git a/app/src/main/java/com/example/ithaca_transit_android_v2/models/Stop.kt b/app/src/main/java/com/cornellappdev/android/ithaca_transit/models/Stop.kt similarity index 67% rename from app/src/main/java/com/example/ithaca_transit_android_v2/models/Stop.kt rename to app/src/main/java/com/cornellappdev/android/ithaca_transit/models/Stop.kt index 0e01d71..15ddf1e 100644 --- a/app/src/main/java/com/example/ithaca_transit_android_v2/models/Stop.kt +++ b/app/src/main/java/com/cornellappdev/android/ithaca_transit/models/Stop.kt @@ -1,5 +1,4 @@ -package com.example.ithaca_transit_android_v2.models -import com.squareup.moshi.Json +package com.cornellappdev.android.ithaca_transit.models import com.squareup.moshi.JsonClass @JsonClass(generateAdapter = true) data class Stop( diff --git a/app/src/main/java/com/example/ithaca_transit_android_v2/models/tracking/BusInformation.kt b/app/src/main/java/com/cornellappdev/android/ithaca_transit/models/tracking/BusInformation.kt similarity index 54% rename from app/src/main/java/com/example/ithaca_transit_android_v2/models/tracking/BusInformation.kt rename to app/src/main/java/com/cornellappdev/android/ithaca_transit/models/tracking/BusInformation.kt index 35cf40b..d37c5be 100644 --- a/app/src/main/java/com/example/ithaca_transit_android_v2/models/tracking/BusInformation.kt +++ b/app/src/main/java/com/cornellappdev/android/ithaca_transit/models/tracking/BusInformation.kt @@ -1,4 +1,4 @@ -package com.example.ithaca_transit_android_v2.models.tracking +package com.cornellappdev.android.ithaca_transit.models.tracking data class BusInformation( val tripId: String?, diff --git a/app/src/main/java/com/example/ithaca_transit_android_v2/models/tracking/TrackingData.kt b/app/src/main/java/com/cornellappdev/android/ithaca_transit/models/tracking/TrackingData.kt similarity index 73% rename from app/src/main/java/com/example/ithaca_transit_android_v2/models/tracking/TrackingData.kt rename to app/src/main/java/com/cornellappdev/android/ithaca_transit/models/tracking/TrackingData.kt index 29667e2..3e98e17 100644 --- a/app/src/main/java/com/example/ithaca_transit_android_v2/models/tracking/TrackingData.kt +++ b/app/src/main/java/com/cornellappdev/android/ithaca_transit/models/tracking/TrackingData.kt @@ -1,10 +1,7 @@ -package com.example.ithaca_transit_android_v2.models.tracking +package com.cornellappdev.android.ithaca_transit.models.tracking -import com.example.ithaca_transit_android_v2.models.Coordinate -import com.example.ithaca_transit_android_v2.models.Direction import com.squareup.moshi.Json import com.squareup.moshi.JsonClass -import java.util.* @JsonClass(generateAdapter = true) data class TrackingData ( diff --git a/app/src/main/java/com/example/ithaca_transit_android_v2/presenters/MapPresenter.kt b/app/src/main/java/com/cornellappdev/android/ithaca_transit/presenters/MapPresenter.kt similarity index 88% rename from app/src/main/java/com/example/ithaca_transit_android_v2/presenters/MapPresenter.kt rename to app/src/main/java/com/cornellappdev/android/ithaca_transit/presenters/MapPresenter.kt index b308b68..987772e 100644 --- a/app/src/main/java/com/example/ithaca_transit_android_v2/presenters/MapPresenter.kt +++ b/app/src/main/java/com/cornellappdev/android/ithaca_transit/presenters/MapPresenter.kt @@ -1,15 +1,15 @@ -package com.example.ithaca_transit_android_v2.presenters +package com.cornellappdev.android.ithaca_transit.presenters import android.graphics.Color import android.util.Log -import com.example.ithaca_transit_android_v2.NetworkUtils -import com.example.ithaca_transit_android_v2.Repository -import com.example.ithaca_transit_android_v2.models.DirectionType -import com.example.ithaca_transit_android_v2.models.Route -import com.example.ithaca_transit_android_v2.models.tracking.BusInformation -import com.example.ithaca_transit_android_v2.states.MapLaunchState -import com.example.ithaca_transit_android_v2.states.MapState -import com.example.ithaca_transit_android_v2.states.SelectedTrip +import com.cornellappdev.android.ithaca_transit.NetworkUtils +import com.cornellappdev.android.ithaca_transit.Repository +import com.cornellappdev.android.ithaca_transit.models.DirectionType +import com.cornellappdev.android.ithaca_transit.models.Route +import com.cornellappdev.android.ithaca_transit.models.tracking.BusInformation +import com.cornellappdev.android.ithaca_transit.states.MapLaunchState +import com.cornellappdev.android.ithaca_transit.states.MapState +import com.cornellappdev.android.ithaca_transit.states.SelectedTrip import com.google.android.gms.maps.CameraUpdateFactory import com.google.android.gms.maps.GoogleMap import com.google.android.gms.maps.model.LatLng diff --git a/app/src/main/java/com/example/ithaca_transit_android_v2/presenters/RouteOptionsPresenter.kt b/app/src/main/java/com/cornellappdev/android/ithaca_transit/presenters/RouteOptionsPresenter.kt similarity index 93% rename from app/src/main/java/com/example/ithaca_transit_android_v2/presenters/RouteOptionsPresenter.kt rename to app/src/main/java/com/cornellappdev/android/ithaca_transit/presenters/RouteOptionsPresenter.kt index 6e69d7f..74ef720 100644 --- a/app/src/main/java/com/example/ithaca_transit_android_v2/presenters/RouteOptionsPresenter.kt +++ b/app/src/main/java/com/cornellappdev/android/ithaca_transit/presenters/RouteOptionsPresenter.kt @@ -1,20 +1,20 @@ -package com.example.ithaca_transit_android_v2.presenters +package com.cornellappdev.android.ithaca_transit.presenters import android.content.Context import android.util.TypedValue import android.view.View import android.widget.LinearLayout import androidx.annotation.NonNull -import com.example.ithaca_transit_android_v2.NetworkUtils -import com.example.ithaca_transit_android_v2.Repository -import com.example.ithaca_transit_android_v2.models.Route -import com.example.ithaca_transit_android_v2.states.OptionsHiddenState -import com.example.ithaca_transit_android_v2.states.RouteCardState -import com.example.ithaca_transit_android_v2.states.RouteDetailViewState -import com.example.ithaca_transit_android_v2.states.RouteListState -import com.example.ithaca_transit_android_v2.ui_adapters.RouteDetailAdapter -import com.example.ithaca_transit_android_v2.ui_adapters.RouteListAdapterObject -import com.example.ithaca_transit_android_v2.ui_adapters.RouteListViewAdapter +import com.cornellappdev.android.ithaca_transit.NetworkUtils +import com.cornellappdev.android.ithaca_transit.Repository +import com.cornellappdev.android.ithaca_transit.models.Route +import com.cornellappdev.android.ithaca_transit.states.OptionsHiddenState +import com.cornellappdev.android.ithaca_transit.states.RouteCardState +import com.cornellappdev.android.ithaca_transit.states.RouteDetailViewState +import com.cornellappdev.android.ithaca_transit.states.RouteListState +import com.cornellappdev.android.ithaca_transit.ui_adapters.RouteDetailAdapter +import com.cornellappdev.android.ithaca_transit.ui_adapters.RouteListAdapterObject +import com.cornellappdev.android.ithaca_transit.ui_adapters.RouteListViewAdapter import com.google.android.material.bottomsheet.BottomSheetBehavior import io.reactivex.Observable import io.reactivex.ObservableEmitter diff --git a/app/src/main/java/com/example/ithaca_transit_android_v2/presenters/SearchPresenter.kt b/app/src/main/java/com/cornellappdev/android/ithaca_transit/presenters/SearchPresenter.kt similarity index 95% rename from app/src/main/java/com/example/ithaca_transit_android_v2/presenters/SearchPresenter.kt rename to app/src/main/java/com/cornellappdev/android/ithaca_transit/presenters/SearchPresenter.kt index 37ef80f..3dfcee0 100644 --- a/app/src/main/java/com/example/ithaca_transit_android_v2/presenters/SearchPresenter.kt +++ b/app/src/main/java/com/cornellappdev/android/ithaca_transit/presenters/SearchPresenter.kt @@ -1,23 +1,21 @@ -package com.example.ithaca_transit_android_v2.presenters +package com.cornellappdev.android.ithaca_transit.presenters import android.app.Activity import android.content.Context -import android.graphics.PorterDuff import android.text.Editable import android.text.TextWatcher import android.util.Log import android.view.View import android.view.inputmethod.InputMethodManager import android.widget.EditText -import com.example.ithaca_transit_android_v2.MapFragment -import com.example.ithaca_transit_android_v2.NetworkUtils -import com.example.ithaca_transit_android_v2.R -import com.example.ithaca_transit_android_v2.Repository -import com.example.ithaca_transit_android_v2.models.Coordinate -import com.example.ithaca_transit_android_v2.models.Location -import com.example.ithaca_transit_android_v2.models.LocationType -import com.example.ithaca_transit_android_v2.states.* -import com.example.ithaca_transit_android_v2.ui_adapters.SearchViewAdapter +import com.cornellappdev.android.ithaca_transit.MapFragment +import com.cornellappdev.android.ithaca_transit.NetworkUtils +import com.cornellappdev.android.ithaca_transit.Repository +import com.cornellappdev.android.ithaca_transit.models.Coordinate +import com.cornellappdev.android.ithaca_transit.models.Location +import com.cornellappdev.android.ithaca_transit.models.LocationType +import com.cornellappdev.android.ithaca_transit.states.* +import com.cornellappdev.android.ithaca_transit.ui_adapters.SearchViewAdapter import io.reactivex.Observable import io.reactivex.ObservableEmitter import io.reactivex.android.schedulers.AndroidSchedulers diff --git a/app/src/main/java/com/example/ithaca_transit_android_v2/states/MapState.kt b/app/src/main/java/com/cornellappdev/android/ithaca_transit/states/MapState.kt similarity index 73% rename from app/src/main/java/com/example/ithaca_transit_android_v2/states/MapState.kt rename to app/src/main/java/com/cornellappdev/android/ithaca_transit/states/MapState.kt index f4b8600..7657fa1 100644 --- a/app/src/main/java/com/example/ithaca_transit_android_v2/states/MapState.kt +++ b/app/src/main/java/com/cornellappdev/android/ithaca_transit/states/MapState.kt @@ -1,8 +1,8 @@ -package com.example.ithaca_transit_android_v2.states +package com.cornellappdev.android.ithaca_transit.states -import com.example.ithaca_transit_android_v2.models.Coordinate -import com.example.ithaca_transit_android_v2.models.Location -import com.example.ithaca_transit_android_v2.models.Route +import com.cornellappdev.android.ithaca_transit.models.Coordinate +import com.cornellappdev.android.ithaca_transit.models.Location +import com.cornellappdev.android.ithaca_transit.models.Route sealed class MapState(routes: List) diff --git a/app/src/main/java/com/example/ithaca_transit_android_v2/states/RouteOptionsState.kt b/app/src/main/java/com/cornellappdev/android/ithaca_transit/states/RouteOptionsState.kt similarity index 78% rename from app/src/main/java/com/example/ithaca_transit_android_v2/states/RouteOptionsState.kt rename to app/src/main/java/com/cornellappdev/android/ithaca_transit/states/RouteOptionsState.kt index bc5d227..4c31316 100644 --- a/app/src/main/java/com/example/ithaca_transit_android_v2/states/RouteOptionsState.kt +++ b/app/src/main/java/com/cornellappdev/android/ithaca_transit/states/RouteOptionsState.kt @@ -1,8 +1,8 @@ -package com.example.ithaca_transit_android_v2.states +package com.cornellappdev.android.ithaca_transit.states -import com.example.ithaca_transit_android_v2.models.Location -import com.example.ithaca_transit_android_v2.models.Route -import com.example.ithaca_transit_android_v2.models.RouteOptions +import com.cornellappdev.android.ithaca_transit.models.Location +import com.cornellappdev.android.ithaca_transit.models.Route +import com.cornellappdev.android.ithaca_transit.models.RouteOptions // Parent Class sealed class RouteCardState() diff --git a/app/src/main/java/com/example/ithaca_transit_android_v2/states/SearchState.kt b/app/src/main/java/com/cornellappdev/android/ithaca_transit/states/SearchState.kt similarity index 86% rename from app/src/main/java/com/example/ithaca_transit_android_v2/states/SearchState.kt rename to app/src/main/java/com/cornellappdev/android/ithaca_transit/states/SearchState.kt index 461d272..dbc4d7a 100644 --- a/app/src/main/java/com/example/ithaca_transit_android_v2/states/SearchState.kt +++ b/app/src/main/java/com/cornellappdev/android/ithaca_transit/states/SearchState.kt @@ -1,8 +1,6 @@ -package com.example.ithaca_transit_android_v2.states +package com.cornellappdev.android.ithaca_transit.states -import com.example.ithaca_transit_android_v2.models.Coordinate -import com.example.ithaca_transit_android_v2.models.Location -import com.example.ithaca_transit_android_v2.models.LocationType +import com.cornellappdev.android.ithaca_transit.models.Location // Parent Class sealed class SearchState diff --git a/app/src/main/java/com/example/ithaca_transit_android_v2/ui/MaxHeightListView.kt b/app/src/main/java/com/cornellappdev/android/ithaca_transit/ui/MaxHeightListView.kt similarity index 91% rename from app/src/main/java/com/example/ithaca_transit_android_v2/ui/MaxHeightListView.kt rename to app/src/main/java/com/cornellappdev/android/ithaca_transit/ui/MaxHeightListView.kt index 12fe566..e4fbfba 100644 --- a/app/src/main/java/com/example/ithaca_transit_android_v2/ui/MaxHeightListView.kt +++ b/app/src/main/java/com/cornellappdev/android/ithaca_transit/ui/MaxHeightListView.kt @@ -1,10 +1,10 @@ -package com.example.ithaca_transit_android_v2.ui +package com.cornellappdev.android.ithaca_transit.ui import android.content.Context import android.util.AttributeSet import android.util.TypedValue import android.widget.ListView -import com.example.ithaca_transit_android_v2.R +import com.cornellappdev.android.ithaca_transit.R /* This class is a ListView that has a maximum height of 250 pixels. It is used by the main SearchView to * display a list of available options. We can't just wrap the ListView in some layout of constant height * because then the ListView would always have a constant height, we want it to expand up to a specific diff --git a/app/src/main/java/com/example/ithaca_transit_android_v2/ui_adapters/ExpandedStopsAdapter.kt b/app/src/main/java/com/cornellappdev/android/ithaca_transit/ui_adapters/ExpandedStopsAdapter.kt similarity index 89% rename from app/src/main/java/com/example/ithaca_transit_android_v2/ui_adapters/ExpandedStopsAdapter.kt rename to app/src/main/java/com/cornellappdev/android/ithaca_transit/ui_adapters/ExpandedStopsAdapter.kt index 475e60c..1bddf27 100644 --- a/app/src/main/java/com/example/ithaca_transit_android_v2/ui_adapters/ExpandedStopsAdapter.kt +++ b/app/src/main/java/com/cornellappdev/android/ithaca_transit/ui_adapters/ExpandedStopsAdapter.kt @@ -1,4 +1,4 @@ -package com.example.ithaca_transit_android_v2.ui_adapters +package com.cornellappdev.android.ithaca_transit.ui_adapters import android.content.Context import android.view.Gravity @@ -9,14 +9,10 @@ import android.widget.LinearLayout import android.widget.TextView import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView -import com.example.ithaca_transit_android_v2.R -import com.example.ithaca_transit_android_v2.Repository -import com.example.ithaca_transit_android_v2.models.Direction -import com.example.ithaca_transit_android_v2.models.Route -import com.example.ithaca_transit_android_v2.models.Stop -import com.example.ithaca_transit_android_v2.views.DirectionDot -import com.example.ithaca_transit_android_v2.views.DirectionLine -import kotlin.math.exp +import com.cornellappdev.android.ithaca_transit.R +import com.cornellappdev.android.ithaca_transit.models.Stop +import com.cornellappdev.android.ithaca_transit.views.DirectionDot +import com.cornellappdev.android.ithaca_transit.views.DirectionLine class ExpandedStopsAdapter(context: Context, var busStops: List) : diff --git a/app/src/main/java/com/example/ithaca_transit_android_v2/ui_adapters/RouteDetailAdapter.kt b/app/src/main/java/com/cornellappdev/android/ithaca_transit/ui_adapters/RouteDetailAdapter.kt similarity index 98% rename from app/src/main/java/com/example/ithaca_transit_android_v2/ui_adapters/RouteDetailAdapter.kt rename to app/src/main/java/com/cornellappdev/android/ithaca_transit/ui_adapters/RouteDetailAdapter.kt index 51a2291f..c50e3c9 100644 --- a/app/src/main/java/com/example/ithaca_transit_android_v2/ui_adapters/RouteDetailAdapter.kt +++ b/app/src/main/java/com/cornellappdev/android/ithaca_transit/ui_adapters/RouteDetailAdapter.kt @@ -1,11 +1,10 @@ -package com.example.ithaca_transit_android_v2.ui_adapters +package com.cornellappdev.android.ithaca_transit.ui_adapters import android.content.Context import android.graphics.Typeface.BOLD import android.text.Spannable import android.text.SpannableString import android.text.SpannableStringBuilder -import android.text.SpannedString import android.text.style.ForegroundColorSpan import android.text.style.StyleSpan import android.util.Log @@ -17,11 +16,11 @@ import android.widget.RelativeLayout import android.widget.TextView import androidx.core.content.ContextCompat import androidx.core.text.HtmlCompat -import com.example.ithaca_transit_android_v2.R -import com.example.ithaca_transit_android_v2.models.Direction -import com.example.ithaca_transit_android_v2.models.DirectionType -import com.example.ithaca_transit_android_v2.models.Route -import com.example.ithaca_transit_android_v2.views.* +import com.cornellappdev.android.ithaca_transit.R +import com.cornellappdev.android.ithaca_transit.models.Direction +import com.cornellappdev.android.ithaca_transit.models.DirectionType +import com.cornellappdev.android.ithaca_transit.models.Route +import com.cornellappdev.android.ithaca_transit.views.* import kotlinx.android.synthetic.main.route_detailed_holder.view.* import java.text.SimpleDateFormat import java.util.* diff --git a/app/src/main/java/com/example/ithaca_transit_android_v2/ui_adapters/RouteListAdapterObject.kt b/app/src/main/java/com/cornellappdev/android/ithaca_transit/ui_adapters/RouteListAdapterObject.kt similarity index 57% rename from app/src/main/java/com/example/ithaca_transit_android_v2/ui_adapters/RouteListAdapterObject.kt rename to app/src/main/java/com/cornellappdev/android/ithaca_transit/ui_adapters/RouteListAdapterObject.kt index abbf7dd..b2e2c87 100644 --- a/app/src/main/java/com/example/ithaca_transit_android_v2/ui_adapters/RouteListAdapterObject.kt +++ b/app/src/main/java/com/cornellappdev/android/ithaca_transit/ui_adapters/RouteListAdapterObject.kt @@ -1,4 +1,4 @@ -package com.example.ithaca_transit_android_v2.ui_adapters +package com.cornellappdev.android.ithaca_transit.ui_adapters data class RouteListAdapterObject( val type: String, diff --git a/app/src/main/java/com/example/ithaca_transit_android_v2/ui_adapters/RouteListViewAdapter.kt b/app/src/main/java/com/cornellappdev/android/ithaca_transit/ui_adapters/RouteListViewAdapter.kt similarity index 96% rename from app/src/main/java/com/example/ithaca_transit_android_v2/ui_adapters/RouteListViewAdapter.kt rename to app/src/main/java/com/cornellappdev/android/ithaca_transit/ui_adapters/RouteListViewAdapter.kt index 7453707..849e63a 100644 --- a/app/src/main/java/com/example/ithaca_transit_android_v2/ui_adapters/RouteListViewAdapter.kt +++ b/app/src/main/java/com/cornellappdev/android/ithaca_transit/ui_adapters/RouteListViewAdapter.kt @@ -1,4 +1,4 @@ -package com.example.ithaca_transit_android_v2.ui_adapters +package com.cornellappdev.android.ithaca_transit.ui_adapters import android.content.Context import android.graphics.Typeface @@ -9,14 +9,14 @@ import android.view.ViewGroup import android.widget.* import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView -import com.example.ithaca_transit_android_v2.R -import com.example.ithaca_transit_android_v2.Repository -import com.example.ithaca_transit_android_v2.models.Direction -import com.example.ithaca_transit_android_v2.models.DirectionType -import com.example.ithaca_transit_android_v2.models.Route -import com.example.ithaca_transit_android_v2.views.BusNumberComponent -import com.example.ithaca_transit_android_v2.views.DirectionDot -import com.example.ithaca_transit_android_v2.views.DirectionLine +import com.cornellappdev.android.ithaca_transit.R +import com.cornellappdev.android.ithaca_transit.Repository +import com.cornellappdev.android.ithaca_transit.models.Direction +import com.cornellappdev.android.ithaca_transit.models.DirectionType +import com.cornellappdev.android.ithaca_transit.models.Route +import com.cornellappdev.android.ithaca_transit.views.BusNumberComponent +import com.cornellappdev.android.ithaca_transit.views.DirectionDot +import com.cornellappdev.android.ithaca_transit.views.DirectionLine import java.math.BigDecimal import java.math.RoundingMode import java.text.SimpleDateFormat diff --git a/app/src/main/java/com/example/ithaca_transit_android_v2/ui_adapters/SearchViewAdapter.kt b/app/src/main/java/com/cornellappdev/android/ithaca_transit/ui_adapters/SearchViewAdapter.kt similarity index 87% rename from app/src/main/java/com/example/ithaca_transit_android_v2/ui_adapters/SearchViewAdapter.kt rename to app/src/main/java/com/cornellappdev/android/ithaca_transit/ui_adapters/SearchViewAdapter.kt index 512bee1..603dd05 100644 --- a/app/src/main/java/com/example/ithaca_transit_android_v2/ui_adapters/SearchViewAdapter.kt +++ b/app/src/main/java/com/cornellappdev/android/ithaca_transit/ui_adapters/SearchViewAdapter.kt @@ -1,22 +1,18 @@ -package com.example.ithaca_transit_android_v2.ui_adapters +package com.cornellappdev.android.ithaca_transit.ui_adapters import android.content.Context -import android.graphics.Typeface -import android.util.Log import android.util.TypedValue import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.ArrayAdapter import android.widget.BaseAdapter import android.widget.ImageView import android.widget.TextView -import androidx.annotation.LayoutRes -import com.example.ithaca_transit_android_v2.R -import com.example.ithaca_transit_android_v2.Repository -import com.example.ithaca_transit_android_v2.models.Coordinate -import com.example.ithaca_transit_android_v2.models.Location -import com.example.ithaca_transit_android_v2.models.LocationType +import com.cornellappdev.android.ithaca_transit.R +import com.cornellappdev.android.ithaca_transit.Repository +import com.cornellappdev.android.ithaca_transit.models.Coordinate +import com.cornellappdev.android.ithaca_transit.models.Location +import com.cornellappdev.android.ithaca_transit.models.LocationType class SearchViewAdapter(context: Context, private var locations: List ): BaseAdapter() { diff --git a/app/src/main/java/com/example/ithaca_transit_android_v2/util/CurrLocationListener.kt b/app/src/main/java/com/cornellappdev/android/ithaca_transit/util/CurrLocationListener.kt similarity index 75% rename from app/src/main/java/com/example/ithaca_transit_android_v2/util/CurrLocationListener.kt rename to app/src/main/java/com/cornellappdev/android/ithaca_transit/util/CurrLocationListener.kt index b0d74fb..ea2db53 100644 --- a/app/src/main/java/com/example/ithaca_transit_android_v2/util/CurrLocationListener.kt +++ b/app/src/main/java/com/cornellappdev/android/ithaca_transit/util/CurrLocationListener.kt @@ -1,10 +1,9 @@ -package com.example.ithaca_transit_android_v2.util +package com.cornellappdev.android.ithaca_transit.util import android.location.Location import android.location.LocationListener import android.os.Bundle -import android.util.Log -import com.example.ithaca_transit_android_v2.Repository +import com.cornellappdev.android.ithaca_transit.Repository // Used to keep track of the current location of the user at all times class CurrLocationListener: LocationListener { diff --git a/app/src/main/java/com/example/ithaca_transit_android_v2/util/CurrLocationManager.kt b/app/src/main/java/com/cornellappdev/android/ithaca_transit/util/CurrLocationManager.kt similarity index 94% rename from app/src/main/java/com/example/ithaca_transit_android_v2/util/CurrLocationManager.kt rename to app/src/main/java/com/cornellappdev/android/ithaca_transit/util/CurrLocationManager.kt index 51f913c..37f715c 100644 --- a/app/src/main/java/com/example/ithaca_transit_android_v2/util/CurrLocationManager.kt +++ b/app/src/main/java/com/cornellappdev/android/ithaca_transit/util/CurrLocationManager.kt @@ -1,4 +1,4 @@ -package com.example.ithaca_transit_android_v2.util +package com.cornellappdev.android.ithaca_transit.util import android.Manifest import android.app.Activity @@ -6,9 +6,8 @@ import android.content.Context import android.content.pm.PackageManager import android.location.LocationManager import android.os.Looper -import android.util.Log import androidx.core.app.ActivityCompat -import com.example.ithaca_transit_android_v2.Repository +import com.cornellappdev.android.ithaca_transit.Repository import com.google.android.gms.location.* // Manages the user's location and calls CurrLocationListener diff --git a/app/src/main/java/com/example/ithaca_transit_android_v2/views/BusExpandable.kt b/app/src/main/java/com/cornellappdev/android/ithaca_transit/views/BusExpandable.kt similarity index 96% rename from app/src/main/java/com/example/ithaca_transit_android_v2/views/BusExpandable.kt rename to app/src/main/java/com/cornellappdev/android/ithaca_transit/views/BusExpandable.kt index cdcfc93..55d4547 100644 --- a/app/src/main/java/com/example/ithaca_transit_android_v2/views/BusExpandable.kt +++ b/app/src/main/java/com/cornellappdev/android/ithaca_transit/views/BusExpandable.kt @@ -1,15 +1,10 @@ -package com.example.ithaca_transit_android_v2.views +package com.cornellappdev.android.ithaca_transit.views import CenterSpan -import android.R.color -import android.R.string import android.content.Context import android.text.Spannable import android.text.SpannableString -import android.text.Spanned -import android.text.style.BulletSpan import android.text.style.DynamicDrawableSpan -import android.text.style.ImageSpan import android.view.Gravity import android.view.View import android.view.ViewGroup @@ -17,8 +12,8 @@ import android.widget.ImageView import android.widget.LinearLayout import android.widget.TextView import androidx.core.content.ContextCompat -import com.example.ithaca_transit_android_v2.R -import com.example.ithaca_transit_android_v2.models.Direction +import com.cornellappdev.android.ithaca_transit.R +import com.cornellappdev.android.ithaca_transit.models.Direction import java.util.concurrent.TimeUnit diff --git a/app/src/main/java/com/example/ithaca_transit_android_v2/views/BusNumberComponent.kt b/app/src/main/java/com/cornellappdev/android/ithaca_transit/views/BusNumberComponent.kt similarity index 79% rename from app/src/main/java/com/example/ithaca_transit_android_v2/views/BusNumberComponent.kt rename to app/src/main/java/com/cornellappdev/android/ithaca_transit/views/BusNumberComponent.kt index 96fc841..d11f2b9 100644 --- a/app/src/main/java/com/example/ithaca_transit_android_v2/views/BusNumberComponent.kt +++ b/app/src/main/java/com/cornellappdev/android/ithaca_transit/views/BusNumberComponent.kt @@ -1,11 +1,10 @@ -package com.example.ithaca_transit_android_v2.views +package com.cornellappdev.android.ithaca_transit.views import android.content.Context -import android.util.AttributeSet import android.widget.FrameLayout import android.widget.ImageView import android.widget.TextView -import com.example.ithaca_transit_android_v2.R +import com.cornellappdev.android.ithaca_transit.R class BusNumberComponent(context: Context, layout: Int): FrameLayout(context){ diff --git a/app/src/main/java/com/example/ithaca_transit_android_v2/views/CenterSpan.kt b/app/src/main/java/com/cornellappdev/android/ithaca_transit/views/CenterSpan.kt similarity index 100% rename from app/src/main/java/com/example/ithaca_transit_android_v2/views/CenterSpan.kt rename to app/src/main/java/com/cornellappdev/android/ithaca_transit/views/CenterSpan.kt diff --git a/app/src/main/java/com/example/ithaca_transit_android_v2/views/DirectionDot.kt b/app/src/main/java/com/cornellappdev/android/ithaca_transit/views/DirectionDot.kt similarity index 97% rename from app/src/main/java/com/example/ithaca_transit_android_v2/views/DirectionDot.kt rename to app/src/main/java/com/cornellappdev/android/ithaca_transit/views/DirectionDot.kt index 41e1a16..8023b4d 100644 --- a/app/src/main/java/com/example/ithaca_transit_android_v2/views/DirectionDot.kt +++ b/app/src/main/java/com/cornellappdev/android/ithaca_transit/views/DirectionDot.kt @@ -1,4 +1,4 @@ -package com.example.ithaca_transit_android_v2.views +package com.cornellappdev.android.ithaca_transit.views import android.content.Context import android.graphics.Canvas diff --git a/app/src/main/java/com/example/ithaca_transit_android_v2/views/DirectionLine.kt b/app/src/main/java/com/cornellappdev/android/ithaca_transit/views/DirectionLine.kt similarity index 90% rename from app/src/main/java/com/example/ithaca_transit_android_v2/views/DirectionLine.kt rename to app/src/main/java/com/cornellappdev/android/ithaca_transit/views/DirectionLine.kt index f1770c3..17c56da 100644 --- a/app/src/main/java/com/example/ithaca_transit_android_v2/views/DirectionLine.kt +++ b/app/src/main/java/com/cornellappdev/android/ithaca_transit/views/DirectionLine.kt @@ -1,9 +1,8 @@ -package com.example.ithaca_transit_android_v2.views +package com.cornellappdev.android.ithaca_transit.views import android.content.Context import android.graphics.Canvas import android.graphics.Paint -import android.util.AttributeSet import android.view.View class DirectionLine(context: Context) : View(context) { diff --git a/app/src/main/java/com/example/ithaca_transit_android_v2/views/WalkingManComponent.kt b/app/src/main/java/com/cornellappdev/android/ithaca_transit/views/WalkingManComponent.kt similarity index 76% rename from app/src/main/java/com/example/ithaca_transit_android_v2/views/WalkingManComponent.kt rename to app/src/main/java/com/cornellappdev/android/ithaca_transit/views/WalkingManComponent.kt index f384ec6..1dca49c 100644 --- a/app/src/main/java/com/example/ithaca_transit_android_v2/views/WalkingManComponent.kt +++ b/app/src/main/java/com/cornellappdev/android/ithaca_transit/views/WalkingManComponent.kt @@ -1,9 +1,9 @@ -package com.example.ithaca_transit_android_v2.views +package com.cornellappdev.android.ithaca_transit.views import android.content.Context import android.widget.FrameLayout import android.widget.ImageView -import com.example.ithaca_transit_android_v2.R +import com.cornellappdev.android.ithaca_transit.R class WalkingManComponent(context: Context, layout: Int): FrameLayout(context){ diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 4ee78cb..b1456d2 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -10,7 +10,7 @@ diff --git a/app/src/main/res/layout/search_main.xml b/app/src/main/res/layout/search_main.xml index a2fa7fd..d7e7ab3 100644 --- a/app/src/main/res/layout/search_main.xml +++ b/app/src/main/res/layout/search_main.xml @@ -105,7 +105,7 @@ android:clickable="false" android:orientation="vertical"> - -