karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Theming: merged edit buttons into layout.

Browse Source
This commit is contained in:
Dennis Guse
2020-09-14 17:43:25 +02:00
parent a68cde7ac9
commit 6f212328a1
4 changed files with 26 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/res/layout/marker_edit.xml
+15 -6
View File
@@ -78,19 +78,17 @@ limitations under the License.
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_alignParentEnd="true"
android:layout_alignParentTop="true"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:scaleType="fitStart"
android:adjustViewBounds="true"
android:contentDescription="@string/image_photo_marker" />
android:contentDescription="@string/image_photo_marker"
android:scaleType="fitStart" />
<ImageView
android:id="@+id/marker_edit_waypoint_photo_delete"
android:layout_width="32dp"
android:layout_height="32dp"
android:background="@drawable/shape_circle_darkgray"
android:padding="4dp"
android:layout_alignParentTop="true"
android:layout_alignParentEnd="true"
android:layout_margin="16dp"
@@ -98,6 +96,8 @@ limitations under the License.
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
android:background="@drawable/shape_circle_darkgray"
android:padding="4dp"
android:src="@drawable/ic_delete_forever_24dp" />
</RelativeLayout>
</LinearLayout>
@@ -107,6 +107,15 @@ limitations under the License.
<LinearLayout style="@style/BottomButtonBar">
<include layout="@layout/marker_edit_buttons" />
<Button
android:id="@+id/marker_edit_cancel"
style="@style/BottomButton"
android:layout_gravity="left"
android:text="@string/generic_cancel" />
<Button
android:id="@+id/marker_edit_done"
style="@style/BottomButton"
android:layout_gravity="right" />
</LinearLayout>
</LinearLayout>