From 6f1dc14bdcbd529cb1543f4feba68e8a4609c5dc Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Mon, 5 Aug 2019 09:49:58 +0200 Subject: [PATCH] Rename layout for better visibility --- .../java/com/kunzisoft/keepass/activities/AboutActivity.kt | 2 +- .../java/com/kunzisoft/keepass/activities/EntryActivity.kt | 2 +- .../com/kunzisoft/keepass/activities/EntryEditActivity.kt | 2 +- .../keepass/activities/FileDatabaseSelectActivity.kt | 2 +- .../java/com/kunzisoft/keepass/activities/GroupActivity.kt | 3 +-- .../com/kunzisoft/keepass/activities/ListNodesFragment.kt | 2 +- .../com/kunzisoft/keepass/activities/PasswordActivity.kt | 2 +- .../activities/dialogs/AssignMasterKeyDialogFragment.kt | 2 +- .../keepass/activities/dialogs/BrowserDialogFragment.kt | 2 +- .../keepass/activities/dialogs/CreateFileDialogFragment.kt | 2 +- .../activities/dialogs/FileInformationDialogFragment.kt | 2 +- .../activities/dialogs/GeneratePasswordDialogFragment.kt | 3 +-- .../keepass/activities/dialogs/GroupEditDialogFragment.kt | 2 +- .../keepass/activities/dialogs/IconPickerDialogFragment.kt | 4 ++-- .../dialogs/KeyboardExplanationDialogFragment.kt | 2 +- .../keepass/activities/dialogs/SortDialogFragment.kt | 2 +- .../activities/dialogs/UnavailableFeatureDialogFragment.kt | 2 +- .../keepass/adapters/FileDatabaseHistoryAdapter.kt | 2 +- .../java/com/kunzisoft/keepass/adapters/NodeAdapter.kt | 4 ++-- .../kunzisoft/keepass/adapters/SearchEntryCursorAdapter.kt | 2 +- .../java/com/kunzisoft/keepass/autofill/AutofillHelper.kt | 2 +- .../com/kunzisoft/keepass/autofill/KeeAutofillService.kt | 2 +- .../keepass/fingerprint/FingerPrintExplanationDialog.kt | 2 +- .../kunzisoft/keepass/tasks/ProgressTaskDialogFragment.kt | 3 +-- .../java/com/kunzisoft/keepass/view/AddNodeButtonView.kt | 2 +- .../java/com/kunzisoft/keepass/view/EntryContentsView.kt | 2 +- .../java/com/kunzisoft/keepass/view/EntryCustomField.kt | 2 +- .../com/kunzisoft/keepass/view/EntryEditContentsView.kt | 2 +- .../com/kunzisoft/keepass/view/EntryEditCustomField.kt | 2 +- ...xplanation.xml => fragment_fingerprint_explanation.xml} | 0 app/src/main/res/layout/{about.xml => activity_about.xml} | 0 .../main/res/layout/{entry_view.xml => activity_entry.xml} | 0 .../res/layout/{entry_edit.xml => activity_entry_edit.xml} | 0 .../{file_selection.xml => activity_file_selection.xml} | 0 .../{list_nodes_with_add_button.xml => activity_group.xml} | 0 .../res/layout/{password.xml => activity_password.xml} | 0 .../{search_results.xml => activity_search_results.xml} | 0 app/src/main/res/layout/empty.xml | 7 ------- .../{browser_install.xml => fragment_browser_install.xml} | 0 .../{file_creation.xml => fragment_file_creation.xml} | 0 ...rmation.xml => fragment_file_selection_information.xml} | 0 ...enerate_password.xml => fragment_generate_password.xml} | 0 .../res/layout/{group_edit.xml => fragment_group_edit.xml} | 0 .../layout/{icon_picker.xml => fragment_icon_picker.xml} | 0 ...d_explanation.xml => fragment_keyboard_explanation.xml} | 0 .../{list_nodes_fragment.xml => fragment_list_nodes.xml} | 0 .../layout/{progress_dialog.xml => fragment_progress.xml} | 0 .../layout/{set_password.xml => fragment_set_password.xml} | 0 .../{sort_selection.xml => fragment_sort_selection.xml} | 0 ...ilable_feature.xml => fragment_unavailable_feature.xml} | 0 ...ill_service_list_item.xml => item_autofill_service.xml} | 0 ...service_unlock.xml => item_autofill_service_unlock.xml} | 0 .../main/res/layout/{file_row.xml => item_file_row.xml} | 0 app/src/main/res/layout/{icon.xml => item_icon.xml} | 0 .../{list_nodes_entry.xml => item_list_nodes_entry.xml} | 0 .../{list_nodes_group.xml => item_list_nodes_group.xml} | 0 .../res/layout/{search_entry.xml => item_search_entry.xml} | 0 .../{add_node_button.xml => view_button_add_node.xml} | 0 .../{entry_view_contents.xml => view_entry_contents.xml} | 0 ...edit_view_contents.xml => view_entry_edit_contents.xml} | 0 ...ry_edit_new_field.xml => view_entry_edit_new_field.xml} | 0 .../{entry_new_field.xml => view_entry_new_field.xml} | 0 62 files changed, 31 insertions(+), 41 deletions(-) rename app/src/main/res/layout-v23/{fingerprint_explanation.xml => fragment_fingerprint_explanation.xml} (100%) rename app/src/main/res/layout/{about.xml => activity_about.xml} (100%) rename app/src/main/res/layout/{entry_view.xml => activity_entry.xml} (100%) rename app/src/main/res/layout/{entry_edit.xml => activity_entry_edit.xml} (100%) rename app/src/main/res/layout/{file_selection.xml => activity_file_selection.xml} (100%) rename app/src/main/res/layout/{list_nodes_with_add_button.xml => activity_group.xml} (100%) rename app/src/main/res/layout/{password.xml => activity_password.xml} (100%) rename app/src/main/res/layout/{search_results.xml => activity_search_results.xml} (100%) delete mode 100644 app/src/main/res/layout/empty.xml rename app/src/main/res/layout/{browser_install.xml => fragment_browser_install.xml} (100%) rename app/src/main/res/layout/{file_creation.xml => fragment_file_creation.xml} (100%) rename app/src/main/res/layout/{file_selection_information.xml => fragment_file_selection_information.xml} (100%) rename app/src/main/res/layout/{generate_password.xml => fragment_generate_password.xml} (100%) rename app/src/main/res/layout/{group_edit.xml => fragment_group_edit.xml} (100%) rename app/src/main/res/layout/{icon_picker.xml => fragment_icon_picker.xml} (100%) rename app/src/main/res/layout/{keyboard_explanation.xml => fragment_keyboard_explanation.xml} (100%) rename app/src/main/res/layout/{list_nodes_fragment.xml => fragment_list_nodes.xml} (100%) rename app/src/main/res/layout/{progress_dialog.xml => fragment_progress.xml} (100%) rename app/src/main/res/layout/{set_password.xml => fragment_set_password.xml} (100%) rename app/src/main/res/layout/{sort_selection.xml => fragment_sort_selection.xml} (100%) rename app/src/main/res/layout/{unavailable_feature.xml => fragment_unavailable_feature.xml} (100%) rename app/src/main/res/layout/{autofill_service_list_item.xml => item_autofill_service.xml} (100%) rename app/src/main/res/layout/{autofill_service_unlock.xml => item_autofill_service_unlock.xml} (100%) rename app/src/main/res/layout/{file_row.xml => item_file_row.xml} (100%) rename app/src/main/res/layout/{icon.xml => item_icon.xml} (100%) rename app/src/main/res/layout/{list_nodes_entry.xml => item_list_nodes_entry.xml} (100%) rename app/src/main/res/layout/{list_nodes_group.xml => item_list_nodes_group.xml} (100%) rename app/src/main/res/layout/{search_entry.xml => item_search_entry.xml} (100%) rename app/src/main/res/layout/{add_node_button.xml => view_button_add_node.xml} (100%) rename app/src/main/res/layout/{entry_view_contents.xml => view_entry_contents.xml} (100%) rename app/src/main/res/layout/{entry_edit_view_contents.xml => view_entry_edit_contents.xml} (100%) rename app/src/main/res/layout/{entry_edit_new_field.xml => view_entry_edit_new_field.xml} (100%) rename app/src/main/res/layout/{entry_new_field.xml => view_entry_new_field.xml} (100%) diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/AboutActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/AboutActivity.kt index 60fd733d5..c4fb057c2 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/AboutActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/AboutActivity.kt @@ -37,7 +37,7 @@ class AboutActivity : StylishActivity() { public override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - setContentView(R.layout.about) + setContentView(R.layout.activity_about) val toolbar = findViewById(R.id.toolbar) toolbar.title = getString(R.string.menu_about) diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.kt index 38177a673..02aa29c92 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.kt @@ -70,7 +70,7 @@ class EntryActivity : LockingHideActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - setContentView(R.layout.entry_view) + setContentView(R.layout.activity_entry) toolbar = findViewById(R.id.toolbar) setSupportActionBar(toolbar) diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt index 633658d5c..2e684df9d 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt @@ -69,7 +69,7 @@ class EntryEditActivity : LockingHideActivity(), IconPickerDialogFragment.IconPi override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - setContentView(R.layout.entry_edit) + setContentView(R.layout.activity_entry_edit) val toolbar = findViewById(R.id.toolbar) setSupportActionBar(toolbar) diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/FileDatabaseSelectActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/FileDatabaseSelectActivity.kt index 86b0438d0..4ddae2f9b 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/FileDatabaseSelectActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/FileDatabaseSelectActivity.kt @@ -104,7 +104,7 @@ class FileDatabaseSelectActivity : StylishActivity(), mFileDatabaseHistory = FileDatabaseHistory.getInstance(WeakReference(applicationContext)) - setContentView(R.layout.file_selection) + setContentView(R.layout.activity_file_selection) fileListContainer = findViewById(R.id.container_file_list) val toolbar = findViewById(R.id.toolbar) diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt index 22513e4f6..b5b1c2a10 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt @@ -42,7 +42,6 @@ import android.view.MenuItem import android.view.View import android.widget.ImageView import android.widget.TextView -import android.widget.Toast import com.kunzisoft.keepass.R import com.kunzisoft.keepass.activities.dialogs.* import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper @@ -112,7 +111,7 @@ class GroupActivity : LockingActivity(), mDatabase = App.currentDatabase // Construct main view - setContentView(layoutInflater.inflate(R.layout.list_nodes_with_add_button, null)) + setContentView(layoutInflater.inflate(R.layout.activity_group, null)) // Initialize views iconView = findViewById(R.id.icon) diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/ListNodesFragment.kt b/app/src/main/java/com/kunzisoft/keepass/activities/ListNodesFragment.kt index 937591363..30e73c5ff 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/ListNodesFragment.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/ListNodesFragment.kt @@ -118,7 +118,7 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis // To apply theme val rootView = inflater.cloneInContext(contextThemed) - .inflate(R.layout.list_nodes_fragment, container, false) + .inflate(R.layout.fragment_list_nodes, container, false) listView = rootView.findViewById(R.id.nodes_list) notFoundView = rootView.findViewById(R.id.not_found_container) diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/PasswordActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/PasswordActivity.kt index c4c959da0..854ff54b4 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/PasswordActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/PasswordActivity.kt @@ -116,7 +116,7 @@ class PasswordActivity : StylishActivity(), mRememberKeyFile = prefs!!.getBoolean(getString(R.string.keyfile_key), resources.getBoolean(R.bool.keyfile_default)) - setContentView(R.layout.password) + setContentView(R.layout.activity_password) toolbar = findViewById(R.id.toolbar) toolbar?.title = getString(R.string.app_name) diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/AssignMasterKeyDialogFragment.kt b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/AssignMasterKeyDialogFragment.kt index 47f5df68d..460b666a6 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/AssignMasterKeyDialogFragment.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/AssignMasterKeyDialogFragment.kt @@ -76,7 +76,7 @@ class AssignMasterKeyDialogFragment : DialogFragment() { val builder = AlertDialog.Builder(activity) val inflater = activity.layoutInflater - rootView = inflater.inflate(R.layout.set_password, null) + rootView = inflater.inflate(R.layout.fragment_set_password, null) builder.setView(rootView) .setTitle(R.string.assign_master_key) // Add action buttons diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/BrowserDialogFragment.kt b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/BrowserDialogFragment.kt index 00a403e80..80c9f04cb 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/BrowserDialogFragment.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/BrowserDialogFragment.kt @@ -33,7 +33,7 @@ class BrowserDialogFragment : DialogFragment() { activity?.let { activity -> val builder = AlertDialog.Builder(activity) // Get the layout inflater - val root = activity.layoutInflater.inflate(R.layout.browser_install, null) + val root = activity.layoutInflater.inflate(R.layout.fragment_browser_install, null) builder.setView(root) .setNegativeButton(R.string.cancel) { _, _ -> } diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/CreateFileDialogFragment.kt b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/CreateFileDialogFragment.kt index a696c91f5..bf63244ed 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/CreateFileDialogFragment.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/CreateFileDialogFragment.kt @@ -82,7 +82,7 @@ class CreateFileDialogFragment : DialogFragment(), AdapterView.OnItemSelectedLis val builder = AlertDialog.Builder(activity) val inflater = activity.layoutInflater - val rootView = inflater.inflate(R.layout.file_creation, null) + val rootView = inflater.inflate(R.layout.fragment_file_creation, null) builder.setView(rootView) .setTitle(R.string.create_keepass_file) // Add action buttons diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/FileInformationDialogFragment.kt b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/FileInformationDialogFragment.kt index e4df4b5e0..8356c33ec 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/FileInformationDialogFragment.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/FileInformationDialogFragment.kt @@ -39,7 +39,7 @@ class FileInformationDialogFragment : DialogFragment() { activity?.let { activity -> val builder = AlertDialog.Builder(activity) val inflater = activity.layoutInflater - val root = inflater.inflate(R.layout.file_selection_information, null) + val root = inflater.inflate(R.layout.fragment_file_selection_information, null) val fileNameView = root.findViewById(R.id.file_filename) val filePathView = root.findViewById(R.id.file_path) fileSizeContainerView = root.findViewById(R.id.file_size_container) diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/GeneratePasswordDialogFragment.kt b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/GeneratePasswordDialogFragment.kt index 86b6d4c5e..2d12a5092 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/GeneratePasswordDialogFragment.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/GeneratePasswordDialogFragment.kt @@ -29,7 +29,6 @@ import android.widget.* import com.kunzisoft.keepass.R import com.kunzisoft.keepass.password.PasswordGenerator import com.kunzisoft.keepass.settings.PreferencesUtil -import com.kunzisoft.keepass.utils.Util import com.kunzisoft.keepass.utils.applyFontVisibility class GeneratePasswordDialogFragment : DialogFragment() { @@ -64,7 +63,7 @@ class GeneratePasswordDialogFragment : DialogFragment() { activity?.let { activity -> val builder = AlertDialog.Builder(activity) val inflater = activity.layoutInflater - root = inflater.inflate(R.layout.generate_password, null) + root = inflater.inflate(R.layout.fragment_generate_password, null) passwordView = root?.findViewById(R.id.password) passwordView?.applyFontVisibility() diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/GroupEditDialogFragment.kt b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/GroupEditDialogFragment.kt index 45d70988a..560d1bac2 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/GroupEditDialogFragment.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/GroupEditDialogFragment.kt @@ -79,7 +79,7 @@ class GroupEditDialogFragment : DialogFragment(), IconPickerDialogFragment.IconP override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { activity?.let { activity -> - val root = activity.layoutInflater.inflate(R.layout.group_edit, null) + val root = activity.layoutInflater.inflate(R.layout.fragment_group_edit, null) nameTextLayoutView = root?.findViewById(R.id.group_edit_name_container) nameTextView = root?.findViewById(R.id.group_edit_name) iconButtonView = root?.findViewById(R.id.group_edit_icon_button) diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/IconPickerDialogFragment.kt b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/IconPickerDialogFragment.kt index c6105d041..a66dbf130 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/IconPickerDialogFragment.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/IconPickerDialogFragment.kt @@ -64,7 +64,7 @@ class IconPickerDialogFragment : DialogFragment() { // Inflate and set the layout for the dialog // Pass null as the parent view because its going in the dialog layout - val root = activity.layoutInflater.inflate(R.layout.icon_picker, null) + val root = activity.layoutInflater.inflate(R.layout.fragment_icon_picker, null) builder.setView(root) val currIconGridView = root.findViewById(R.id.IconGridView) @@ -101,7 +101,7 @@ class IconPickerDialogFragment : DialogFragment() { override fun getView(position: Int, convertView: View?, parent: ViewGroup): View { val currentView: View = convertView ?: (context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater) - .inflate(R.layout.icon, parent, false) + .inflate(R.layout.item_icon, parent, false) iconPack?.let { iconPack -> val iconImageView = currentView.findViewById(R.id.icon_image) diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/KeyboardExplanationDialogFragment.kt b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/KeyboardExplanationDialogFragment.kt index 474444572..46fb93e72 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/KeyboardExplanationDialogFragment.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/KeyboardExplanationDialogFragment.kt @@ -38,7 +38,7 @@ class KeyboardExplanationDialogFragment : DialogFragment() { val builder = AlertDialog.Builder(activity!!) val inflater = activity!!.layoutInflater - val rootView = inflater.inflate(R.layout.keyboard_explanation, null) + val rootView = inflater.inflate(R.layout.fragment_keyboard_explanation, null) rootView.findViewById(R.id.keyboards_activate_setting_path1_text) .setOnClickListener { launchActivateKeyboardSetting() } diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/SortDialogFragment.kt b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/SortDialogFragment.kt index 89785fb65..b7d0859db 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/SortDialogFragment.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/SortDialogFragment.kt @@ -80,7 +80,7 @@ class SortDialogFragment : DialogFragment() { mCheckedId = retrieveViewFromEnum(mSortNodeEnum!!) - val rootView = activity.layoutInflater.inflate(R.layout.sort_selection, null) + val rootView = activity.layoutInflater.inflate(R.layout.fragment_sort_selection, null) builder.setTitle(R.string.sort_menu) builder.setView(rootView) // Add action buttons diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/UnavailableFeatureDialogFragment.kt b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/UnavailableFeatureDialogFragment.kt index 5762f584f..5bc66efad 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/UnavailableFeatureDialogFragment.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/UnavailableFeatureDialogFragment.kt @@ -40,7 +40,7 @@ class UnavailableFeatureDialogFragment : DialogFragment() { minVersionRequired = getInt(MIN_REQUIRED_VERSION_ARG) } - val rootView = activity.layoutInflater.inflate(R.layout.unavailable_feature, null) + val rootView = activity.layoutInflater.inflate(R.layout.fragment_unavailable_feature, null) val messageView = rootView.findViewById(R.id.unavailable_feature_message) val builder = AlertDialog.Builder(activity) diff --git a/app/src/main/java/com/kunzisoft/keepass/adapters/FileDatabaseHistoryAdapter.kt b/app/src/main/java/com/kunzisoft/keepass/adapters/FileDatabaseHistoryAdapter.kt index 5d2b9ee68..8f58b207b 100644 --- a/app/src/main/java/com/kunzisoft/keepass/adapters/FileDatabaseHistoryAdapter.kt +++ b/app/src/main/java/com/kunzisoft/keepass/adapters/FileDatabaseHistoryAdapter.kt @@ -55,7 +55,7 @@ class FileDatabaseHistoryAdapter(private val context: Context, private val listF } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): FileDatabaseHistoryViewHolder { - val view = inflater.inflate(R.layout.file_row, parent, false) + val view = inflater.inflate(R.layout.item_file_row, parent, false) return FileDatabaseHistoryViewHolder(view) } diff --git a/app/src/main/java/com/kunzisoft/keepass/adapters/NodeAdapter.kt b/app/src/main/java/com/kunzisoft/keepass/adapters/NodeAdapter.kt index 5e3660b1d..d47c550f1 100644 --- a/app/src/main/java/com/kunzisoft/keepass/adapters/NodeAdapter.kt +++ b/app/src/main/java/com/kunzisoft/keepass/adapters/NodeAdapter.kt @@ -189,9 +189,9 @@ class NodeAdapter override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): NodeViewHolder { val view: View = if (viewType == Type.GROUP.ordinal) { - inflater.inflate(R.layout.list_nodes_group, parent, false) + inflater.inflate(R.layout.item_list_nodes_group, parent, false) } else { - inflater.inflate(R.layout.list_nodes_entry, parent, false) + inflater.inflate(R.layout.item_list_nodes_entry, parent, false) } return NodeViewHolder(view) } diff --git a/app/src/main/java/com/kunzisoft/keepass/adapters/SearchEntryCursorAdapter.kt b/app/src/main/java/com/kunzisoft/keepass/adapters/SearchEntryCursorAdapter.kt index 764a1176c..6efecea3d 100644 --- a/app/src/main/java/com/kunzisoft/keepass/adapters/SearchEntryCursorAdapter.kt +++ b/app/src/main/java/com/kunzisoft/keepass/adapters/SearchEntryCursorAdapter.kt @@ -60,7 +60,7 @@ class SearchEntryCursorAdapter(context: Context, private val database: Database) override fun newView(context: Context, cursor: Cursor, parent: ViewGroup): View { - val view = cursorInflater.inflate(R.layout.search_entry, parent, false) + val view = cursorInflater.inflate(R.layout.item_search_entry, parent, false) val viewHolder = ViewHolder() viewHolder.imageViewIcon = view.findViewById(R.id.entry_icon) viewHolder.textViewTitle = view.findViewById(R.id.entry_text) diff --git a/app/src/main/java/com/kunzisoft/keepass/autofill/AutofillHelper.kt b/app/src/main/java/com/kunzisoft/keepass/autofill/AutofillHelper.kt index 980e0d3f2..e887c7833 100644 --- a/app/src/main/java/com/kunzisoft/keepass/autofill/AutofillHelper.kt +++ b/app/src/main/java/com/kunzisoft/keepass/autofill/AutofillHelper.kt @@ -141,7 +141,7 @@ object AutofillHelper { } private fun newRemoteViews(packageName: String, remoteViewsText: String): RemoteViews { - val presentation = RemoteViews(packageName, R.layout.autofill_service_list_item) + val presentation = RemoteViews(packageName, R.layout.item_autofill_service) presentation.setTextViewText(R.id.text, remoteViewsText) return presentation } diff --git a/app/src/main/java/com/kunzisoft/keepass/autofill/KeeAutofillService.kt b/app/src/main/java/com/kunzisoft/keepass/autofill/KeeAutofillService.kt index ffa32e526..bdcfd9026 100644 --- a/app/src/main/java/com/kunzisoft/keepass/autofill/KeeAutofillService.kt +++ b/app/src/main/java/com/kunzisoft/keepass/autofill/KeeAutofillService.kt @@ -45,7 +45,7 @@ class KeeAutofillService : AutofillService() { // If the entire Autofill Response is authenticated, AuthActivity is used // to generate Response. val sender = AutofillLauncherActivity.getAuthIntentSenderForResponse(this) - val presentation = RemoteViews(packageName, R.layout.autofill_service_unlock) + val presentation = RemoteViews(packageName, R.layout.item_autofill_service_unlock) responseBuilder.setAuthentication(autofillIds, sender, presentation) callback.onSuccess(responseBuilder.build()) } diff --git a/app/src/main/java/com/kunzisoft/keepass/fingerprint/FingerPrintExplanationDialog.kt b/app/src/main/java/com/kunzisoft/keepass/fingerprint/FingerPrintExplanationDialog.kt index ddb22c417..4a3be70de 100644 --- a/app/src/main/java/com/kunzisoft/keepass/fingerprint/FingerPrintExplanationDialog.kt +++ b/app/src/main/java/com/kunzisoft/keepass/fingerprint/FingerPrintExplanationDialog.kt @@ -39,7 +39,7 @@ class FingerPrintExplanationDialog : DialogFragment() { val builder = AlertDialog.Builder(activity) val inflater = activity.layoutInflater - val rootView = inflater.inflate(R.layout.fingerprint_explanation, null) + val rootView = inflater.inflate(R.layout.fragment_fingerprint_explanation, null) val fingerprintSettingWayTextView = rootView.findViewById(R.id.fingerprint_setting_way_text) fingerprintSettingWayTextView.setOnClickListener { startActivity(Intent(android.provider.Settings.ACTION_SECURITY_SETTINGS)) } diff --git a/app/src/main/java/com/kunzisoft/keepass/tasks/ProgressTaskDialogFragment.kt b/app/src/main/java/com/kunzisoft/keepass/tasks/ProgressTaskDialogFragment.kt index bfe2af2ce..070bae894 100644 --- a/app/src/main/java/com/kunzisoft/keepass/tasks/ProgressTaskDialogFragment.kt +++ b/app/src/main/java/com/kunzisoft/keepass/tasks/ProgressTaskDialogFragment.kt @@ -31,7 +31,6 @@ import android.view.View import android.widget.ProgressBar import android.widget.TextView import com.kunzisoft.keepass.R -import com.kunzisoft.keepass.utils.Util import com.kunzisoft.keepass.utils.lockScreenOrientation import com.kunzisoft.keepass.utils.unlockScreenOrientation @@ -59,7 +58,7 @@ open class ProgressTaskDialogFragment : DialogFragment(), ProgressTaskUpdater { // Inflate and set the layout for the dialog // Pass null as the parent view because its going in the dialog layout @SuppressLint("InflateParams") - val root = inflater.inflate(R.layout.progress_dialog, null) + val root = inflater.inflate(R.layout.fragment_progress, null) builder.setView(root) titleView = root.findViewById(R.id.progress_dialog_title) diff --git a/app/src/main/java/com/kunzisoft/keepass/view/AddNodeButtonView.kt b/app/src/main/java/com/kunzisoft/keepass/view/AddNodeButtonView.kt index df0f22da5..e4c6f0877 100644 --- a/app/src/main/java/com/kunzisoft/keepass/view/AddNodeButtonView.kt +++ b/app/src/main/java/com/kunzisoft/keepass/view/AddNodeButtonView.kt @@ -68,7 +68,7 @@ class AddNodeButtonView @JvmOverloads constructor(context: Context, attrs: Attri private fun inflate(context: Context) { val inflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater - inflater.inflate(R.layout.add_node_button, this) + inflater.inflate(R.layout.view_button_add_node, this) addEntryEnable = true addGroupEnable = true diff --git a/app/src/main/java/com/kunzisoft/keepass/view/EntryContentsView.kt b/app/src/main/java/com/kunzisoft/keepass/view/EntryContentsView.kt index 37509fd14..8b2a11828 100644 --- a/app/src/main/java/com/kunzisoft/keepass/view/EntryContentsView.kt +++ b/app/src/main/java/com/kunzisoft/keepass/view/EntryContentsView.kt @@ -72,7 +72,7 @@ class EntryContentsView @JvmOverloads constructor(context: Context, attrs: Attri init { val inflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater - inflater.inflate(R.layout.entry_view_contents, this) + inflater.inflate(R.layout.view_entry_contents, this) userNameContainerView = findViewById(R.id.entry_user_name_container) userNameView = findViewById(R.id.entry_user_name) diff --git a/app/src/main/java/com/kunzisoft/keepass/view/EntryCustomField.kt b/app/src/main/java/com/kunzisoft/keepass/view/EntryCustomField.kt index 3877f7f61..30b96532c 100644 --- a/app/src/main/java/com/kunzisoft/keepass/view/EntryCustomField.kt +++ b/app/src/main/java/com/kunzisoft/keepass/view/EntryCustomField.kt @@ -49,7 +49,7 @@ open class EntryCustomField(context: Context, init { val inflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater - inflater.inflate(R.layout.entry_new_field, this) + inflater.inflate(R.layout.view_entry_new_field, this) labelView = findViewById(R.id.title) valueView = findViewById(R.id.value) diff --git a/app/src/main/java/com/kunzisoft/keepass/view/EntryEditContentsView.kt b/app/src/main/java/com/kunzisoft/keepass/view/EntryEditContentsView.kt index 1b0dd9831..2633a92bd 100644 --- a/app/src/main/java/com/kunzisoft/keepass/view/EntryEditContentsView.kt +++ b/app/src/main/java/com/kunzisoft/keepass/view/EntryEditContentsView.kt @@ -40,7 +40,7 @@ class EntryEditContentsView @JvmOverloads constructor(context: Context, attrs: A init { val inflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater - inflater.inflate(R.layout.entry_edit_view_contents, this) + inflater.inflate(R.layout.view_entry_edit_contents, this) entryTitleLayoutView = findViewById(R.id.entry_edit_container_title) entryTitleView = findViewById(R.id.entry_edit_title) diff --git a/app/src/main/java/com/kunzisoft/keepass/view/EntryEditCustomField.kt b/app/src/main/java/com/kunzisoft/keepass/view/EntryEditCustomField.kt index 2f2f42652..5b8541bd9 100644 --- a/app/src/main/java/com/kunzisoft/keepass/view/EntryEditCustomField.kt +++ b/app/src/main/java/com/kunzisoft/keepass/view/EntryEditCustomField.kt @@ -56,7 +56,7 @@ class EntryEditCustomField @JvmOverloads constructor(context: Context, init { val inflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater - inflater.inflate(R.layout.entry_edit_new_field, this) + inflater.inflate(R.layout.view_entry_edit_new_field, this) val deleteView = findViewById(R.id.entry_edit_new_field_delete) deleteView.setOnClickListener { deleteViewFromParent() } diff --git a/app/src/main/res/layout-v23/fingerprint_explanation.xml b/app/src/main/res/layout-v23/fragment_fingerprint_explanation.xml similarity index 100% rename from app/src/main/res/layout-v23/fingerprint_explanation.xml rename to app/src/main/res/layout-v23/fragment_fingerprint_explanation.xml diff --git a/app/src/main/res/layout/about.xml b/app/src/main/res/layout/activity_about.xml similarity index 100% rename from app/src/main/res/layout/about.xml rename to app/src/main/res/layout/activity_about.xml diff --git a/app/src/main/res/layout/entry_view.xml b/app/src/main/res/layout/activity_entry.xml similarity index 100% rename from app/src/main/res/layout/entry_view.xml rename to app/src/main/res/layout/activity_entry.xml diff --git a/app/src/main/res/layout/entry_edit.xml b/app/src/main/res/layout/activity_entry_edit.xml similarity index 100% rename from app/src/main/res/layout/entry_edit.xml rename to app/src/main/res/layout/activity_entry_edit.xml diff --git a/app/src/main/res/layout/file_selection.xml b/app/src/main/res/layout/activity_file_selection.xml similarity index 100% rename from app/src/main/res/layout/file_selection.xml rename to app/src/main/res/layout/activity_file_selection.xml diff --git a/app/src/main/res/layout/list_nodes_with_add_button.xml b/app/src/main/res/layout/activity_group.xml similarity index 100% rename from app/src/main/res/layout/list_nodes_with_add_button.xml rename to app/src/main/res/layout/activity_group.xml diff --git a/app/src/main/res/layout/password.xml b/app/src/main/res/layout/activity_password.xml similarity index 100% rename from app/src/main/res/layout/password.xml rename to app/src/main/res/layout/activity_password.xml diff --git a/app/src/main/res/layout/search_results.xml b/app/src/main/res/layout/activity_search_results.xml similarity index 100% rename from app/src/main/res/layout/search_results.xml rename to app/src/main/res/layout/activity_search_results.xml diff --git a/app/src/main/res/layout/empty.xml b/app/src/main/res/layout/empty.xml deleted file mode 100644 index 31b441e01..000000000 --- a/app/src/main/res/layout/empty.xml +++ /dev/null @@ -1,7 +0,0 @@ - - \ No newline at end of file diff --git a/app/src/main/res/layout/browser_install.xml b/app/src/main/res/layout/fragment_browser_install.xml similarity index 100% rename from app/src/main/res/layout/browser_install.xml rename to app/src/main/res/layout/fragment_browser_install.xml diff --git a/app/src/main/res/layout/file_creation.xml b/app/src/main/res/layout/fragment_file_creation.xml similarity index 100% rename from app/src/main/res/layout/file_creation.xml rename to app/src/main/res/layout/fragment_file_creation.xml diff --git a/app/src/main/res/layout/file_selection_information.xml b/app/src/main/res/layout/fragment_file_selection_information.xml similarity index 100% rename from app/src/main/res/layout/file_selection_information.xml rename to app/src/main/res/layout/fragment_file_selection_information.xml diff --git a/app/src/main/res/layout/generate_password.xml b/app/src/main/res/layout/fragment_generate_password.xml similarity index 100% rename from app/src/main/res/layout/generate_password.xml rename to app/src/main/res/layout/fragment_generate_password.xml diff --git a/app/src/main/res/layout/group_edit.xml b/app/src/main/res/layout/fragment_group_edit.xml similarity index 100% rename from app/src/main/res/layout/group_edit.xml rename to app/src/main/res/layout/fragment_group_edit.xml diff --git a/app/src/main/res/layout/icon_picker.xml b/app/src/main/res/layout/fragment_icon_picker.xml similarity index 100% rename from app/src/main/res/layout/icon_picker.xml rename to app/src/main/res/layout/fragment_icon_picker.xml diff --git a/app/src/main/res/layout/keyboard_explanation.xml b/app/src/main/res/layout/fragment_keyboard_explanation.xml similarity index 100% rename from app/src/main/res/layout/keyboard_explanation.xml rename to app/src/main/res/layout/fragment_keyboard_explanation.xml diff --git a/app/src/main/res/layout/list_nodes_fragment.xml b/app/src/main/res/layout/fragment_list_nodes.xml similarity index 100% rename from app/src/main/res/layout/list_nodes_fragment.xml rename to app/src/main/res/layout/fragment_list_nodes.xml diff --git a/app/src/main/res/layout/progress_dialog.xml b/app/src/main/res/layout/fragment_progress.xml similarity index 100% rename from app/src/main/res/layout/progress_dialog.xml rename to app/src/main/res/layout/fragment_progress.xml diff --git a/app/src/main/res/layout/set_password.xml b/app/src/main/res/layout/fragment_set_password.xml similarity index 100% rename from app/src/main/res/layout/set_password.xml rename to app/src/main/res/layout/fragment_set_password.xml diff --git a/app/src/main/res/layout/sort_selection.xml b/app/src/main/res/layout/fragment_sort_selection.xml similarity index 100% rename from app/src/main/res/layout/sort_selection.xml rename to app/src/main/res/layout/fragment_sort_selection.xml diff --git a/app/src/main/res/layout/unavailable_feature.xml b/app/src/main/res/layout/fragment_unavailable_feature.xml similarity index 100% rename from app/src/main/res/layout/unavailable_feature.xml rename to app/src/main/res/layout/fragment_unavailable_feature.xml diff --git a/app/src/main/res/layout/autofill_service_list_item.xml b/app/src/main/res/layout/item_autofill_service.xml similarity index 100% rename from app/src/main/res/layout/autofill_service_list_item.xml rename to app/src/main/res/layout/item_autofill_service.xml diff --git a/app/src/main/res/layout/autofill_service_unlock.xml b/app/src/main/res/layout/item_autofill_service_unlock.xml similarity index 100% rename from app/src/main/res/layout/autofill_service_unlock.xml rename to app/src/main/res/layout/item_autofill_service_unlock.xml diff --git a/app/src/main/res/layout/file_row.xml b/app/src/main/res/layout/item_file_row.xml similarity index 100% rename from app/src/main/res/layout/file_row.xml rename to app/src/main/res/layout/item_file_row.xml diff --git a/app/src/main/res/layout/icon.xml b/app/src/main/res/layout/item_icon.xml similarity index 100% rename from app/src/main/res/layout/icon.xml rename to app/src/main/res/layout/item_icon.xml diff --git a/app/src/main/res/layout/list_nodes_entry.xml b/app/src/main/res/layout/item_list_nodes_entry.xml similarity index 100% rename from app/src/main/res/layout/list_nodes_entry.xml rename to app/src/main/res/layout/item_list_nodes_entry.xml diff --git a/app/src/main/res/layout/list_nodes_group.xml b/app/src/main/res/layout/item_list_nodes_group.xml similarity index 100% rename from app/src/main/res/layout/list_nodes_group.xml rename to app/src/main/res/layout/item_list_nodes_group.xml diff --git a/app/src/main/res/layout/search_entry.xml b/app/src/main/res/layout/item_search_entry.xml similarity index 100% rename from app/src/main/res/layout/search_entry.xml rename to app/src/main/res/layout/item_search_entry.xml diff --git a/app/src/main/res/layout/add_node_button.xml b/app/src/main/res/layout/view_button_add_node.xml similarity index 100% rename from app/src/main/res/layout/add_node_button.xml rename to app/src/main/res/layout/view_button_add_node.xml diff --git a/app/src/main/res/layout/entry_view_contents.xml b/app/src/main/res/layout/view_entry_contents.xml similarity index 100% rename from app/src/main/res/layout/entry_view_contents.xml rename to app/src/main/res/layout/view_entry_contents.xml diff --git a/app/src/main/res/layout/entry_edit_view_contents.xml b/app/src/main/res/layout/view_entry_edit_contents.xml similarity index 100% rename from app/src/main/res/layout/entry_edit_view_contents.xml rename to app/src/main/res/layout/view_entry_edit_contents.xml diff --git a/app/src/main/res/layout/entry_edit_new_field.xml b/app/src/main/res/layout/view_entry_edit_new_field.xml similarity index 100% rename from app/src/main/res/layout/entry_edit_new_field.xml rename to app/src/main/res/layout/view_entry_edit_new_field.xml diff --git a/app/src/main/res/layout/entry_new_field.xml b/app/src/main/res/layout/view_entry_new_field.xml similarity index 100% rename from app/src/main/res/layout/entry_new_field.xml rename to app/src/main/res/layout/view_entry_new_field.xml