cleanup
This commit is contained in:
parent
43502d47ea
commit
78a605a498
|
@ -109,9 +109,11 @@ public class MainActivity extends AppCompatActivity implements
|
||||||
intent = new Intent(this, UserProfile.class);
|
intent = new Intent(this, UserProfile.class);
|
||||||
Bundle bundle = new Bundle();
|
Bundle bundle = new Bundle();
|
||||||
bundle.putLong("userID",homeId);
|
bundle.putLong("userID",homeId);
|
||||||
|
bundle.putString("username", "");
|
||||||
intent.putExtras(bundle);
|
intent.putExtras(bundle);
|
||||||
startActivity(intent);
|
startActivity(intent);
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
case R.id.action_tweet:
|
case R.id.action_tweet:
|
||||||
intent = new Intent(this, TweetPopup.class);
|
intent = new Intent(this, TweetPopup.class);
|
||||||
Bundle b = new Bundle();
|
Bundle b = new Bundle();
|
||||||
|
@ -119,14 +121,14 @@ public class MainActivity extends AppCompatActivity implements
|
||||||
intent.putExtras(b);
|
intent.putExtras(b);
|
||||||
startActivity(intent);
|
startActivity(intent);
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
case R.id.action_settings:
|
case R.id.action_settings:
|
||||||
settingChanged = true;
|
settingChanged = true;
|
||||||
intent = new Intent(this, AppSettings.class);
|
intent = new Intent(this, AppSettings.class);
|
||||||
startActivity(intent);
|
startActivity(intent);
|
||||||
return true;
|
return true;
|
||||||
default:
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -20,6 +20,7 @@ public class TrendDatabase {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Load trend List
|
* Load trend List
|
||||||
|
* @param woeId Yahoo World ID
|
||||||
* @return list of trends
|
* @return list of trends
|
||||||
*/
|
*/
|
||||||
public List<Trend> load(int woeId) {
|
public List<Trend> load(int woeId) {
|
||||||
|
@ -46,6 +47,7 @@ public class TrendDatabase {
|
||||||
/**
|
/**
|
||||||
* Speichere Twitter Trends
|
* Speichere Twitter Trends
|
||||||
* @param trends List of Trends
|
* @param trends List of Trends
|
||||||
|
* @param woeId Yahoo World ID
|
||||||
*/
|
*/
|
||||||
public void store(final List<Trend> trends, int woeId) {
|
public void store(final List<Trend> trends, int woeId) {
|
||||||
SQLiteDatabase db = dataHelper.getWritableDatabase();
|
SQLiteDatabase db = dataHelper.getWritableDatabase();
|
||||||
|
|
|
@ -21,7 +21,9 @@ public class LogAdapter extends Adapter<LogAdapter.ItemHolder> {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getItemCount(){return messages.size();}
|
public int getItemCount() {
|
||||||
|
return messages.size();
|
||||||
|
}
|
||||||
|
|
||||||
@NonNull
|
@NonNull
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -62,13 +62,13 @@ public class TimelineRecycler extends Adapter<TimelineRecycler.ItemHolder> imple
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getItemCount(){
|
public int getItemCount() {
|
||||||
return tweets.size();
|
return tweets.size();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public long getItemId(int pos){
|
public long getItemId(int pos) {
|
||||||
return tweets.get(pos).tweetID;
|
return tweets.get(pos).tweetID;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -41,11 +41,13 @@ public class TrendRecycler extends Adapter<TrendRecycler.ItemHolder>
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public List<Trend> getData(){return trendList;}
|
public List<Trend> getData() {
|
||||||
|
return trendList;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getItemCount(){
|
public int getItemCount() {
|
||||||
return trendList.size();
|
return trendList.size();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -37,7 +37,9 @@ public class UserRecycler extends Adapter<UserRecycler.ItemHolder> implements On
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public List<TwitterUser> getData(){return mUser; }
|
public List<TwitterUser> getData() {
|
||||||
|
return mUser;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
public void toggleImage(boolean image) {
|
public void toggleImage(boolean image) {
|
||||||
|
@ -52,7 +54,7 @@ public class UserRecycler extends Adapter<UserRecycler.ItemHolder> implements On
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public long getItemId(int pos){
|
public long getItemId(int pos) {
|
||||||
return mUser.get(pos).userID;
|
return mUser.get(pos).userID;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -190,8 +190,8 @@ public class AppSettings extends AppCompatActivity implements OnClickListener,
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
|
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
|
||||||
wId = id;
|
|
||||||
woeIdPos = position;
|
woeIdPos = position;
|
||||||
|
wId = id;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,6 @@ package org.nuclearfog.twidda.window;
|
||||||
|
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.support.annotation.Nullable;
|
|
||||||
import android.support.v4.content.ContextCompat;
|
import android.support.v4.content.ContextCompat;
|
||||||
import android.support.v4.widget.SwipeRefreshLayout;
|
import android.support.v4.widget.SwipeRefreshLayout;
|
||||||
import android.support.v4.widget.SwipeRefreshLayout.OnRefreshListener;
|
import android.support.v4.widget.SwipeRefreshLayout.OnRefreshListener;
|
||||||
|
@ -29,7 +28,6 @@ import org.nuclearfog.twidda.viewadapter.TimelineRecycler;
|
||||||
import org.nuclearfog.twidda.viewadapter.TimelineRecycler.OnItemClicked;
|
import org.nuclearfog.twidda.viewadapter.TimelineRecycler.OnItemClicked;
|
||||||
import org.nuclearfog.twidda.viewadapter.UserRecycler;
|
import org.nuclearfog.twidda.viewadapter.UserRecycler;
|
||||||
|
|
||||||
|
|
||||||
public class SearchPage extends AppCompatActivity implements UserRecycler.OnItemClicked,
|
public class SearchPage extends AppCompatActivity implements UserRecycler.OnItemClicked,
|
||||||
OnRefreshListener, OnTabChangeListener, OnItemClicked {
|
OnRefreshListener, OnTabChangeListener, OnItemClicked {
|
||||||
|
|
||||||
|
@ -44,8 +42,11 @@ public class SearchPage extends AppCompatActivity implements UserRecycler.OnItem
|
||||||
@Override
|
@Override
|
||||||
protected void onCreate(Bundle b) {
|
protected void onCreate(Bundle b) {
|
||||||
super.onCreate(b);
|
super.onCreate(b);
|
||||||
|
b = getIntent().getExtras();
|
||||||
|
if (b != null) {
|
||||||
|
search = b.getString("search");
|
||||||
|
}
|
||||||
setContentView(R.layout.searchpage);
|
setContentView(R.layout.searchpage);
|
||||||
getExtras(getIntent().getExtras());
|
|
||||||
|
|
||||||
GlobalSettings settings = GlobalSettings.getInstance(this);
|
GlobalSettings settings = GlobalSettings.getInstance(this);
|
||||||
int background = settings.getBackgroundColor();
|
int background = settings.getBackgroundColor();
|
||||||
|
@ -226,10 +227,4 @@ public class SearchPage extends AppCompatActivity implements UserRecycler.OnItem
|
||||||
mSearch = new TwitterSearch(this);
|
mSearch = new TwitterSearch(this);
|
||||||
mSearch.execute(search);
|
mSearch.execute(search);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void getExtras(@Nullable Bundle b) {
|
|
||||||
if(b != null) {
|
|
||||||
search = b.getString("search");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
|
@ -6,7 +6,6 @@ import android.content.Intent;
|
||||||
import android.net.ConnectivityManager;
|
import android.net.ConnectivityManager;
|
||||||
import android.net.Uri;
|
import android.net.Uri;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.support.annotation.Nullable;
|
|
||||||
import android.support.design.widget.CollapsingToolbarLayout;
|
import android.support.design.widget.CollapsingToolbarLayout;
|
||||||
import android.support.v4.widget.SwipeRefreshLayout;
|
import android.support.v4.widget.SwipeRefreshLayout;
|
||||||
import android.support.v4.widget.SwipeRefreshLayout.OnRefreshListener;
|
import android.support.v4.widget.SwipeRefreshLayout.OnRefreshListener;
|
||||||
|
@ -42,16 +41,21 @@ public class TweetDetail extends AppCompatActivity implements OnClickListener,
|
||||||
private SwipeRefreshLayout answerReload;
|
private SwipeRefreshLayout answerReload;
|
||||||
private ConnectivityManager mConnect;
|
private ConnectivityManager mConnect;
|
||||||
private GlobalSettings settings;
|
private GlobalSettings settings;
|
||||||
private String username;
|
private String username = "";
|
||||||
private long userID;
|
private long userID = 0;
|
||||||
private long tweetID;
|
private long tweetID = 0;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onCreate(Bundle b) {
|
protected void onCreate(Bundle b) {
|
||||||
super.onCreate(b);
|
super.onCreate(b);
|
||||||
setContentView(R.layout.tweetpage);
|
|
||||||
|
|
||||||
getExtras(getIntent().getExtras());
|
b = getIntent().getExtras();
|
||||||
|
if (b != null) {
|
||||||
|
tweetID = b.getLong("tweetID");
|
||||||
|
userID = b.getLong("userID");
|
||||||
|
username = b.getString("username");
|
||||||
|
}
|
||||||
|
setContentView(R.layout.tweetpage);
|
||||||
|
|
||||||
settings = GlobalSettings.getInstance(this);
|
settings = GlobalSettings.getInstance(this);
|
||||||
boolean home = userID == settings.getUserId();
|
boolean home = userID == settings.getUserId();
|
||||||
|
@ -214,12 +218,4 @@ public class TweetDetail extends AppCompatActivity implements OnClickListener,
|
||||||
mStat.execute(tweetID, StatusLoader.LOAD_TWEET);
|
mStat.execute(tweetID, StatusLoader.LOAD_TWEET);
|
||||||
mReply.execute(tweetID, StatusLoader.LOAD_REPLY);
|
mReply.execute(tweetID, StatusLoader.LOAD_REPLY);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void getExtras(@Nullable Bundle b) {
|
|
||||||
if(b != null) {
|
|
||||||
tweetID = b.getLong("tweetID");
|
|
||||||
userID = b.getLong("userID");
|
|
||||||
username = b.getString("username");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
|
@ -8,7 +8,6 @@ import android.database.Cursor;
|
||||||
import android.os.Build;
|
import android.os.Build;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.provider.MediaStore;
|
import android.provider.MediaStore;
|
||||||
import android.support.annotation.Nullable;
|
|
||||||
import android.support.v7.app.AlertDialog;
|
import android.support.v7.app.AlertDialog;
|
||||||
import android.support.v7.app.AppCompatActivity;
|
import android.support.v7.app.AppCompatActivity;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
|
@ -34,15 +33,22 @@ public class TweetPopup extends AppCompatActivity implements OnClickListener,
|
||||||
private List<String> mediaPath;
|
private List<String> mediaPath;
|
||||||
private TextView imgCount;
|
private TextView imgCount;
|
||||||
private EditText tweet;
|
private EditText tweet;
|
||||||
private String addition="";
|
private String addition = "";
|
||||||
private long inReplyId =-1L;
|
private long inReplyId = -1L;
|
||||||
private int imgIndex = 0;
|
private int imgIndex = 0;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onCreate(Bundle b) {
|
protected void onCreate(Bundle b) {
|
||||||
super.onCreate(b);
|
super.onCreate(b);
|
||||||
|
b = getIntent().getExtras();
|
||||||
|
if (b != null) {
|
||||||
|
if (b.containsKey("TweetID"))
|
||||||
|
inReplyId = b.getLong("TweetID");
|
||||||
|
if (b.containsKey("Addition"))
|
||||||
|
addition = b.getString("Addition") + " ";
|
||||||
|
}
|
||||||
setContentView(R.layout.tweetwindow);
|
setContentView(R.layout.tweetwindow);
|
||||||
getExtras(getIntent().getExtras());
|
|
||||||
GlobalSettings settings = GlobalSettings.getInstance(this);
|
GlobalSettings settings = GlobalSettings.getInstance(this);
|
||||||
|
|
||||||
View tweetButton = findViewById(R.id.sendTweet);
|
View tweetButton = findViewById(R.id.sendTweet);
|
||||||
|
@ -55,8 +61,7 @@ public class TweetPopup extends AppCompatActivity implements OnClickListener,
|
||||||
tweet = findViewById(R.id.tweet_input);
|
tweet = findViewById(R.id.tweet_input);
|
||||||
imgCount = findViewById(R.id.imgcount);
|
imgCount = findViewById(R.id.imgcount);
|
||||||
send_circle = findViewById(R.id.tweet_sending);
|
send_circle = findViewById(R.id.tweet_sending);
|
||||||
int tweetColor = settings.getTweetColor();
|
root.setBackgroundColor(settings.getTweetColor());
|
||||||
root.setBackgroundColor(tweetColor);
|
|
||||||
tweet.append(addition);
|
tweet.append(addition);
|
||||||
|
|
||||||
closeButton.setOnClickListener(this);
|
closeButton.setOnClickListener(this);
|
||||||
|
@ -165,13 +170,4 @@ public class TweetPopup extends AppCompatActivity implements OnClickListener,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void getExtras(@Nullable Bundle b) {
|
|
||||||
if(b != null) {
|
|
||||||
if (b.containsKey("TweetID"))
|
|
||||||
inReplyId = b.getLong("TweetID");
|
|
||||||
if (b.containsKey("Addition"))
|
|
||||||
addition = b.getString("Addition") + " ";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
|
@ -2,7 +2,6 @@ package org.nuclearfog.twidda.window;
|
||||||
|
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.support.annotation.Nullable;
|
|
||||||
import android.support.v7.app.AppCompatActivity;
|
import android.support.v7.app.AppCompatActivity;
|
||||||
import android.support.v7.widget.LinearLayoutManager;
|
import android.support.v7.widget.LinearLayoutManager;
|
||||||
import android.support.v7.widget.RecyclerView;
|
import android.support.v7.widget.RecyclerView;
|
||||||
|
@ -21,17 +20,23 @@ import org.nuclearfog.twidda.viewadapter.UserRecycler.OnItemClicked;
|
||||||
|
|
||||||
public class UserDetail extends AppCompatActivity implements OnItemClicked {
|
public class UserDetail extends AppCompatActivity implements OnItemClicked {
|
||||||
|
|
||||||
private long userID, tweetID;
|
|
||||||
private long mode;
|
|
||||||
private RecyclerView userList;
|
private RecyclerView userList;
|
||||||
private UserLists uList;
|
private UserLists uList;
|
||||||
|
private long mode = -1;
|
||||||
|
private long userID = 0;
|
||||||
|
private long tweetID = 0;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onCreate(Bundle b) {
|
protected void onCreate(Bundle b) {
|
||||||
super.onCreate(b);
|
super.onCreate(b);
|
||||||
|
b = getIntent().getExtras();
|
||||||
|
if (b != null) {
|
||||||
|
userID = b.getLong("userID");
|
||||||
|
mode = b.getLong("mode");
|
||||||
|
if (b.containsKey("tweetID"))
|
||||||
|
tweetID = b.getLong("tweetID");
|
||||||
|
}
|
||||||
setContentView(R.layout.userpage);
|
setContentView(R.layout.userpage);
|
||||||
if(getIntent().getExtras() != null)
|
|
||||||
getExtras(getIntent().getExtras());
|
|
||||||
|
|
||||||
userList = findViewById(R.id.userlist);
|
userList = findViewById(R.id.userlist);
|
||||||
userList.setLayoutManager(new LinearLayoutManager(getApplicationContext()));
|
userList.setLayoutManager(new LinearLayoutManager(getApplicationContext()));
|
||||||
|
@ -99,14 +104,4 @@ public class UserDetail extends AppCompatActivity implements OnItemClicked {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void getExtras(@Nullable Bundle b) {
|
|
||||||
if(b != null) {
|
|
||||||
userID = b.getLong("userID");
|
|
||||||
mode = b.getLong("mode");
|
|
||||||
if(b.containsKey("tweetID")) {
|
|
||||||
tweetID = b.getLong("tweetID");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
|
@ -2,7 +2,6 @@ package org.nuclearfog.twidda.window;
|
||||||
|
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.support.annotation.Nullable;
|
|
||||||
import android.support.v4.widget.SwipeRefreshLayout;
|
import android.support.v4.widget.SwipeRefreshLayout;
|
||||||
import android.support.v4.widget.SwipeRefreshLayout.OnRefreshListener;
|
import android.support.v4.widget.SwipeRefreshLayout.OnRefreshListener;
|
||||||
import android.support.v7.app.AppCompatActivity;
|
import android.support.v7.app.AppCompatActivity;
|
||||||
|
@ -39,16 +38,20 @@ public class UserProfile extends AppCompatActivity implements OnClickListener,
|
||||||
|
|
||||||
private TabHost mTab;
|
private TabHost mTab;
|
||||||
private View lastView;
|
private View lastView;
|
||||||
private long userId;
|
|
||||||
private boolean home;
|
private boolean home;
|
||||||
|
private long userId = 0;
|
||||||
private int tabIndex = 0;
|
private int tabIndex = 0;
|
||||||
private String username = "";
|
private String username = "";
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onCreate(Bundle b) {
|
protected void onCreate(Bundle b) {
|
||||||
super.onCreate(b);
|
super.onCreate(b);
|
||||||
|
b = getIntent().getExtras();
|
||||||
|
if (b != null) {
|
||||||
|
userId = b.getLong("userID");
|
||||||
|
username = b.getString("username");
|
||||||
|
}
|
||||||
setContentView(R.layout.profilepage);
|
setContentView(R.layout.profilepage);
|
||||||
getExtras(getIntent().getExtras());
|
|
||||||
|
|
||||||
Toolbar tool = findViewById(R.id.profile_toolbar);
|
Toolbar tool = findViewById(R.id.profile_toolbar);
|
||||||
setSupportActionBar(tool);
|
setSupportActionBar(tool);
|
||||||
|
@ -268,13 +271,4 @@ public class UserProfile extends AppCompatActivity implements OnClickListener,
|
||||||
intent.putExtras(bundle);
|
intent.putExtras(bundle);
|
||||||
startActivity(intent);
|
startActivity(intent);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private void getExtras(@Nullable Bundle b) {
|
|
||||||
if(b != null) {
|
|
||||||
userId = b.getLong("userID");
|
|
||||||
if (b.containsKey("username"))
|
|
||||||
username = b.getString("username");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
Loading…
Reference in New Issue