From 60a75c802857ed8cb2700211fd39573ab291e813 Mon Sep 17 00:00:00 2001 From: Nereo Date: Sun, 12 Jun 2016 18:09:40 +0800 Subject: [PATCH] add private resources support, AS1.3+ --- .../multiimageselector/MainActivity.java | 8 ++--- multi-image-selector/build.gradle | 2 ++ .../MultiImageSelector.java | 4 +-- .../MultiImageSelectorActivity.java | 10 +++--- .../MultiImageSelectorFragment.java | 20 ++++++------ .../adapter/FolderAdapter.java | 24 +++++++------- .../adapter/ImageGridAdapter.java | 12 +++---- ...t_color.xml => mis_default_text_color.xml} | 0 ...xt_color.xml => mis_folder_text_color.xml} | 0 .../{btn_back.png => mis_btn_back.png} | Bin ...lt_check_s.png => mis_default_check_s.png} | Bin ...{ic_menu_back.png => mis_ic_menu_back.png} | Bin ...dicator.png => mis_selector_indicator.png} | Bin .../drawable-xxhdpi/{asv.png => mis_asv.png} | Bin .../drawable-xxhdpi/{asy.png => mis_asy.png} | Bin ...{btn_selected.png => mis_btn_selected.png} | Bin ..._unselected.png => mis_btn_unselected.png} | Bin ...efault_check.png => mis_default_check.png} | Bin ...efault_error.png => mis_default_error.png} | Bin ...t_indicator.png => mis_text_indicator.png} | Bin .../{action_btn.xml => mis_action_btn.xml} | 0 ...image.xml => mis_fragment_multi_image.xml} | 10 +++--- ...y_default.xml => mis_activity_default.xml} | 6 ++-- ...bar.xml => mis_cmp_customer_actionbar.xml} | 6 ++-- ...image.xml => mis_fragment_multi_image.xml} | 8 ++--- ...em_camera.xml => mis_list_item_camera.xml} | 4 +-- ...em_folder.xml => mis_list_item_folder.xml} | 10 +++--- ...item_image.xml => mis_list_item_image.xml} | 4 +-- .../src/main/res/values-sw360dp/dimens.xml | 6 ++-- .../src/main/res/values-sw480dp/dimens.xml | 6 ++-- .../src/main/res/values-sw720dp/dimens.xml | 6 ++-- .../src/main/res/values-zh/strings.xml | 28 ++++++++-------- .../src/main/res/values/colors.xml | 2 +- .../src/main/res/values/dimens.xml | 6 ++-- .../src/main/res/values/public.xml | 4 +++ .../src/main/res/values/strings.xml | 30 +++++++++--------- .../src/main/res/values/styles.xml | 2 +- 37 files changed, 112 insertions(+), 106 deletions(-) rename multi-image-selector/src/main/res/color/{default_text_color.xml => mis_default_text_color.xml} (100%) rename multi-image-selector/src/main/res/color/{folder_text_color.xml => mis_folder_text_color.xml} (100%) rename multi-image-selector/src/main/res/drawable-xhdpi/{btn_back.png => mis_btn_back.png} (100%) rename multi-image-selector/src/main/res/drawable-xhdpi/{default_check_s.png => mis_default_check_s.png} (100%) rename multi-image-selector/src/main/res/drawable-xhdpi/{ic_menu_back.png => mis_ic_menu_back.png} (100%) rename multi-image-selector/src/main/res/drawable-xhdpi/{selector_indicator.png => mis_selector_indicator.png} (100%) rename multi-image-selector/src/main/res/drawable-xxhdpi/{asv.png => mis_asv.png} (100%) rename multi-image-selector/src/main/res/drawable-xxhdpi/{asy.png => mis_asy.png} (100%) rename multi-image-selector/src/main/res/drawable-xxhdpi/{btn_selected.png => mis_btn_selected.png} (100%) rename multi-image-selector/src/main/res/drawable-xxhdpi/{btn_unselected.png => mis_btn_unselected.png} (100%) rename multi-image-selector/src/main/res/drawable-xxhdpi/{default_check.png => mis_default_check.png} (100%) rename multi-image-selector/src/main/res/drawable-xxhdpi/{default_error.png => mis_default_error.png} (100%) rename multi-image-selector/src/main/res/drawable-xxhdpi/{text_indicator.png => mis_text_indicator.png} (100%) rename multi-image-selector/src/main/res/drawable/{action_btn.xml => mis_action_btn.xml} (100%) rename multi-image-selector/src/main/res/layout-v14/{fragment_multi_image.xml => mis_fragment_multi_image.xml} (83%) rename multi-image-selector/src/main/res/layout/{activity_default.xml => mis_activity_default.xml} (88%) rename multi-image-selector/src/main/res/layout/{cmp_customer_actionbar.xml => mis_cmp_customer_actionbar.xml} (88%) rename multi-image-selector/src/main/res/layout/{fragment_multi_image.xml => mis_fragment_multi_image.xml} (85%) rename multi-image-selector/src/main/res/layout/{list_item_camera.xml => mis_list_item_camera.xml} (78%) rename multi-image-selector/src/main/res/layout/{list_item_folder.xml => mis_list_item_folder.xml} (89%) rename multi-image-selector/src/main/res/layout/{list_item_image.xml => mis_list_item_image.xml} (85%) create mode 100644 multi-image-selector/src/main/res/values/public.xml diff --git a/app/src/main/java/me/nereo/multiimageselector/MainActivity.java b/app/src/main/java/me/nereo/multiimageselector/MainActivity.java index 61d2622..fcc2068 100644 --- a/app/src/main/java/me/nereo/multiimageselector/MainActivity.java +++ b/app/src/main/java/me/nereo/multiimageselector/MainActivity.java @@ -74,7 +74,7 @@ public class MainActivity extends AppCompatActivity { && ActivityCompat.checkSelfPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) { requestPermission(Manifest.permission.READ_EXTERNAL_STORAGE, - getString(R.string.permission_rationale), + getString(R.string.mis_permission_rationale), REQUEST_STORAGE_READ_ACCESS_PERMISSION); }else { boolean showCamera = mShowCamera.getCheckedRadioButtonId() == R.id.show; @@ -103,15 +103,15 @@ public class MainActivity extends AppCompatActivity { private void requestPermission(final String permission, String rationale, final int requestCode){ if(ActivityCompat.shouldShowRequestPermissionRationale(this, permission)){ new AlertDialog.Builder(this) - .setTitle(R.string.permission_dialog_title) + .setTitle(R.string.mis_permission_dialog_title) .setMessage(rationale) - .setPositiveButton(R.string.permission_dialog_ok, new DialogInterface.OnClickListener() { + .setPositiveButton(R.string.mis_permission_dialog_ok, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { ActivityCompat.requestPermissions(MainActivity.this, new String[]{permission}, requestCode); } }) - .setNegativeButton(R.string.permission_dialog_cancel, null) + .setNegativeButton(R.string.mis_permission_dialog_cancel, null) .create().show(); }else{ ActivityCompat.requestPermissions(this, new String[]{permission}, requestCode); diff --git a/multi-image-selector/build.gradle b/multi-image-selector/build.gradle index f2c0368..dba9a97 100644 --- a/multi-image-selector/build.gradle +++ b/multi-image-selector/build.gradle @@ -16,6 +16,8 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + + resourcePrefix "mis_" } dependencies { diff --git a/multi-image-selector/src/main/java/me/nereo/multi_image_selector/MultiImageSelector.java b/multi-image-selector/src/main/java/me/nereo/multi_image_selector/MultiImageSelector.java index a23c2cd..d0818e8 100644 --- a/multi-image-selector/src/main/java/me/nereo/multi_image_selector/MultiImageSelector.java +++ b/multi-image-selector/src/main/java/me/nereo/multi_image_selector/MultiImageSelector.java @@ -67,7 +67,7 @@ public class MultiImageSelector { if(hasPermission()) { activity.startActivityForResult(createIntent(), requestCode); }else{ - Toast.makeText(mContext, R.string.error_no_permission, Toast.LENGTH_SHORT).show(); + Toast.makeText(mContext, R.string.mis_error_no_permission, Toast.LENGTH_SHORT).show(); } } @@ -75,7 +75,7 @@ public class MultiImageSelector { if(hasPermission()) { fragment.startActivityForResult(createIntent(), requestCode); }else{ - Toast.makeText(mContext, R.string.error_no_permission, Toast.LENGTH_SHORT).show(); + Toast.makeText(mContext, R.string.mis_error_no_permission, Toast.LENGTH_SHORT).show(); } } diff --git a/multi-image-selector/src/main/java/me/nereo/multi_image_selector/MultiImageSelectorActivity.java b/multi-image-selector/src/main/java/me/nereo/multi_image_selector/MultiImageSelectorActivity.java index 268bd46..26905ca 100644 --- a/multi-image-selector/src/main/java/me/nereo/multi_image_selector/MultiImageSelectorActivity.java +++ b/multi-image-selector/src/main/java/me/nereo/multi_image_selector/MultiImageSelectorActivity.java @@ -50,8 +50,8 @@ public class MultiImageSelectorActivity extends AppCompatActivity @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setTheme(R.style.NO_ACTIONBAR); - setContentView(R.layout.activity_default); + setTheme(R.style.MIS_NO_ACTIONBAR); + setContentView(R.layout.mis_activity_default); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { getWindow().setStatusBarColor(Color.BLACK); @@ -129,14 +129,14 @@ public class MultiImageSelectorActivity extends AppCompatActivity private void updateDoneText(ArrayList resultList){ int size = 0; if(resultList == null || resultList.size()<=0){ - mSubmitButton.setText(R.string.action_done); + mSubmitButton.setText(R.string.mis_action_done); mSubmitButton.setEnabled(false); }else{ size = resultList.size(); mSubmitButton.setEnabled(true); } - mSubmitButton.setText(getString(R.string.action_button_string, - getString(R.string.action_done), size, mDefaultCount)); + mSubmitButton.setText(getString(R.string.mis_action_button_string, + getString(R.string.mis_action_done), size, mDefaultCount)); } @Override diff --git a/multi-image-selector/src/main/java/me/nereo/multi_image_selector/MultiImageSelectorFragment.java b/multi-image-selector/src/main/java/me/nereo/multi_image_selector/MultiImageSelectorFragment.java index e5c38e7..4c068c6 100644 --- a/multi-image-selector/src/main/java/me/nereo/multi_image_selector/MultiImageSelectorFragment.java +++ b/multi-image-selector/src/main/java/me/nereo/multi_image_selector/MultiImageSelectorFragment.java @@ -112,7 +112,7 @@ public class MultiImageSelectorFragment extends Fragment { @Override public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { - return inflater.inflate(R.layout.fragment_multi_image, container, false); + return inflater.inflate(R.layout.mis_fragment_multi_image, container, false); } @Override @@ -132,7 +132,7 @@ public class MultiImageSelectorFragment extends Fragment { mPopupAnchorView = view.findViewById(R.id.footer); mCategoryText = (TextView) view.findViewById(R.id.category_btn); - mCategoryText.setText(R.string.folder_all); + mCategoryText.setText(R.string.mis_folder_all); mCategoryText.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { @@ -220,7 +220,7 @@ public class MultiImageSelectorFragment extends Fragment { if (index == 0) { getActivity().getSupportLoaderManager().restartLoader(LOADER_ALL, null, mLoaderCallback); - mCategoryText.setText(R.string.folder_all); + mCategoryText.setText(R.string.mis_folder_all); if (showCamera()) { mImageAdapter.setShowCamera(true); } else { @@ -306,7 +306,7 @@ public class MultiImageSelectorFragment extends Fragment { if(ContextCompat.checkSelfPermission(getContext(), Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED){ requestPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE, - getString(R.string.permission_rationale_write_storage), + getString(R.string.mis_permission_rationale_write_storage), REQUEST_STORAGE_WRITE_ACCESS_PERMISSION); }else { Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); @@ -320,10 +320,10 @@ public class MultiImageSelectorFragment extends Fragment { intent.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(mTmpFile)); startActivityForResult(intent, REQUEST_CAMERA); } else { - Toast.makeText(getActivity(), R.string.error_image_not_exist, Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), R.string.mis_error_image_not_exist, Toast.LENGTH_SHORT).show(); } } else { - Toast.makeText(getActivity(), R.string.msg_no_camera, Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), R.string.mis_msg_no_camera, Toast.LENGTH_SHORT).show(); } } } @@ -331,15 +331,15 @@ public class MultiImageSelectorFragment extends Fragment { private void requestPermission(final String permission, String rationale, final int requestCode){ if(shouldShowRequestPermissionRationale(permission)){ new AlertDialog.Builder(getContext()) - .setTitle(R.string.permission_dialog_title) + .setTitle(R.string.mis_permission_dialog_title) .setMessage(rationale) - .setPositiveButton(R.string.permission_dialog_ok, new DialogInterface.OnClickListener() { + .setPositiveButton(R.string.mis_permission_dialog_ok, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { requestPermissions(new String[]{permission}, requestCode); } }) - .setNegativeButton(R.string.permission_dialog_cancel, null) + .setNegativeButton(R.string.mis_permission_dialog_cancel, null) .create().show(); }else{ requestPermissions(new String[]{permission}, requestCode); @@ -371,7 +371,7 @@ public class MultiImageSelectorFragment extends Fragment { } } else { if(selectImageCount() == resultList.size()){ - Toast.makeText(getActivity(), R.string.msg_amount_limit, Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), R.string.mis_msg_amount_limit, Toast.LENGTH_SHORT).show(); return; } resultList.add(image.path); diff --git a/multi-image-selector/src/main/java/me/nereo/multi_image_selector/adapter/FolderAdapter.java b/multi-image-selector/src/main/java/me/nereo/multi_image_selector/adapter/FolderAdapter.java index bd09053..2d04ffa 100644 --- a/multi-image-selector/src/main/java/me/nereo/multi_image_selector/adapter/FolderAdapter.java +++ b/multi-image-selector/src/main/java/me/nereo/multi_image_selector/adapter/FolderAdapter.java @@ -36,7 +36,7 @@ public class FolderAdapter extends BaseAdapter { public FolderAdapter(Context context){ mContext = context; mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE); - mImageSize = mContext.getResources().getDimensionPixelOffset(R.dimen.folder_cover_size); + mImageSize = mContext.getResources().getDimensionPixelOffset(R.dimen.mis_folder_cover_size); } /** @@ -72,28 +72,28 @@ public class FolderAdapter extends BaseAdapter { public View getView(int i, View view, ViewGroup viewGroup) { ViewHolder holder; if(view == null){ - view = mInflater.inflate(R.layout.list_item_folder, viewGroup, false); + view = mInflater.inflate(R.layout.mis_list_item_folder, viewGroup, false); holder = new ViewHolder(view); }else{ holder = (ViewHolder) view.getTag(); } if (holder != null) { if(i == 0){ - holder.name.setText(R.string.folder_all); + holder.name.setText(R.string.mis_folder_all); holder.path.setText("/sdcard"); holder.size.setText(String.format("%d%s", - getTotalImageSize(), mContext.getResources().getString(R.string.photo_unit))); + getTotalImageSize(), mContext.getResources().getString(R.string.mis_photo_unit))); if(mFolders.size()>0){ Folder f = mFolders.get(0); if (f != null) { Picasso.with(mContext) .load(new File(f.cover.path)) - .error(R.drawable.default_error) - .resizeDimen(R.dimen.folder_cover_size, R.dimen.folder_cover_size) + .error(R.drawable.mis_default_error) + .resizeDimen(R.dimen.mis_folder_cover_size, R.dimen.mis_folder_cover_size) .centerCrop() .into(holder.cover); }else{ - holder.cover.setImageResource(R.drawable.default_error); + holder.cover.setImageResource(R.drawable.mis_default_error); } } }else { @@ -151,20 +151,20 @@ public class FolderAdapter extends BaseAdapter { name.setText(data.name); path.setText(data.path); if (data.images != null) { - size.setText(String.format("%d%s", data.images.size(), mContext.getResources().getString(R.string.photo_unit))); + size.setText(String.format("%d%s", data.images.size(), mContext.getResources().getString(R.string.mis_photo_unit))); }else{ - size.setText("*"+mContext.getResources().getString(R.string.photo_unit)); + size.setText("*"+mContext.getResources().getString(R.string.mis_photo_unit)); } if (data.cover != null) { // 显示图片 Picasso.with(mContext) .load(new File(data.cover.path)) - .placeholder(R.drawable.default_error) - .resizeDimen(R.dimen.folder_cover_size, R.dimen.folder_cover_size) + .placeholder(R.drawable.mis_default_error) + .resizeDimen(R.dimen.mis_folder_cover_size, R.dimen.mis_folder_cover_size) .centerCrop() .into(cover); }else{ - cover.setImageResource(R.drawable.default_error); + cover.setImageResource(R.drawable.mis_default_error); } } } diff --git a/multi-image-selector/src/main/java/me/nereo/multi_image_selector/adapter/ImageGridAdapter.java b/multi-image-selector/src/main/java/me/nereo/multi_image_selector/adapter/ImageGridAdapter.java index 5a89774..921b0aa 100644 --- a/multi-image-selector/src/main/java/me/nereo/multi_image_selector/adapter/ImageGridAdapter.java +++ b/multi-image-selector/src/main/java/me/nereo/multi_image_selector/adapter/ImageGridAdapter.java @@ -170,14 +170,14 @@ public class ImageGridAdapter extends BaseAdapter { if(isShowCamera()){ if(i == 0){ - view = mInflater.inflate(R.layout.list_item_camera, viewGroup, false); + view = mInflater.inflate(R.layout.mis_list_item_camera, viewGroup, false); return view; } } ViewHolder holder; if(view == null){ - view = mInflater.inflate(R.layout.list_item_image, viewGroup, false); + view = mInflater.inflate(R.layout.mis_list_item_image, viewGroup, false); holder = new ViewHolder(view); }else{ holder = (ViewHolder) view.getTag(); @@ -209,11 +209,11 @@ public class ImageGridAdapter extends BaseAdapter { indicator.setVisibility(View.VISIBLE); if(mSelectedImages.contains(data)){ // 设置选中状态 - indicator.setImageResource(R.drawable.btn_selected); + indicator.setImageResource(R.drawable.mis_btn_selected); mask.setVisibility(View.VISIBLE); }else{ // 未选择 - indicator.setImageResource(R.drawable.btn_unselected); + indicator.setImageResource(R.drawable.mis_btn_unselected); mask.setVisibility(View.GONE); } }else{ @@ -224,13 +224,13 @@ public class ImageGridAdapter extends BaseAdapter { // 显示图片 Picasso.with(mContext) .load(imageFile) - .placeholder(R.drawable.default_error) + .placeholder(R.drawable.mis_default_error) .tag(MultiImageSelectorFragment.TAG) .resize(mGridWidth, mGridWidth) .centerCrop() .into(image); }else{ - image.setImageResource(R.drawable.default_error); + image.setImageResource(R.drawable.mis_default_error); } } } diff --git a/multi-image-selector/src/main/res/color/default_text_color.xml b/multi-image-selector/src/main/res/color/mis_default_text_color.xml similarity index 100% rename from multi-image-selector/src/main/res/color/default_text_color.xml rename to multi-image-selector/src/main/res/color/mis_default_text_color.xml diff --git a/multi-image-selector/src/main/res/color/folder_text_color.xml b/multi-image-selector/src/main/res/color/mis_folder_text_color.xml similarity index 100% rename from multi-image-selector/src/main/res/color/folder_text_color.xml rename to multi-image-selector/src/main/res/color/mis_folder_text_color.xml diff --git a/multi-image-selector/src/main/res/drawable-xhdpi/btn_back.png b/multi-image-selector/src/main/res/drawable-xhdpi/mis_btn_back.png similarity index 100% rename from multi-image-selector/src/main/res/drawable-xhdpi/btn_back.png rename to multi-image-selector/src/main/res/drawable-xhdpi/mis_btn_back.png diff --git a/multi-image-selector/src/main/res/drawable-xhdpi/default_check_s.png b/multi-image-selector/src/main/res/drawable-xhdpi/mis_default_check_s.png similarity index 100% rename from multi-image-selector/src/main/res/drawable-xhdpi/default_check_s.png rename to multi-image-selector/src/main/res/drawable-xhdpi/mis_default_check_s.png diff --git a/multi-image-selector/src/main/res/drawable-xhdpi/ic_menu_back.png b/multi-image-selector/src/main/res/drawable-xhdpi/mis_ic_menu_back.png similarity index 100% rename from multi-image-selector/src/main/res/drawable-xhdpi/ic_menu_back.png rename to multi-image-selector/src/main/res/drawable-xhdpi/mis_ic_menu_back.png diff --git a/multi-image-selector/src/main/res/drawable-xhdpi/selector_indicator.png b/multi-image-selector/src/main/res/drawable-xhdpi/mis_selector_indicator.png similarity index 100% rename from multi-image-selector/src/main/res/drawable-xhdpi/selector_indicator.png rename to multi-image-selector/src/main/res/drawable-xhdpi/mis_selector_indicator.png diff --git a/multi-image-selector/src/main/res/drawable-xxhdpi/asv.png b/multi-image-selector/src/main/res/drawable-xxhdpi/mis_asv.png similarity index 100% rename from multi-image-selector/src/main/res/drawable-xxhdpi/asv.png rename to multi-image-selector/src/main/res/drawable-xxhdpi/mis_asv.png diff --git a/multi-image-selector/src/main/res/drawable-xxhdpi/asy.png b/multi-image-selector/src/main/res/drawable-xxhdpi/mis_asy.png similarity index 100% rename from multi-image-selector/src/main/res/drawable-xxhdpi/asy.png rename to multi-image-selector/src/main/res/drawable-xxhdpi/mis_asy.png diff --git a/multi-image-selector/src/main/res/drawable-xxhdpi/btn_selected.png b/multi-image-selector/src/main/res/drawable-xxhdpi/mis_btn_selected.png similarity index 100% rename from multi-image-selector/src/main/res/drawable-xxhdpi/btn_selected.png rename to multi-image-selector/src/main/res/drawable-xxhdpi/mis_btn_selected.png diff --git a/multi-image-selector/src/main/res/drawable-xxhdpi/btn_unselected.png b/multi-image-selector/src/main/res/drawable-xxhdpi/mis_btn_unselected.png similarity index 100% rename from multi-image-selector/src/main/res/drawable-xxhdpi/btn_unselected.png rename to multi-image-selector/src/main/res/drawable-xxhdpi/mis_btn_unselected.png diff --git a/multi-image-selector/src/main/res/drawable-xxhdpi/default_check.png b/multi-image-selector/src/main/res/drawable-xxhdpi/mis_default_check.png similarity index 100% rename from multi-image-selector/src/main/res/drawable-xxhdpi/default_check.png rename to multi-image-selector/src/main/res/drawable-xxhdpi/mis_default_check.png diff --git a/multi-image-selector/src/main/res/drawable-xxhdpi/default_error.png b/multi-image-selector/src/main/res/drawable-xxhdpi/mis_default_error.png similarity index 100% rename from multi-image-selector/src/main/res/drawable-xxhdpi/default_error.png rename to multi-image-selector/src/main/res/drawable-xxhdpi/mis_default_error.png diff --git a/multi-image-selector/src/main/res/drawable-xxhdpi/text_indicator.png b/multi-image-selector/src/main/res/drawable-xxhdpi/mis_text_indicator.png similarity index 100% rename from multi-image-selector/src/main/res/drawable-xxhdpi/text_indicator.png rename to multi-image-selector/src/main/res/drawable-xxhdpi/mis_text_indicator.png diff --git a/multi-image-selector/src/main/res/drawable/action_btn.xml b/multi-image-selector/src/main/res/drawable/mis_action_btn.xml similarity index 100% rename from multi-image-selector/src/main/res/drawable/action_btn.xml rename to multi-image-selector/src/main/res/drawable/mis_action_btn.xml diff --git a/multi-image-selector/src/main/res/layout-v14/fragment_multi_image.xml b/multi-image-selector/src/main/res/layout-v14/mis_fragment_multi_image.xml similarity index 83% rename from multi-image-selector/src/main/res/layout-v14/fragment_multi_image.xml rename to multi-image-selector/src/main/res/layout-v14/mis_fragment_multi_image.xml index ba19155..7a72f21 100644 --- a/multi-image-selector/src/main/res/layout-v14/fragment_multi_image.xml +++ b/multi-image-selector/src/main/res/layout-v14/mis_fragment_multi_image.xml @@ -9,12 +9,12 @@ android:id="@+id/grid" android:layout_width="match_parent" android:layout_height="match_parent" - android:horizontalSpacing="@dimen/space_size" - android:verticalSpacing="@dimen/space_size" + android:horizontalSpacing="@dimen/mis_space_size" + android:verticalSpacing="@dimen/mis_space_size" android:paddingBottom="?android:attr/actionBarSize" android:clipToPadding="false" android:numColumns="auto_fit" - android:columnWidth="@dimen/image_size"/> + android:columnWidth="@dimen/mis_image_size"/>