From ce816b8ceedbabfb072e80a5da0963dc30fe139d Mon Sep 17 00:00:00 2001 From: aasthashah999 Date: Wed, 12 Feb 2020 17:55:38 -0500 Subject: [PATCH] Aastha/map view2 (#35) * Add mvp searchview functionality with rxjava * Route Options searchview ui * Addressing requested changes * Adding MaxHeightListView commenting * More commenting * SearchInput focus on lower API versions * More states for SearchView * Search State changes * Update map slightly * Resolving conflicts * MapSupport is now a MapView Co-authored-by: connorreinhold --- .gitignore | 2 + app/.DS_Store | Bin 6148 -> 6148 bytes app/src/.DS_Store | Bin 6148 -> 6148 bytes app/src/main/AndroidManifest.xml | 14 ++-- .../ithaca_transit_android_v2/MainActivity.kt | 1 - .../ithaca_transit_android_v2/MapFragment.kt | 60 ++++++++++++++++++ .../ithaca_transit_android_v2/NetworkUtils.kt | 1 + app/src/main/res/layout/activity_main.xml | 24 +++---- app/src/main/res/layout/fragment_map.xml | 14 ++++ 9 files changed, 96 insertions(+), 20 deletions(-) create mode 100644 app/src/main/java/com/example/ithaca_transit_android_v2/MapFragment.kt create mode 100644 app/src/main/res/layout/fragment_map.xml diff --git a/.gitignore b/.gitignore index d93cfa9..7ef979e 100644 --- a/.gitignore +++ b/.gitignore @@ -61,6 +61,8 @@ build/ # Custom app/src/main/res/values/google_maps_api.xml .DS_Store +app/.DS_Store +app/src/.DS_Store google-services.json # API keys diff --git a/app/.DS_Store b/app/.DS_Store index 4ad6958b924c1bb82e4acf28323f7874e0c5cd14..09587896357469d79f6ac141b7e2e5ebd9011642 100644 GIT binary patch delta 39 vcmZoMXfc@J&&atkU^g=(=Vl%jaVE}`;^ds9{QMlo&5~@l88@?Y{N)D#=KTxL delta 32 ocmZoMXfc@J&&aVcU^g=($7UWDai+~?Y!?|PHVAKK=lIJH0G@RTr~m)} diff --git a/app/src/.DS_Store b/app/src/.DS_Store index ad96edf51bd0733324d74684447221e425b5226f..d661142e52f6b6e88f9ff4c9bb273768dea595e8 100644 GIT binary patch delta 39 vcmZoMXfc@J&&akhU^gQp+h!gnZ${3P;^ds9{QMlo&ECw*SvIqC{N)D#>YNMq delta 32 ocmZoMXfc@J&&awlU^gQp>t-G%Z^q3z%(Gc0Hi&L!=lIJH0HGHN(*OVf diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8511b08..dc6048f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -4,9 +4,9 @@ - - - + + + - - - + + + - \ No newline at end of file + diff --git a/app/src/main/java/com/example/ithaca_transit_android_v2/MainActivity.kt b/app/src/main/java/com/example/ithaca_transit_android_v2/MainActivity.kt index f56c5c6..27cf4e8 100644 --- a/app/src/main/java/com/example/ithaca_transit_android_v2/MainActivity.kt +++ b/app/src/main/java/com/example/ithaca_transit_android_v2/MainActivity.kt @@ -45,7 +45,6 @@ class MainActivity : AppCompatActivity(), OnMapReadyCallback { mSearchPresenter = SearchPresenter(search_card_holder, this, mSearchAdapter) searchDisposable = mSearchPresenter.initSearchView() - (map_fragment as SupportMapFragment).getMapAsync(this) // set up search adapter, location_list refers to listview of locations on launch // location_list_2 refers to the listview of locations when editing their route options diff --git a/app/src/main/java/com/example/ithaca_transit_android_v2/MapFragment.kt b/app/src/main/java/com/example/ithaca_transit_android_v2/MapFragment.kt new file mode 100644 index 0000000..926f17a --- /dev/null +++ b/app/src/main/java/com/example/ithaca_transit_android_v2/MapFragment.kt @@ -0,0 +1,60 @@ +package com.example.ithaca_transit_android_v2 + +import android.os.Bundle +import android.util.Log +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.fragment.app.Fragment +import com.example.ithaca_transit_android_v2.R.id.map_fragment +import com.google.android.gms.common.GooglePlayServicesRepairableException +import com.google.android.gms.maps.GoogleMap +import com.google.android.gms.maps.MapView +import com.google.android.gms.maps.model.LatLng +import com.google.android.gms.maps.CameraUpdateFactory +import com.google.android.gms.maps.OnMapReadyCallback + + +class MapFragment: Fragment() , OnMapReadyCallback{ + private lateinit var mapView: MapView + private lateinit var map: GoogleMap + + + override fun onCreateView(inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle?): View? { + + var v = inflater.inflate(R.layout.fragment_map, container, false) + mapView = v.findViewById(R.id.mapView2) + mapView.onCreate(savedInstanceState) + mapView.getMapAsync { this } + return v + } + + override fun onMapReady(googleMap: GoogleMap) { + map = googleMap + map.uiSettings.isMyLocationButtonEnabled = false + map.isMyLocationEnabled = true + mapView.onResume() + } + override fun onResume() { + mapView.onResume() + super.onResume() + } + + + override fun onPause() { + super.onPause() + mapView.onPause() + } + + override fun onDestroy() { + super.onDestroy() + mapView.onDestroy() + } + + override fun onLowMemory() { + super.onLowMemory() + mapView.onLowMemory() + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/ithaca_transit_android_v2/NetworkUtils.kt b/app/src/main/java/com/example/ithaca_transit_android_v2/NetworkUtils.kt index 0a1d4f2..cf99fe6 100644 --- a/app/src/main/java/com/example/ithaca_transit_android_v2/NetworkUtils.kt +++ b/app/src/main/java/com/example/ithaca_transit_android_v2/NetworkUtils.kt @@ -5,6 +5,7 @@ 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.RouteOptions import com.squareup.moshi.JsonAdapter +import com.squareup.moshi.JsonReader import com.squareup.moshi.Moshi import com.squareup.moshi.Types.newParameterizedType import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 0b73779..07bef24 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -8,21 +8,21 @@ android:gravity="bottom" tools:context=".MainActivity"> + - - - + android:layout_height="match_parent" /> + + + + - diff --git a/app/src/main/res/layout/fragment_map.xml b/app/src/main/res/layout/fragment_map.xml new file mode 100644 index 0000000..4cb41ad --- /dev/null +++ b/app/src/main/res/layout/fragment_map.xml @@ -0,0 +1,14 @@ + + + + + + + + \ No newline at end of file