From 8b260a7c7bf1833e107cae8b81713c6b24800f2d Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 11 Oct 2016 20:41:21 +0200 Subject: [PATCH] prefix all library resources with smtfp --- .../filemanager/adapters/ItemsAdapter.kt | 4 +- .../filemanager/dialogs/SelectFolderDialog.kt | 4 +- app/src/main/res/drawable-v21/selector.xml | 4 +- app/src/main/res/drawable/selector.xml | 4 +- app/src/main/res/layout/activity_about.xml | 26 ++-- app/src/main/res/layout/activity_license.xml | 4 +- app/src/main/res/layout/activity_main.xml | 2 +- app/src/main/res/layout/activity_settings.xml | 6 +- app/src/main/res/layout/copy_item.xml | 30 ++--- app/src/main/res/layout/create_new.xml | 10 +- app/src/main/res/layout/directory_picker.xml | 2 +- app/src/main/res/layout/item_properties.xml | 34 ++--- app/src/main/res/layout/items_fragment.xml | 4 +- app/src/main/res/layout/list_item.xml | 20 +-- app/src/main/res/layout/rename_item.xml | 4 +- app/src/main/res/values/styles.xml | 4 +- .../filepicker/Breadcrumbs.kt | 2 +- .../filepicker/adapters/ItemsAdapter.kt | 8 +- .../filepicker/dialogs/SelectFolderDialog.kt | 126 ------------------ .../filepicker/views/Breadcrumbs.kt | 4 +- .../{selector.xml => smtfp_selector.xml} | 4 +- library/src/main/res/drawable/selector.xml | 5 - .../src/main/res/drawable/smtfp_selector.xml | 5 + ...umb_item.xml => smtfp_breadcrumb_item.xml} | 0 ..._picker.xml => smtfp_directory_picker.xml} | 2 +- .../{list_item.xml => smtfp_list_item.xml} | 22 +-- .../{directory.png => smtfp_directory.png} | Bin .../mipmap-hdpi/{file.png => smtfp_file.png} | Bin .../{directory.png => smtfp_directory.png} | Bin .../mipmap-mdpi/{file.png => smtfp_file.png} | Bin .../{directory.png => smtfp_directory.png} | Bin .../mipmap-xhdpi/{file.png => smtfp_file.png} | Bin .../{directory.png => smtfp_directory.png} | Bin .../{file.png => smtfp_file.png} | Bin .../{directory.png => smtfp_directory.png} | Bin .../{file.png => smtfp_file.png} | Bin library/src/main/res/values/colors.xml | 6 +- library/src/main/res/values/dimens.xml | 10 +- 38 files changed, 115 insertions(+), 241 deletions(-) delete mode 100644 library/src/main/kotlin/com/simplemobiletools/filepicker/dialogs/SelectFolderDialog.kt rename library/src/main/res/drawable-v21/{selector.xml => smtfp_selector.xml} (74%) delete mode 100644 library/src/main/res/drawable/selector.xml create mode 100644 library/src/main/res/drawable/smtfp_selector.xml rename library/src/main/res/layout/{breadcrumb_item.xml => smtfp_breadcrumb_item.xml} (100%) rename library/src/main/res/layout/{directory_picker.xml => smtfp_directory_picker.xml} (92%) rename library/src/main/res/layout/{list_item.xml => smtfp_list_item.xml} (63%) rename library/src/main/res/mipmap-hdpi/{directory.png => smtfp_directory.png} (100%) rename library/src/main/res/mipmap-hdpi/{file.png => smtfp_file.png} (100%) rename library/src/main/res/mipmap-mdpi/{directory.png => smtfp_directory.png} (100%) rename library/src/main/res/mipmap-mdpi/{file.png => smtfp_file.png} (100%) rename library/src/main/res/mipmap-xhdpi/{directory.png => smtfp_directory.png} (100%) rename library/src/main/res/mipmap-xhdpi/{file.png => smtfp_file.png} (100%) rename library/src/main/res/mipmap-xxhdpi/{directory.png => smtfp_directory.png} (100%) rename library/src/main/res/mipmap-xxhdpi/{file.png => smtfp_file.png} (100%) rename library/src/main/res/mipmap-xxxhdpi/{directory.png => smtfp_directory.png} (100%) rename library/src/main/res/mipmap-xxxhdpi/{file.png => smtfp_file.png} (100%) diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ItemsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ItemsAdapter.kt index f753ec03..1d67d40a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ItemsAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ItemsAdapter.kt @@ -13,7 +13,7 @@ import com.simplemobiletools.filemanager.R import com.simplemobiletools.filemanager.extensions.formatSize import com.simplemobiletools.filemanager.extensions.getColoredIcon import com.simplemobiletools.filepicker.models.FileDirItem -import kotlinx.android.synthetic.main.list_item.view.* +import kotlinx.android.synthetic.main.smtfp_list_item.view.* class ItemsAdapter(context: Context, private val mItems: List) : BaseAdapter() { private val mInflater: LayoutInflater @@ -33,7 +33,7 @@ class ItemsAdapter(context: Context, private val mItems: List) : Ba var view = convertView val viewHolder: ViewHolder if (view == null) { - view = mInflater.inflate(R.layout.list_item, parent, false) + view = mInflater.inflate(R.layout.smtfp_list_item, parent, false) viewHolder = ViewHolder(view) view!!.tag = viewHolder } else { diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/dialogs/SelectFolderDialog.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/dialogs/SelectFolderDialog.kt index 56ffe89f..aa7018e9 100644 --- a/app/src/main/kotlin/com/simplemobiletools/filemanager/dialogs/SelectFolderDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/dialogs/SelectFolderDialog.kt @@ -13,7 +13,7 @@ import com.simplemobiletools.filemanager.Utils import com.simplemobiletools.filemanager.adapters.ItemsAdapter import com.simplemobiletools.filemanager.fragments.ItemsFragment import com.simplemobiletools.filepicker.models.FileDirItem -import kotlinx.android.synthetic.main.directory_picker.view.* +import kotlinx.android.synthetic.main.smtfp_directory_picker.view.* import java.io.File import java.util.* import kotlin.comparisons.compareBy @@ -33,7 +33,7 @@ class SelectFolderDialog : DialogFragment() { lateinit var dialog: View override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - dialog = activity.layoutInflater.inflate(R.layout.directory_picker, null) + dialog = activity.layoutInflater.inflate(R.layout.smtfp_directory_picker, null) updateItems() setupBreadcrumbs() diff --git a/app/src/main/res/drawable-v21/selector.xml b/app/src/main/res/drawable-v21/selector.xml index 4d61c7b4..a454cfaf 100644 --- a/app/src/main/res/drawable-v21/selector.xml +++ b/app/src/main/res/drawable-v21/selector.xml @@ -3,12 +3,12 @@ - + diff --git a/app/src/main/res/drawable/selector.xml b/app/src/main/res/drawable/selector.xml index 1277703b..24f9c0ac 100644 --- a/app/src/main/res/drawable/selector.xml +++ b/app/src/main/res/drawable/selector.xml @@ -1,5 +1,5 @@ - - + + diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index f43c95dd..4c0f6851 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -10,9 +10,9 @@ android:id="@+id/about_holder" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingBottom="@dimen/activity_margin" - android:paddingLeft="@dimen/activity_margin" - android:paddingTop="@dimen/activity_margin"> + android:paddingBottom="@dimen/smtfp_activity_margin" + android:paddingLeft="@dimen/smtfp_activity_margin" + android:paddingTop="@dimen/smtfp_activity_margin"> @@ -52,8 +52,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@+id/about_invite" - android:paddingBottom="@dimen/activity_margin" - android:paddingTop="@dimen/activity_margin" + android:paddingBottom="@dimen/smtfp_activity_margin" + android:paddingTop="@dimen/smtfp_activity_margin" android:text="@string/rate_us_underlined" android:textColor="@color/colorPrimary"/> @@ -62,8 +62,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@+id/about_rate_us" - android:paddingBottom="@dimen/activity_margin" - android:paddingTop="@dimen/activity_margin" + android:paddingBottom="@dimen/smtfp_activity_margin" + android:paddingTop="@dimen/smtfp_activity_margin" android:text="@string/third_party_licences_underlined" android:textColor="@color/colorPrimary"/> @@ -73,7 +73,7 @@ android:layout_height="wrap_content" android:layout_below="@+id/about_license" android:paddingBottom="@dimen/social_padding" - android:paddingTop="@dimen/activity_margin" + android:paddingTop="@dimen/smtfp_activity_margin" android:text="@string/follow_us"/> diff --git a/app/src/main/res/layout/activity_license.xml b/app/src/main/res/layout/activity_license.xml index 3dfaabdb..b7355142 100644 --- a/app/src/main/res/layout/activity_license.xml +++ b/app/src/main/res/layout/activity_license.xml @@ -10,7 +10,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="@dimen/activity_margin"> + android:padding="@dimen/smtfp_activity_margin"> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 276588ed..5fd54390 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -9,7 +9,7 @@ android:id="@+id/breadcrumbs" android:layout_width="match_parent" android:layout_height="wrap_content" - android:padding="@dimen/activity_margin"/> + android:padding="@dimen/smtfp_activity_margin"/> + android:padding="@dimen/smtfp_activity_margin"> + android:padding="@dimen/smtfp_activity_margin"> + android:padding="@dimen/smtfp_activity_margin"> + android:paddingLeft="@dimen/smtfp_activity_margin" + android:paddingRight="@dimen/smtfp_activity_margin" + android:paddingTop="@dimen/smtfp_activity_margin"> + android:textSize="@dimen/smtfp_details_text_size"/> + android:textSize="@dimen/smtfp_details_text_size"/> + android:paddingLeft="@dimen/smtfp_activity_margin" + android:paddingRight="@dimen/smtfp_activity_margin" + android:paddingTop="@dimen/smtfp_activity_margin"> @@ -27,7 +27,7 @@ android:id="@+id/dialog_radio_directory" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="@dimen/medium_margin" + android:layout_marginBottom="@dimen/smtfp_medium_margin" android:text="@string/directory"/> + android:padding="@dimen/smtfp_activity_margin"/> + android:paddingLeft="@dimen/smtfp_activity_margin" + android:paddingRight="@dimen/smtfp_activity_margin" + android:paddingTop="@dimen/smtfp_activity_margin"> + android:textSize="@dimen/smtfp_details_text_size"/> + android:textSize="@dimen/smtfp_details_text_size"/> + android:textSize="@dimen/smtfp_details_text_size"/> + android:textSize="@dimen/smtfp_details_text_size"/> diff --git a/app/src/main/res/layout/items_fragment.xml b/app/src/main/res/layout/items_fragment.xml index dce29add..ea504d2b 100644 --- a/app/src/main/res/layout/items_fragment.xml +++ b/app/src/main/res/layout/items_fragment.xml @@ -16,7 +16,7 @@ android:layout_height="wrap_content" android:choiceMode="multipleChoiceModal" android:clipToPadding="false" - android:paddingLeft="@dimen/activity_margin"/> + android:paddingLeft="@dimen/smtfp_activity_margin"/> @@ -25,7 +25,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="bottom|end" - android:layout_margin="@dimen/activity_margin" + android:layout_margin="@dimen/smtfp_activity_margin" android:src="@mipmap/plus"/> diff --git a/app/src/main/res/layout/list_item.xml b/app/src/main/res/layout/list_item.xml index b668a57a..14d3d464 100644 --- a/app/src/main/res/layout/list_item.xml +++ b/app/src/main/res/layout/list_item.xml @@ -3,21 +3,21 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:foreground="@drawable/selector"> + android:foreground="@drawable/smtfp_selector"> + android:paddingRight="@dimen/smtfp_activity_margin"> + android:paddingBottom="@dimen/smtfp_medium_margin" + android:paddingTop="@dimen/smtfp_medium_margin" + android:src="@mipmap/smtfp_directory"/> + android:textSize="@dimen/smtfp_details_text_size"/> diff --git a/app/src/main/res/layout/rename_item.xml b/app/src/main/res/layout/rename_item.xml index cdd4bdd6..05eb387b 100644 --- a/app/src/main/res/layout/rename_item.xml +++ b/app/src/main/res/layout/rename_item.xml @@ -5,13 +5,13 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - android:padding="@dimen/activity_margin"> + android:padding="@dimen/smtfp_activity_margin"> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 682ebbb8..4e747d99 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -5,7 +5,7 @@ @color/colorPrimaryDark @color/colorAccent @style/AppTheme.ActionBarStyle - @dimen/normal_text_size + @dimen/smtfp_normal_text_size diff --git a/library/src/main/kotlin/com/simplemobiletools/filepicker/Breadcrumbs.kt b/library/src/main/kotlin/com/simplemobiletools/filepicker/Breadcrumbs.kt index d4d9f7af..f24bcf71 100644 --- a/library/src/main/kotlin/com/simplemobiletools/filepicker/Breadcrumbs.kt +++ b/library/src/main/kotlin/com/simplemobiletools/filepicker/Breadcrumbs.kt @@ -129,7 +129,7 @@ class Breadcrumbs(context: Context, attrs: AttributeSet) : LinearLayout(context, } fun addBreadcrumb(item: FileDirItem, addPrefix: Boolean) { - val view = mInflater!!.inflate(R.layout.breadcrumb_item, null, false) + val view = mInflater!!.inflate(R.layout.smtfp_breadcrumb_item, null, false) val textView = view.findViewById(R.id.breadcrumb_text) as TextView var textToAdd = item.name diff --git a/library/src/main/kotlin/com/simplemobiletools/filepicker/adapters/ItemsAdapter.kt b/library/src/main/kotlin/com/simplemobiletools/filepicker/adapters/ItemsAdapter.kt index f174702f..c066e63c 100644 --- a/library/src/main/kotlin/com/simplemobiletools/filepicker/adapters/ItemsAdapter.kt +++ b/library/src/main/kotlin/com/simplemobiletools/filepicker/adapters/ItemsAdapter.kt @@ -13,7 +13,7 @@ import com.simplemobiletools.filepicker.R import com.simplemobiletools.filepicker.extensions.formatSize import com.simplemobiletools.filepicker.extensions.getColoredIcon import com.simplemobiletools.filepicker.models.FileDirItem -import kotlinx.android.synthetic.main.list_item.view.* +import kotlinx.android.synthetic.main.smtfp_list_item.view.* class ItemsAdapter(context: Context, private val mItems: List) : BaseAdapter() { private val mInflater: LayoutInflater @@ -25,15 +25,15 @@ class ItemsAdapter(context: Context, private val mItems: List) : Ba mInflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater mRes = context.resources - mDirectoryBmp = mRes.getColoredIcon(R.color.thumbnail_grey, R.mipmap.directory) - mFileBmp = mRes.getColoredIcon(R.color.thumbnail_grey, R.mipmap.file) + mDirectoryBmp = mRes.getColoredIcon(R.color.smtfp_thumbnail_grey, R.mipmap.directory) + mFileBmp = mRes.getColoredIcon(R.color.smtfp_thumbnail_grey, R.mipmap.file) } override fun getView(position: Int, convertView: View?, parent: ViewGroup): View { var view = convertView val viewHolder: ViewHolder if (view == null) { - view = mInflater.inflate(R.layout.list_item, parent, false) + view = mInflater.inflate(R.layout.smtfp_list_item, parent, false) viewHolder = ViewHolder(view) view!!.tag = viewHolder } else { diff --git a/library/src/main/kotlin/com/simplemobiletools/filepicker/dialogs/SelectFolderDialog.kt b/library/src/main/kotlin/com/simplemobiletools/filepicker/dialogs/SelectFolderDialog.kt deleted file mode 100644 index ec64dc42..00000000 --- a/library/src/main/kotlin/com/simplemobiletools/filepicker/dialogs/SelectFolderDialog.kt +++ /dev/null @@ -1,126 +0,0 @@ -package com.simplemobiletools.filepicker.dialogs - -import android.app.Activity -import android.app.Dialog -import android.content.Intent -import android.os.Bundle -import android.support.v4.app.DialogFragment -import android.support.v7.app.AlertDialog -import android.view.View -import com.simplemobiletools.filepicker.R -import com.simplemobiletools.filepicker.adapters.ItemsAdapter -import com.simplemobiletools.filepicker.extensions.getFilenameFromPath -import com.simplemobiletools.filepicker.models.FileDirItem -import kotlinx.android.synthetic.main.directory_picker.view.* -import java.io.File -import java.util.* -import kotlin.comparisons.compareBy - -class SelectFolderDialog : DialogFragment() { - val SELECT_FOLDER_REQUEST = 1 - val SELECT_FOLDER_PATH = "path" - - companion object { - lateinit var mPath: String - var mFirstUpdate: Boolean = true - - fun newInstance(path: String): SelectFolderDialog { - mPath = path - mFirstUpdate = true - return SelectFolderDialog() - } - } - - lateinit var dialog: View - - override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - dialog = activity.layoutInflater.inflate(R.layout.directory_picker, null) - - updateItems() - setupBreadcrumbs() - - return AlertDialog.Builder(activity) - .setTitle(resources.getString(R.string.smtfp_select_destination)) - .setView(dialog) - .setPositiveButton(R.string.smtfp_ok) { dialog, which -> sendResult() } - .setNegativeButton(R.string.smtfp_cancel, null) - .create() - } - - private fun updateItems() { - var items = getItems(mPath) - if (!containsDirectory(items) && !mFirstUpdate) { - sendResult() - return - } - - items = items.sortedWith(compareBy({ !it.isDirectory }, { it.name })) - - val adapter = ItemsAdapter(context, items) - dialog.directory_picker_list.adapter = adapter - //dialog.directory_picker_breadcrumbs.setInitialBreadcrumb(mPath) - dialog.directory_picker_list.setOnItemClickListener { adapterView, view, position, id -> - val item = items[position] - if (item.isDirectory) { - mPath = item.path - updateItems() - } - } - - mFirstUpdate = false - } - - private fun sendResult() { - val intent = Intent() - intent.putExtra(SELECT_FOLDER_PATH, mPath) - targetFragment.onActivityResult(SELECT_FOLDER_REQUEST, Activity.RESULT_OK, intent) - dismiss() - } - - private fun setupBreadcrumbs() { - /*dialog.directory_picker_breadcrumbs.setListener { id -> - val item = dialog.directory_picker_breadcrumbs.getChildAt(id).tag as FileDirItem - mPath = item.path - updateItems() - }*/ - } - - private fun getItems(path: String): List { - //val showHidden = Config.newInstance(context).showHidden - val items = ArrayList() - val base = File(path) - val files = base.listFiles() - if (files != null) { - for (file in files) { - if (!file.isDirectory) - continue - - /* if (!showHidden && file.isHidden) - continue*/ - - val curPath = file.absolutePath - val curName = curPath.getFilenameFromPath() - val size = file.length() - - items.add(FileDirItem(curPath, curName, file.isDirectory, getChildren(file), size)) - } - } - return items - } - - private fun getChildren(file: File): Int { - if (file.listFiles() == null || !file.isDirectory) - return 0 - - return file.listFiles().size - } - - private fun containsDirectory(items: List): Boolean { - for (item in items) { - if (item.isDirectory) { - return true - } - } - return false - } -} diff --git a/library/src/main/kotlin/com/simplemobiletools/filepicker/views/Breadcrumbs.kt b/library/src/main/kotlin/com/simplemobiletools/filepicker/views/Breadcrumbs.kt index 6ca87ba8..949dcc2a 100644 --- a/library/src/main/kotlin/com/simplemobiletools/filepicker/views/Breadcrumbs.kt +++ b/library/src/main/kotlin/com/simplemobiletools/filepicker/views/Breadcrumbs.kt @@ -10,7 +10,7 @@ import android.view.WindowManager import android.widget.LinearLayout import com.simplemobiletools.filepicker.R import com.simplemobiletools.filepicker.models.FileDirItem -import kotlinx.android.synthetic.main.breadcrumb_item.view.* +import kotlinx.android.synthetic.main.smtfp_breadcrumb_item.view.* class Breadcrumbs(context: Context, attrs: AttributeSet) : LinearLayout(context, attrs), View.OnClickListener { private var mDeviceWidth: Int = 0 @@ -130,7 +130,7 @@ class Breadcrumbs(context: Context, attrs: AttributeSet) : LinearLayout(context, } fun addBreadcrumb(item: FileDirItem, addPrefix: Boolean) { - val view = mInflater!!.inflate(R.layout.breadcrumb_item, null, false) + val view = mInflater!!.inflate(R.layout.smtfp_breadcrumb_item, null, false) var textToAdd = item.name if (addPrefix) diff --git a/library/src/main/res/drawable-v21/selector.xml b/library/src/main/res/drawable-v21/smtfp_selector.xml similarity index 74% rename from library/src/main/res/drawable-v21/selector.xml rename to library/src/main/res/drawable-v21/smtfp_selector.xml index 4d61c7b4..a454cfaf 100644 --- a/library/src/main/res/drawable-v21/selector.xml +++ b/library/src/main/res/drawable-v21/smtfp_selector.xml @@ -3,12 +3,12 @@ - + diff --git a/library/src/main/res/drawable/selector.xml b/library/src/main/res/drawable/selector.xml deleted file mode 100644 index 1277703b..00000000 --- a/library/src/main/res/drawable/selector.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/library/src/main/res/drawable/smtfp_selector.xml b/library/src/main/res/drawable/smtfp_selector.xml new file mode 100644 index 00000000..24f9c0ac --- /dev/null +++ b/library/src/main/res/drawable/smtfp_selector.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/library/src/main/res/layout/breadcrumb_item.xml b/library/src/main/res/layout/smtfp_breadcrumb_item.xml similarity index 100% rename from library/src/main/res/layout/breadcrumb_item.xml rename to library/src/main/res/layout/smtfp_breadcrumb_item.xml diff --git a/library/src/main/res/layout/directory_picker.xml b/library/src/main/res/layout/smtfp_directory_picker.xml similarity index 92% rename from library/src/main/res/layout/directory_picker.xml rename to library/src/main/res/layout/smtfp_directory_picker.xml index bf067e1f..76de4b7f 100644 --- a/library/src/main/res/layout/directory_picker.xml +++ b/library/src/main/res/layout/smtfp_directory_picker.xml @@ -10,7 +10,7 @@ android:id="@+id/directory_picker_breadcrumbs" android:layout_width="match_parent" android:layout_height="wrap_content" - android:padding="@dimen/activity_margin"/> + android:padding="@dimen/smtfp_activity_margin"/> + android:foreground="@drawable/smtfp_selector"> + android:paddingRight="@dimen/smtfp_activity_margin"> + android:layout_width="@dimen/smtfp_icon_size" + android:layout_height="@dimen/smtfp_icon_size" + android:paddingBottom="@dimen/smtfp_medium_margin" + android:paddingTop="@dimen/smtfp_medium_margin" + android:src="@mipmap/smtfp_directory"/> + android:textSize="@dimen/smtfp_details_text_size"/> diff --git a/library/src/main/res/mipmap-hdpi/directory.png b/library/src/main/res/mipmap-hdpi/smtfp_directory.png similarity index 100% rename from library/src/main/res/mipmap-hdpi/directory.png rename to library/src/main/res/mipmap-hdpi/smtfp_directory.png diff --git a/library/src/main/res/mipmap-hdpi/file.png b/library/src/main/res/mipmap-hdpi/smtfp_file.png similarity index 100% rename from library/src/main/res/mipmap-hdpi/file.png rename to library/src/main/res/mipmap-hdpi/smtfp_file.png diff --git a/library/src/main/res/mipmap-mdpi/directory.png b/library/src/main/res/mipmap-mdpi/smtfp_directory.png similarity index 100% rename from library/src/main/res/mipmap-mdpi/directory.png rename to library/src/main/res/mipmap-mdpi/smtfp_directory.png diff --git a/library/src/main/res/mipmap-mdpi/file.png b/library/src/main/res/mipmap-mdpi/smtfp_file.png similarity index 100% rename from library/src/main/res/mipmap-mdpi/file.png rename to library/src/main/res/mipmap-mdpi/smtfp_file.png diff --git a/library/src/main/res/mipmap-xhdpi/directory.png b/library/src/main/res/mipmap-xhdpi/smtfp_directory.png similarity index 100% rename from library/src/main/res/mipmap-xhdpi/directory.png rename to library/src/main/res/mipmap-xhdpi/smtfp_directory.png diff --git a/library/src/main/res/mipmap-xhdpi/file.png b/library/src/main/res/mipmap-xhdpi/smtfp_file.png similarity index 100% rename from library/src/main/res/mipmap-xhdpi/file.png rename to library/src/main/res/mipmap-xhdpi/smtfp_file.png diff --git a/library/src/main/res/mipmap-xxhdpi/directory.png b/library/src/main/res/mipmap-xxhdpi/smtfp_directory.png similarity index 100% rename from library/src/main/res/mipmap-xxhdpi/directory.png rename to library/src/main/res/mipmap-xxhdpi/smtfp_directory.png diff --git a/library/src/main/res/mipmap-xxhdpi/file.png b/library/src/main/res/mipmap-xxhdpi/smtfp_file.png similarity index 100% rename from library/src/main/res/mipmap-xxhdpi/file.png rename to library/src/main/res/mipmap-xxhdpi/smtfp_file.png diff --git a/library/src/main/res/mipmap-xxxhdpi/directory.png b/library/src/main/res/mipmap-xxxhdpi/smtfp_directory.png similarity index 100% rename from library/src/main/res/mipmap-xxxhdpi/directory.png rename to library/src/main/res/mipmap-xxxhdpi/smtfp_directory.png diff --git a/library/src/main/res/mipmap-xxxhdpi/file.png b/library/src/main/res/mipmap-xxxhdpi/smtfp_file.png similarity index 100% rename from library/src/main/res/mipmap-xxxhdpi/file.png rename to library/src/main/res/mipmap-xxxhdpi/smtfp_file.png diff --git a/library/src/main/res/values/colors.xml b/library/src/main/res/values/colors.xml index e7986e11..b2c92efe 100644 --- a/library/src/main/res/values/colors.xml +++ b/library/src/main/res/values/colors.xml @@ -1,6 +1,6 @@ - #33000000 - #08000000 - #44888888 + #33000000 + #08000000 + #44888888 diff --git a/library/src/main/res/values/dimens.xml b/library/src/main/res/values/dimens.xml index 3ef9e585..a37d74c9 100644 --- a/library/src/main/res/values/dimens.xml +++ b/library/src/main/res/values/dimens.xml @@ -1,9 +1,9 @@ - 16dp - 6dp - 10dp + 16dp + 6dp + 10dp 48dp - 12sp - 14sp + 12sp + 14sp