From 4124e8ea20b31b2fddb01f0ef929d54106bb74d9 Mon Sep 17 00:00:00 2001 From: Jonas Kalderstam Date: Mon, 13 Jul 2015 13:50:08 +0200 Subject: [PATCH] Prefix resources And add an overridable toolbar theme. Fixes #31 Signed-off-by: Jonas Kalderstam --- gradle.properties | 4 +- library/src/main/AndroidManifest.xml | 2 +- .../AbstractFilePickerActivity.java | 2 +- .../AbstractFilePickerFragment.java | 14 +++---- .../filepicker/FilePickerFragment.java | 3 +- .../filepicker/NewItemFragment.java | 4 +- ... => nnf_ic_collections_add_collection.png} | Bin ...file_folder.png => nnf_ic_file_folder.png} | Bin ... => nnf_ic_collections_add_collection.png} | Bin ...file_folder.png => nnf_ic_file_folder.png} | Bin ... => nnf_ic_collections_add_collection.png} | Bin ...file_folder.png => nnf_ic_file_folder.png} | Bin ... => nnf_ic_collections_add_collection.png} | Bin ...file_folder.png => nnf_ic_file_folder.png} | Bin ...file_folder.png => nnf_ic_file_folder.png} | Bin ...picker.xml => nnf_activity_filepicker.xml} | 0 ...er_name.xml => nnf_dialog_folder_name.xml} | 2 +- ... => nnf_filepicker_listitem_checkable.xml} | 4 +- ...ir.xml => nnf_filepicker_listitem_dir.xml} | 4 +- ...picker.xml => nnf_fragment_filepicker.xml} | 3 +- library/src/main/res/menu/picker_actions.xml | 6 +-- library/src/main/res/values/attr.xml | 22 +++++++++++ library/src/main/res/values/strings.xml | 10 ++--- library/src/main/res/values/styles.xml | 37 ++++++++++++++++++ release-notes.md | 6 +++ sample/src/main/AndroidManifest.xml | 14 +++---- .../dropbox/DropboxFilePickerFragment.java | 2 +- sample/src/main/res/values/styles.xml | 17 ++++---- 28 files changed, 109 insertions(+), 47 deletions(-) rename library/src/main/res/drawable-hdpi/{ic_collections_add_collection.png => nnf_ic_collections_add_collection.png} (100%) rename library/src/main/res/drawable-hdpi/{ic_file_folder.png => nnf_ic_file_folder.png} (100%) rename library/src/main/res/drawable-mdpi/{ic_collections_add_collection.png => nnf_ic_collections_add_collection.png} (100%) rename library/src/main/res/drawable-mdpi/{ic_file_folder.png => nnf_ic_file_folder.png} (100%) rename library/src/main/res/drawable-xhdpi/{ic_collections_add_collection.png => nnf_ic_collections_add_collection.png} (100%) rename library/src/main/res/drawable-xhdpi/{ic_file_folder.png => nnf_ic_file_folder.png} (100%) rename library/src/main/res/drawable-xxhdpi/{ic_collections_add_collection.png => nnf_ic_collections_add_collection.png} (100%) rename library/src/main/res/drawable-xxhdpi/{ic_file_folder.png => nnf_ic_file_folder.png} (100%) rename library/src/main/res/drawable-xxxhdpi/{ic_file_folder.png => nnf_ic_file_folder.png} (100%) rename library/src/main/res/layout/{activity_filepicker.xml => nnf_activity_filepicker.xml} (100%) rename library/src/main/res/layout/{dialog_folder_name.xml => nnf_dialog_folder_name.xml} (96%) rename library/src/main/res/layout/{filepicker_listitem_checkable.xml => nnf_filepicker_listitem_checkable.xml} (95%) rename library/src/main/res/layout/{filepicker_listitem_dir.xml => nnf_filepicker_listitem_dir.xml} (94%) rename library/src/main/res/layout/{fragment_filepicker.xml => nnf_fragment_filepicker.xml} (95%) create mode 100644 library/src/main/res/values/attr.xml create mode 100644 library/src/main/res/values/styles.xml diff --git a/gradle.properties b/gradle.properties index d4950a8..2084edf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ # Project-wide Gradle settings. -VERSION_NAME=2.1 -VERSION_CODE=16 +VERSION_NAME=2.2 +VERSION_CODE=17 GROUP=com.nononsenseapps PROJECT_NAME=com.nononsenseapps:filepicker diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml index 63710e7..51f0114 100644 --- a/library/src/main/AndroidManifest.xml +++ b/library/src/main/AndroidManifest.xml @@ -20,7 +20,7 @@ diff --git a/library/src/main/java/com/nononsenseapps/filepicker/AbstractFilePickerActivity.java b/library/src/main/java/com/nononsenseapps/filepicker/AbstractFilePickerActivity.java index 7df36e6..ba4f18f 100644 --- a/library/src/main/java/com/nononsenseapps/filepicker/AbstractFilePickerActivity.java +++ b/library/src/main/java/com/nononsenseapps/filepicker/AbstractFilePickerActivity.java @@ -85,7 +85,7 @@ public abstract class AbstractFilePickerActivity extends AppCompatActivity protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_filepicker); + setContentView(R.layout.nnf_activity_filepicker); Intent intent = getIntent(); if (intent != null) { diff --git a/library/src/main/java/com/nononsenseapps/filepicker/AbstractFilePickerFragment.java b/library/src/main/java/com/nononsenseapps/filepicker/AbstractFilePickerFragment.java index 9cad574..90105f4 100644 --- a/library/src/main/java/com/nononsenseapps/filepicker/AbstractFilePickerFragment.java +++ b/library/src/main/java/com/nononsenseapps/filepicker/AbstractFilePickerFragment.java @@ -124,7 +124,7 @@ public abstract class AbstractFilePickerFragment extends Fragment @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - View view = inflater.inflate(R.layout.fragment_filepicker, container, false); + View view = inflater.inflate(R.layout.nnf_fragment_filepicker, container, false); Toolbar mToolbar = (Toolbar) view.findViewById(R.id.picker_toolbar); ((AppCompatActivity) getActivity()).setSupportActionBar(mToolbar); @@ -162,7 +162,7 @@ public abstract class AbstractFilePickerFragment extends Fragment // Some invalid cases first if ((allowMultiple || mode == MODE_FILE) && checkedItems.isEmpty()) { Toast.makeText(getActivity(), - R.string.select_something_first, + R.string.nnf_select_something_first, Toast.LENGTH_SHORT).show(); return; } @@ -289,13 +289,13 @@ public abstract class AbstractFilePickerFragment extends Fragment public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { inflater.inflate(R.menu.picker_actions, menu); - MenuItem item = menu.findItem(R.id.action_createdir); + MenuItem item = menu.findItem(R.id.nnf_action_createdir); item.setVisible(allowCreateDir); } @Override public boolean onOptionsItemSelected(MenuItem menuItem) { - if (R.id.action_createdir == menuItem.getItemId()) { + if (R.id.nnf_action_createdir == menuItem.getItemId()) { Activity activity = getActivity(); if (activity instanceof AppCompatActivity) { NewFolderFragment.showDialog(((AppCompatActivity) activity).getSupportFragmentManager(), @@ -420,16 +420,16 @@ public abstract class AbstractFilePickerFragment extends Fragment View v; switch (viewType) { case LogicHandler.VIEWTYPE_HEADER: - v = LayoutInflater.from(getActivity()).inflate(R.layout.filepicker_listitem_dir, + v = LayoutInflater.from(getActivity()).inflate(R.layout.nnf_filepicker_listitem_dir, parent, false); return new HeaderViewHolder(v); case LogicHandler.VIEWTYPE_CHECKABLE: - v = LayoutInflater.from(getActivity()).inflate(R.layout.filepicker_listitem_checkable, + v = LayoutInflater.from(getActivity()).inflate(R.layout.nnf_filepicker_listitem_checkable, parent, false); return new CheckableViewHolder(v); case LogicHandler.VIEWTYPE_DIR: default: - v = LayoutInflater.from(getActivity()).inflate(R.layout.filepicker_listitem_dir, + v = LayoutInflater.from(getActivity()).inflate(R.layout.nnf_filepicker_listitem_dir, parent, false); return new DirViewHolder(v); } diff --git a/library/src/main/java/com/nononsenseapps/filepicker/FilePickerFragment.java b/library/src/main/java/com/nononsenseapps/filepicker/FilePickerFragment.java index e5af96f..27b7674 100644 --- a/library/src/main/java/com/nononsenseapps/filepicker/FilePickerFragment.java +++ b/library/src/main/java/com/nononsenseapps/filepicker/FilePickerFragment.java @@ -18,7 +18,6 @@ package com.nononsenseapps.filepicker; import android.net.Uri; -import android.os.Environment; import android.os.FileObserver; import android.support.v4.content.AsyncTaskLoader; import android.support.v4.content.Loader; @@ -227,7 +226,7 @@ public class FilePickerFragment extends AbstractFilePickerFragment { currentPath = folder; refresh(); } else { - Toast.makeText(getActivity(), R.string.create_folder_error, + Toast.makeText(getActivity(), R.string.nnf_create_folder_error, Toast.LENGTH_SHORT).show(); } } diff --git a/library/src/main/java/com/nononsenseapps/filepicker/NewItemFragment.java b/library/src/main/java/com/nononsenseapps/filepicker/NewItemFragment.java index d28a01a..25f0746 100644 --- a/library/src/main/java/com/nononsenseapps/filepicker/NewItemFragment.java +++ b/library/src/main/java/com/nononsenseapps/filepicker/NewItemFragment.java @@ -52,8 +52,8 @@ public abstract class NewItemFragment extends DialogFragment { @Override public Dialog onCreateDialog(Bundle savedInstanceState) { AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); - builder.setView(R.layout.dialog_folder_name) - .setTitle(R.string.new_folder) + builder.setView(R.layout.nnf_dialog_folder_name) + .setTitle(R.string.nnf_new_folder) .setNegativeButton(android.R.string.cancel, null) .setPositiveButton(android.R.string.ok, diff --git a/library/src/main/res/drawable-hdpi/ic_collections_add_collection.png b/library/src/main/res/drawable-hdpi/nnf_ic_collections_add_collection.png similarity index 100% rename from library/src/main/res/drawable-hdpi/ic_collections_add_collection.png rename to library/src/main/res/drawable-hdpi/nnf_ic_collections_add_collection.png diff --git a/library/src/main/res/drawable-hdpi/ic_file_folder.png b/library/src/main/res/drawable-hdpi/nnf_ic_file_folder.png similarity index 100% rename from library/src/main/res/drawable-hdpi/ic_file_folder.png rename to library/src/main/res/drawable-hdpi/nnf_ic_file_folder.png diff --git a/library/src/main/res/drawable-mdpi/ic_collections_add_collection.png b/library/src/main/res/drawable-mdpi/nnf_ic_collections_add_collection.png similarity index 100% rename from library/src/main/res/drawable-mdpi/ic_collections_add_collection.png rename to library/src/main/res/drawable-mdpi/nnf_ic_collections_add_collection.png diff --git a/library/src/main/res/drawable-mdpi/ic_file_folder.png b/library/src/main/res/drawable-mdpi/nnf_ic_file_folder.png similarity index 100% rename from library/src/main/res/drawable-mdpi/ic_file_folder.png rename to library/src/main/res/drawable-mdpi/nnf_ic_file_folder.png diff --git a/library/src/main/res/drawable-xhdpi/ic_collections_add_collection.png b/library/src/main/res/drawable-xhdpi/nnf_ic_collections_add_collection.png similarity index 100% rename from library/src/main/res/drawable-xhdpi/ic_collections_add_collection.png rename to library/src/main/res/drawable-xhdpi/nnf_ic_collections_add_collection.png diff --git a/library/src/main/res/drawable-xhdpi/ic_file_folder.png b/library/src/main/res/drawable-xhdpi/nnf_ic_file_folder.png similarity index 100% rename from library/src/main/res/drawable-xhdpi/ic_file_folder.png rename to library/src/main/res/drawable-xhdpi/nnf_ic_file_folder.png diff --git a/library/src/main/res/drawable-xxhdpi/ic_collections_add_collection.png b/library/src/main/res/drawable-xxhdpi/nnf_ic_collections_add_collection.png similarity index 100% rename from library/src/main/res/drawable-xxhdpi/ic_collections_add_collection.png rename to library/src/main/res/drawable-xxhdpi/nnf_ic_collections_add_collection.png diff --git a/library/src/main/res/drawable-xxhdpi/ic_file_folder.png b/library/src/main/res/drawable-xxhdpi/nnf_ic_file_folder.png similarity index 100% rename from library/src/main/res/drawable-xxhdpi/ic_file_folder.png rename to library/src/main/res/drawable-xxhdpi/nnf_ic_file_folder.png diff --git a/library/src/main/res/drawable-xxxhdpi/ic_file_folder.png b/library/src/main/res/drawable-xxxhdpi/nnf_ic_file_folder.png similarity index 100% rename from library/src/main/res/drawable-xxxhdpi/ic_file_folder.png rename to library/src/main/res/drawable-xxxhdpi/nnf_ic_file_folder.png diff --git a/library/src/main/res/layout/activity_filepicker.xml b/library/src/main/res/layout/nnf_activity_filepicker.xml similarity index 100% rename from library/src/main/res/layout/activity_filepicker.xml rename to library/src/main/res/layout/nnf_activity_filepicker.xml diff --git a/library/src/main/res/layout/dialog_folder_name.xml b/library/src/main/res/layout/nnf_dialog_folder_name.xml similarity index 96% rename from library/src/main/res/layout/dialog_folder_name.xml rename to library/src/main/res/layout/nnf_dialog_folder_name.xml index 7f2f6ca..eb14d51 100644 --- a/library/src/main/res/layout/dialog_folder_name.xml +++ b/library/src/main/res/layout/nnf_dialog_folder_name.xml @@ -28,7 +28,7 @@ android:padding="4dp" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" - android:hint="@string/name" + android:hint="@string/nnf_name" android:singleLine="true" android:maxLines="1" android:gravity="center_vertical" diff --git a/library/src/main/res/layout/filepicker_listitem_checkable.xml b/library/src/main/res/layout/nnf_filepicker_listitem_checkable.xml similarity index 95% rename from library/src/main/res/layout/filepicker_listitem_checkable.xml rename to library/src/main/res/layout/nnf_filepicker_listitem_checkable.xml index b317e19..23f5017 100644 --- a/library/src/main/res/layout/filepicker_listitem_checkable.xml +++ b/library/src/main/res/layout/nnf_filepicker_listitem_checkable.xml @@ -32,7 +32,7 @@ android:layout_height="?android:listPreferredItemHeight" android:adjustViewBounds="true" android:scaleType="fitCenter" - android:src="@drawable/ic_file_folder" + android:src="@drawable/nnf_ic_file_folder" android:tint="?attr/colorAccent" android:visibility="visible" tools:ignore="ContentDescription" /> @@ -48,7 +48,7 @@ android:maxLines="1" android:padding="8dp" android:singleLine="true" - android:text="@string/name"/> + android:text="@string/nnf_name"/> @@ -48,5 +48,5 @@ android:maxLines="1" android:padding="8dp" android:singleLine="true" - android:text="@string/name"/> + android:text="@string/nnf_name"/> \ No newline at end of file diff --git a/library/src/main/res/layout/fragment_filepicker.xml b/library/src/main/res/layout/nnf_fragment_filepicker.xml similarity index 95% rename from library/src/main/res/layout/fragment_filepicker.xml rename to library/src/main/res/layout/nnf_fragment_filepicker.xml index 6ed4e55..a5b5799 100644 --- a/library/src/main/res/layout/fragment_filepicker.xml +++ b/library/src/main/res/layout/nnf_fragment_filepicker.xml @@ -30,7 +30,7 @@ android:layout_alignParentTop="true" android:background="?attr/colorPrimary" android:minHeight="?attr/actionBarSize" - android:theme="@style/ThemeOverlay.AppCompat.ActionBar"> + android:theme="?nnf_toolbarTheme"> diff --git a/library/src/main/res/menu/picker_actions.xml b/library/src/main/res/menu/picker_actions.xml index 8e883b7..3888b0c 100644 --- a/library/src/main/res/menu/picker_actions.xml +++ b/library/src/main/res/menu/picker_actions.xml @@ -18,10 +18,10 @@ - \ No newline at end of file diff --git a/library/src/main/res/values/attr.xml b/library/src/main/res/values/attr.xml new file mode 100644 index 0000000..2b0fd7a --- /dev/null +++ b/library/src/main/res/values/attr.xml @@ -0,0 +1,22 @@ + + + + + + + \ No newline at end of file diff --git a/library/src/main/res/values/strings.xml b/library/src/main/res/values/strings.xml index ae1ea5d..431c61c 100644 --- a/library/src/main/res/values/strings.xml +++ b/library/src/main/res/values/strings.xml @@ -16,9 +16,9 @@ --> - NoNonsense File Picker - New folder - Failed to create folder - Name - Please select something first + NoNonsense File Picker + New folder + Failed to create folder + Name + Please select something first diff --git a/library/src/main/res/values/styles.xml b/library/src/main/res/values/styles.xml new file mode 100644 index 0000000..9f5e1bf --- /dev/null +++ b/library/src/main/res/values/styles.xml @@ -0,0 +1,37 @@ + + + + + + + + \ No newline at end of file diff --git a/release-notes.md b/release-notes.md index fb567f9..e2933f4 100644 --- a/release-notes.md +++ b/release-notes.md @@ -1,3 +1,9 @@ +# 2.2 +- All library resources are now prefixed with "nnf_" to avoid conflicts. +- Added two base themes for convenience. +- Now possible to specify a specific Toolbar-theme separate from the rest + of your theme. + # 2.1 - Now easier to override sort-order and filtering in built in SD-card picker diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml index 480c457..321b582 100644 --- a/sample/src/main/AndroidManifest.xml +++ b/sample/src/main/AndroidManifest.xml @@ -27,7 +27,7 @@ @@ -43,7 +43,7 @@ @@ -53,7 +53,7 @@ @@ -63,7 +63,7 @@ @@ -73,7 +73,7 @@ @@ -84,12 +84,12 @@ diff --git a/sample/src/main/java/com/nononsenseapps/filepicker/sample/dropbox/DropboxFilePickerFragment.java b/sample/src/main/java/com/nononsenseapps/filepicker/sample/dropbox/DropboxFilePickerFragment.java index e84938e..710a4c3 100644 --- a/sample/src/main/java/com/nononsenseapps/filepicker/sample/dropbox/DropboxFilePickerFragment.java +++ b/sample/src/main/java/com/nononsenseapps/filepicker/sample/dropbox/DropboxFilePickerFragment.java @@ -206,7 +206,7 @@ public class DropboxFilePickerFragment currentPath = dbApi.metadata(path, 1, null, false, null); refresh(); } catch (DropboxException e) { - Toast.makeText(getActivity(), R.string.create_folder_error, + Toast.makeText(getActivity(), R.string.nnf_create_folder_error, Toast.LENGTH_SHORT).show(); } } diff --git a/sample/src/main/res/values/styles.xml b/sample/src/main/res/values/styles.xml index 3e6ec47..803673a 100644 --- a/sample/src/main/res/values/styles.xml +++ b/sample/src/main/res/values/styles.xml @@ -17,28 +17,23 @@ - - + +