mirror/EVMap
1
0
Fork 0
mirror of https://github.com/ev-map/EVMap.git synced 2026-04-23 15:47:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

change app package name

Browse Source
This commit is contained in:
Johan von Forstner
2020-04-13 22:30:20 +02:00
parent efdfe795ac
commit c7e3708858
31 changed files with 104 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/johan/evmap/EvMapApplication.kt → app/src/main/java/net/vonforst/evmap/EvMapApplication.kt
View File

@@ -1,4 +1,4 @@
package com.johan.evmap
package net.vonforst.evmap
import android.app.Application
import com.facebook.stetho.Stetho

4
app/src/main/java/com/johan/evmap/MapsActivity.kt → app/src/main/java/net/vonforst/evmap/MapsActivity.kt
View File

@@ -1,4 +1,4 @@
package com.johan.evmap
package net.vonforst.evmap
import android.content.Intent
import android.net.Uri
@@ -12,7 +12,7 @@ import androidx.navigation.ui.AppBarConfiguration
import androidx.navigation.ui.setupWithNavController
import com.google.android.material.navigation.NavigationView
import com.google.android.material.snackbar.Snackbar
import com.johan.evmap.api.goingelectric.ChargeLocation
import net.vonforst.evmap.api.goingelectric.ChargeLocation
const val REQUEST_LOCATION_PERMISSION = 1

12
app/src/main/java/com/johan/evmap/adapter/DataBindingAdapters.kt → app/src/main/java/net/vonforst/evmap/adapter/DataBindingAdapters.kt
View File

