Mastodon
/
Shitter-android-app
mirror of https://github.com/nuclearfog/Shitter.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cleanup

This commit is contained in:
NudeDude 2018-08-01 16:35:47 +02:00
parent 43502d47ea
commit 78a605a498
12 changed files with 62 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/nuclearfog/twidda/MainActivity.java
View File

@ -109,9 +109,11 @@ public class MainActivity extends AppCompatActivity implements
intent = new Intent(this, UserProfile.class);
Bundle bundle = new Bundle();
bundle.putLong("userID",homeId);
bundle.putString("username", "");
intent.putExtras(bundle);
startActivity(intent);
return true;
case R.id.action_tweet:
intent = new Intent(this, TweetPopup.class);
Bundle b = new Bundle();
@ -119,14 +121,14 @@ public class MainActivity extends AppCompatActivity implements
intent.putExtras(b);
startActivity(intent);
return true;
case R.id.action_settings:
settingChanged = true;
intent = new Intent(this, AppSettings.class);
startActivity(intent);
return true;
default:
return false;
}
return false;
}
@Override

2
app/src/main/java/org/nuclearfog/twidda/database/TrendDatabase.java
View File

@ -20,6 +20,7 @@ public class TrendDatabase {
/**
* Load trend List
* @param woeId Yahoo World ID
* @return list of trends
*/
public List<Trend> load(int woeId) {
@ -46,6 +47,7 @@ public class TrendDatabase {
/**
* Speichere Twitter Trends
* @param trends List of Trends
* @param woeId Yahoo World ID
*/
public void store(final List<Trend> trends, int woeId) {
SQLiteDatabase db = dataHelper.getWritableDatabase();

6
app/src/main/java/org/nuclearfog/twidda/viewadapter/LogAdapter.java
View File

@ -21,7 +21,9 @@ public class LogAdapter extends Adapter<LogAdapter.ItemHolder> {
}
@Override
public int getItemCount(){return messages.size();}
public int getItemCount() {
return messages.size();
}
@NonNull
@Override
@ -43,4 +45,4 @@ public class LogAdapter extends Adapter<LogAdapter.ItemHolder> {
message = v.findViewById(R.id.errortext);
}
}
}
}

4
app/src/main/java/org/nuclearfog/twidda/viewadapter/TimelineRecycler.java
View File

@ -62,13 +62,13 @@ public class TimelineRecycler extends Adapter<TimelineRecycler.ItemHolder> imple
@Override
public int getItemCount(){
public int getItemCount() {
return tweets.size();
}
@Override
public long getItemId(int pos){
public long getItemId(int pos) {
return tweets.get(pos).tweetID;
}

6
app/src/main/java/org/nuclearfog/twidda/viewadapter/TrendRecycler.java
View File

@ -41,11 +41,13 @@ public class TrendRecycler extends Adapter<TrendRecycler.ItemHolder>
}
public List<Trend> getData(){return trendList;}
public List<Trend> getData() {
return trendList;
}
@Override
public int getItemCount(){
public int getItemCount() {
return trendList.size();
}

6
app/src/main/java/org/nuclearfog/twidda/viewadapter/UserRecycler.java
View File

@ -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) {
@ -52,7 +54,7 @@ public class UserRecycler extends Adapter<UserRecycler.ItemHolder> implements On
@Override
public long getItemId(int pos){
public long getItemId(int pos) {
return mUser.get(pos).userID;
}

2
app/src/main/java/org/nuclearfog/twidda/window/AppSettings.java
View File

@ -190,8 +190,8 @@ public class AppSettings extends AppCompatActivity implements OnClickListener,
@Override
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
wId = id;
woeIdPos = position;
wId = id;
}

13
app/src/main/java/org/nuclearfog/twidda/window/SearchPage.java
View File

@ -2,7 +2,6 @@ package org.nuclearfog.twidda.window;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.content.ContextCompat;
import android.support.v4.widget.SwipeRefreshLayout;
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.UserRecycler;
public class SearchPage extends AppCompatActivity implements UserRecycler.OnItemClicked,
OnRefreshListener, OnTabChangeListener, OnItemClicked {
@ -44,8 +42,11 @@ public class SearchPage extends AppCompatActivity implements UserRecycler.OnItem
@Override
protected void onCreate(Bundle b) {
super.onCreate(b);
b = getIntent().getExtras();
if (b != null) {
search = b.getString("search");
}
setContentView(R.layout.searchpage);
getExtras(getIntent().getExtras());
GlobalSettings settings = GlobalSettings.getInstance(this);
int background = settings.getBackgroundColor();
@ -226,10 +227,4 @@ public class SearchPage extends AppCompatActivity implements UserRecycler.OnItem
mSearch = new TwitterSearch(this);
mSearch.execute(search);
}
private void getExtras(@Nullable Bundle b) {
if(b != null) {
search = b.getString("search");
}
}
}

24
app/src/main/java/org/nuclearfog/twidda/window/TweetDetail.java
View File

@ -6,7 +6,6 @@ import android.content.Intent;
import android.net.ConnectivityManager;
import android.net.Uri;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.design.widget.CollapsingToolbarLayout;
import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v4.widget.SwipeRefreshLayout.OnRefreshListener;
@ -42,16 +41,21 @@ public class TweetDetail extends AppCompatActivity implements OnClickListener,
private SwipeRefreshLayout answerReload;
private ConnectivityManager mConnect;
private GlobalSettings settings;
private String username;
private long userID;
private long tweetID;
private String username = "";
private long userID = 0;
private long tweetID = 0;
@Override
protected void onCreate(Bundle 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);
boolean home = userID == settings.getUserId();
@ -214,12 +218,4 @@ public class TweetDetail extends AppCompatActivity implements OnClickListener,
mStat.execute(tweetID, StatusLoader.LOAD_TWEET);
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");
}
}
}

