diff --git a/app/src/main/java/com/monke/monkeybook/view/adapter/BookShelfGridAdapter.java b/app/src/main/java/com/monke/monkeybook/view/adapter/BookShelfGridAdapter.java index b896f8daee..b615c72863 100644 --- a/app/src/main/java/com/monke/monkeybook/view/adapter/BookShelfGridAdapter.java +++ b/app/src/main/java/com/monke/monkeybook/view/adapter/BookShelfGridAdapter.java @@ -90,7 +90,7 @@ public int getItemCount() { @NonNull @Override public MyViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - return new MyViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.adapter_bookshelf_grid, parent, false)); + return new MyViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.item_bookshelf_grid, parent, false)); } @Override diff --git a/app/src/main/java/com/monke/monkeybook/view/adapter/BookShelfListAdapter.java b/app/src/main/java/com/monke/monkeybook/view/adapter/BookShelfListAdapter.java index 4c8a0a1476..f5323ef317 100644 --- a/app/src/main/java/com/monke/monkeybook/view/adapter/BookShelfListAdapter.java +++ b/app/src/main/java/com/monke/monkeybook/view/adapter/BookShelfListAdapter.java @@ -86,7 +86,7 @@ public int getItemCount() { @NonNull @Override public MyViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - return new MyViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.adapter_bookshelf_list, parent, false)); + return new MyViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.item_bookshelf_list, parent, false)); } @Override diff --git a/app/src/main/java/com/monke/monkeybook/view/adapter/BookSourceAdapter.java b/app/src/main/java/com/monke/monkeybook/view/adapter/BookSourceAdapter.java index 0258ef2d4f..f3d16c7fe1 100644 --- a/app/src/main/java/com/monke/monkeybook/view/adapter/BookSourceAdapter.java +++ b/app/src/main/java/com/monke/monkeybook/view/adapter/BookSourceAdapter.java @@ -90,7 +90,7 @@ public MyItemTouchHelpCallback.OnItemTouchCallbackListener getItemTouchCallbackL @NonNull @Override public MyViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.adapter_book_source_item, parent, false); + View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_book_source, parent, false); return new MyViewHolder(view); } diff --git a/app/src/main/java/com/monke/monkeybook/view/adapter/ChangeSourceAdapter.java b/app/src/main/java/com/monke/monkeybook/view/adapter/ChangeSourceAdapter.java index 056804184f..8ed832f503 100644 --- a/app/src/main/java/com/monke/monkeybook/view/adapter/ChangeSourceAdapter.java +++ b/app/src/main/java/com/monke/monkeybook/view/adapter/ChangeSourceAdapter.java @@ -79,7 +79,7 @@ class MyViewHolder extends RecyclerView.ViewHolder{ @Override public RecyclerView.ViewHolder onCreateIViewHolder(ViewGroup parent, int viewType) { - return new MyViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.adapter_change_source_item, parent, false)); + return new MyViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.item_change_source, parent, false)); } @Override diff --git a/app/src/main/java/com/monke/monkeybook/view/adapter/ChapterListAdapter.java b/app/src/main/java/com/monke/monkeybook/view/adapter/ChapterListAdapter.java index ee19268fb8..ef609a03a9 100644 --- a/app/src/main/java/com/monke/monkeybook/view/adapter/ChapterListAdapter.java +++ b/app/src/main/java/com/monke/monkeybook/view/adapter/ChapterListAdapter.java @@ -103,7 +103,7 @@ public void onError(Throwable e) { @NonNull @Override public ThisViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - return new ThisViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.adapter_chapterlist, parent, false)); + return new ThisViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.item_chapter_list, parent, false)); } @Override diff --git a/app/src/main/java/com/monke/monkeybook/view/adapter/ChoiceBookAdapter.java b/app/src/main/java/com/monke/monkeybook/view/adapter/ChoiceBookAdapter.java index 9be6afca84..feb3eb5ac2 100644 --- a/app/src/main/java/com/monke/monkeybook/view/adapter/ChoiceBookAdapter.java +++ b/app/src/main/java/com/monke/monkeybook/view/adapter/ChoiceBookAdapter.java @@ -41,7 +41,7 @@ public ChoiceBookAdapter(Activity activity) { @Override public RecyclerView.ViewHolder onCreateIViewHolder(ViewGroup parent, int viewType) { - return new MyViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.adapter_searchbook_item, parent, false)); + return new MyViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.item_search_book, parent, false)); } @Override diff --git a/app/src/main/java/com/monke/monkeybook/view/adapter/DownloadAdapter.java b/app/src/main/java/com/monke/monkeybook/view/adapter/DownloadAdapter.java index ddb6d28f68..3eea378678 100644 --- a/app/src/main/java/com/monke/monkeybook/view/adapter/DownloadAdapter.java +++ b/app/src/main/java/com/monke/monkeybook/view/adapter/DownloadAdapter.java @@ -36,7 +36,7 @@ public void upDataS(List dataS) { @NonNull @Override public MyViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.adapter_download_item, parent, false); + View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_download, parent, false); return new MyViewHolder(view); } diff --git a/app/src/main/java/com/monke/monkeybook/view/adapter/FindKindAdapter.java b/app/src/main/java/com/monke/monkeybook/view/adapter/FindKindAdapter.java index b41661f6c1..6373ce5f22 100644 --- a/app/src/main/java/com/monke/monkeybook/view/adapter/FindKindAdapter.java +++ b/app/src/main/java/com/monke/monkeybook/view/adapter/FindKindAdapter.java @@ -1,7 +1,5 @@ package com.monke.monkeybook.view.adapter; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -9,9 +7,7 @@ import android.widget.TextView; import com.monke.monkeybook.R; -import com.monke.monkeybook.bean.FindKindBean; import com.monke.monkeybook.bean.FindKindGroupBean; -import com.monke.monkeybook.view.activity.ChoiceBookActivity; import com.monke.monkeybook.view.activity.FindBookActivity; import java.util.ArrayList; @@ -84,7 +80,7 @@ public boolean hasStableIds() { public View getGroupView(int i, boolean b, View convertView, ViewGroup parent) { GroupViewHolder groupViewHolder; if (convertView == null) { - convertView = LayoutInflater.from(parent.getContext()).inflate(R.layout.adapter_find_group, parent, false); + convertView = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_find_group, parent, false); groupViewHolder = new GroupViewHolder(); groupViewHolder.tvTitle = convertView.findViewById(R.id.tv_kind_name); convertView.setTag(groupViewHolder); @@ -99,7 +95,7 @@ public View getGroupView(int i, boolean b, View convertView, ViewGroup parent) { public View getChildView(int i, int i1, boolean b, View convertView, ViewGroup parent) { ChildViewHolder childViewHolder; if (convertView == null) { - convertView = LayoutInflater.from(parent.getContext()).inflate(R.layout.adapter_find_kind, parent, false); + convertView = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_find_kind, parent, false); childViewHolder = new ChildViewHolder(); childViewHolder.tvTitle = convertView.findViewById(R.id.tv_kind_name); convertView.setTag(childViewHolder); diff --git a/app/src/main/java/com/monke/monkeybook/view/adapter/ReplaceRuleAdapter.java b/app/src/main/java/com/monke/monkeybook/view/adapter/ReplaceRuleAdapter.java index f983c84c2a..a973994daf 100644 --- a/app/src/main/java/com/monke/monkeybook/view/adapter/ReplaceRuleAdapter.java +++ b/app/src/main/java/com/monke/monkeybook/view/adapter/ReplaceRuleAdapter.java @@ -66,7 +66,7 @@ public List getDataList() { @NonNull @Override public MyViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.adapter_replace_rule_item, parent, false); + View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_replace_rule, parent, false); return new MyViewHolder(view); } diff --git a/app/src/main/java/com/monke/monkeybook/view/adapter/SearchBookAdapter.java b/app/src/main/java/com/monke/monkeybook/view/adapter/SearchBookAdapter.java index b5d5b131e2..a611bb0957 100644 --- a/app/src/main/java/com/monke/monkeybook/view/adapter/SearchBookAdapter.java +++ b/app/src/main/java/com/monke/monkeybook/view/adapter/SearchBookAdapter.java @@ -48,7 +48,7 @@ public SearchBookAdapter(Activity activity) { @Override public RecyclerView.ViewHolder onCreateIViewHolder(ViewGroup parent, int viewType) { - return new MyViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.adapter_searchbook_item, parent, false)); + return new MyViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.item_search_book, parent, false)); } @SuppressLint("DefaultLocale") diff --git a/app/src/main/java/com/monke/monkeybook/view/adapter/SearchHistoryAdapter.java b/app/src/main/java/com/monke/monkeybook/view/adapter/SearchHistoryAdapter.java index 9e33dfb5f3..d1a4550aa7 100644 --- a/app/src/main/java/com/monke/monkeybook/view/adapter/SearchHistoryAdapter.java +++ b/app/src/main/java/com/monke/monkeybook/view/adapter/SearchHistoryAdapter.java @@ -34,7 +34,7 @@ public void setOnItemClickListener(OnItemClickListener listener) { @Override public View getView(FlowLayout parent, int position, final SearchHistoryBean searchHistoryBean) { - TextView tv = (TextView) LayoutInflater.from(parent.getContext()).inflate(R.layout.adapter_searchhistory_item, + TextView tv = (TextView) LayoutInflater.from(parent.getContext()).inflate(R.layout.item_search_history, parent, false); tv.setText(searchHistoryBean.getContent()); tv.setOnClickListener(v -> { diff --git a/app/src/main/res/layout/adapter_file_folder_item.xml b/app/src/main/res/layout/adapter_file_folder_item.xml deleted file mode 100644 index c58a10c7c2..0000000000 --- a/app/src/main/res/layout/adapter_file_folder_item.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/adapter_importbook.xml b/app/src/main/res/layout/adapter_importbook.xml deleted file mode 100644 index 9d20d7d2a1..0000000000 --- a/app/src/main/res/layout/adapter_importbook.xml +++ /dev/null @@ -1,95 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/adapter_book_source_item.xml b/app/src/main/res/layout/item_book_source.xml similarity index 100% rename from app/src/main/res/layout/adapter_book_source_item.xml rename to app/src/main/res/layout/item_book_source.xml diff --git a/app/src/main/res/layout/adapter_bookshelf_grid.xml b/app/src/main/res/layout/item_bookshelf_grid.xml similarity index 100% rename from app/src/main/res/layout/adapter_bookshelf_grid.xml rename to app/src/main/res/layout/item_bookshelf_grid.xml diff --git a/app/src/main/res/layout/adapter_bookshelf_list.xml b/app/src/main/res/layout/item_bookshelf_list.xml similarity index 100% rename from app/src/main/res/layout/adapter_bookshelf_list.xml rename to app/src/main/res/layout/item_bookshelf_list.xml diff --git a/app/src/main/res/layout/adapter_change_source_item.xml b/app/src/main/res/layout/item_change_source.xml similarity index 100% rename from app/src/main/res/layout/adapter_change_source_item.xml rename to app/src/main/res/layout/item_change_source.xml diff --git a/app/src/main/res/layout/adapter_chapterlist.xml b/app/src/main/res/layout/item_chapter_list.xml similarity index 100% rename from app/src/main/res/layout/adapter_chapterlist.xml rename to app/src/main/res/layout/item_chapter_list.xml diff --git a/app/src/main/res/layout/adapter_download_item.xml b/app/src/main/res/layout/item_download.xml similarity index 100% rename from app/src/main/res/layout/adapter_download_item.xml rename to app/src/main/res/layout/item_download.xml diff --git a/app/src/main/res/layout/adapter_find_group.xml b/app/src/main/res/layout/item_find_group.xml similarity index 100% rename from app/src/main/res/layout/adapter_find_group.xml rename to app/src/main/res/layout/item_find_group.xml diff --git a/app/src/main/res/layout/adapter_find_kind.xml b/app/src/main/res/layout/item_find_kind.xml similarity index 100% rename from app/src/main/res/layout/adapter_find_kind.xml rename to app/src/main/res/layout/item_find_kind.xml diff --git a/app/src/main/res/layout/adapter_replace_rule_item.xml b/app/src/main/res/layout/item_replace_rule.xml similarity index 100% rename from app/src/main/res/layout/adapter_replace_rule_item.xml rename to app/src/main/res/layout/item_replace_rule.xml diff --git a/app/src/main/res/layout/adapter_searchbook_item.xml b/app/src/main/res/layout/item_search_book.xml similarity index 100% rename from app/src/main/res/layout/adapter_searchbook_item.xml rename to app/src/main/res/layout/item_search_book.xml diff --git a/app/src/main/res/layout/adapter_searchhistory_item.xml b/app/src/main/res/layout/item_search_history.xml similarity index 100% rename from app/src/main/res/layout/adapter_searchhistory_item.xml rename to app/src/main/res/layout/item_search_history.xml