@@ -1,4 +1,4 @@
package com.johan.evmap.adapter
package net.vonforst.evmap.adapter
import android.content.Context
import android.view.LayoutInflater
@@ -8,11 +8,11 @@ import androidx.databinding.ViewDataBinding
import androidx.recyclerview.widget.DiffUtil
import androidx.recyclerview.widget.ListAdapter
import androidx.recyclerview.widget.RecyclerView
import com.johan.evmap.BR
import com.johan.evmap.R
import com.johan.evmap.api.availability.ChargepointStatus
import com.johan.evmap.api.goingelectric.ChargeLocation
import com.johan.evmap.api.goingelectric.Chargepoint
import net.vonforst.evmap.BR
import net.vonforst.evmap.R
import net.vonforst.evmap.api.availability.ChargepointStatus
import net.vonforst.evmap.api.goingelectric.ChargeLocation
import net.vonforst.evmap.api.goingelectric.Chargepoint
interface Equatable {
override fun equals(other: Any?): Boolean;

6
app/src/main/java/com/johan/evmap/adapter/GalleryAdapter.kt → app/src/main/java/net/vonforst/evmap/adapter/GalleryAdapter.kt
View File

@@ -1,4 +1,4 @@
package com.johan.evmap.adapter
package net.vonforst.evmap.adapter
import android.annotation.SuppressLint
import android.content.Context
@@ -7,11 +7,11 @@ import android.widget.ImageView
import androidx.recyclerview.widget.DiffUtil
import androidx.recyclerview.widget.ListAdapter
import androidx.recyclerview.widget.RecyclerView
import com.johan.evmap.R
import com.johan.evmap.api.goingelectric.ChargerPhoto
import com.ortiz.touchview.TouchImageView
import com.squareup.picasso.Callback
import com.squareup.picasso.Picasso
import net.vonforst.evmap.R
import net.vonforst.evmap.api.goingelectric.ChargerPhoto
class GalleryAdapter(

6
app/src/main/java/com/johan/evmap/api/Utils.kt → app/src/main/java/net/vonforst/evmap/api/Utils.kt
View File

@@ -1,4 +1,4 @@
package com.johan.evmap.api
package net.vonforst.evmap.api
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.suspendCancellableCoroutine
@@ -9,8 +9,8 @@ import org.json.JSONArray
import java.io.IOException
import kotlin.coroutines.resumeWithException
operator fun<T> JSONArray.iterator(): Iterator<T>
= (0 until length()).asSequence().map { get(it) as T }.iterator()
operator fun <T> JSONArray.iterator(): Iterator<T> =
(0 until length()).asSequence().map { get(it) as T }.iterator()
@ExperimentalCoroutinesApi
suspend fun Call.await(): Response {

8
app/src/main/java/com/johan/evmap/api/availability/AvailabilityDetector.kt → app/src/main/java/net/vonforst/evmap/api/availability/AvailabilityDetector.kt
View File

@@ -1,9 +1,9 @@
package com.johan.evmap.api.availability
package net.vonforst.evmap.api.availability
import com.facebook.stetho.okhttp3.StethoInterceptor
import com.johan.evmap.api.await
import com.johan.evmap.api.goingelectric.ChargeLocation
import com.johan.evmap.api.goingelectric.Chargepoint
import net.vonforst.evmap.api.await
import net.vonforst.evmap.api.goingelectric.ChargeLocation
import net.vonforst.evmap.api.goingelectric.Chargepoint
import okhttp3.OkHttpClient
import okhttp3.Request
import java.io.IOException

8
app/src/main/java/com/johan/evmap/api/availability/ChargecloudAvailabilityDetector.kt → app/src/main/java/net/vonforst/evmap/api/availability/ChargecloudAvailabilityDetector.kt
View File

@@ -1,9 +1,9 @@
package com.johan.evmap.api.availability
package net.vonforst.evmap.api.availability
import com.johan.evmap.api.goingelectric.ChargeLocation
import com.johan.evmap.api.goingelectric.Chargepoint
import com.johan.evmap.api.iterator
import kotlinx.coroutines.ExperimentalCoroutinesApi
import net.vonforst.evmap.api.goingelectric.ChargeLocation
import net.vonforst.evmap.api.goingelectric.Chargepoint
import net.vonforst.evmap.api.iterator
import okhttp3.OkHttpClient
import org.json.JSONObject
import java.io.IOException

8
app/src/main/java/com/johan/evmap/api/availability/NewMotionAvailabilityDetector.kt → app/src/main/java/net/vonforst/evmap/api/availability/NewMotionAvailabilityDetector.kt
View File

@@ -1,9 +1,9 @@
package com.johan.evmap.api.availability
package net.vonforst.evmap.api.availability
import com.johan.evmap.api.distanceBetween
import com.johan.evmap.api.goingelectric.ChargeLocation
import com.johan.evmap.api.goingelectric.Chargepoint
import com.squareup.moshi.JsonClass
import net.vonforst.evmap.api.distanceBetween
import net.vonforst.evmap.api.goingelectric.ChargeLocation
import net.vonforst.evmap.api.goingelectric.Chargepoint
import okhttp3.OkHttpClient
import retrofit2.Retrofit
import retrofit2.converter.moshi.MoshiConverterFactory

2
app/src/main/java/com/johan/evmap/api/goingelectric/GoingElectricAdapters.kt → app/src/main/java/net/vonforst/evmap/api/goingelectric/GoingElectricAdapters.kt
View File

@@ -1,4 +1,4 @@
package com.johan.evmap.api.goingelectric
package net.vonforst.evmap.api.goingelectric
import com.squareup.moshi.*
import java.lang.reflect.Type

2
app/src/main/java/com/johan/evmap/api/goingelectric/GoingElectricApi.kt → app/src/main/java/net/vonforst/evmap/api/goingelectric/GoingElectricApi.kt
View File

@@ -1,4 +1,4 @@
package com.johan.evmap.api.goingelectric
package net.vonforst.evmap.api.goingelectric
import com.facebook.stetho.okhttp3.StethoInterceptor
import com.squareup.moshi.Moshi

6
app/src/main/java/com/johan/evmap/api/goingelectric/GoingElectricModel.kt → app/src/main/java/net/vonforst/evmap/api/goingelectric/GoingElectricModel.kt
View File

@@ -1,13 +1,13 @@
package com.johan.evmap.api.goingelectric
package net.vonforst.evmap.api.goingelectric
import android.content.Context
import android.os.Parcelable
import androidx.core.text.HtmlCompat
import com.johan.evmap.R
import com.johan.evmap.adapter.Equatable
import com.squareup.moshi.Json
import com.squareup.moshi.JsonClass
import kotlinx.android.parcel.Parcelize
import net.vonforst.evmap.R
import net.vonforst.evmap.adapter.Equatable
import java.time.DayOfWeek
import java.time.LocalDate
import java.time.LocalTime

8
app/src/main/java/com/johan/evmap/fragment/AboutFragment.kt → app/src/main/java/net/vonforst/evmap/fragment/AboutFragment.kt
View File

@@ -1,4 +1,4 @@
package com.johan.evmap.fragment
package net.vonforst.evmap.fragment
import android.os.Bundle
import android.view.View
@@ -7,10 +7,10 @@ import androidx.navigation.fragment.findNavController
import androidx.navigation.ui.setupWithNavController
import androidx.preference.Preference
import androidx.preference.PreferenceFragmentCompat
import com.johan.evmap.BuildConfig
import com.johan.evmap.MapsActivity
import com.johan.evmap.R
import com.mikepenz.aboutlibraries.LibsBuilder
import net.vonforst.evmap.BuildConfig
import net.vonforst.evmap.MapsActivity
import net.vonforst.evmap.R
class AboutFragment : PreferenceFragmentCompat() {

16
app/src/main/java/com/johan/evmap/fragment/GalleryFragment.kt → app/src/main/java/net/vonforst/evmap/fragment/GalleryFragment.kt
View File

@@ -1,4 +1,4 @@
package com.johan.evmap.fragment
package net.vonforst.evmap.fragment
import android.os.Bundle
import android.view.LayoutInflater
@@ -10,14 +10,14 @@ import androidx.fragment.app.Fragment
import androidx.fragment.app.activityViewModels
import androidx.transition.TransitionInflater
import androidx.viewpager2.widget.ViewPager2
import com.johan.evmap.MapsActivity
import com.johan.evmap.R
import com.johan.evmap.adapter.GalleryAdapter
import com.johan.evmap.adapter.galleryTransitionName
import com.johan.evmap.api.goingelectric.ChargerPhoto
import com.johan.evmap.databinding.FragmentGalleryBinding
import com.johan.evmap.viewmodel.GalleryViewModel
import com.ortiz.touchview.TouchImageView
import net.vonforst.evmap.MapsActivity
import net.vonforst.evmap.R
import net.vonforst.evmap.adapter.GalleryAdapter
import net.vonforst.evmap.adapter.galleryTransitionName
import net.vonforst.evmap.api.goingelectric.ChargerPhoto
import net.vonforst.evmap.databinding.FragmentGalleryBinding
import net.vonforst.evmap.viewmodel.GalleryViewModel
class GalleryFragment : Fragment(), MapsActivity.FragmentCallback {

32
app/src/main/java/com/johan/evmap/fragment/MapFragment.kt → app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt
View File

@@ -1,4 +1,4 @@
package com.johan.evmap.fragment
package net.vonforst.evmap.fragment
import android.Manifest
import android.annotation.SuppressLint
@@ -32,23 +32,23 @@ import com.google.android.libraries.places.api.model.Place
import com.google.android.libraries.places.widget.Autocomplete
import com.google.android.libraries.places.widget.model.AutocompleteActivityMode
import com.google.android.material.snackbar.Snackbar
import com.johan.evmap.MapsActivity
import com.johan.evmap.R
import com.johan.evmap.REQUEST_LOCATION_PERMISSION
import com.johan.evmap.adapter.ConnectorAdapter
import com.johan.evmap.adapter.DetailAdapter
import com.johan.evmap.adapter.GalleryAdapter
import com.johan.evmap.api.goingelectric.ChargeLocation
import com.johan.evmap.api.goingelectric.ChargeLocationCluster
import com.johan.evmap.api.goingelectric.ChargepointListItem
import com.johan.evmap.databinding.FragmentMapBinding
import com.johan.evmap.ui.*
import com.johan.evmap.viewmodel.GalleryViewModel
import com.johan.evmap.viewmodel.MapPosition
import com.johan.evmap.viewmodel.MapViewModel
import com.johan.evmap.viewmodel.viewModelFactory
import com.mahc.custombottomsheetbehavior.BottomSheetBehaviorGoogleMapsLike
import kotlinx.android.synthetic.main.fragment_map.*
import net.vonforst.evmap.MapsActivity
import net.vonforst.evmap.R
import net.vonforst.evmap.REQUEST_LOCATION_PERMISSION
import net.vonforst.evmap.adapter.ConnectorAdapter
import net.vonforst.evmap.adapter.DetailAdapter
import net.vonforst.evmap.adapter.GalleryAdapter
import net.vonforst.evmap.api.goingelectric.ChargeLocation
import net.vonforst.evmap.api.goingelectric.ChargeLocationCluster
import net.vonforst.evmap.api.goingelectric.ChargepointListItem
import net.vonforst.evmap.databinding.FragmentMapBinding
import net.vonforst.evmap.ui.*
import net.vonforst.evmap.viewmodel.GalleryViewModel
import net.vonforst.evmap.viewmodel.MapPosition
import net.vonforst.evmap.viewmodel.MapViewModel
import net.vonforst.evmap.viewmodel.viewModelFactory
const val REQUEST_AUTOCOMPLETE = 2

6
app/src/main/java/com/johan/evmap/ui/BindingAdapters.kt → app/src/main/java/net/vonforst/evmap/ui/BindingAdapters.kt
View File

@@ -1,4 +1,4 @@
package com.johan.evmap.ui
package net.vonforst.evmap.ui
import android.content.Context
import android.content.res.ColorStateList
@@ -11,8 +11,8 @@ import androidx.recyclerview.widget.ListAdapter
import androidx.recyclerview.widget.RecyclerView
import androidx.viewpager2.widget.ViewPager2
import com.google.android.material.floatingactionbutton.FloatingActionButton
import com.johan.evmap.R
import com.johan.evmap.api.goingelectric.Chargepoint
import net.vonforst.evmap.R
import net.vonforst.evmap.api.goingelectric.Chargepoint
@BindingAdapter("goneUnless")

2
app/src/main/java/com/johan/evmap/ui/HideOnScrollFabBehavior.kt → app/src/main/java/net/vonforst/evmap/ui/HideOnScrollFabBehavior.kt
View File

@@ -1,4 +1,4 @@
package com.johan.evmap.ui
package net.vonforst.evmap.ui
import android.content.Context
import android.util.AttributeSet

4
app/src/main/java/com/johan/evmap/ui/IconGenerators.kt → app/src/main/java/net/vonforst/evmap/ui/IconGenerators.kt
View File

@@ -1,4 +1,4 @@
package com.johan.evmap.ui
package net.vonforst.evmap.ui
import android.content.Context
import android.graphics.Bitmap
@@ -14,7 +14,7 @@ import com.google.android.gms.maps.model.BitmapDescriptor
import com.google.android.gms.maps.model.BitmapDescriptorFactory
import com.google.maps.android.ui.IconGenerator
import com.google.maps.android.ui.SquareTextView
import com.johan.evmap.R
import net.vonforst.evmap.R
class ClusterIconGenerator(context: Context) : IconGenerator(context) {
init {

6
app/src/main/java/com/johan/evmap/ui/MarkerUtils.kt → app/src/main/java/net/vonforst/evmap/ui/MarkerUtils.kt
View File

@@ -1,12 +1,12 @@
package com.johan.evmap.ui
package net.vonforst.evmap.ui
import android.animation.ValueAnimator
import androidx.core.animation.addListener
import androidx.interpolator.view.animation.FastOutLinearInInterpolator
import androidx.interpolator.view.animation.LinearOutSlowInInterpolator
import com.google.android.gms.maps.model.Marker
import com.johan.evmap.R
import com.johan.evmap.api.goingelectric.ChargeLocation
import net.vonforst.evmap.R
import net.vonforst.evmap.api.goingelectric.ChargeLocation
fun getMarkerTint(charger: ChargeLocation): Int = when {
charger.maxPower >= 100 -> R.color.charger_100kw

2
app/src/main/java/com/johan/evmap/viewmodel/GalleryViewModel.kt → app/src/main/java/net/vonforst/evmap/viewmodel/GalleryViewModel.kt
View File

@@ -1,4 +1,4 @@
package com.johan.evmap.viewmodel
package net.vonforst.evmap.viewmodel
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel

16
app/src/main/java/com/johan/evmap/viewmodel/MapViewModel.kt → app/src/main/java/net/vonforst/evmap/viewmodel/MapViewModel.kt
View File

@@ -1,20 +1,20 @@
package com.johan.evmap.viewmodel
package net.vonforst.evmap.viewmodel
import androidx.lifecycle.MediatorLiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.google.android.gms.maps.model.LatLngBounds
import com.johan.evmap.api.availability.AvailabilityDetectorException
import com.johan.evmap.api.availability.ChargeLocationStatus
import com.johan.evmap.api.availability.availabilityDetectors
import com.johan.evmap.api.goingelectric.ChargeLocation
import com.johan.evmap.api.goingelectric.ChargepointList
import com.johan.evmap.api.goingelectric.ChargepointListItem
import com.johan.evmap.api.goingelectric.GoingElectricApi
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import net.vonforst.evmap.api.availability.AvailabilityDetectorException
import net.vonforst.evmap.api.availability.ChargeLocationStatus
import net.vonforst.evmap.api.availability.availabilityDetectors
import net.vonforst.evmap.api.goingelectric.ChargeLocation
import net.vonforst.evmap.api.goingelectric.ChargepointList
import net.vonforst.evmap.api.goingelectric.ChargepointListItem
import net.vonforst.evmap.api.goingelectric.GoingElectricApi
import retrofit2.Call
import retrofit2.Callback
import retrofit2.HttpException

2
app/src/main/java/com/johan/evmap/viewmodel/Utils.kt → app/src/main/java/net/vonforst/evmap/viewmodel/Utils.kt
View File

@@ -1,4 +1,4 @@
package com.johan.evmap.viewmodel
package net.vonforst.evmap.viewmodel
import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider