Adam/fix file structure (#69)

* Fixed route line UI issue, fixed bottom modal UI issue, fixed "does not allow searching if leaving and returning to app" issue, added app icon.

* Small file structure and package name changes now that the app will be on play store.

* trying

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

app/src/androidTest/java/com/example/ithaca_transit_android_v2/ExampleInstrumentedTest.kt → 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

app/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.ithaca_transit_android_v2">
+    package="com.cornellappdev.android.ithaca_transit">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

app/src/main/java/com/example/ithaca_transit_android_v2/MainActivity.kt → 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.*

app/src/main/java/com/example/ithaca_transit_android_v2/MapFragment.kt → 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?) {

app/src/main/java/com/example/ithaca_transit_android_v2/NetworkUtils.kt → 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

app/src/main/java/com/example/ithaca_transit_android_v2/NetworkingAdapters.kt → 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

app/src/main/java/com/example/ithaca_transit_android_v2/Repository.kt → 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 {

app/src/main/java/com/example/ithaca_transit_android_v2/models/ActionType.kt → 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.

app/src/main/java/com/example/ithaca_transit_android_v2/models/Coordinate.kt → 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
 

app/src/main/java/com/example/ithaca_transit_android_v2/models/Direction.kt → 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

app/src/main/java/com/example/ithaca_transit_android_v2/models/DirectionType.kt → 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
 

app/src/main/java/com/example/ithaca_transit_android_v2/models/Location.kt → 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)

app/src/main/java/com/example/ithaca_transit_android_v2/models/LocationType.kt → 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
 

app/src/main/java/com/example/ithaca_transit_android_v2/models/Route.kt → 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

app/src/main/java/com/example/ithaca_transit_android_v2/models/RouteOptions.kt → 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
 
 /*

app/src/main/java/com/example/ithaca_transit_android_v2/models/Stop.kt → 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(

app/src/main/java/com/example/ithaca_transit_android_v2/models/tracking/BusInformation.kt → 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?,

app/src/main/java/com/example/ithaca_transit_android_v2/models/tracking/TrackingData.kt → 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 (

app/src/main/java/com/example/ithaca_transit_android_v2/presenters/MapPresenter.kt → 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

app/src/main/java/com/example/ithaca_transit_android_v2/presenters/RouteOptionsPresenter.kt → 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

app/src/main/java/com/example/ithaca_transit_android_v2/presenters/SearchPresenter.kt → 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

app/src/main/java/com/example/ithaca_transit_android_v2/states/MapState.kt → 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<Route>)
 

app/src/main/java/com/example/ithaca_transit_android_v2/states/RouteOptionsState.kt → 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()

app/src/main/java/com/example/ithaca_transit_android_v2/states/SearchState.kt → 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

app/src/main/java/com/example/ithaca_transit_android_v2/ui/MaxHeightListView.kt → 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

app/src/main/java/com/example/ithaca_transit_android_v2/ui_adapters/ExpandedStopsAdapter.kt → 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<Stop>) :