TouchInstinct
/
RoboSwag
303
0
Fork 0
Code Issues Pull Requests 2 Packages Projects Releases Wiki Activity

Merge pull request #98 from TouchInstinct/fix/static 

Fixed static
This commit is contained in:
Aksenov Vladimir 2019-10-30 20:02:30 +03:00 committed by GitHub
parent a56e93fde3 c2d540f56f
commit ae49509a82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
base-map/src/main/java/ru/touchin/basemap/AbstractMapManager.kt
View File

@ -3,6 +3,7 @@ package ru.touchin.basemap
import android.os.Bundle
import android.view.View
@Suppress("detekt.TooManyFunctions")
abstract class AbstractMapManager<TMapView : View, TMap : Any, TLocation : Any>(protected val mapView: TMapView) {
protected lateinit var map: TMap

1
google-map/src/main/java/ru/touchin/googlemap/GoogleMapManager.kt
View File

@ -10,6 +10,7 @@ import com.google.android.gms.maps.model.LatLng
import com.google.android.gms.maps.model.LatLngBounds
import ru.touchin.basemap.AbstractMapManager
@Suppress("detekt.TooManyFunctions")
class GoogleMapManager(mapView: MapView) : AbstractMapManager<MapView, GoogleMap, LatLng>(mapView) {
override fun initialize(mapListener: AbstractMapListener<MapView, GoogleMap, LatLng>?) {

1
navigation-new/src/main/java/ru/touchin/roboswag/components/navigation_new/activities/NavigationActivity.kt
View File

@ -2,7 +2,6 @@ package ru.touchin.roboswag.components.navigation_new.activities
import androidx.fragment.app.FragmentTransaction
import ru.touchin.roboswag.components.navigation.activities.BaseActivity
import ru.touchin.roboswag.components.navigation.viewcontrollers.ViewControllerNavigation
import ru.touchin.roboswag.components.navigation_new.FragmentNavigation
/**

3
navigation/src/main/java/ru/touchin/roboswag/components/navigation/FragmentNavigation.kt
View File

@ -21,15 +21,12 @@ package ru.touchin.roboswag.components.navigation
import android.content.Context
import android.os.Bundle
import android.os.Parcelable
import android.view.MenuItem
import androidx.annotation.IdRes
import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentManager
import androidx.fragment.app.FragmentTransaction
import ru.touchin.roboswag.core.log.Lc
import ru.touchin.roboswag.components.navigation.viewcontrollers.EmptyState
import kotlin.reflect.KClass
/**
* Created by Gavriil Sitnikov on 07/03/2016.

1
yandex-map/src/main/java/ru/touchin/yandexmap/YandexMapManager.kt
View File

@ -21,6 +21,7 @@ import com.yandex.mapkit.user_location.UserLocationView
import com.yandex.runtime.image.ImageProvider
import ru.touchin.basemap.AbstractMapManager
@Suppress("detekt.TooManyFunctions")
class YandexMapManager(
mapView: MapView,
private val isDebug: Boolean = false