gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-19 18:55:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

replace current-position icon

Browse Source 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
Marcel Hibbe 2021-06-08 17:59:01 +02:00 committed by Andy Scherzinger
parent 22333d2f57
commit 751cd1268e
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/com/nextcloud/talk/controllers/LocationPickerController.kt
View File

@ -22,6 +22,7 @@ import android.widget.Toast
import androidx.appcompat.widget.SearchView import androidx.appcompat.widget.SearchView
import androidx.cardview.widget.CardView import androidx.cardview.widget.CardView
import androidx.core.content.PermissionChecker import androidx.core.content.PermissionChecker
import androidx.core.content.res.ResourcesCompat
import androidx.core.view.MenuItemCompat import androidx.core.view.MenuItemCompat
import androidx.preference.PreferenceManager import androidx.preference.PreferenceManager
import autodagger.AutoInjector import autodagger.AutoInjector
@ -34,6 +35,7 @@ import com.nextcloud.talk.application.NextcloudTalkApplication
import com.nextcloud.talk.controllers.base.BaseController import com.nextcloud.talk.controllers.base.BaseController
import com.nextcloud.talk.models.json.generic.GenericOverall import com.nextcloud.talk.models.json.generic.GenericOverall
import com.nextcloud.talk.utils.ApiUtils import com.nextcloud.talk.utils.ApiUtils
import com.nextcloud.talk.utils.DisplayUtils
import com.nextcloud.talk.utils.bundle.BundleKeys import com.nextcloud.talk.utils.bundle.BundleKeys
import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_ROOM_TOKEN import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_ROOM_TOKEN
import com.nextcloud.talk.utils.database.user.UserUtils import com.nextcloud.talk.utils.database.user.UserUtils
@ -224,8 +226,9 @@ class LocationPickerController(args: Bundle) :
val locationOverlay = MyLocationNewOverlay(GpsMyLocationProvider(context), map) val locationOverlay = MyLocationNewOverlay(GpsMyLocationProvider(context), map)
// locationOverlay.enableFollowLocation() // locationOverlay.enableFollowLocation()
locationOverlay.enableMyLocation() locationOverlay.enableMyLocation()
// locationOverlay.setPersonIcon( locationOverlay.setPersonHotspot(20.0F,20.0F)
// DisplayUtils.getBitmap(ResourcesCompat.getDrawable(resources!!, R.drawable.current_location_circle, null))) locationOverlay.setPersonIcon(
DisplayUtils.getBitmap(ResourcesCompat.getDrawable(resources!!, R.drawable.current_location_circle, null)))
map?.overlays?.add(locationOverlay) map?.overlays?.add(locationOverlay)
val mapController = map?.controller val mapController = map?.controller
@ -237,7 +240,7 @@ class LocationPickerController(args: Bundle) :
} }
var myLocation: GeoPoint var myLocation: GeoPoint
myLocation = GeoPoint(13.0, 52.0) myLocation = GeoPoint(52.0, 13.0)
var zoomToCurrentPositionAllowed = !receivedChosenGeocodingResult var zoomToCurrentPositionAllowed = !receivedChosenGeocodingResult
locationOverlay.runOnFirstFix { locationOverlay.runOnFirstFix {

6
app/src/main/res/drawable/current_location_circle.xml
View File

@ -4,9 +4,9 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item> <item>
<shape android:shape="oval"> <shape android:shape="oval">
<solid android:color="#0039C9"/> <solid android:color="#0082C9"/>
<stroke android:color="#FFFFFF" android:width="0.1dp"/> <stroke android:color="#FFFFFF" android:width="2dp"/>
<size android:width="6dp" android:height="6dp"/> <size android:width="15dp" android:height="15dp"/>
</shape> </shape>
</item> </item>
</selector> </selector>

2
app/src/main/res/layout/controller_location.xml
View File

@ -48,7 +48,7 @@
android:layout_height="50dp" android:layout_height="50dp"
android:src="@drawable/ic_baseline_location_on_red_24" android:src="@drawable/ic_baseline_location_on_red_24"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginBottom="0dp" android:layout_marginBottom="-10dp"
android:layout_above="@id/locationpicker_anchor" android:layout_above="@id/locationpicker_anchor"
android:contentDescription="@string/nc_location_current_position_description"> android:contentDescription="@string/nc_location_current_position_description">
</ImageView> </ImageView>