Skip to content

Commit

Permalink
Merge branch 'issue347' into issue347-dev
Browse files Browse the repository at this point in the history
  • Loading branch information
@FR3DD221
FR3DD221 committed Dec 19, 2024
2 parents 1d745eb + 078b41f commit b62f7f4
Show file tree
Hide file tree
Showing 4 changed files with 69 additions and 51 deletions.
5 changes: 3 additions & 2 deletions app/src/main/java/net/osmtracker/activity/AvailableLayouts.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,10 +151,11 @@ public void setAvailableLayouts(List<String> options) {
Button layoutButton = new Button(this);
layoutButton.setHeight(150);
layoutButton.setText(CustomLayoutsUtils.convertFileName(option));
layoutButton.setTextSize((float)22 );
layoutButton.setTextSize(16f);
layoutButton.setTextColor(Color.WHITE);
layoutButton.setSingleLine(false);
LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
layoutParams.setMargins(110, 0, 110, 0);
layoutParams.setMargins(50, 10, 50, 10);
layoutButton.setLayoutParams(layoutParams);
layoutButton.setPadding(10,20,10,20);
layoutButton.setOnClickListener(listener);
Expand Down
2 changes: 0 additions & 2 deletions app/src/main/res/layout-iw/waypointlist_item.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,4 @@
<TextView android:layout_width="wrap_content" android:id="@+id/wplist_item_timestamp" android:layout_height="wrap_content" android:text="{timestamp}" android:layout_below="@+id/wplist_item_location" android:layout_alignParentLeft="true" android:layout_marginLeft="10dp"></TextView>
<TextView style="@android:style/TextAppearance.Large" android:layout_width="wrap_content" android:id="@+id/wplist_item_name" android:layout_height="wrap_content" android:text="{name}" android:layout_alignParentTop="true" android:layout_alignParentRight="true"></TextView>
<TextView android:layout_width="wrap_content" android:id="@+id/wplist_item_location" android:layout_height="wrap_content" android:text="{location}" android:layout_below="@+id/wplist_item_name" android:layout_alignParentLeft="true" android:layout_marginLeft="10dp"></TextView>


</RelativeLayout>
9 changes: 4 additions & 5 deletions app/src/main/res/layout/available_layouts.xml
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:contentDescription="@string/prefs_ui_available_layout"
android:paddingTop="4dp">
android:fillViewport="true">

<LinearLayout
android:id="@+id/root_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" />
</ScrollView>
android:orientation="vertical"
android:paddingTop="5dp" />
</ScrollView>
104 changes: 62 additions & 42 deletions app/src/main/res/layout/tracklist_item.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,53 +41,73 @@
style="@android:style/TextAppearance.Large"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:autoSizeTextType="uniform"
android:maxLines="1"
android:text="{start_date}" />

<TextView
android:id="@+id/trackmgr_item_waypoints"
style="@android:style/TextAppearance.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/trackmgr_item_nameordate"
android:layout_marginEnd="3dp"
android:layout_marginRight="3dp"
android:text="@string/trackmgr_waypoints_count"
android:textStyle="bold" />
<LinearLayout
android:id="@+id/waypoints_container"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/trackmgr_item_nameordate"
android:orientation="horizontal">

<TextView
android:id="@+id/trackmgr_item_wps"
style="@android:style/TextAppearance.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/trackmgr_item_nameordate"
android:layout_toEndOf="@id/trackmgr_item_waypoints"
android:layout_toRightOf="@id/trackmgr_item_waypoints"
android:text="{x}" />
<TextView
android:id="@+id/trackmgr_item_waypoints"
style="@android:style/TextAppearance.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/trackmgr_item_nameordate"
android:layout_marginStart="8dp"
android:layout_marginLeft="8dp"
android:layout_marginEnd="3dp"
android:layout_marginRight="3dp"
android:text="@string/trackmgr_waypoints_count"
android:textStyle="bold" />

<TextView
android:id="@+id/trackmgr_item_trackpoints"
style="@android:style/TextAppearance.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/trackmgr_item_nameordate"
android:layout_marginStart="8dp"
android:layout_marginLeft="8dp"
android:layout_marginEnd="3dp"
android:layout_marginRight="3dp"
android:layout_toEndOf="@id/trackmgr_item_wps"
android:layout_toRightOf="@id/trackmgr_item_wps"
android:text="@string/trackmgr_trackpoints_count"
android:textStyle="bold" />
<TextView
android:id="@+id/trackmgr_item_wps"
style="@android:style/TextAppearance.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/trackmgr_item_nameordate"
android:layout_toEndOf="@id/trackmgr_item_waypoints"
android:layout_toRightOf="@id/trackmgr_item_waypoints"
android:text="{x}" />
</LinearLayout>

<TextView
android:id="@+id/trackmgr_item_tps"
style="@android:style/TextAppearance.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/trackmgr_item_nameordate"
android:layout_toEndOf="@id/trackmgr_item_trackpoints"
android:layout_toRightOf="@id/trackmgr_item_trackpoints"
android:text="{y}" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/waypoints_container"
android:orientation="horizontal">

<TextView
android:id="@+id/trackmgr_item_trackpoints"
style="@android:style/TextAppearance.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/trackmgr_item_nameordate"
android:layout_marginStart="8dp"
android:layout_marginLeft="8dp"
android:layout_marginEnd="3dp"
android:layout_marginRight="3dp"
android:layout_toEndOf="@id/trackmgr_item_wps"
android:layout_toRightOf="@id/trackmgr_item_wps"
android:text="@string/trackmgr_trackpoints_count"
android:textStyle="bold" />

<TextView
android:id="@+id/trackmgr_item_tps"
style="@android:style/TextAppearance.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/trackmgr_item_nameordate"
android:layout_toEndOf="@id/trackmgr_item_trackpoints"
android:layout_toRightOf="@id/trackmgr_item_trackpoints"
android:text="{y}" />

</LinearLayout>

</RelativeLayout>

Expand Down

0 comments on commit b62f7f4

Please sign in to comment.