From c7e37088583f18c20e859aae2f03d84e79efa8d4 Mon Sep 17 00:00:00 2001 From: Johan von Forstner Date: Mon, 13 Apr 2020 22:30:20 +0200 Subject: [PATCH] change app package name --- app/build.gradle | 4 +-- app/src/main/AndroidManifest.xml | 2 +- .../vonforst}/evmap/EvMapApplication.kt | 2 +- .../vonforst}/evmap/MapsActivity.kt | 4 +-- .../evmap/adapter/DataBindingAdapters.kt | 12 +++---- .../vonforst}/evmap/adapter/GalleryAdapter.kt | 6 ++-- .../johan => net/vonforst}/evmap/api/Utils.kt | 6 ++-- .../api/availability/AvailabilityDetector.kt | 8 ++--- .../ChargecloudAvailabilityDetector.kt | 8 ++--- .../NewMotionAvailabilityDetector.kt | 8 ++--- .../goingelectric/GoingElectricAdapters.kt | 2 +- .../api/goingelectric/GoingElectricApi.kt | 2 +- .../api/goingelectric/GoingElectricModel.kt | 6 ++-- .../vonforst}/evmap/fragment/AboutFragment.kt | 8 ++--- .../evmap/fragment/GalleryFragment.kt | 16 +++++----- .../vonforst}/evmap/fragment/MapFragment.kt | 32 +++++++++---------- .../vonforst}/evmap/ui/BindingAdapters.kt | 6 ++-- .../evmap/ui/HideOnScrollFabBehavior.kt | 2 +- .../vonforst}/evmap/ui/IconGenerators.kt | 4 +-- .../vonforst}/evmap/ui/MarkerUtils.kt | 6 ++-- .../evmap/viewmodel/GalleryViewModel.kt | 2 +- .../vonforst}/evmap/viewmodel/MapViewModel.kt | 16 +++++----- .../vonforst}/evmap/viewmodel/Utils.kt | 2 +- app/src/main/res/layout/detail_view.xml | 13 ++++---- app/src/main/res/layout/fragment_gallery.xml | 2 +- app/src/main/res/layout/fragment_map.xml | 7 ++-- app/src/main/res/layout/item_connector.xml | 2 +- app/src/main/res/layout/item_detail.xml | 2 +- app/src/main/res/navigation/nav_graph.xml | 6 ++-- app/src/main/res/xml/about.xml | 2 +- .../NewMotionAvailabilityDetectorTest.kt | 8 ++--- 31 files changed, 104 insertions(+), 102 deletions(-) rename app/src/main/java/{com/johan => net/vonforst}/evmap/EvMapApplication.kt (92%) rename app/src/main/java/{com/johan => net/vonforst}/evmap/MapsActivity.kt (96%) rename app/src/main/java/{com/johan => net/vonforst}/evmap/adapter/DataBindingAdapters.kt (93%) rename app/src/main/java/{com/johan => net/vonforst}/evmap/adapter/GalleryAdapter.kt (97%) rename app/src/main/java/{com/johan => net/vonforst}/evmap/api/Utils.kt (91%) rename app/src/main/java/{com/johan => net/vonforst}/evmap/api/availability/AvailabilityDetector.kt (94%) rename app/src/main/java/{com/johan => net/vonforst}/evmap/api/availability/ChargecloudAvailabilityDetector.kt (95%) rename app/src/main/java/{com/johan => net/vonforst}/evmap/api/availability/NewMotionAvailabilityDetector.kt (96%) rename app/src/main/java/{com/johan => net/vonforst}/evmap/api/goingelectric/GoingElectricAdapters.kt (98%) rename app/src/main/java/{com/johan => net/vonforst}/evmap/api/goingelectric/GoingElectricApi.kt (97%) rename app/src/main/java/{com/johan => net/vonforst}/evmap/api/goingelectric/GoingElectricModel.kt (98%) rename app/src/main/java/{com/johan => net/vonforst}/evmap/fragment/AboutFragment.kt (93%) rename app/src/main/java/{com/johan => net/vonforst}/evmap/fragment/GalleryFragment.kt (92%) rename app/src/main/java/{com/johan => net/vonforst}/evmap/fragment/MapFragment.kt (95%) rename app/src/main/java/{com/johan => net/vonforst}/evmap/ui/BindingAdapters.kt (96%) rename app/src/main/java/{com/johan => net/vonforst}/evmap/ui/HideOnScrollFabBehavior.kt (99%) rename app/src/main/java/{com/johan => net/vonforst}/evmap/ui/IconGenerators.kt (98%) rename app/src/main/java/{com/johan => net/vonforst}/evmap/ui/MarkerUtils.kt (93%) rename app/src/main/java/{com/johan => net/vonforst}/evmap/viewmodel/GalleryViewModel.kt (81%) rename app/src/main/java/{com/johan => net/vonforst}/evmap/viewmodel/MapViewModel.kt (92%) rename app/src/main/java/{com/johan => net/vonforst}/evmap/viewmodel/Utils.kt (95%) rename app/src/test/java/{com/johan => net/vonforst}/evmap/NewMotionAvailabilityDetectorTest.kt (93%) diff --git a/app/build.gradle b/app/build.gradle index 5f31b435..41d5876b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,11 +10,11 @@ android { buildToolsVersion "29.0.3" defaultConfig { - applicationId "com.johan.evmap" + applicationId "net.vonforst.evmap" minSdkVersion 21 targetSdkVersion 29 versionCode 1 - versionName "1.0" + versionName "0.0.1" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9117872e..90ffab04 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="net.vonforst.evmap"> diff --git a/app/src/main/java/com/johan/evmap/EvMapApplication.kt b/app/src/main/java/net/vonforst/evmap/EvMapApplication.kt similarity index 92% rename from app/src/main/java/com/johan/evmap/EvMapApplication.kt rename to app/src/main/java/net/vonforst/evmap/EvMapApplication.kt index b6b6743c..8a7f0e1b 100644 --- a/app/src/main/java/com/johan/evmap/EvMapApplication.kt +++ b/app/src/main/java/net/vonforst/evmap/EvMapApplication.kt @@ -1,4 +1,4 @@ -package com.johan.evmap +package net.vonforst.evmap import android.app.Application import com.facebook.stetho.Stetho diff --git a/app/src/main/java/com/johan/evmap/MapsActivity.kt b/app/src/main/java/net/vonforst/evmap/MapsActivity.kt similarity index 96% rename from app/src/main/java/com/johan/evmap/MapsActivity.kt rename to app/src/main/java/net/vonforst/evmap/MapsActivity.kt index 9cb20cd9..15761253 100644 --- a/app/src/main/java/com/johan/evmap/MapsActivity.kt +++ b/app/src/main/java/net/vonforst/evmap/MapsActivity.kt @@ -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 diff --git a/app/src/main/java/com/johan/evmap/adapter/DataBindingAdapters.kt b/app/src/main/java/net/vonforst/evmap/adapter/DataBindingAdapters.kt similarity index 93% rename from app/src/main/java/com/johan/evmap/adapter/DataBindingAdapters.kt rename to app/src/main/java/net/vonforst/evmap/adapter/DataBindingAdapters.kt index df8394ab..cff1a1c8 100644 --- a/app/src/main/java/com/johan/evmap/adapter/DataBindingAdapters.kt +++ b/app/src/main/java/net/vonforst/evmap/adapter/DataBindingAdapters.kt @@ -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; diff --git a/app/src/main/java/com/johan/evmap/adapter/GalleryAdapter.kt b/app/src/main/java/net/vonforst/evmap/adapter/GalleryAdapter.kt similarity index 97% rename from app/src/main/java/com/johan/evmap/adapter/GalleryAdapter.kt rename to app/src/main/java/net/vonforst/evmap/adapter/GalleryAdapter.kt index 059b23b2..c4a4263c 100644 --- a/app/src/main/java/com/johan/evmap/adapter/GalleryAdapter.kt +++ b/app/src/main/java/net/vonforst/evmap/adapter/GalleryAdapter.kt @@ -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( diff --git a/app/src/main/java/com/johan/evmap/api/Utils.kt b/app/src/main/java/net/vonforst/evmap/api/Utils.kt similarity index 91% rename from app/src/main/java/com/johan/evmap/api/Utils.kt rename to app/src/main/java/net/vonforst/evmap/api/Utils.kt index 4496ebdc..bd433888 100644 --- a/app/src/main/java/com/johan/evmap/api/Utils.kt +++ b/app/src/main/java/net/vonforst/evmap/api/Utils.kt @@ -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 JSONArray.iterator(): Iterator - = (0 until length()).asSequence().map { get(it) as T }.iterator() +operator fun JSONArray.iterator(): Iterator = + (0 until length()).asSequence().map { get(it) as T }.iterator() @ExperimentalCoroutinesApi suspend fun Call.await(): Response { diff --git a/app/src/main/java/com/johan/evmap/api/availability/AvailabilityDetector.kt b/app/src/main/java/net/vonforst/evmap/api/availability/AvailabilityDetector.kt similarity index 94% rename from app/src/main/java/com/johan/evmap/api/availability/AvailabilityDetector.kt rename to app/src/main/java/net/vonforst/evmap/api/availability/AvailabilityDetector.kt index babb98eb..484c93d7 100644 --- a/app/src/main/java/com/johan/evmap/api/availability/AvailabilityDetector.kt +++ b/app/src/main/java/net/vonforst/evmap/api/availability/AvailabilityDetector.kt @@ -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 diff --git a/app/src/main/java/com/johan/evmap/api/availability/ChargecloudAvailabilityDetector.kt b/app/src/main/java/net/vonforst/evmap/api/availability/ChargecloudAvailabilityDetector.kt similarity index 95% rename from app/src/main/java/com/johan/evmap/api/availability/ChargecloudAvailabilityDetector.kt rename to app/src/main/java/net/vonforst/evmap/api/availability/ChargecloudAvailabilityDetector.kt index 48df3432..a358f83c 100644 --- a/app/src/main/java/com/johan/evmap/api/availability/ChargecloudAvailabilityDetector.kt +++ b/app/src/main/java/net/vonforst/evmap/api/availability/ChargecloudAvailabilityDetector.kt @@ -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 diff --git a/app/src/main/java/com/johan/evmap/api/availability/NewMotionAvailabilityDetector.kt b/app/src/main/java/net/vonforst/evmap/api/availability/NewMotionAvailabilityDetector.kt similarity index 96% rename from app/src/main/java/com/johan/evmap/api/availability/NewMotionAvailabilityDetector.kt rename to app/src/main/java/net/vonforst/evmap/api/availability/NewMotionAvailabilityDetector.kt index b69b9217..71823f2c 100644 --- a/app/src/main/java/com/johan/evmap/api/availability/NewMotionAvailabilityDetector.kt +++ b/app/src/main/java/net/vonforst/evmap/api/availability/NewMotionAvailabilityDetector.kt @@ -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 diff --git a/app/src/main/java/com/johan/evmap/api/goingelectric/GoingElectricAdapters.kt b/app/src/main/java/net/vonforst/evmap/api/goingelectric/GoingElectricAdapters.kt similarity index 98% rename from app/src/main/java/com/johan/evmap/api/goingelectric/GoingElectricAdapters.kt rename to app/src/main/java/net/vonforst/evmap/api/goingelectric/GoingElectricAdapters.kt index 61982473..49d2121c 100644 --- a/app/src/main/java/com/johan/evmap/api/goingelectric/GoingElectricAdapters.kt +++ b/app/src/main/java/net/vonforst/evmap/api/goingelectric/GoingElectricAdapters.kt @@ -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 diff --git a/app/src/main/java/com/johan/evmap/api/goingelectric/GoingElectricApi.kt b/app/src/main/java/net/vonforst/evmap/api/goingelectric/GoingElectricApi.kt similarity index 97% rename from app/src/main/java/com/johan/evmap/api/goingelectric/GoingElectricApi.kt rename to app/src/main/java/net/vonforst/evmap/api/goingelectric/GoingElectricApi.kt index ebc64704..2be82533 100644 --- a/app/src/main/java/com/johan/evmap/api/goingelectric/GoingElectricApi.kt +++ b/app/src/main/java/net/vonforst/evmap/api/goingelectric/GoingElectricApi.kt @@ -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 diff --git a/app/src/main/java/com/johan/evmap/api/goingelectric/GoingElectricModel.kt b/app/src/main/java/net/vonforst/evmap/api/goingelectric/GoingElectricModel.kt similarity index 98% rename from app/src/main/java/com/johan/evmap/api/goingelectric/GoingElectricModel.kt rename to app/src/main/java/net/vonforst/evmap/api/goingelectric/GoingElectricModel.kt index 10a5188d..1b27cf66 100644 --- a/app/src/main/java/com/johan/evmap/api/goingelectric/GoingElectricModel.kt +++ b/app/src/main/java/net/vonforst/evmap/api/goingelectric/GoingElectricModel.kt @@ -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 diff --git a/app/src/main/java/com/johan/evmap/fragment/AboutFragment.kt b/app/src/main/java/net/vonforst/evmap/fragment/AboutFragment.kt similarity index 93% rename from app/src/main/java/com/johan/evmap/fragment/AboutFragment.kt rename to app/src/main/java/net/vonforst/evmap/fragment/AboutFragment.kt index d32d3538..0477fc3c 100644 --- a/app/src/main/java/com/johan/evmap/fragment/AboutFragment.kt +++ b/app/src/main/java/net/vonforst/evmap/fragment/AboutFragment.kt @@ -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() { diff --git a/app/src/main/java/com/johan/evmap/fragment/GalleryFragment.kt b/app/src/main/java/net/vonforst/evmap/fragment/GalleryFragment.kt similarity index 92% rename from app/src/main/java/com/johan/evmap/fragment/GalleryFragment.kt rename to app/src/main/java/net/vonforst/evmap/fragment/GalleryFragment.kt index a6e1c405..156644ee 100644 --- a/app/src/main/java/com/johan/evmap/fragment/GalleryFragment.kt +++ b/app/src/main/java/net/vonforst/evmap/fragment/GalleryFragment.kt @@ -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 { diff --git a/app/src/main/java/com/johan/evmap/fragment/MapFragment.kt b/app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt similarity index 95% rename from app/src/main/java/com/johan/evmap/fragment/MapFragment.kt rename to app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt index 802c6516..62e3587a 100644 --- a/app/src/main/java/com/johan/evmap/fragment/MapFragment.kt +++ b/app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt @@ -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 diff --git a/app/src/main/java/com/johan/evmap/ui/BindingAdapters.kt b/app/src/main/java/net/vonforst/evmap/ui/BindingAdapters.kt similarity index 96% rename from app/src/main/java/com/johan/evmap/ui/BindingAdapters.kt rename to app/src/main/java/net/vonforst/evmap/ui/BindingAdapters.kt index 2e29e5da..07cfadf0 100644 --- a/app/src/main/java/com/johan/evmap/ui/BindingAdapters.kt +++ b/app/src/main/java/net/vonforst/evmap/ui/BindingAdapters.kt @@ -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") diff --git a/app/src/main/java/com/johan/evmap/ui/HideOnScrollFabBehavior.kt b/app/src/main/java/net/vonforst/evmap/ui/HideOnScrollFabBehavior.kt similarity index 99% rename from app/src/main/java/com/johan/evmap/ui/HideOnScrollFabBehavior.kt rename to app/src/main/java/net/vonforst/evmap/ui/HideOnScrollFabBehavior.kt index 88a40e6f..0f68537a 100644 --- a/app/src/main/java/com/johan/evmap/ui/HideOnScrollFabBehavior.kt +++ b/app/src/main/java/net/vonforst/evmap/ui/HideOnScrollFabBehavior.kt @@ -1,4 +1,4 @@ -package com.johan.evmap.ui +package net.vonforst.evmap.ui import android.content.Context import android.util.AttributeSet diff --git a/app/src/main/java/com/johan/evmap/ui/IconGenerators.kt b/app/src/main/java/net/vonforst/evmap/ui/IconGenerators.kt similarity index 98% rename from app/src/main/java/com/johan/evmap/ui/IconGenerators.kt rename to app/src/main/java/net/vonforst/evmap/ui/IconGenerators.kt index 79c9a937..f6a05d37 100644 --- a/app/src/main/java/com/johan/evmap/ui/IconGenerators.kt +++ b/app/src/main/java/net/vonforst/evmap/ui/IconGenerators.kt @@ -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 { diff --git a/app/src/main/java/com/johan/evmap/ui/MarkerUtils.kt b/app/src/main/java/net/vonforst/evmap/ui/MarkerUtils.kt similarity index 93% rename from app/src/main/java/com/johan/evmap/ui/MarkerUtils.kt rename to app/src/main/java/net/vonforst/evmap/ui/MarkerUtils.kt index a8088098..4de3ef07 100644 --- a/app/src/main/java/com/johan/evmap/ui/MarkerUtils.kt +++ b/app/src/main/java/net/vonforst/evmap/ui/MarkerUtils.kt @@ -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 diff --git a/app/src/main/java/com/johan/evmap/viewmodel/GalleryViewModel.kt b/app/src/main/java/net/vonforst/evmap/viewmodel/GalleryViewModel.kt similarity index 81% rename from app/src/main/java/com/johan/evmap/viewmodel/GalleryViewModel.kt rename to app/src/main/java/net/vonforst/evmap/viewmodel/GalleryViewModel.kt index 1b72e403..444c44fd 100644 --- a/app/src/main/java/com/johan/evmap/viewmodel/GalleryViewModel.kt +++ b/app/src/main/java/net/vonforst/evmap/viewmodel/GalleryViewModel.kt @@ -1,4 +1,4 @@ -package com.johan.evmap.viewmodel +package net.vonforst.evmap.viewmodel import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel diff --git a/app/src/main/java/com/johan/evmap/viewmodel/MapViewModel.kt b/app/src/main/java/net/vonforst/evmap/viewmodel/MapViewModel.kt similarity index 92% rename from app/src/main/java/com/johan/evmap/viewmodel/MapViewModel.kt rename to app/src/main/java/net/vonforst/evmap/viewmodel/MapViewModel.kt index 3b680e58..ee22009c 100644 --- a/app/src/main/java/com/johan/evmap/viewmodel/MapViewModel.kt +++ b/app/src/main/java/net/vonforst/evmap/viewmodel/MapViewModel.kt @@ -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 diff --git a/app/src/main/java/com/johan/evmap/viewmodel/Utils.kt b/app/src/main/java/net/vonforst/evmap/viewmodel/Utils.kt similarity index 95% rename from app/src/main/java/com/johan/evmap/viewmodel/Utils.kt rename to app/src/main/java/net/vonforst/evmap/viewmodel/Utils.kt index 29c090ac..0f86c036 100644 --- a/app/src/main/java/com/johan/evmap/viewmodel/Utils.kt +++ b/app/src/main/java/net/vonforst/evmap/viewmodel/Utils.kt @@ -1,4 +1,4 @@ -package com.johan.evmap.viewmodel +package net.vonforst.evmap.viewmodel import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider diff --git a/app/src/main/res/layout/detail_view.xml b/app/src/main/res/layout/detail_view.xml index ac5a77b7..839220ae 100644 --- a/app/src/main/res/layout/detail_view.xml +++ b/app/src/main/res/layout/detail_view.xml @@ -5,16 +5,17 @@ - + - + - + - + - - + + + - + diff --git a/app/src/main/res/layout/fragment_map.xml b/app/src/main/res/layout/fragment_map.xml index 63a832a6..c42984d1 100644 --- a/app/src/main/res/layout/fragment_map.xml +++ b/app/src/main/res/layout/fragment_map.xml @@ -5,12 +5,13 @@ - - + + + + type="net.vonforst.evmap.viewmodel.MapViewModel" /> - + + type="net.vonforst.evmap.adapter.DetailAdapter.Detail" /> \ No newline at end of file diff --git a/app/src/main/res/xml/about.xml b/app/src/main/res/xml/about.xml index 06ff7671..9e173531 100644 --- a/app/src/main/res/xml/about.xml +++ b/app/src/main/res/xml/about.xml @@ -25,7 +25,7 @@ - + diff --git a/app/src/test/java/com/johan/evmap/NewMotionAvailabilityDetectorTest.kt b/app/src/test/java/net/vonforst/evmap/NewMotionAvailabilityDetectorTest.kt similarity index 93% rename from app/src/test/java/com/johan/evmap/NewMotionAvailabilityDetectorTest.kt rename to app/src/test/java/net/vonforst/evmap/NewMotionAvailabilityDetectorTest.kt index ad9d1933..151dc21f 100644 --- a/app/src/test/java/com/johan/evmap/NewMotionAvailabilityDetectorTest.kt +++ b/app/src/test/java/net/vonforst/evmap/NewMotionAvailabilityDetectorTest.kt @@ -1,10 +1,10 @@ -package com.johan.evmap +package net.vonforst.evmap -import com.johan.evmap.api.availability.NewMotionAvailabilityDetector -import com.johan.evmap.api.goingelectric.ChargeLocation -import com.johan.evmap.api.goingelectric.GoingElectricApi import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.runBlocking +import net.vonforst.evmap.api.availability.NewMotionAvailabilityDetector +import net.vonforst.evmap.api.goingelectric.ChargeLocation +import net.vonforst.evmap.api.goingelectric.GoingElectricApi import okhttp3.OkHttpClient import okhttp3.mockwebserver.Dispatcher import okhttp3.mockwebserver.MockResponse