diff options
author | Andy Scherzinger <info@andy-scherzinger.de> | 2021-06-10 01:29:03 +0300 |
---|---|---|
committer | Andy Scherzinger <info@andy-scherzinger.de> | 2021-06-11 11:22:34 +0300 |
commit | 73e0b4e719a644e193db5fb06d3b2dc284542390 (patch) | |
tree | 1a12c14bc6676ea6c8f1e171c8c556604d8b8dfb /app/src/main/res | |
parent | 9f8a98ba07e5073868ceda51da6a4fc8c0c3b314 (diff) |
polish location map and move to native view bindings
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
Diffstat (limited to 'app/src/main/res')
-rw-r--r-- | app/src/main/res/layout/controller_location.xml | 86 | ||||
-rw-r--r-- | app/src/main/res/values-night/colors.xml | 1 | ||||
-rw-r--r-- | app/src/main/res/values/colors.xml | 1 |
3 files changed, 48 insertions, 40 deletions
diff --git a/app/src/main/res/layout/controller_location.xml b/app/src/main/res/layout/controller_location.xml index a82cfc16b..ed6b775df 100644 --- a/app/src/main/res/layout/controller_location.xml +++ b/app/src/main/res/layout/controller_location.xml @@ -3,6 +3,8 @@ ~ Nextcloud Talk application ~ ~ @author Marcel Hibbe + ~ @author Andy Scherzinger + ~ Copyright (C) 2021 Andy Scherzinger <info@andy-scherzinger.de> ~ Copyright (C) 2021 Marcel Hibbe <dev@mhibbe.de> ~ ~ This program is free software: you can redistribute it and/or modify @@ -32,29 +34,32 @@ android:layout_height="0dp" android:layout_weight="1"> - <org.osmdroid.views.MapView android:id="@+id/map" + <org.osmdroid.views.MapView + android:id="@+id/map" android:layout_width="fill_parent" android:layout_height="fill_parent" /> - <androidx.cardview.widget.CardView - android:id="@+id/ic_center_map" - android:layout_alignParentTop="true" - android:layout_alignParentEnd="true" + <com.google.android.material.button.MaterialButton + android:id="@+id/centerMapButton" + style="@style/Widget.AppTheme.Button.IconButton" android:layout_width="50dp" android:layout_height="50dp" - android:layout_margin="5dp" - android:elevation="10dp" - app:cardCornerRadius="25dp" - app:cardBackgroundColor="@color/appbar"> - - <ImageView - android:id="@+id/roundedImageView" - android:layout_width="25dp" - android:layout_height="25dp" - android:src="@drawable/ic_baseline_gps_fixed_24" - android:layout_gravity="center" - /> - </androidx.cardview.widget.CardView> + android:layout_alignParentTop="true" + android:layout_alignParentEnd="true" + android:layout_margin="8dp" + android:insetLeft="0dp" + android:insetTop="0dp" + android:insetRight="0dp" + android:insetBottom="0dp" + android:padding="0dp" + app:backgroundTint="@color/bg_default_semitransparent" + app:cornerRadius="@dimen/button_corner_radius" + app:elevation="0dp" + app:icon="@drawable/ic_baseline_gps_fixed_24" + app:iconGravity="textStart" + app:iconPadding="0dp" + app:iconSize="24dp" + app:iconTint="@color/high_emphasis_text" /> <View android:id="@+id/locationpicker_anchor" @@ -65,42 +70,43 @@ <ImageView android:layout_width="30dp" android:layout_height="50dp" - android:src="@drawable/ic_baseline_location_on_red_24" + android:layout_above="@id/locationpicker_anchor" android:layout_centerHorizontal="true" android:layout_marginBottom="-10dp" - android:layout_above="@id/locationpicker_anchor" - android:contentDescription="@string/nc_location_current_position_description"> - </ImageView> + android:contentDescription="@string/nc_location_current_position_description" + android:src="@drawable/ic_baseline_location_on_red_24" /> </RelativeLayout> <LinearLayout android:id="@+id/share_location" android:layout_width="match_parent" - android:layout_height="60dp" + android:layout_height="72dp" android:orientation="horizontal"> <ImageView - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:height="60dp" - android:minWidth="50dp" - android:padding="10dp" - android:textAlignment="textStart" - app:srcCompat="@drawable/ic_baseline_location_on_24"> - </ImageView> + android:id="@+id/roundedImageView" + android:layout_width="@dimen/avatar_size" + android:layout_height="@dimen/avatar_size" + android:layout_gravity="top" + android:layout_margin="@dimen/standard_margin" + android:contentDescription="@null" + android:src="@drawable/ic_circular_location" /> + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="vertical" - android:layout_gravity="center_vertical"> + android:layout_gravity="center_vertical" + android:orientation="vertical"> + <TextView android:id="@+id/share_location_description" android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" - android:textSize="20sp" - tools:text="Share this location"> - </TextView> + android:textColor="@color/high_emphasis_text" + android:textSize="16sp" + tools:text="Share this location" /> + <TextView android:id="@+id/place_name" android:layout_width="match_parent" @@ -108,11 +114,11 @@ android:layout_weight="1" android:ellipsize="end" android:maxLines="1" - tools:text="Brandenburg, Germany"> - </TextView> + android:textColor="@color/medium_emphasis_text" + android:textSize="14sp" + tools:text="Brandenburg, Germany" /> </LinearLayout> - </LinearLayout> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index 12b249d12..f70a55e11 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -39,6 +39,7 @@ <color name="low_emphasis_text">#61ffffff</color> <color name="bg_default">#121212</color> + <color name="bg_default_semitransparent">#99121212</color> <color name="bg_inverse">@color/grey950</color> <color name="fg_default">#FFFFFF</color> diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index c1ad8456c..83dad5b08 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -67,6 +67,7 @@ <color name="fg_inverse">#FFFFFF</color> <color name="bg_default">#FFFFFF</color> + <color name="bg_default_semitransparent">#99FFFFFF</color> <color name="bg_inverse">@color/grey950</color> <color name="bg_dark_mention_chips">#333333</color> |