26
app/src/main/java/org/nuclearfog/twidda/window/TweetPopup.java
View File

@ -8,7 +8,6 @@ import android.database.Cursor;
import android.os.Build;
import android.os.Bundle;
import android.provider.MediaStore;
import android.support.annotation.Nullable;
import android.support.v7.app.AlertDialog;
import android.support.v7.app.AppCompatActivity;
import android.view.View;
@ -34,15 +33,22 @@ public class TweetPopup extends AppCompatActivity implements OnClickListener,
private List<String> mediaPath;
private TextView imgCount;
private EditText tweet;
private String addition="";
private long inReplyId =-1L;
private String addition = "";
private long inReplyId = -1L;
private int imgIndex = 0;
@Override
protected void onCreate(Bundle 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);
getExtras(getIntent().getExtras());
GlobalSettings settings = GlobalSettings.getInstance(this);
View tweetButton = findViewById(R.id.sendTweet);
@ -55,8 +61,7 @@ public class TweetPopup extends AppCompatActivity implements OnClickListener,
tweet = findViewById(R.id.tweet_input);
imgCount = findViewById(R.id.imgcount);
send_circle = findViewById(R.id.tweet_sending);
int tweetColor = settings.getTweetColor();
root.setBackgroundColor(tweetColor);
root.setBackgroundColor(settings.getTweetColor());
tweet.append(addition);
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") + " ";
}
}
}

25
app/src/main/java/org/nuclearfog/twidda/window/UserDetail.java
View File

@ -2,7 +2,6 @@ package org.nuclearfog.twidda.window;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
@ -21,17 +20,23 @@ import org.nuclearfog.twidda.viewadapter.UserRecycler.OnItemClicked;
public class UserDetail extends AppCompatActivity implements OnItemClicked {
private long userID, tweetID;
private long mode;
private RecyclerView userList;
private UserLists uList;
private long mode = -1;
private long userID = 0;
private long tweetID = 0;
@Override
protected void onCreate(Bundle 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);
if(getIntent().getExtras() != null)
getExtras(getIntent().getExtras());
userList = findViewById(R.id.userlist);
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");
}
}
}
}

18
app/src/main/java/org/nuclearfog/twidda/window/UserProfile.java
View File

@ -2,7 +2,6 @@ package org.nuclearfog.twidda.window;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v4.widget.SwipeRefreshLayout.OnRefreshListener;
import android.support.v7.app.AppCompatActivity;
@ -39,16 +38,20 @@ public class UserProfile extends AppCompatActivity implements OnClickListener,
private TabHost mTab;
private View lastView;
private long userId;
private boolean home;
private long userId = 0;
private int tabIndex = 0;
private String username = "";
@Override
protected void onCreate(Bundle b) {
super.onCreate(b);
b = getIntent().getExtras();
if (b != null) {
userId = b.getLong("userID");
username = b.getString("username");
}
setContentView(R.layout.profilepage);
getExtras(getIntent().getExtras());
Toolbar tool = findViewById(R.id.profile_toolbar);
setSupportActionBar(tool);
@ -268,13 +271,4 @@ public class UserProfile extends AppCompatActivity implements OnClickListener,
intent.putExtras(bundle);
startActivity(intent);
}
private void getExtras(@Nullable Bundle b) {
if(b != null) {
userId = b.getLong("userID");
if (b.containsKey("username"))
username = b.getString("username");
}
}
}