android-projects/aNMClient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Исправлено именование полей в соответствии со стандартами Android

Browse Source
This commit is contained in:
Victor 2014-01-09 22:59:05 +02:00
parent 12d4e2a709
commit 53b2a6d603
7 changed files with 64 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/annimon/client/MainActivity.java
View File

@ -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;

24
src/com/annimon/client/adapters/ActionsAdapter.java
View File

@ -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<Action> actions;
private final LayoutInflater mInflater;
private final ArrayList<Action> mActions;
public ActionsAdapter(Context context) {
inflater = LayoutInflater.from(context);
actions = new ArrayList<Action>();
mInflater = LayoutInflater.from(context);
mActions = new ArrayList<Action>();
}
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;
}

18
src/com/annimon/client/adapters/ForumPostAdapter.java
View File

@ -13,22 +13,22 @@ import android.widget.TextView;
public class ForumPostAdapter extends BaseAdapter {
private final LayoutInflater inflater;
private List<ForumPost> items;
private final LayoutInflater mInflater;
private final List<ForumPost> mItems;
public ForumPostAdapter(Context context, List<ForumPost> 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());

6
src/com/annimon/client/fragments/ForumFragment.java
View File

@ -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<ForumPost> items) {
adapter = new ForumPostAdapter(getActivity(), items);
setListAdapter(adapter);
mAdapter = new ForumPostAdapter(getActivity(), items);
setListAdapter(mAdapter);
}
}).execute(URL);
}

12
src/com/annimon/client/fragments/MailFragment.java
View File

@ -7,13 +7,13 @@ import java.util.ArrayList;
public class MailFragment extends ListFragment {
private MoreListHelper<String> moreListHelper;
private MoreListHelper<String> mMoreListHelper;
@Override
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
moreListHelper = new MoreListHelper<String>(getActivity(), getListView()) {
mMoreListHelper = new MoreListHelper<String>(getActivity(), getListView()) {
@Override
public void onLoadItems(ArrayList<String> 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();
}
}

22
src/com/annimon/client/tasks/ForumPostLoader.java
View File

@ -18,13 +18,13 @@ public class ForumPostLoader extends AsyncTask<String, Void, List<ForumPost>> {
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<String, Void, List<ForumPost>> {
@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<ForumPost> items) {
super.onPostExecute(items);
listener.onLoadingFinished(items);
dialog.dismiss();
mListener.onLoadingFinished(items);
mDialog.dismiss();
}
public interface FinishLoadingListener {

44
src/com/annimon/client/utils/MoreListHelper.java
View File

@ -16,22 +16,22 @@ import java.util.ArrayList;
*/
public abstract class MoreListHelper<T> {
private int itemsPerPage;
private int mItemsPerPage;
private Activity activity;
private ArrayList<T> items;
private ArrayAdapter<T> adapter;
private Activity mActivity;
private ArrayList<T> mItems;
private ArrayAdapter<T> 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<T> {
((TextView) footerView).setText("Loading...");
}
loadingMore = false;
items = new ArrayList<T>();
mLoadingMore = false;
mItems = new ArrayList<T>();
listView.addFooterView(footerView);
listView.setOnScrollListener(scrollListener);
@ -51,15 +51,15 @@ public abstract class MoreListHelper<T> {
* @param layoutResource ðåñóðñ ðàçìåòêè
*/
public void createAdapter(int layoutResource) {
adapter = new ArrayAdapter<T>(activity, layoutResource, items);
mAdapter = new ArrayAdapter<T>(mActivity, layoutResource, mItems);
}
public ArrayAdapter<T> getAdapter() {
return adapter;
return mAdapter;
}
public void setAdapter(ArrayAdapter<T> adapter) {
this.adapter = adapter;
this.mAdapter = adapter;
}
/**
@ -68,7 +68,7 @@ public abstract class MoreListHelper<T> {
* @param value êîëè÷åñòâî ýëåìåíòîâ
*/
public void setItemsPerPage(int value) {
itemsPerPage = value;
mItemsPerPage = value;
}
public void loadItems() {
@ -84,7 +84,7 @@ public abstract class MoreListHelper<T> {
@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<T> {
private Runnable loadMoreListItemsRunnable = new Runnable() {
@Override
public void run() {
loadingMore = true;
items = new ArrayList<T>();
mLoadingMore = true;
mItems = new ArrayList<T>();
// Çàãðóæàåì äàííûå.
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;
}
};
}