Page Menu
Home
GitPull.it
Search
Configure Global Search
Log In
Files
F11448513
D203.1773639497.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Award Token
Flag For Later
Size
9 KB
Referenced Files
None
Subscribers
None
D203.1773639497.diff
View Options
diff --git a/app/src/main/java/it/reyboz/bustorino/fragments/MapLibreFragment.kt b/app/src/main/java/it/reyboz/bustorino/fragments/MapLibreFragment.kt
--- a/app/src/main/java/it/reyboz/bustorino/fragments/MapLibreFragment.kt
+++ b/app/src/main/java/it/reyboz/bustorino/fragments/MapLibreFragment.kt
@@ -1089,9 +1089,9 @@
*/
private fun updateFollowingIcon(enabled: Boolean){
if(enabled)
- followUserButton.setImageDrawable(ContextCompat.getDrawable(requireContext(), R.drawable.ic_follow_me_on))
+ followUserButton.setImageDrawable(ContextCompat.getDrawable(requireContext(), R.drawable.walk_circle_active))
else
- followUserButton.setImageDrawable(ContextCompat.getDrawable(requireContext(), R.drawable.ic_follow_me))
+ followUserButton.setImageDrawable(ContextCompat.getDrawable(requireContext(), R.drawable.walk_circle_inactive))
}
private fun setFollowingUser(following: Boolean){
diff --git a/app/src/main/res/drawable/crosshair_circle_grey.xml b/app/src/main/res/drawable/crosshair_circle_grey.xml
new file mode 100644
--- /dev/null
+++ b/app/src/main/res/drawable/crosshair_circle_grey.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:height="@dimen/map_toolbar_icon_size" android:viewportHeight="48"
+ android:viewportWidth="48" android:width="@dimen/map_toolbar_icon_size">
+
+ <path android:fillAlpha="0.65" android:fillColor="#c6c6c6" android:pathData="M0.449,24.048a23.505,23.505 0,1 0,47.009 0a23.505,23.505 0,1 0,-47.009 0z" android:strokeColor="#333333" android:strokeLineJoin="round" android:strokeWidth="1.4"/>
+
+ <path android:fillColor="#282828" android:pathData="M22.364,12.661C17.347,13.379 13.379,17.347 12.661,22.364L15.818,22.364l0,3.273L12.661,25.636C13.379,30.653 17.347,34.621 22.364,35.339L22.364,32.182l3.273,0l0,3.157C30.653,34.621 34.621,30.653 35.339,25.636L32.182,25.636l0,-3.273l3.157,0C34.621,17.347 30.653,13.379 25.636,12.661L25.636,15.818L22.364,15.818ZM9.363,22.364C10.117,15.537 15.537,10.117 22.364,9.363L22.364,6l3.273,0L25.636,9.363C32.463,10.117 37.883,15.537 38.637,22.364L42,22.364l0,3.273L38.637,25.636C37.883,32.463 32.463,37.883 25.636,38.637L25.636,42L22.364,42L22.364,38.637C15.537,37.883 10.117,32.463 9.363,25.636L6,25.636L6,22.364ZM27.273,24c0,1.808 -1.465,3.273 -3.273,3.273 -1.808,0 -3.273,-1.465 -3.273,-3.273 0,-1.808 1.465,-3.273 3.273,-3.273 1.808,0 3.273,1.465 3.273,3.273z"/>
+
+</vector>
diff --git a/app/src/main/res/drawable/location_circlew_grey.xml b/app/src/main/res/drawable/location_circlew_grey.xml
--- a/app/src/main/res/drawable/location_circlew_grey.xml
+++ b/app/src/main/res/drawable/location_circlew_grey.xml
@@ -1,5 +1,5 @@
-<vector android:height="40sp"
- android:width="40sp"
+<vector android:height="@dimen/map_toolbar_icon_size"
+ android:width="@dimen/map_toolbar_icon_size"
android:viewportHeight="48"
android:viewportWidth="48"
xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/app/src/main/res/drawable/location_circlew_red.xml b/app/src/main/res/drawable/location_circlew_red.xml
--- a/app/src/main/res/drawable/location_circlew_red.xml
+++ b/app/src/main/res/drawable/location_circlew_red.xml
@@ -1,9 +1,9 @@
-<vector android:height="40sp"
- android:width="40sp"
+<vector android:height="@dimen/map_toolbar_icon_size"
+ android:width="@dimen/map_toolbar_icon_size"
android:viewportHeight="48"
android:viewportWidth="48"
xmlns:android="http://schemas.android.com/apk/res/android">
- <path android:fillAlpha="0.7"
+ <path android:fillAlpha="0.75"
android:fillColor="#f15000"
android:pathData="M24.064,23.98m-23.21,0a23.21,23.21 0,1 1,46.42 0a23.21,23.21 0,1 1,-46.42 0"
android:strokeColor="#333333" android:strokeLineJoin="round"
diff --git a/app/src/main/res/drawable/walk_circle_active.xml b/app/src/main/res/drawable/walk_circle_active.xml
new file mode 100644
--- /dev/null
+++ b/app/src/main/res/drawable/walk_circle_active.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true"
+ android:height="@dimen/map_toolbar_icon_size" android:width="@dimen/map_toolbar_icon_size" android:viewportHeight="48" android:viewportWidth="48" >
+
+ <path android:fillAlpha="0.75" android:fillColor="#f15000" android:pathData="M24.064,23.98m-23.21,0a23.21,23.21 0,1 1,46.42 0a23.21,23.21 0,1 1,-46.42 0"
+ android:strokeColor="#333333" android:strokeLineJoin="round" android:strokeWidth="1.4"/>
+
+ <path android:fillColor="#333" android:pathData="m16.428,18.116 l5.384,-3.912c0.591,-0.431 1.321,-0.669 2.088,-0.643 1.867,0.046 3.507,1.27 4.077,3.057 0.313,0.981 0.598,1.643 0.856,1.986C30.366,20.641 32.804,21.959 35.55,21.959l0,3.36c-3.653,0 -6.917,-1.666 -9.074,-4.279l-1.172,6.645 3.462,2.905 3.735,10.261L29.344,42 25.917,32.585 20.222,27.806C19.302,27.063 18.804,25.855 19.024,24.608L19.878,19.762 18.741,20.588 15.168,25.506 12.45,23.531 16.399,18.095ZM26.311,12.72c-1.856,0 -3.36,-1.504 -3.36,-3.36 0,-1.856 1.504,-3.36 3.36,-3.36 1.855,0 3.36,1.504 3.36,3.36 0,1.856 -1.504,3.36 -3.36,3.36zM21.319,34.863 L15.92,41.297 13.346,39.137 18.344,33.181 19.598,29.518 22.607,32.038Z"/>
+
+</vector>
diff --git a/app/src/main/res/drawable/walk_circle_inactive.xml b/app/src/main/res/drawable/walk_circle_inactive.xml
new file mode 100644
--- /dev/null
+++ b/app/src/main/res/drawable/walk_circle_inactive.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:autoMirrored="true"
+ android:height="@dimen/map_toolbar_icon_size" android:width="@dimen/map_toolbar_icon_size"
+ android:viewportHeight="48" android:viewportWidth="48" >
+
+ <path android:fillAlpha="0.65"
+ android:fillColor="#c6c6c6"
+ android:pathData="M0.449,24.048a23.505,23.505 0,1 0,47.009 0a23.505,23.505 0,1 0,-47.009 0z" android:strokeColor="#333333" android:strokeLineJoin="round"
+ android:strokeWidth="1.4"/>
+
+ <path android:fillColor="#333" android:pathData="m16.428,18.116 l5.384,-3.912c0.591,-0.431 1.321,-0.669 2.088,-0.643 1.867,0.046 3.507,1.27 4.077,3.057 0.313,0.981 0.598,1.643 0.856,1.986C30.366,20.641 32.804,21.959 35.55,21.959l0,3.36c-3.653,0 -6.917,-1.666 -9.074,-4.279l-1.172,6.645 3.462,2.905 3.735,10.261L29.344,42 25.917,32.585 20.222,27.806C19.302,27.063 18.804,25.855 19.024,24.608L19.878,19.762 18.741,20.588 15.168,25.506 12.45,23.531 16.399,18.095ZM26.311,12.72c-1.856,0 -3.36,-1.504 -3.36,-3.36 0,-1.856 1.504,-3.36 3.36,-3.36 1.855,0 3.36,1.504 3.36,3.36 0,1.856 -1.504,3.36 -3.36,3.36zM21.319,34.863 L15.92,41.297 13.346,39.137 18.344,33.181 19.598,29.518 22.607,32.038Z"/>
+
+</vector>
diff --git a/app/src/main/res/layout/fragment_map_libre.xml b/app/src/main/res/layout/fragment_map_libre.xml
--- a/app/src/main/res/layout/fragment_map_libre.xml
+++ b/app/src/main/res/layout/fragment_map_libre.xml
@@ -163,18 +163,20 @@
android:contentDescription="@string/enable_position"
android:layout_alignParentTop="true"
android:layout_alignParentEnd="true"
- android:layout_marginEnd="4dp"
+ android:layout_marginEnd="1dp"
android:cropToPadding="true"/>
<ImageButton
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/centerMapImageButton"
- android:src="@drawable/ic_center_map"
+ android:src="@drawable/crosshair_circle_grey"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_below="@id/locationEnableIcon"
- android:layout_marginTop="6dp"
+ android:layout_marginTop="7dp"
+ android:layout_marginEnd="1dp"
+
android:background="#00ffffff"
android:contentDescription="@string/bt_center_map_description"
android:cropToPadding="true" />
@@ -187,10 +189,12 @@
android:background="#00ffffff"
android:contentDescription="@string/bt_follow_me_description"
android:cropToPadding="true"
+ android:layout_marginEnd="1dp"
+
android:layout_below="@+id/centerMapImageButton"
android:layout_alignStart="@+id/centerMapImageButton"
- android:layout_marginTop="6dp" />
+ android:layout_marginTop="7dp" />
</RelativeLayout>
</FrameLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -12,4 +12,6 @@
<dimen name="margin_arr">5dp</dimen>
<dimen name="subtitle_size">28sp</dimen>
+ <dimen name="map_toolbar_icon_size">43dp</dimen>
+
</resources>
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Mon, Mar 16, 06:38 (13 h, 36 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1750918
Default Alt Text
D203.1773639497.diff (9 KB)
Attached To
Mode
D203: Add new icons
Attached
Detach File
Event Timeline
Log In to Comment