Skip to content

Commit

Permalink
Merge branch 'pr/698' into hotfix/patches
Browse files Browse the repository at this point in the history
Fixes #695
  • Loading branch information
rivaldi8 committed Jun 26, 2017
2 parents 450fd35 + fdaef22 commit badbe14
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions app/src/main/res/layout/activity_transaction_detail.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,9 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">



<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
Expand Down Expand Up @@ -65,6 +62,9 @@
</LinearLayout>
</android.support.v7.widget.Toolbar>

<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
<TableLayout android:id="@+id/fragment_transaction_details"
android:layout_width="match_parent"
android:layout_height="wrap_content"
Expand Down Expand Up @@ -146,6 +146,7 @@
</TableRow>

</TableLayout>
</ScrollView>
</LinearLayout>
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab_edit_transaction"
Expand Down

0 comments on commit badbe14

Please sign in to comment.