aboutsummaryrefslogtreecommitdiffstats
path: root/app/src/main/java/net/lacolaco
diff options
context:
space:
mode:
authorKazuki Yamaguchi <k@rhe.jp>2015-09-04 18:13:46 +0900
committerKazuki Yamaguchi <k@rhe.jp>2015-09-04 18:13:46 +0900
commitd28ef87ab7ba5aa2dff191120c6fce9ecbfbd2c3 (patch)
tree0f1ef148c5f55ea58010130ab77849b1a8917816 /app/src/main/java/net/lacolaco
parent63602b9b89b8ae4f8b48e5fa1ed5fa03a963e699 (diff)
downloadSmileEssence-d28ef87ab7ba5aa2dff191120c6fce9ecbfbd2c3.tar.gz
fix tests
Diffstat (limited to 'app/src/main/java/net/lacolaco')
-rw-r--r--app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.java17
-rw-r--r--app/src/main/java/net/lacolaco/smileessence/view/adapter/CustomListAdapter.java2
-rw-r--r--app/src/main/java/net/lacolaco/smileessence/view/adapter/StatusListAdapter.java4
3 files changed, 13 insertions, 10 deletions
diff --git a/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.java b/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.java
index 29ef9e82..3e65742f 100644
--- a/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.java
+++ b/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.java
@@ -38,7 +38,6 @@ import android.view.KeyEvent;
import android.view.Menu;
import android.view.MenuItem;
import android.view.WindowManager;
-import android.widget.Adapter;
import android.widget.ImageView;
import net.lacolaco.smileessence.Application;
@@ -100,7 +99,7 @@ public class MainActivity extends Activity {
private int pageIndexHistory;
private int pageIndexMessages;
private int pageIndexSearch;
- private int pageIndexUserlist;
+ private int pageIndexUserList;
private ViewPager viewPager;
private PageListAdapter pagerAdapter;
private Account currentAccount;
@@ -164,6 +163,10 @@ public class MainActivity extends Activity {
return pageIndexHome;
}
+ public int getPageIndexMentions() {
+ return pageIndexMentions;
+ }
+
public int getPageIndexHistory() {
return pageIndexHistory;
}
@@ -176,8 +179,8 @@ public class MainActivity extends Activity {
return pageIndexSearch;
}
- public int getPageIndexUserlist() {
- return pageIndexUserlist;
+ public int getPageIndexUserList() {
+ return pageIndexUserList;
}
public PageListAdapter getPagerAdapter() {
@@ -536,7 +539,7 @@ public class MainActivity extends Activity {
boolean visible = getUserPreferenceHelper().getValue(R.string.key_page_list_visibility, true);
getUserPreferenceHelper().putValue(R.string.key_page_list_visibility, visible);
UserListListAdapter userListAdapter = new UserListListAdapter(this);
- pageIndexUserlist = addListPage(getString(R.string.page_name_list), UserListFragment.class, userListAdapter, AdapterID.UserList, visible);
+ pageIndexUserList = addListPage(getString(R.string.page_name_list), UserListFragment.class, userListAdapter, AdapterID.UserList, visible);
}
private void getImageUri(int requestCode, int resultCode, Intent data) {
@@ -640,7 +643,7 @@ public class MainActivity extends Activity {
}
private void initUserList(Twitter twitter) {
- if (pageIndexUserlist == PAGE_INDEX_GONE) {
+ if (pageIndexUserList == PAGE_INDEX_GONE) {
return;
}
String lastUserList = getLastUserList();
@@ -679,7 +682,7 @@ public class MainActivity extends Activity {
}
private void openUserListPage() {
- setSelectedPageIndex(pageIndexUserlist);
+ setSelectedPageIndex(pageIndexUserList);
}
private void receiveOAuth(int requestCode, int resultCode, Intent data) {
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/adapter/CustomListAdapter.java b/app/src/main/java/net/lacolaco/smileessence/view/adapter/CustomListAdapter.java
index 8b7b47a2..84585ebf 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/adapter/CustomListAdapter.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/adapter/CustomListAdapter.java
@@ -152,7 +152,7 @@ public class CustomListAdapter<T extends IViewModel> extends BaseAdapter {
}
}
- public void sort() {
+ protected void sort() {
}
public void update() {
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/adapter/StatusListAdapter.java b/app/src/main/java/net/lacolaco/smileessence/view/adapter/StatusListAdapter.java
index f2b4854d..ece2eea8 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/adapter/StatusListAdapter.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/adapter/StatusListAdapter.java
@@ -74,10 +74,10 @@ public class StatusListAdapter extends CustomListAdapter<StatusViewModel> {
}
/**
- * Sort list by Status#createdAt
+ * Sort list by Status ID
*/
@Override
- public void sort() {
+ protected void sort() {
synchronized (LOCK) {
Collections.sort(list, new Comparator<StatusViewModel>() {
@Override