Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'r3.4'

Browse source
This commit is contained in:
Chumva 2019-07-24 09:47:11 +03:00
commit 7f8a6ca226
6 changed files with 29 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
OsmAnd/res/layout/gpx_item_altitude.xml
View file

@ -22,6 +22,7 @@
android:id="@+id/gpx_join_gaps_container" android:id="@+id/gpx_join_gaps_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:minHeight="@dimen/card_row_min_height" android:minHeight="@dimen/card_row_min_height"
android:orientation="horizontal"> android:orientation="horizontal">
@ -42,6 +43,10 @@
android:id="@+id/gpx_join_gaps_switch" android:id="@+id/gpx_join_gaps_switch"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@null"
android:clickable="false"
android:focusable="false"
android:focusableInTouchMode="false"
android:paddingLeft="@dimen/content_padding" android:paddingLeft="@dimen/content_padding"
android:paddingRight="@dimen/content_padding" /> android:paddingRight="@dimen/content_padding" />

5
OsmAnd/res/layout/gpx_item_general.xml
View file

@ -22,6 +22,7 @@
android:id="@+id/gpx_join_gaps_container" android:id="@+id/gpx_join_gaps_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:minHeight="@dimen/card_row_min_height" android:minHeight="@dimen/card_row_min_height"
android:orientation="horizontal"> android:orientation="horizontal">
@ -42,6 +43,10 @@
android:id="@+id/gpx_join_gaps_switch" android:id="@+id/gpx_join_gaps_switch"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@null"
android:clickable="false"
android:focusable="false"
android:focusableInTouchMode="false"
android:paddingLeft="@dimen/content_padding" android:paddingLeft="@dimen/content_padding"
android:paddingRight="@dimen/content_padding" /> android:paddingRight="@dimen/content_padding" />

6
OsmAnd/res/layout/gpx_item_list_header.xml
View file

@ -53,8 +53,10 @@
android:background="?attr/bg_color"> android:background="?attr/bg_color">
<LinearLayout <LinearLayout
android:id="@+id/showOnMapContainer"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:orientation="horizontal" android:orientation="horizontal"
android:gravity="center_vertical"> android:gravity="center_vertical">
@ -81,6 +83,10 @@
android:id="@+id/showOnMapToggle" android:id="@+id/showOnMapToggle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@null"
android:clickable="false"
android:focusable="false"
android:focusableInTouchMode="false"
android:paddingLeft="16dp" android:paddingLeft="16dp"
android:paddingRight="8dp"/> android:paddingRight="8dp"/>

5
OsmAnd/res/layout/gpx_item_speed.xml
View file

@ -22,6 +22,7 @@
android:id="@+id/gpx_join_gaps_container" android:id="@+id/gpx_join_gaps_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:minHeight="@dimen/card_row_min_height" android:minHeight="@dimen/card_row_min_height"
android:orientation="horizontal"> android:orientation="horizontal">
@ -42,6 +43,10 @@
android:id="@+id/gpx_join_gaps_switch" android:id="@+id/gpx_join_gaps_switch"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@null"
android:clickable="false"
android:focusable="false"
android:focusableInTouchMode="false"
android:paddingLeft="@dimen/content_padding" android:paddingLeft="@dimen/content_padding"
android:paddingRight="@dimen/content_padding" /> android:paddingRight="@dimen/content_padding" />

3
OsmAnd/src/net/osmand/plus/myplaces/TrackActivityFragmentAdapter.java
View file

@ -321,9 +321,10 @@ public class TrackActivityFragmentAdapter implements TrackBitmapDrawerListener {
} }
vis.setChecked(gpxFileSelected); vis.setChecked(gpxFileSelected);
vis.setOnClickListener(new View.OnClickListener() { headerView.findViewById(R.id.showOnMapContainer).setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
vis.toggle();
if (!vis.isChecked()) { if (!vis.isChecked()) {
selectedSplitInterval = 0; selectedSplitInterval = 0;
} }

15
OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
View file

@ -716,11 +716,10 @@ public class TrackSegmentFragment extends OsmAndListFragment implements TrackBit
((ImageView) view.findViewById(R.id.end_time_icon)) ((ImageView) view.findViewById(R.id.end_time_icon))
.setImageDrawable(ic.getThemedIcon(R.drawable.ic_action_time_end)); .setImageDrawable(ic.getThemedIcon(R.drawable.ic_action_time_end));
final SwitchCompat joinGapsSwitch = (SwitchCompat) view.findViewById(R.id.gpx_join_gaps_switch); view.findViewById(R.id.gpx_join_gaps_container).setOnClickListener(new View.OnClickListener() {
joinGapsSwitch.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
joinGapsEnabled = joinGapsSwitch.isChecked(); joinGapsEnabled = !joinGapsEnabled;
for (int i = 0; i < getCount(); i++) { for (int i = 0; i < getCount(); i++) {
View view = getViewAtPosition(i); View view = getViewAtPosition(i);
updateJoinGapsInfo(view, i); updateJoinGapsInfo(view, i);
@ -854,11 +853,10 @@ public class TrackSegmentFragment extends OsmAndListFragment implements TrackBit
((TextView) view.findViewById(R.id.ascent_text)).setText(asc); ((TextView) view.findViewById(R.id.ascent_text)).setText(asc);
((TextView) view.findViewById(R.id.descent_text)).setText(desc); ((TextView) view.findViewById(R.id.descent_text)).setText(desc);
final SwitchCompat joinGapsSwitch = (SwitchCompat) view.findViewById(R.id.gpx_join_gaps_switch); view.findViewById(R.id.gpx_join_gaps_container).setOnClickListener(new View.OnClickListener() {
joinGapsSwitch.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
joinGapsEnabled = joinGapsSwitch.isChecked(); joinGapsEnabled = !joinGapsEnabled;
for (int i = 0; i < getCount(); i++) { for (int i = 0; i < getCount(); i++) {
View view = getViewAtPosition(i); View view = getViewAtPosition(i);
updateJoinGapsInfo(view, i); updateJoinGapsInfo(view, i);
@ -961,11 +959,10 @@ public class TrackSegmentFragment extends OsmAndListFragment implements TrackBit
((TextView) view.findViewById(R.id.average_text)).setText(avg); ((TextView) view.findViewById(R.id.average_text)).setText(avg);
((TextView) view.findViewById(R.id.max_text)).setText(max); ((TextView) view.findViewById(R.id.max_text)).setText(max);
final SwitchCompat joinGapsSwitch = (SwitchCompat) view.findViewById(R.id.gpx_join_gaps_switch); view.findViewById(R.id.gpx_join_gaps_container).setOnClickListener(new View.OnClickListener() {
joinGapsSwitch.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
joinGapsEnabled = joinGapsSwitch.isChecked(); joinGapsEnabled = !joinGapsEnabled;
for (int i = 0; i < getCount(); i++) { for (int i = 0; i < getCount(); i++) {
View view = getViewAtPosition(i); View view = getViewAtPosition(i);
updateJoinGapsInfo(view, i); updateJoinGapsInfo(view, i);