Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
22dccaa24b
40 changed files with 561 additions and 165 deletions
|
@ -125,6 +125,7 @@
|
|||
android:id="@+id/statisticList"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:nestedScrollingEnabled="true"
|
||||
tools:listitem="@layout/item_chart" />
|
||||
</LinearLayout>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue