code reformat, bug fix
This commit is contained in:
parent
ebd30a2b66
commit
94747c572d
|
@ -14,13 +14,13 @@ import android.support.v7.widget.Toolbar;
|
||||||
import android.view.Menu;
|
import android.view.Menu;
|
||||||
import android.view.MenuItem;
|
import android.view.MenuItem;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.view.ViewGroup;
|
|
||||||
import android.view.animation.Animation;
|
import android.view.animation.Animation;
|
||||||
import android.view.animation.TranslateAnimation;
|
import android.view.animation.TranslateAnimation;
|
||||||
import android.widget.TabHost;
|
import android.widget.TabHost;
|
||||||
import android.widget.TabHost.OnTabChangeListener;
|
import android.widget.TabHost.OnTabChangeListener;
|
||||||
import android.widget.TabHost.TabSpec;
|
import android.widget.TabHost.TabSpec;
|
||||||
|
|
||||||
|
import org.nuclearfog.twidda.adapter.OnItemClickListener;
|
||||||
import org.nuclearfog.twidda.adapter.TimelineAdapter;
|
import org.nuclearfog.twidda.adapter.TimelineAdapter;
|
||||||
import org.nuclearfog.twidda.adapter.TrendAdapter;
|
import org.nuclearfog.twidda.adapter.TrendAdapter;
|
||||||
import org.nuclearfog.twidda.backend.MainPage;
|
import org.nuclearfog.twidda.backend.MainPage;
|
||||||
|
@ -40,8 +40,8 @@ import static android.os.AsyncTask.Status.RUNNING;
|
||||||
*
|
*
|
||||||
* @see MainPage
|
* @see MainPage
|
||||||
*/
|
*/
|
||||||
public class MainActivity extends AppCompatActivity implements OnRefreshListener, OnTabChangeListener,
|
public class MainActivity extends AppCompatActivity implements OnRefreshListener,
|
||||||
TimelineAdapter.OnItemClicked, TrendAdapter.OnItemClicked {
|
OnTabChangeListener, OnItemClickListener {
|
||||||
|
|
||||||
private static final int LOGIN = 1;
|
private static final int LOGIN = 1;
|
||||||
private static final int SETTING = 2;
|
private static final int SETTING = 2;
|
||||||
|
@ -285,7 +285,7 @@ public class MainActivity extends AppCompatActivity implements OnRefreshListener
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onItemClick(ViewGroup parent, int position) {
|
public void onItemClick(RecyclerView parent, int position) {
|
||||||
if (parent.getId() == R.id.tl_list) {
|
if (parent.getId() == R.id.tl_list) {
|
||||||
if (timelineAdapter != null && !timelineReload.isRefreshing()) {
|
if (timelineAdapter != null && !timelineReload.isRefreshing()) {
|
||||||
Tweet tweet = timelineAdapter.getData().get(position);
|
Tweet tweet = timelineAdapter.getData().get(position);
|
||||||
|
|
|
@ -0,0 +1,15 @@
|
||||||
|
package org.nuclearfog.twidda.adapter;
|
||||||
|
|
||||||
|
import android.support.v7.widget.RecyclerView;
|
||||||
|
|
||||||
|
public interface OnItemClickListener {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Item Click Listener
|
||||||
|
*
|
||||||
|
* @param rv RecyclerView
|
||||||
|
* @param index Position of View
|
||||||
|
*/
|
||||||
|
void onItemClick(RecyclerView rv, int index);
|
||||||
|
|
||||||
|
}
|
|
@ -26,14 +26,14 @@ import java.util.List;
|
||||||
|
|
||||||
public class TimelineAdapter extends Adapter<TimelineAdapter.ItemHolder> {
|
public class TimelineAdapter extends Adapter<TimelineAdapter.ItemHolder> {
|
||||||
|
|
||||||
private OnItemClicked mListener;
|
private OnItemClickListener mListener;
|
||||||
private List<Tweet> tweets;
|
private List<Tweet> tweets;
|
||||||
private int highlight = 0xFFFFFFFF;
|
private int highlight = 0xFFFFFFFF;
|
||||||
private int font_color = 0xFFFFFFFF;
|
private int font_color = 0xFFFFFFFF;
|
||||||
private boolean img_ldr = true;
|
private boolean img_ldr = true;
|
||||||
|
|
||||||
|
|
||||||
public TimelineAdapter(OnItemClicked mListener) {
|
public TimelineAdapter(OnItemClickListener mListener) {
|
||||||
tweets = new ArrayList<>();
|
tweets = new ArrayList<>();
|
||||||
this.mListener = mListener;
|
this.mListener = mListener;
|
||||||
}
|
}
|
||||||
|
@ -83,7 +83,7 @@ public class TimelineAdapter extends Adapter<TimelineAdapter.ItemHolder> {
|
||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
RecyclerView rv = (RecyclerView) parent;
|
RecyclerView rv = (RecyclerView) parent;
|
||||||
int position = rv.getChildLayoutPosition(v);
|
int position = rv.getChildLayoutPosition(v);
|
||||||
mListener.onItemClick(parent, position);
|
mListener.onItemClick(rv, position);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
return new ItemHolder(v);
|
return new ItemHolder(v);
|
||||||
|
@ -151,14 +151,6 @@ public class TimelineAdapter extends Adapter<TimelineAdapter.ItemHolder> {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Custom Click Listener
|
|
||||||
*/
|
|
||||||
public interface OnItemClicked {
|
|
||||||
void onItemClick(ViewGroup parent, int position);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
class ItemHolder extends ViewHolder {
|
class ItemHolder extends ViewHolder {
|
||||||
final TextView username, screenname, tweet, retweet;
|
final TextView username, screenname, tweet, retweet;
|
||||||
final TextView favorite, retweeter, time;
|
final TextView favorite, retweeter, time;
|
||||||
|
|
|
@ -19,11 +19,11 @@ import java.util.List;
|
||||||
public class TrendAdapter extends Adapter<TrendAdapter.ItemHolder> {
|
public class TrendAdapter extends Adapter<TrendAdapter.ItemHolder> {
|
||||||
|
|
||||||
private List<Trend> trendList;
|
private List<Trend> trendList;
|
||||||
private OnItemClicked mListener;
|
private OnItemClickListener mListener;
|
||||||
private int font_color = 0xFFFFFFFF;
|
private int font_color = 0xFFFFFFFF;
|
||||||
|
|
||||||
|
|
||||||
public TrendAdapter(OnItemClicked mListener) {
|
public TrendAdapter(OnItemClickListener mListener) {
|
||||||
trendList = new ArrayList<>();
|
trendList = new ArrayList<>();
|
||||||
this.mListener = mListener;
|
this.mListener = mListener;
|
||||||
}
|
}
|
||||||
|
@ -59,7 +59,7 @@ public class TrendAdapter extends Adapter<TrendAdapter.ItemHolder> {
|
||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
RecyclerView rv = (RecyclerView) parent;
|
RecyclerView rv = (RecyclerView) parent;
|
||||||
int position = rv.getChildLayoutPosition(v);
|
int position = rv.getChildLayoutPosition(v);
|
||||||
mListener.onItemClick(parent, position);
|
mListener.onItemClick(rv, position);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
return new ItemHolder(v);
|
return new ItemHolder(v);
|
||||||
|
@ -77,14 +77,6 @@ public class TrendAdapter extends Adapter<TrendAdapter.ItemHolder> {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Custom Click Listener
|
|
||||||
*/
|
|
||||||
public interface OnItemClicked {
|
|
||||||
void onItemClick(ViewGroup parent, int position);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
class ItemHolder extends ViewHolder {
|
class ItemHolder extends ViewHolder {
|
||||||
final TextView trends, pos;
|
final TextView trends, pos;
|
||||||
|
|
||||||
|
|
|
@ -22,12 +22,12 @@ import java.util.List;
|
||||||
public class UserAdapter extends Adapter<UserAdapter.ItemHolder> {
|
public class UserAdapter extends Adapter<UserAdapter.ItemHolder> {
|
||||||
|
|
||||||
private List<TwitterUser> mUser;
|
private List<TwitterUser> mUser;
|
||||||
private OnItemClicked mListener;
|
private OnItemClickListener mListener;
|
||||||
private int font_color = 0xFFFFFFFF;
|
private int font_color = 0xFFFFFFFF;
|
||||||
private boolean loadImage = true;
|
private boolean loadImage = true;
|
||||||
|
|
||||||
|
|
||||||
public UserAdapter(OnItemClicked mListener) {
|
public UserAdapter(OnItemClickListener mListener) {
|
||||||
mUser = new ArrayList<>();
|
mUser = new ArrayList<>();
|
||||||
this.mListener = mListener;
|
this.mListener = mListener;
|
||||||
}
|
}
|
||||||
|
@ -74,7 +74,7 @@ public class UserAdapter extends Adapter<UserAdapter.ItemHolder> {
|
||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
RecyclerView rv = (RecyclerView) parent;
|
RecyclerView rv = (RecyclerView) parent;
|
||||||
int position = rv.getChildLayoutPosition(v);
|
int position = rv.getChildLayoutPosition(v);
|
||||||
mListener.onItemClick(parent, position);
|
mListener.onItemClick(rv, position);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
return new ItemHolder(v);
|
return new ItemHolder(v);
|
||||||
|
@ -107,11 +107,6 @@ public class UserAdapter extends Adapter<UserAdapter.ItemHolder> {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public interface OnItemClicked {
|
|
||||||
void onItemClick(ViewGroup parent, int position);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
class ItemHolder extends ViewHolder {
|
class ItemHolder extends ViewHolder {
|
||||||
final ImageView profileImg, verifyIco, lockIco;
|
final ImageView profileImg, verifyIco, lockIco;
|
||||||
final TextView username, screenname;
|
final TextView username, screenname;
|
||||||
|
|
|
@ -181,7 +181,7 @@ public class StatusLoader extends AsyncTask<Long, Void, Long> {
|
||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
Intent intent = new Intent(ui.get(), TweetDetail.class);
|
Intent intent = new Intent(ui.get(), TweetDetail.class);
|
||||||
intent.putExtra("tweetID", tweet.getReplyId());
|
intent.putExtra("tweetID", tweet.getReplyId());
|
||||||
intent.putExtra("userID", tweet.getUser().getId());
|
intent.putExtra("userID", tweet.getReplyUserId());
|
||||||
intent.putExtra("username", tweet.getReplyName());
|
intent.putExtra("username", tweet.getReplyName());
|
||||||
ui.get().startActivity(intent);
|
ui.get().startActivity(intent);
|
||||||
}
|
}
|
||||||
|
|
|
@ -19,7 +19,6 @@ import static android.database.sqlite.SQLiteDatabase.CONFLICT_REPLACE;
|
||||||
|
|
||||||
public class DatabaseAdapter {
|
public class DatabaseAdapter {
|
||||||
|
|
||||||
private final int LIMIT = 50;
|
|
||||||
private final int favoritedMask = 1;
|
private final int favoritedMask = 1;
|
||||||
private final int retweetedMask = 1 << 1;
|
private final int retweetedMask = 1 << 1;
|
||||||
private final int homeMask = 1 << 2;
|
private final int homeMask = 1 << 2;
|
||||||
|
@ -47,7 +46,7 @@ public class DatabaseAdapter {
|
||||||
public void storeUser(TwitterUser user) {
|
public void storeUser(TwitterUser user) {
|
||||||
SQLiteDatabase db = getDbWrite();
|
SQLiteDatabase db = getDbWrite();
|
||||||
db.beginTransaction();
|
db.beginTransaction();
|
||||||
storeUser(user, db);
|
storeUser(user, db, CONFLICT_REPLACE);
|
||||||
commit(db);
|
commit(db);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -206,7 +205,7 @@ public class DatabaseAdapter {
|
||||||
String SQL_GET_HOME = "SELECT * FROM tweet " +
|
String SQL_GET_HOME = "SELECT * FROM tweet " +
|
||||||
"INNER JOIN user ON tweet.userID=user.userID " +
|
"INNER JOIN user ON tweet.userID=user.userID " +
|
||||||
"WHERE statusregister&" + homeMask + ">0 " +
|
"WHERE statusregister&" + homeMask + ">0 " +
|
||||||
"ORDER BY tweetID DESC LIMIT " + LIMIT;
|
"ORDER BY tweetID DESC";
|
||||||
Cursor cursor = db.rawQuery(SQL_GET_HOME, null);
|
Cursor cursor = db.rawQuery(SQL_GET_HOME, null);
|
||||||
if (cursor.moveToFirst()) {
|
if (cursor.moveToFirst()) {
|
||||||
do {
|
do {
|
||||||
|
@ -229,7 +228,7 @@ public class DatabaseAdapter {
|
||||||
String SQL_GET_HOME = "SELECT * FROM tweet " +
|
String SQL_GET_HOME = "SELECT * FROM tweet " +
|
||||||
"INNER JOIN user ON tweet.userID=user.userID " +
|
"INNER JOIN user ON tweet.userID=user.userID " +
|
||||||
"WHERE statusregister&" + mentionMask + ">0 " +
|
"WHERE statusregister&" + mentionMask + ">0 " +
|
||||||
"ORDER BY tweetID DESC LIMIT " + LIMIT;
|
"ORDER BY tweetID DESC";
|
||||||
Cursor cursor = db.rawQuery(SQL_GET_HOME, null);
|
Cursor cursor = db.rawQuery(SQL_GET_HOME, null);
|
||||||
if (cursor.moveToFirst()) {
|
if (cursor.moveToFirst()) {
|
||||||
do {
|
do {
|
||||||
|
@ -253,7 +252,7 @@ public class DatabaseAdapter {
|
||||||
String SQL_GET_HOME = "SELECT * FROM tweet " +
|
String SQL_GET_HOME = "SELECT * FROM tweet " +
|
||||||
"INNER JOIN user ON tweet.userID = user.userID " +
|
"INNER JOIN user ON tweet.userID = user.userID " +
|
||||||
"WHERE statusregister&" + userTweetMask + ">0 " +
|
"WHERE statusregister&" + userTweetMask + ">0 " +
|
||||||
"AND user.userID =" + userID + " ORDER BY tweetID DESC LIMIT " + LIMIT;
|
"AND user.userID =" + userID + " ORDER BY tweetID DESC";
|
||||||
|
|
||||||
Cursor cursor = db.rawQuery(SQL_GET_HOME, null);
|
Cursor cursor = db.rawQuery(SQL_GET_HOME, null);
|
||||||
|
|
||||||
|
@ -270,16 +269,16 @@ public class DatabaseAdapter {
|
||||||
/**
|
/**
|
||||||
* Lade Favorisierte Tweets eines Nutzers
|
* Lade Favorisierte Tweets eines Nutzers
|
||||||
*
|
*
|
||||||
* @param userID Nutzer ID
|
* @param ownerID Nutzer ID
|
||||||
* @return Favoriten des Nutzers
|
* @return Favoriten des Nutzers
|
||||||
*/
|
*/
|
||||||
public List<Tweet> getUserFavs(long userID) {
|
public List<Tweet> getUserFavs(long ownerID) {
|
||||||
SQLiteDatabase db = dataHelper.getReadableDatabase();
|
SQLiteDatabase db = dataHelper.getReadableDatabase();
|
||||||
List<Tweet> tweetList = new ArrayList<>();
|
List<Tweet> tweetList = new ArrayList<>();
|
||||||
String SQL_GET_HOME = "SELECT * FROM tweet " +
|
String SQL_GET_HOME = "SELECT * FROM tweet " +
|
||||||
"INNER JOIN favorit on tweet.tweetID = favorit.tweetID " +
|
"INNER JOIN favorit on tweet.tweetID = favorit.tweetID " +
|
||||||
"INNER JOIN user ON tweet.userID = user.userID " +
|
"INNER JOIN user ON tweet.userID = user.userID " +
|
||||||
"WHERE favorit.ownerID =" + userID + " ORDER BY tweetID DESC LIMIT " + LIMIT;
|
"WHERE favorit.ownerID =" + ownerID + " ORDER BY tweetID DESC";
|
||||||
Cursor cursor = db.rawQuery(SQL_GET_HOME, null);
|
Cursor cursor = db.rawQuery(SQL_GET_HOME, null);
|
||||||
if (cursor.moveToFirst()) {
|
if (cursor.moveToFirst()) {
|
||||||
do {
|
do {
|
||||||
|
@ -323,7 +322,7 @@ public class DatabaseAdapter {
|
||||||
String SQL_GET_HOME = "SELECT * FROM tweet " +
|
String SQL_GET_HOME = "SELECT * FROM tweet " +
|
||||||
"INNER JOIN user ON tweet.userID = user.userID " +
|
"INNER JOIN user ON tweet.userID = user.userID " +
|
||||||
"WHERE tweet.replyID=" + tweetId + " AND statusregister&" + replyMask + ">0 " +
|
"WHERE tweet.replyID=" + tweetId + " AND statusregister&" + replyMask + ">0 " +
|
||||||
"ORDER BY tweetID DESC LIMIT " + LIMIT;
|
"ORDER BY tweetID DESC";
|
||||||
Cursor cursor = db.rawQuery(SQL_GET_HOME, null);
|
Cursor cursor = db.rawQuery(SQL_GET_HOME, null);
|
||||||
if (cursor.moveToFirst()) {
|
if (cursor.moveToFirst()) {
|
||||||
do {
|
do {
|
||||||
|
@ -567,7 +566,7 @@ public class DatabaseAdapter {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private void storeUser(TwitterUser user, SQLiteDatabase db) {
|
private void storeUser(TwitterUser user, SQLiteDatabase db, int mode) {
|
||||||
ContentValues userColumn = new ContentValues();
|
ContentValues userColumn = new ContentValues();
|
||||||
int userRegister = 0;
|
int userRegister = 0;
|
||||||
if (user.isVerified())
|
if (user.isVerified())
|
||||||
|
@ -586,11 +585,11 @@ public class DatabaseAdapter {
|
||||||
userColumn.put("createdAt", user.getCreatedAt());
|
userColumn.put("createdAt", user.getCreatedAt());
|
||||||
userColumn.put("following", user.getFollowing());
|
userColumn.put("following", user.getFollowing());
|
||||||
userColumn.put("follower", user.getFollower());
|
userColumn.put("follower", user.getFollower());
|
||||||
db.insertWithOnConflict("user", null, userColumn, CONFLICT_REPLACE);
|
db.insertWithOnConflict("user", null, userColumn, mode);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private void storeStatus(Tweet tweet, int newStatusRegister, SQLiteDatabase db) {
|
private void storeStatus(Tweet tweet, int statusRegister, SQLiteDatabase db) {
|
||||||
ContentValues status = new ContentValues();
|
ContentValues status = new ContentValues();
|
||||||
TwitterUser user = tweet.getUser();
|
TwitterUser user = tweet.getUser();
|
||||||
Tweet rtStat = tweet.getEmbeddedTweet();
|
Tweet rtStat = tweet.getEmbeddedTweet();
|
||||||
|
@ -601,26 +600,25 @@ public class DatabaseAdapter {
|
||||||
rtId = rtStat.getId();
|
rtId = rtStat.getId();
|
||||||
}
|
}
|
||||||
|
|
||||||
ContentValues userColumn = new ContentValues();
|
statusRegister |= getStatRegister(db, tweet.getId());
|
||||||
int userRegister = 0;
|
if (tweet.favorized()) {
|
||||||
if (user.isVerified())
|
statusRegister |= favoritedMask;
|
||||||
userRegister |= verifiedMask;
|
} else {
|
||||||
if (user.isLocked())
|
statusRegister &= ~favoritedMask;
|
||||||
userRegister |= lockedMask;
|
}
|
||||||
|
if (tweet.retweeted()) {
|
||||||
userColumn.put("userID", user.getId());
|
statusRegister |= retweetedMask;
|
||||||
userColumn.put("username", user.getUsername());
|
} else {
|
||||||
userColumn.put("scrname", user.getScreenname());
|
statusRegister &= ~retweetedMask;
|
||||||
userColumn.put("pbLink", user.getImageLink());
|
}
|
||||||
userColumn.put("userregister", userRegister);
|
|
||||||
userColumn.put("bio", user.getBio());
|
|
||||||
userColumn.put("link", user.getLink());
|
|
||||||
userColumn.put("location", user.getLocation());
|
|
||||||
userColumn.put("banner", user.getBannerLink());
|
|
||||||
userColumn.put("createdAt", user.getCreatedAt());
|
|
||||||
userColumn.put("following", user.getFollowing());
|
|
||||||
userColumn.put("follower", user.getFollower());
|
|
||||||
|
|
||||||
|
StringBuilder media = new StringBuilder();
|
||||||
|
for (String link : tweet.getMediaLinks()) {
|
||||||
|
media.append(link);
|
||||||
|
media.append(";");
|
||||||
|
}
|
||||||
|
status.put("media", media.toString());
|
||||||
|
status.put("statusregister", statusRegister);
|
||||||
status.put("tweetID", tweet.getId());
|
status.put("tweetID", tweet.getId());
|
||||||
status.put("userID", user.getId());
|
status.put("userID", user.getId());
|
||||||
status.put("time", tweet.getTime());
|
status.put("time", tweet.getTime());
|
||||||
|
@ -633,26 +631,7 @@ public class DatabaseAdapter {
|
||||||
status.put("favorite", tweet.getFavorCount());
|
status.put("favorite", tweet.getFavorCount());
|
||||||
status.put("retweeterID", tweet.getMyRetweetId());
|
status.put("retweeterID", tweet.getMyRetweetId());
|
||||||
status.put("replyUserID", tweet.getReplyUserId());
|
status.put("replyUserID", tweet.getReplyUserId());
|
||||||
String[] mediaLinks = tweet.getMediaLinks();
|
storeUser(user, db, CONFLICT_IGNORE);
|
||||||
StringBuilder media = new StringBuilder();
|
|
||||||
for (String link : mediaLinks) {
|
|
||||||
media.append(link);
|
|
||||||
media.append(";");
|
|
||||||
}
|
|
||||||
status.put("media", media.toString());
|
|
||||||
int statusRegister = getStatRegister(db, tweet.getId());
|
|
||||||
statusRegister |= newStatusRegister;
|
|
||||||
if (tweet.favorized())
|
|
||||||
statusRegister |= favoritedMask;
|
|
||||||
else
|
|
||||||
statusRegister &= ~favoritedMask;
|
|
||||||
if (tweet.retweeted())
|
|
||||||
statusRegister |= retweetedMask;
|
|
||||||
else
|
|
||||||
statusRegister &= ~retweetedMask;
|
|
||||||
status.put("statusregister", statusRegister);
|
|
||||||
|
|
||||||
db.insertWithOnConflict("user", null, userColumn, CONFLICT_IGNORE);
|
|
||||||
db.insertWithOnConflict("tweet", null, status, CONFLICT_REPLACE);
|
db.insertWithOnConflict("tweet", null, status, CONFLICT_REPLACE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -664,8 +643,8 @@ public class DatabaseAdapter {
|
||||||
messageColumn.put("senderID", message.getSender().getId());
|
messageColumn.put("senderID", message.getSender().getId());
|
||||||
messageColumn.put("receiverID", message.getReceiver().getId());
|
messageColumn.put("receiverID", message.getReceiver().getId());
|
||||||
messageColumn.put("message", message.getText());
|
messageColumn.put("message", message.getText());
|
||||||
storeUser(message.getSender(), db);
|
storeUser(message.getSender(), db, CONFLICT_IGNORE);
|
||||||
storeUser(message.getReceiver(), db);
|
storeUser(message.getReceiver(), db, CONFLICT_IGNORE);
|
||||||
db.insertWithOnConflict("message", null, messageColumn, CONFLICT_IGNORE);
|
db.insertWithOnConflict("message", null, messageColumn, CONFLICT_IGNORE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -675,7 +654,6 @@ public class DatabaseAdapter {
|
||||||
trendColumn.put("woeID", woeId);
|
trendColumn.put("woeID", woeId);
|
||||||
trendColumn.put("trendpos", trend.getPosition());
|
trendColumn.put("trendpos", trend.getPosition());
|
||||||
trendColumn.put("trendname", trend.getName());
|
trendColumn.put("trendname", trend.getName());
|
||||||
// trendColumn.put("trendlink", "");//todo
|
|
||||||
db.insertWithOnConflict("trend", null, trendColumn, CONFLICT_REPLACE);
|
db.insertWithOnConflict("trend", null, trendColumn, CONFLICT_REPLACE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -14,15 +14,14 @@ import android.support.v7.widget.Toolbar;
|
||||||
import android.view.Menu;
|
import android.view.Menu;
|
||||||
import android.view.MenuItem;
|
import android.view.MenuItem;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.view.ViewGroup;
|
|
||||||
import android.view.animation.Animation;
|
import android.view.animation.Animation;
|
||||||
import android.view.animation.TranslateAnimation;
|
import android.view.animation.TranslateAnimation;
|
||||||
import android.widget.TabHost;
|
import android.widget.TabHost;
|
||||||
import android.widget.TabHost.OnTabChangeListener;
|
import android.widget.TabHost.OnTabChangeListener;
|
||||||
|
|
||||||
import org.nuclearfog.twidda.R;
|
import org.nuclearfog.twidda.R;
|
||||||
|
import org.nuclearfog.twidda.adapter.OnItemClickListener;
|
||||||
import org.nuclearfog.twidda.adapter.TimelineAdapter;
|
import org.nuclearfog.twidda.adapter.TimelineAdapter;
|
||||||
import org.nuclearfog.twidda.adapter.TimelineAdapter.OnItemClicked;
|
|
||||||
import org.nuclearfog.twidda.adapter.UserAdapter;
|
import org.nuclearfog.twidda.adapter.UserAdapter;
|
||||||
import org.nuclearfog.twidda.backend.TwitterSearch;
|
import org.nuclearfog.twidda.backend.TwitterSearch;
|
||||||
import org.nuclearfog.twidda.backend.items.Tweet;
|
import org.nuclearfog.twidda.backend.items.Tweet;
|
||||||
|
@ -36,8 +35,8 @@ import static android.os.AsyncTask.Status.RUNNING;
|
||||||
*
|
*
|
||||||
* @see TwitterSearch
|
* @see TwitterSearch
|
||||||
*/
|
*/
|
||||||
public class SearchPage extends AppCompatActivity implements UserAdapter.OnItemClicked,
|
public class SearchPage extends AppCompatActivity implements OnRefreshListener,
|
||||||
OnRefreshListener, OnTabChangeListener, OnItemClicked {
|
OnTabChangeListener, OnItemClickListener {
|
||||||
|
|
||||||
private RecyclerView tweetSearch, userSearch;
|
private RecyclerView tweetSearch, userSearch;
|
||||||
private SwipeRefreshLayout tweetReload;
|
private SwipeRefreshLayout tweetReload;
|
||||||
|
@ -170,9 +169,9 @@ public class SearchPage extends AppCompatActivity implements UserAdapter.OnItemC
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onItemClick(ViewGroup parent, int position) {
|
public void onItemClick(RecyclerView rv, int position) {
|
||||||
if (!tweetReload.isRefreshing())
|
if (!tweetReload.isRefreshing())
|
||||||
if (parent.getId() == R.id.tweet_result) {
|
if (rv.getId() == R.id.tweet_result) {
|
||||||
TimelineAdapter tweetAdapter = (TimelineAdapter) tweetSearch.getAdapter();
|
TimelineAdapter tweetAdapter = (TimelineAdapter) tweetSearch.getAdapter();
|
||||||
if (tweetAdapter != null) {
|
if (tweetAdapter != null) {
|
||||||
Tweet tweet = tweetAdapter.getData().get(position);
|
Tweet tweet = tweetAdapter.getData().get(position);
|
||||||
|
|
|
@ -17,13 +17,12 @@ import android.view.Menu;
|
||||||
import android.view.MenuItem;
|
import android.view.MenuItem;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.view.View.OnClickListener;
|
import android.view.View.OnClickListener;
|
||||||
import android.view.ViewGroup;
|
|
||||||
import android.widget.Toast;
|
import android.widget.Toast;
|
||||||
|
|
||||||
import org.nuclearfog.tag.Tagger;
|
import org.nuclearfog.tag.Tagger.OnTagClickListener;
|
||||||
import org.nuclearfog.twidda.R;
|
import org.nuclearfog.twidda.R;
|
||||||
|
import org.nuclearfog.twidda.adapter.OnItemClickListener;
|
||||||
import org.nuclearfog.twidda.adapter.TimelineAdapter;
|
import org.nuclearfog.twidda.adapter.TimelineAdapter;
|
||||||
import org.nuclearfog.twidda.adapter.TimelineAdapter.OnItemClicked;
|
|
||||||
import org.nuclearfog.twidda.backend.ImageLoad;
|
import org.nuclearfog.twidda.backend.ImageLoad;
|
||||||
import org.nuclearfog.twidda.backend.StatusLoader;
|
import org.nuclearfog.twidda.backend.StatusLoader;
|
||||||
import org.nuclearfog.twidda.backend.items.Tweet;
|
import org.nuclearfog.twidda.backend.items.Tweet;
|
||||||
|
@ -38,7 +37,7 @@ import static android.os.AsyncTask.Status.RUNNING;
|
||||||
* @see ImageLoad
|
* @see ImageLoad
|
||||||
*/
|
*/
|
||||||
public class TweetDetail extends AppCompatActivity implements OnClickListener,
|
public class TweetDetail extends AppCompatActivity implements OnClickListener,
|
||||||
OnItemClicked, OnRefreshListener, Tagger.OnTagClickListener {
|
OnItemClickListener, OnRefreshListener, OnTagClickListener {
|
||||||
|
|
||||||
public static final int CHANGED = 1;
|
public static final int CHANGED = 1;
|
||||||
private static final int TWEET = 2;
|
private static final int TWEET = 2;
|
||||||
|
@ -227,7 +226,7 @@ public class TweetDetail extends AppCompatActivity implements OnClickListener,
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onItemClick(ViewGroup parent, int position) {
|
public void onItemClick(RecyclerView rv, int position) {
|
||||||
TimelineAdapter timeLineAdapter = (TimelineAdapter) answer_list.getAdapter();
|
TimelineAdapter timeLineAdapter = (TimelineAdapter) answer_list.getAdapter();
|
||||||
if (timeLineAdapter != null && !answerReload.isRefreshing()) {
|
if (timeLineAdapter != null && !answerReload.isRefreshing()) {
|
||||||
Tweet tweet = timeLineAdapter.getData().get(position);
|
Tweet tweet = timeLineAdapter.getData().get(position);
|
||||||
|
|
|
@ -9,11 +9,10 @@ import android.support.v7.widget.LinearLayoutManager;
|
||||||
import android.support.v7.widget.RecyclerView;
|
import android.support.v7.widget.RecyclerView;
|
||||||
import android.support.v7.widget.Toolbar;
|
import android.support.v7.widget.Toolbar;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.view.ViewGroup;
|
|
||||||
|
|
||||||
import org.nuclearfog.twidda.R;
|
import org.nuclearfog.twidda.R;
|
||||||
|
import org.nuclearfog.twidda.adapter.OnItemClickListener;
|
||||||
import org.nuclearfog.twidda.adapter.UserAdapter;
|
import org.nuclearfog.twidda.adapter.UserAdapter;
|
||||||
import org.nuclearfog.twidda.adapter.UserAdapter.OnItemClicked;
|
|
||||||
import org.nuclearfog.twidda.backend.UserLists;
|
import org.nuclearfog.twidda.backend.UserLists;
|
||||||
import org.nuclearfog.twidda.backend.items.TwitterUser;
|
import org.nuclearfog.twidda.backend.items.TwitterUser;
|
||||||
import org.nuclearfog.twidda.database.GlobalSettings;
|
import org.nuclearfog.twidda.database.GlobalSettings;
|
||||||
|
@ -25,7 +24,7 @@ import static android.os.AsyncTask.Status.RUNNING;
|
||||||
*
|
*
|
||||||
* @see UserLists
|
* @see UserLists
|
||||||
*/
|
*/
|
||||||
public class UserDetail extends AppCompatActivity implements OnItemClicked, OnRefreshListener {
|
public class UserDetail extends AppCompatActivity implements OnItemClickListener, OnRefreshListener {
|
||||||
|
|
||||||
private RecyclerView userList;
|
private RecyclerView userList;
|
||||||
private SwipeRefreshLayout refresh;
|
private SwipeRefreshLayout refresh;
|
||||||
|
@ -111,7 +110,7 @@ public class UserDetail extends AppCompatActivity implements OnItemClicked, OnRe
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onItemClick(ViewGroup parent, int position) {
|
public void onItemClick(RecyclerView rv, int position) {
|
||||||
UserAdapter userListAdapter = (UserAdapter) userList.getAdapter();
|
UserAdapter userListAdapter = (UserAdapter) userList.getAdapter();
|
||||||
if (userListAdapter != null && !refresh.isRefreshing()) {
|
if (userListAdapter != null && !refresh.isRefreshing()) {
|
||||||
TwitterUser user = userListAdapter.getData().get(position);
|
TwitterUser user = userListAdapter.getData().get(position);
|
||||||
|
|
|
@ -15,7 +15,6 @@ import android.support.v7.widget.Toolbar;
|
||||||
import android.view.Menu;
|
import android.view.Menu;
|
||||||
import android.view.MenuItem;
|
import android.view.MenuItem;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.view.ViewGroup;
|
|
||||||
import android.view.animation.Animation;
|
import android.view.animation.Animation;
|
||||||
import android.view.animation.TranslateAnimation;
|
import android.view.animation.TranslateAnimation;
|
||||||
import android.widget.TabHost;
|
import android.widget.TabHost;
|
||||||
|
@ -23,8 +22,8 @@ import android.widget.TabHost.OnTabChangeListener;
|
||||||
|
|
||||||
import org.nuclearfog.tag.Tagger.OnTagClickListener;
|
import org.nuclearfog.tag.Tagger.OnTagClickListener;
|
||||||
import org.nuclearfog.twidda.R;
|
import org.nuclearfog.twidda.R;
|
||||||
|
import org.nuclearfog.twidda.adapter.OnItemClickListener;
|
||||||
import org.nuclearfog.twidda.adapter.TimelineAdapter;
|
import org.nuclearfog.twidda.adapter.TimelineAdapter;
|
||||||
import org.nuclearfog.twidda.adapter.TimelineAdapter.OnItemClicked;
|
|
||||||
import org.nuclearfog.twidda.backend.ProfileLoader;
|
import org.nuclearfog.twidda.backend.ProfileLoader;
|
||||||
import org.nuclearfog.twidda.backend.items.Tweet;
|
import org.nuclearfog.twidda.backend.items.Tweet;
|
||||||
import org.nuclearfog.twidda.database.GlobalSettings;
|
import org.nuclearfog.twidda.database.GlobalSettings;
|
||||||
|
@ -37,7 +36,7 @@ import static android.os.AsyncTask.Status.RUNNING;
|
||||||
* @see ProfileLoader
|
* @see ProfileLoader
|
||||||
*/
|
*/
|
||||||
public class UserProfile extends AppCompatActivity implements OnRefreshListener,
|
public class UserProfile extends AppCompatActivity implements OnRefreshListener,
|
||||||
OnTabChangeListener, OnItemClicked, OnTagClickListener {
|
OnTabChangeListener, OnItemClickListener, OnTagClickListener {
|
||||||
|
|
||||||
private static final int TWEET = 1;
|
private static final int TWEET = 1;
|
||||||
|
|
||||||
|
@ -297,7 +296,7 @@ public class UserProfile extends AppCompatActivity implements OnRefreshListener,
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onItemClick(ViewGroup parent, int position) {
|
public void onItemClick(RecyclerView parent, int position) {
|
||||||
if (parent.getId() == R.id.ht_list) {
|
if (parent.getId() == R.id.ht_list) {
|
||||||
TimelineAdapter tweetAdapter = (TimelineAdapter) homeList.getAdapter();
|
TimelineAdapter tweetAdapter = (TimelineAdapter) homeList.getAdapter();
|
||||||
if (tweetAdapter != null && !homeReload.isRefreshing()) {
|
if (tweetAdapter != null && !homeReload.isRefreshing()) {
|
||||||
|
@ -372,6 +371,5 @@ public class UserProfile extends AppCompatActivity implements OnRefreshListener,
|
||||||
Intent image = new Intent(this, ImageDetail.class);
|
Intent image = new Intent(this, ImageDetail.class);
|
||||||
image.putExtra("link", new String[]{link});
|
image.putExtra("link", new String[]{link});
|
||||||
startActivity(image);
|
startActivity(image);
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
Reference in New Issue