TnSb/android-calculatorpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FAB added to history view

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

20
android-app/src/main/java/org/solovyev/android/calculator/history/BaseHistoryFragment.java
View File

@@ -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<MenuItem> {
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) {

2
android-app/src/main/java/org/solovyev/android/calculator/history/HistoryArrayAdapter.java
View File

@@ -99,7 +99,7 @@ public class HistoryArrayAdapter extends ArrayAdapter<CalculatorHistoryState> {
}
});
} else {
status.setVisibility(INVISIBLE);
status.setVisibility(GONE);
status.setOnClickListener(null);
}
}