From 32acd946982747a37b29a5e23ac313a49df31823 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Sat, 21 Feb 2015 20:46:37 +0100 Subject: Floating action button icons and methods for key list --- .../keychain/ui/KeyListFragment.java | 56 +++++++++++++++------ .../res/drawable-hdpi/ic_folder_white_24dp.png | Bin 0 -> 224 bytes .../res/drawable-mdpi/ic_folder_white_24dp.png | Bin 0 -> 206 bytes .../res/drawable-xhdpi/ic_folder_white_24dp.png | Bin 0 -> 273 bytes .../res/drawable-xxhdpi/ic_folder_white_24dp.png | Bin 0 -> 342 bytes .../res/drawable-xxxhdpi/ic_folder_white_24dp.png | Bin 0 -> 504 bytes OpenKeychain/src/main/res/drawable/qrcode.xml | 8 +++ .../src/main/res/layout/key_list_fragment.xml | 7 ++- OpenKeychain/src/main/res/menu/key_list.xml | 16 ------ 9 files changed, 54 insertions(+), 33 deletions(-) create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_folder_white_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_folder_white_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_folder_white_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_folder_white_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_folder_white_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable/qrcode.xml (limited to 'OpenKeychain/src') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java index 079ebb729..0f4b0278b 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java @@ -56,6 +56,8 @@ import android.widget.ImageView; import android.widget.ListView; import android.widget.TextView; +import com.getbase.floatingactionbutton.FloatingActionButton; + import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.operations.results.ConsolidateResult; @@ -105,6 +107,10 @@ public class KeyListFragment extends LoaderFragment private String mQuery; private SearchView mSearchView; + private FloatingActionButton mFabQrCode; + private FloatingActionButton mFabCloud; + private FloatingActionButton mFabFile; + @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -123,6 +129,29 @@ public class KeyListFragment extends LoaderFragment mStickyList = (StickyListHeadersListView) view.findViewById(R.id.key_list_list); mStickyList.setOnItemClickListener(this); + mFabQrCode = (FloatingActionButton) view.findViewById(R.id.fab_add_qr_code); + mFabCloud = (FloatingActionButton) view.findViewById(R.id.fab_add_cloud); + mFabFile = (FloatingActionButton) view.findViewById(R.id.fab_add_file); + + mFabQrCode.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + scanQrCode(); + } + }); + mFabCloud.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + searchCloud(); + } + }); + mFabFile.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + importFile(); + } + }); + mSwipeRefreshLayout = (ListAwareSwipeRefreshLayout) view.findViewById(R.id.key_list_swipe_container); mSwipeRefreshLayout.setOnRefreshListener(new NoScrollableSwipeRefreshLayout.OnRefreshListener() { @Override @@ -496,26 +525,11 @@ public class KeyListFragment extends LoaderFragment @Override public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { - case R.id.menu_key_list_add: - Intent scanQrCode = new Intent(getActivity(), QrCodeScanActivity.class); - scanQrCode.setAction(QrCodeScanActivity.ACTION_SCAN_WITH_RESULT); - startActivityForResult(scanQrCode, 0); - return true; - - case R.id.menu_key_list_search_cloud: - searchCloud(); - return true; case R.id.menu_key_list_create: createKey(); return true; - case R.id.menu_key_list_import_existing_key: - Intent intentImportExisting = new Intent(getActivity(), ImportKeysActivity.class); - intentImportExisting.setAction(ImportKeysActivity.ACTION_IMPORT_KEY_FROM_FILE_AND_RETURN); - startActivityForResult(intentImportExisting, 0); - return true; - case R.id.menu_key_list_export: mExportHelper.showExportKeysDialog(null, Constants.Path.APP_DIR_FILE, true); return true; @@ -587,6 +601,18 @@ public class KeyListFragment extends LoaderFragment startActivity(importIntent); } + private void scanQrCode() { + Intent scanQrCode = new Intent(getActivity(), QrCodeScanActivity.class); + scanQrCode.setAction(QrCodeScanActivity.ACTION_SCAN_WITH_RESULT); + startActivityForResult(scanQrCode, 0); + } + + private void importFile() { + Intent intentImportExisting = new Intent(getActivity(), ImportKeysActivity.class); + intentImportExisting.setAction(ImportKeysActivity.ACTION_IMPORT_KEY_FROM_FILE_AND_RETURN); + startActivityForResult(intentImportExisting, 0); + } + private void createKey() { Intent intent = new Intent(getActivity(), CreateKeyActivity.class); startActivityForResult(intent, 0); diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_folder_white_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_folder_white_24dp.png new file mode 100644 index 000000000..9f5c75609 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_folder_white_24dp.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_folder_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_folder_white_24dp.png new file mode 100644 index 000000000..1c5797c9e Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_folder_white_24dp.png differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_folder_white_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_folder_white_24dp.png new file mode 100644 index 000000000..e5f54cef0 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_folder_white_24dp.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_folder_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_folder_white_24dp.png new file mode 100644 index 000000000..0d1ac4876 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_folder_white_24dp.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_folder_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_folder_white_24dp.png new file mode 100644 index 000000000..7a3c198ee Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_folder_white_24dp.png differ diff --git a/OpenKeychain/src/main/res/drawable/qrcode.xml b/OpenKeychain/src/main/res/drawable/qrcode.xml new file mode 100644 index 000000000..87eb7d485 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable/qrcode.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/key_list_fragment.xml b/OpenKeychain/src/main/res/layout/key_list_fragment.xml index 0c3c6404a..290e56872 100644 --- a/OpenKeychain/src/main/res/layout/key_list_fragment.xml +++ b/OpenKeychain/src/main/res/layout/key_list_fragment.xml @@ -63,18 +63,20 @@ android:layout_marginEnd="16dp"> - - - - - -