From 53b2a6d603e1f27704ecef4b70c66c45cbce2e3e Mon Sep 17 00:00:00 2001 From: Victor Date: Thu, 9 Jan 2014 22:59:05 +0200 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=BE=20=D0=B8=D0=BC=D0=B5=D0=BD=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=BE=D0=BB=D0=B5=D0=B9=20=D0=B2=20?= =?UTF-8?q?=D1=81=D0=BE=D0=BE=D1=82=D0=B2=D0=B5=D1=82=D1=81=D1=82=D0=B2?= =?UTF-8?q?=D0=B8=D0=B8=20=D1=81=D0=BE=20=D1=81=D1=82=D0=B0=D0=BD=D0=B4?= =?UTF-8?q?=D0=B0=D1=80=D1=82=D0=B0=D0=BC=D0=B8=20Android?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/annimon/client/MainActivity.java | 6 +-- .../client/adapters/ActionsAdapter.java | 24 +++++----- .../client/adapters/ForumPostAdapter.java | 18 ++++---- .../client/fragments/ForumFragment.java | 6 +-- .../client/fragments/MailFragment.java | 12 ++--- .../annimon/client/tasks/ForumPostLoader.java | 22 +++++----- .../annimon/client/utils/MoreListHelper.java | 44 +++++++++---------- 7 files changed, 64 insertions(+), 68 deletions(-) diff --git a/src/com/annimon/client/MainActivity.java b/src/com/annimon/client/MainActivity.java index fd83ff3..f71435d 100644 --- a/src/com/annimon/client/MainActivity.java +++ b/src/com/annimon/client/MainActivity.java @@ -1,23 +1,19 @@ package com.annimon.client; -import android.os.Bundle; -import android.app.Activity; import android.content.res.Configuration; +import android.os.Bundle; import android.support.v4.app.ActionBarDrawerToggle; import android.support.v4.app.ActivityCompat; import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentActivity; import android.support.v4.app.FragmentManager; import android.support.v4.view.GravityCompat; import android.support.v4.widget.DrawerLayout; import android.support.v7.app.ActionBarActivity; import android.view.KeyEvent; -import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.widget.AdapterView; import android.widget.ListView; -import android.widget.Toast; import com.annimon.client.adapters.ActionsAdapter; import com.annimon.client.entities.Action; diff --git a/src/com/annimon/client/adapters/ActionsAdapter.java b/src/com/annimon/client/adapters/ActionsAdapter.java index 18b9202..137473e 100644 --- a/src/com/annimon/client/adapters/ActionsAdapter.java +++ b/src/com/annimon/client/adapters/ActionsAdapter.java @@ -18,36 +18,36 @@ public class ActionsAdapter extends BaseAdapter { private static final int VIEW_TYPE_TITLE = 1; private static final int VIEW_TYPES_COUNT = 2; - private final LayoutInflater inflater; - private ArrayList actions; + private final LayoutInflater mInflater; + private final ArrayList mActions; public ActionsAdapter(Context context) { - inflater = LayoutInflater.from(context); - actions = new ArrayList(); + mInflater = LayoutInflater.from(context); + mActions = new ArrayList(); } public void addAction(String name, String path) { - actions.add(new Action(name, path)); + mActions.add(new Action(name, path)); } public void addActions(String[] names, String[] paths) { for (int i = 0; i < names.length; i++) { - actions.add(new Action(names[i], paths[i])); + mActions.add(new Action(names[i], paths[i])); } } public Action getAction(int position) { - return actions.get(position); + return mActions.get(position); } @Override public int getCount() { - return actions.size(); + return mActions.size(); } @Override public Object getItem(int position) { - return actions.get(position); + return mActions.get(position); } @Override @@ -62,7 +62,7 @@ public class ActionsAdapter extends BaseAdapter { final ViewHolder holder; if (convertView == null) { int layoutId = (viewType == VIEW_TYPE_ITEM) ? R.layout.action_row_item : R.layout.action_row_title; - convertView = inflater.inflate(layoutId, parent, false); + convertView = mInflater.inflate(layoutId, parent, false); holder = new ViewHolder(); holder.text = (TextView) convertView;//.findViewById(android.R.id.text1); @@ -71,7 +71,7 @@ public class ActionsAdapter extends BaseAdapter { holder = (ViewHolder) convertView.getTag(); } - final Action action = actions.get(position); + final Action action = mActions.get(position); holder.text.setText(action.getName()); return convertView; @@ -84,7 +84,7 @@ public class ActionsAdapter extends BaseAdapter { @Override public int getItemViewType(int position) { - if (actions.get(position).isTitle()) return VIEW_TYPE_TITLE; + if (mActions.get(position).isTitle()) return VIEW_TYPE_TITLE; return VIEW_TYPE_ITEM; } diff --git a/src/com/annimon/client/adapters/ForumPostAdapter.java b/src/com/annimon/client/adapters/ForumPostAdapter.java index ab28b52..7167bfc 100644 --- a/src/com/annimon/client/adapters/ForumPostAdapter.java +++ b/src/com/annimon/client/adapters/ForumPostAdapter.java @@ -13,22 +13,22 @@ import android.widget.TextView; public class ForumPostAdapter extends BaseAdapter { - private final LayoutInflater inflater; - private List items; + private final LayoutInflater mInflater; + private final List mItems; public ForumPostAdapter(Context context, List items) { - inflater = LayoutInflater.from(context); - this.items = items; + mInflater = LayoutInflater.from(context); + mItems = items; } @Override public int getCount() { - return items.size(); + return mItems.size(); } @Override public Object getItem(int position) { - return items.get(position); + return mItems.get(position); } @Override @@ -40,8 +40,8 @@ public class ForumPostAdapter extends BaseAdapter { public View getView(int position, View convertView, ViewGroup parent) { final ViewHolder holder; if (convertView == null) { - int layoutId = R.layout.forum_post_item; - convertView = inflater.inflate(layoutId, parent, false); + final int layoutId = R.layout.forum_post_item; + convertView = mInflater.inflate(layoutId, parent, false); holder = new ViewHolder(); holder.author = (TextView) convertView.findViewById(R.id.forum_author); @@ -52,7 +52,7 @@ public class ForumPostAdapter extends BaseAdapter { holder = (ViewHolder) convertView.getTag(); } - final ForumPost post = items.get(position); + final ForumPost post = mItems.get(position); holder.author.setText(post.getAuthor()); holder.date.setText(post.getDate()); holder.message.setText(post.getMessage()); diff --git a/src/com/annimon/client/fragments/ForumFragment.java b/src/com/annimon/client/fragments/ForumFragment.java index feebcde..1d87824 100644 --- a/src/com/annimon/client/fragments/ForumFragment.java +++ b/src/com/annimon/client/fragments/ForumFragment.java @@ -12,7 +12,7 @@ public class ForumFragment extends ListFragment { private static final String URL = "http://annimon.com/rss/forumreader.php"; - private ForumPostAdapter adapter; + private ForumPostAdapter mAdapter; @Override public void onActivityCreated(Bundle savedInstanceState) { @@ -26,8 +26,8 @@ public class ForumFragment extends ListFragment { @Override public void onLoadingFinished(List items) { - adapter = new ForumPostAdapter(getActivity(), items); - setListAdapter(adapter); + mAdapter = new ForumPostAdapter(getActivity(), items); + setListAdapter(mAdapter); } }).execute(URL); } diff --git a/src/com/annimon/client/fragments/MailFragment.java b/src/com/annimon/client/fragments/MailFragment.java index 607bc8b..12b41b7 100644 --- a/src/com/annimon/client/fragments/MailFragment.java +++ b/src/com/annimon/client/fragments/MailFragment.java @@ -7,13 +7,13 @@ import java.util.ArrayList; public class MailFragment extends ListFragment { - private MoreListHelper moreListHelper; + private MoreListHelper mMoreListHelper; @Override public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); - moreListHelper = new MoreListHelper(getActivity(), getListView()) { + mMoreListHelper = new MoreListHelper(getActivity(), getListView()) { @Override public void onLoadItems(ArrayList items, int itemsPerPage) { try { @@ -24,9 +24,9 @@ public class MailFragment extends ListFragment { } } }; - moreListHelper.setItemsPerPage(15); - moreListHelper.createAdapter(android.R.layout.simple_list_item_1); - setListAdapter(moreListHelper.getAdapter()); - moreListHelper.loadItems(); + mMoreListHelper.setItemsPerPage(15); + mMoreListHelper.createAdapter(android.R.layout.simple_list_item_1); + setListAdapter(mMoreListHelper.getAdapter()); + mMoreListHelper.loadItems(); } } diff --git a/src/com/annimon/client/tasks/ForumPostLoader.java b/src/com/annimon/client/tasks/ForumPostLoader.java index 569afae..85080e2 100644 --- a/src/com/annimon/client/tasks/ForumPostLoader.java +++ b/src/com/annimon/client/tasks/ForumPostLoader.java @@ -18,13 +18,13 @@ public class ForumPostLoader extends AsyncTask> { private static final String SEPARATOR = "\\|\\$\\|"; - private Context context; - private FinishLoadingListener listener; - private AlertDialog dialog; + private final Context mContext; + private final FinishLoadingListener mListener; + private AlertDialog mDialog; public ForumPostLoader(Context context, FinishLoadingListener listener) { - this.context = context; - this.listener = listener; + mContext = context; + mListener = listener; } @Override @@ -54,23 +54,23 @@ public class ForumPostLoader extends AsyncTask> { @Override protected void onPreExecute() { - ProgressBar progressBar = new ProgressBar(context); + ProgressBar progressBar = new ProgressBar(mContext); progressBar.setIndeterminate(true); - AlertDialog.Builder builder = new AlertDialog.Builder(context); + AlertDialog.Builder builder = new AlertDialog.Builder(mContext); builder.setCustomTitle(progressBar); builder.setIcon(android.R.drawable.ic_menu_upload); builder.setMessage("Please, wait..."); builder.setCancelable(false); - dialog = builder.create(); - dialog.show(); + mDialog = builder.create(); + mDialog.show(); } @Override protected void onPostExecute(List items) { super.onPostExecute(items); - listener.onLoadingFinished(items); - dialog.dismiss(); + mListener.onLoadingFinished(items); + mDialog.dismiss(); } public interface FinishLoadingListener { diff --git a/src/com/annimon/client/utils/MoreListHelper.java b/src/com/annimon/client/utils/MoreListHelper.java index 106e7d3..98ccf77 100644 --- a/src/com/annimon/client/utils/MoreListHelper.java +++ b/src/com/annimon/client/utils/MoreListHelper.java @@ -16,22 +16,22 @@ import java.util.ArrayList; */ public abstract class MoreListHelper { - private int itemsPerPage; + private int mItemsPerPage; - private Activity activity; - private ArrayList items; - private ArrayAdapter adapter; + private Activity mActivity; + private ArrayList mItems; + private ArrayAdapter mAdapter; - private boolean loadingMore; + private boolean mLoadingMore; public MoreListHelper(Activity activity, ListView listView) { this(activity, listView, null); } public MoreListHelper(Activity activity, ListView listView, View footerView) { - itemsPerPage = 10; + mItemsPerPage = 10; - this.activity = activity; + mActivity = activity; if (footerView == null) { // Создаём footer по умочанию. @@ -39,8 +39,8 @@ public abstract class MoreListHelper { ((TextView) footerView).setText("Loading..."); } - loadingMore = false; - items = new ArrayList(); + mLoadingMore = false; + mItems = new ArrayList(); listView.addFooterView(footerView); listView.setOnScrollListener(scrollListener); @@ -51,15 +51,15 @@ public abstract class MoreListHelper { * @param layoutResource ресурс разметки */ public void createAdapter(int layoutResource) { - adapter = new ArrayAdapter(activity, layoutResource, items); + mAdapter = new ArrayAdapter(mActivity, layoutResource, mItems); } public ArrayAdapter getAdapter() { - return adapter; + return mAdapter; } public void setAdapter(ArrayAdapter adapter) { - this.adapter = adapter; + this.mAdapter = adapter; } /** @@ -68,7 +68,7 @@ public abstract class MoreListHelper { * @param value количество элементов */ public void setItemsPerPage(int value) { - itemsPerPage = value; + mItemsPerPage = value; } public void loadItems() { @@ -84,7 +84,7 @@ public abstract class MoreListHelper { @Override public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) { int lastInScreen = firstVisibleItem + visibleItemCount; - if ( (lastInScreen == totalItemCount) && !loadingMore ){ + if ( (lastInScreen == totalItemCount) && !mLoadingMore ){ loadItems(); } } @@ -101,23 +101,23 @@ public abstract class MoreListHelper { private Runnable loadMoreListItemsRunnable = new Runnable() { @Override public void run() { - loadingMore = true; - items = new ArrayList(); + mLoadingMore = true; + mItems = new ArrayList(); // Загружаем данные. - onLoadItems(items, itemsPerPage); + onLoadItems(mItems, mItemsPerPage); // Обновляем список и адаптер. - activity.runOnUiThread(updateAdapterRunnable); + mActivity.runOnUiThread(updateAdapterRunnable); } }; private Runnable updateAdapterRunnable = new Runnable() { @Override public void run() { - if ( (items != null) && (items.size() > 0) ){ - adapter.addAll(items); + if ( (mItems != null) && (mItems.size() > 0) ){ + mAdapter.addAll(mItems); } - adapter.notifyDataSetChanged(); - loadingMore = false; + mAdapter.notifyDataSetChanged(); + mLoadingMore = false; } }; }