From a6577a70b70e50819fdb1912b356866cdd77d8c4 Mon Sep 17 00:00:00 2001 From: serso Date: Mon, 26 Jan 2015 22:39:01 +0100 Subject: [PATCH] FAB added to history view --- android-app-tests/android-app-tests.iml | 38 +++++++++-------- android-app/android-app.iml | 3 ++ android-app/build.gradle | 2 +- .../history/BaseHistoryFragment.java | 20 ++++----- .../history/HistoryArrayAdapter.java | 2 +- .../drawable-hdpi/ic_delete_white_36dp.png | Bin 0 -> 345 bytes .../drawable-mdpi/ic_delete_white_36dp.png | Bin 0 -> 246 bytes .../drawable-xhdpi/ic_delete_white_36dp.png | Bin 0 -> 338 bytes .../drawable-xxhdpi/ic_delete_white_36dp.png | Bin 0 -> 456 bytes .../src/main/res/layout/history_fragment.xml | 39 ++++++++++++------ .../src/main/res/layout/history_item.xml | 9 ++-- .../src/main/res/menu/history_menu.xml | 6 --- .../src/main/res/values/styles_history.xml | 7 +++- .../src/main/res/values/theme_gray.xml | 2 +- 14 files changed, 73 insertions(+), 55 deletions(-) create mode 100644 android-app/src/main/res/drawable-hdpi/ic_delete_white_36dp.png create mode 100644 android-app/src/main/res/drawable-mdpi/ic_delete_white_36dp.png create mode 100644 android-app/src/main/res/drawable-xhdpi/ic_delete_white_36dp.png create mode 100644 android-app/src/main/res/drawable-xxhdpi/ic_delete_white_36dp.png diff --git a/android-app-tests/android-app-tests.iml b/android-app-tests/android-app-tests.iml index 3fb9b10e..dfee8079 100644 --- a/android-app-tests/android-app-tests.iml +++ b/android-app-tests/android-app-tests.iml @@ -71,36 +71,40 @@ - - + + - - + + + + + - - - + - + + + - - - - + + - + - - - - + + + + + + + \ No newline at end of file diff --git a/android-app/android-app.iml b/android-app/android-app.iml index 891c037a..1e6cc733 100644 --- a/android-app/android-app.iml +++ b/android-app/android-app.iml @@ -97,12 +97,15 @@ + + + diff --git a/android-app/build.gradle b/android-app/build.gradle index 00892a91..e516d32b 100644 --- a/android-app/build.gradle +++ b/android-app/build.gradle @@ -71,7 +71,7 @@ dependencies { compile 'org.solovyev.android:checkout:0.6.0@aar' compile 'com.actionbarsherlock:actionbarsherlock:4.4.0@aar' compile 'com.google.android.gms:play-services:6.5.87@aar' - + compile 'com.melnykov:floatingactionbutton:1.1.0' } task androidJavadocs(type: Javadoc) { diff --git a/android-app/src/main/java/org/solovyev/android/calculator/history/BaseHistoryFragment.java b/android-app/src/main/java/org/solovyev/android/calculator/history/BaseHistoryFragment.java index 2a106fe1..cd407770 100644 --- a/android-app/src/main/java/org/solovyev/android/calculator/history/BaseHistoryFragment.java +++ b/android-app/src/main/java/org/solovyev/android/calculator/history/BaseHistoryFragment.java @@ -35,12 +35,11 @@ import android.view.ViewGroup; import android.widget.AdapterView; import android.widget.ArrayAdapter; import android.widget.ListView; - import com.actionbarsherlock.app.SherlockListFragment; import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.MenuInflater; import com.actionbarsherlock.view.MenuItem; - +import com.melnykov.fab.FloatingActionButton; import org.solovyev.android.calculator.*; import org.solovyev.android.calculator.R; import org.solovyev.android.calculator.jscl.JsclOperation; @@ -55,7 +54,6 @@ import org.solovyev.common.text.Strings; import javax.annotation.Nonnull; import javax.annotation.Nullable; - import java.util.ArrayList; import java.util.Comparator; import java.util.List; @@ -149,6 +147,15 @@ public abstract class BaseHistoryFragment extends SherlockListFragment implement final ListView lv = getListView(); lv.setTextFilterEnabled(true); + final FloatingActionButton fab = (FloatingActionButton) root.findViewById(R.id.fab); + fab.attachToListView(lv); + fab.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Locator.getInstance().getCalculator().fireCalculatorEvent(clear_history_requested, null); + } + }); + lv.setOnItemClickListener(new AdapterView.OnItemClickListener() { public void onItemClick(final AdapterView parent, final View view, @@ -361,13 +368,6 @@ public abstract class BaseHistoryFragment extends SherlockListFragment implement private static enum HistoryMenu implements IdentifiableMenuItem { - clear_history(R.id.menu_history_clear_history) { - @Override - public void onClick(@Nonnull MenuItem data, @Nonnull Context context) { - Locator.getInstance().getCalculator().fireCalculatorEvent(clear_history_requested, null); - } - }, - toggle_datetime(R.id.menu_history_toggle_datetime) { @Override public void onClick(@Nonnull MenuItem data, @Nonnull Context context) { diff --git a/android-app/src/main/java/org/solovyev/android/calculator/history/HistoryArrayAdapter.java b/android-app/src/main/java/org/solovyev/android/calculator/history/HistoryArrayAdapter.java index bca6bb53..a1e49237 100644 --- a/android-app/src/main/java/org/solovyev/android/calculator/history/HistoryArrayAdapter.java +++ b/android-app/src/main/java/org/solovyev/android/calculator/history/HistoryArrayAdapter.java @@ -99,7 +99,7 @@ public class HistoryArrayAdapter extends ArrayAdapter { } }); } else { - status.setVisibility(INVISIBLE); + status.setVisibility(GONE); status.setOnClickListener(null); } } diff --git a/android-app/src/main/res/drawable-hdpi/ic_delete_white_36dp.png b/android-app/src/main/res/drawable-hdpi/ic_delete_white_36dp.png new file mode 100644 index 0000000000000000000000000000000000000000..f788f344cd8e896906be2b7303993e77d7253eee GIT binary patch literal 345 zcmeAS@N?(olHy`uVBq!ia0vp^W+2SL0wmRZ7KH&Rg=CK)Uj~LMH3o);76yi2K%s^g z3=E|P3=FRl7#OT(FffQ0%-I!a1C(G&@^*J&_}|`tWO>_%)r1c48n{Iv*t(u z1uuHKIEF+VetW}^>yU#$>%;oBIxaR&TpKriV5<@lwB9IuMaxs!!-`v5uz!)cz?vKt z_kax>CsZ`LOggKjlz+PM>FvZDN%K5^+%r7Xvh$FYNzkhBzIPiLrG30?6Hi>zo#ra~ zXwwGUyF!O8F9?4tUDF@V)P3{sm*wBq?CS2!-N104iJP;9Q&`PshC$+?7S7+?XU^|C zwp+c;?8c0#tY%5M&8C*YnjW^9g&U(ED66q3qmQ8Ek lRs86o-ou|So@x3>=r_vuF>?O(GXi>!!PC{xWt~$(697Gze4qdT literal 0 HcmV?d00001 diff --git a/android-app/src/main/res/drawable-mdpi/ic_delete_white_36dp.png b/android-app/src/main/res/drawable-mdpi/ic_delete_white_36dp.png new file mode 100644 index 0000000000000000000000000000000000000000..a9eac0ca7e773fa639e5c86ed460ba7abb6c6b7f GIT binary patch literal 246 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K;Lb6AYF9SoB8UsT^3j@P1pisjL z28L1t28LG&3=CE?7#PG0=Ijcz0ZK3>dAqwX{BQ3+vmeOgEbxddW?af+om}F=aBk5-JbP0l+XkKJF8LJ literal 0 HcmV?d00001 diff --git a/android-app/src/main/res/drawable-xhdpi/ic_delete_white_36dp.png b/android-app/src/main/res/drawable-xhdpi/ic_delete_white_36dp.png new file mode 100644 index 0000000000000000000000000000000000000000..0e95e9b1d0a70a13c1c4a28f5180f697b7828e01 GIT binary patch literal 338 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw6p}rHd>I(3)EF2VS{N990fib~ zFff!FFfhDIU|_JC!N4G1FlSew4N!t9$=lt9;eUJonf*W>XMsm#F#`j)FbFd;%$g$s z6g=hW;uw-~@9kAvKE_0m)`#V*IHLnDaQC)^<#UTI5V8(japl{BYyD1%j3(P0Op@83 zy*KXJvwZK_$+L@#7f-qGrQ$I`!I78stHp&{zqK>4$;7 OV(@hJb6Mw<&;$URHE|CB literal 0 HcmV?d00001 diff --git a/android-app/src/main/res/drawable-xxhdpi/ic_delete_white_36dp.png b/android-app/src/main/res/drawable-xxhdpi/ic_delete_white_36dp.png new file mode 100644 index 0000000000000000000000000000000000000000..4b6530d656e56830f1fc1eeb7ce9a555cd582da7 GIT binary patch literal 456 zcmeAS@N?(olHy`uVBq!ia0vp^IUvlz0wh)Q=eq$Zg=CK)Uj~LMH3o);76yi2K%s^g z3=E|P3=FRl7#OT(FffQ0%-I!a1C(G&@^*J&_}|`tWO>_%)r1c48n{Iv*t)J zFfclJx;TbZ+dtLC73aTeTkX5uW_722yxo&?O7CWg zt(*MOFKfKESZ-K#;n~4e4!3hZZ}XX1Hhtr+{zee^`^+S+u(|QBQE6&f^ zSQ@kBO!)17QD&{{;!l@Vd44a=T&8jIzIJ$M-GQ3d6 weWU%Q(5;=@E8a|7))=^$6Xv9E?-TBSmfr9=MDXYlU;s0Cy85}Sb4q9e0Gs!%;s5{u literal 0 HcmV?d00001 diff --git a/android-app/src/main/res/layout/history_fragment.xml b/android-app/src/main/res/layout/history_fragment.xml index 523779ca..3079b69d 100644 --- a/android-app/src/main/res/layout/history_fragment.xml +++ b/android-app/src/main/res/layout/history_fragment.xml @@ -23,19 +23,34 @@ --> + 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"> + + + + + + + + - - - - - + a:layout_gravity="bottom|right" + a:layout_margin="16dp" + a:src="@drawable/ic_delete_white_36dp" + fab:fab_colorNormal="#393939" + fab:fab_colorRipple="#40000000" /> + \ No newline at end of file diff --git a/android-app/src/main/res/layout/history_item.xml b/android-app/src/main/res/layout/history_item.xml index 0beb255c..4d7fb50d 100644 --- a/android-app/src/main/res/layout/history_item.xml +++ b/android-app/src/main/res/layout/history_item.xml @@ -48,12 +48,11 @@ + a:visibility="gone" + a:layout_width="30dp" + a:layout_height="30dp"/> \ No newline at end of file diff --git a/android-app/src/main/res/menu/history_menu.xml b/android-app/src/main/res/menu/history_menu.xml index f22bb5a6..bff8d8d7 100644 --- a/android-app/src/main/res/menu/history_menu.xml +++ b/android-app/src/main/res/menu/history_menu.xml @@ -36,10 +36,4 @@ a:title="@string/c_toggle_datetime" a:showAsAction="always"/> - - \ No newline at end of file diff --git a/android-app/src/main/res/values/styles_history.xml b/android-app/src/main/res/values/styles_history.xml index c13fd9e0..830666a9 100644 --- a/android-app/src/main/res/values/styles_history.xml +++ b/android-app/src/main/res/values/styles_history.xml @@ -22,9 +22,12 @@ -