diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ActivitySummaryDetail.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ActivitySummaryDetail.java index f6cf15d62..762d7284c 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ActivitySummaryDetail.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ActivitySummaryDetail.java @@ -31,7 +31,7 @@ import android.view.animation.Animation; import android.view.animation.AnimationUtils; import android.widget.Button; import android.widget.ImageView; -import android.widget.RelativeLayout; +import android.widget.LinearLayout; import android.widget.TableLayout; import android.widget.TableRow; import android.widget.TextView; @@ -82,7 +82,7 @@ public class ActivitySummaryDetail extends AbstractGBActivity { final long dateToFilter = intent.getLongExtra("dateToFilter", 0); final ActivitySummaryItems items = new ActivitySummaryItems(this, gbDevice, filter, dateFromFilter, dateToFilter); - final RelativeLayout layout = findViewById(R.id.activity_summary_detail_relative_layout); + final LinearLayout layout = findViewById(R.id.activity_summary_detail_relative_layout); alternateColor = getAlternateColor(this); final Animation animFadeRight; @@ -103,6 +103,7 @@ public class ActivitySummaryDetail extends AbstractGBActivity { this, R.anim.bounceright); + layout.setOnTouchListener(new SwipeEvents(this) { @Override public void onSwipeRight() { @@ -129,6 +130,7 @@ public class ActivitySummaryDetail extends AbstractGBActivity { } }); + currentItem = items.getItem(position); if (currentItem != null) { makeSummaryHeader(currentItem); diff --git a/app/src/main/res/layout/activity_summary_details.xml b/app/src/main/res/layout/activity_summary_details.xml index 0ff8c2ab2..99e2db3a2 100644 --- a/app/src/main/res/layout/activity_summary_details.xml +++ b/app/src/main/res/layout/activity_summary_details.xml @@ -1,120 +1,146 @@ - + - + android:layout_height="wrap_content" + android:orientation="horizontal"> + - - - + android:layout_height="wrap_content" + android:layout_centerVertical="false" + android:clickable="false" + android:foregroundGravity="top" + android:gravity="top" + android:orientation="vertical" + android:paddingStart="8dp" + android:paddingEnd="8dp"> - + + + android:layout_height="wrap_content"> - + - + - + - + - + - - + - + + - + - - + - + + + + + + + + + + + + + -