FAB added to history view

This commit is contained in:
serso
2015-01-26 22:39:01 +01:00
parent 141741c446
commit a6577a70b7
14 changed files with 73 additions and 55 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 345 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 246 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 338 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 456 B

View File

@@ -23,19 +23,34 @@
-->
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/main_fragment_layout"
style="?cpp_fragment_layout_style"
a:layout_width="match_parent"
a:layout_height="match_parent">
xmlns:fab="http://schemas.android.com/apk/res-auto"
a:id="@+id/main_fragment_layout"
style="?cpp_fragment_layout_style"
a:layout_width="match_parent"
a:layout_height="match_parent">
<TextView
a:id="@+id/fragment_title"
a:id="@+id/fragment_title"
a:layout_height="wrap_content"
a:layout_width="match_parent"
style="?cpp_fragment_title_style" />
<include layout="@layout/ad" />
<FrameLayout
a:layout_width="match_parent"
a:layout_height="match_parent">
<ListView style="?cpp_fragment_list_view_style" />
<com.melnykov.fab.FloatingActionButton
a:id="@+id/fab"
a:layout_width="wrap_content"
a:layout_height="wrap_content"
a:layout_width="match_parent"
style="?cpp_fragment_title_style"/>
<include layout="@layout/ad"/>
<ListView style="?cpp_fragment_list_view_style"/>
a:layout_gravity="bottom|right"
a:layout_margin="16dp"
a:src="@drawable/ic_delete_white_36dp"
fab:fab_colorNormal="#393939"
fab:fab_colorRipple="#40000000" />
</FrameLayout>
</LinearLayout>

View File

@@ -48,12 +48,11 @@
</LinearLayout>
<ImageView a:id="@+id/history_item_status_icon"
a:layout_gravity="center_vertical"
a:layout_gravity="center_vertical|right"
a:scaleType="centerInside"
a:padding="6dp"
a:src="@drawable/ic_save_grey600_48dp"
a:visibility="invisible"
a:layout_width="wrap_content"
a:layout_height="match_parent"/>
a:visibility="gone"
a:layout_width="30dp"
a:layout_height="30dp"/>
</LinearLayout>

View File

@@ -36,10 +36,4 @@
a:title="@string/c_toggle_datetime"
a:showAsAction="always"/>
<item
a:id="@+id/menu_history_clear_history"
a:icon="@drawable/ic_delete_grey600_48dp"
a:title="@string/c_clear_history"
a:showAsAction="always"/>
</menu>

View File

@@ -22,9 +22,12 @@
<resources>
<style name="history_time" parent="math_entity_description"/>
<style name="history_time" parent="math_entity_description" />
<style name="history_item" parent="math_entity_text"/>
<style name="history_item" parent="math_entity_text">
<item name="android:maxLines">2</item>
<item name="android:ellipsize">end</item>
</style>
<style name="history_item_label" parent="math_entity_description">
<item name="android:textStyle">bold</item>

View File

@@ -60,7 +60,7 @@
<style name="cpp_default_fragment_list_view_style">
<item name="android:id">@android:id/list</item>
<item name="android:dividerHeight">1dp</item>
<item name="android:dividerHeight">1px</item>
<item name="android:divider">@color/cpp_list_divider</item>
<item name="android:cacheColorHint">@android:color/transparent</item>
<item name="android:layout_height">match_parent</item>