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

Bugfix 

Code Cleanup
This commit is contained in:
NudeDude 2018-02-25 15:29:06 +01:00
parent 7a347b1b93
commit cd6d572733
10 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/AndroidManifest.xml
View File

@ -22,7 +22,7 @@
</activity>
<activity
android:name=".window.SearchWindow"
android:name=".window.SearchPage"
android:screenOrientation="portrait"/>
<activity

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

@ -18,12 +18,12 @@ import android.widget.TabHost.TabSpec;
import org.nuclearfog.twidda.database.TrendDatabase;
import org.nuclearfog.twidda.database.TweetDatabase;
import org.nuclearfog.twidda.backend.RegisterAccount;
import org.nuclearfog.twidda.backend.Registration;
import org.nuclearfog.twidda.backend.MainPage;
import org.nuclearfog.twidda.viewadapter.TimelineAdapter;
import org.nuclearfog.twidda.viewadapter.TrendAdapter;
import org.nuclearfog.twidda.window.LoginPage;
import org.nuclearfog.twidda.window.SearchWindow;
import org.nuclearfog.twidda.window.SearchPage;
import org.nuclearfog.twidda.window.UserProfile;
import org.nuclearfog.twidda.window.AppSettings;
import org.nuclearfog.twidda.window.TweetDetail;
@ -31,7 +31,7 @@ import org.nuclearfog.twidda.window.TweetPopup;
/**
* MainPage of the App
* @see RegisterAccount Registing App in Twitter
* @see Registration Registing App in Twitter
* @see MainPage show Home Window
*/
public class MainActivity extends AppCompatActivity implements AdapterView.OnItemClickListener,
@ -84,7 +84,7 @@ public class MainActivity extends AppCompatActivity implements AdapterView.OnIte
searchQuery.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
@Override
public boolean onQueryTextSubmit(String s) {
Intent intent = new Intent(con, SearchWindow.class);
Intent intent = new Intent(con, SearchPage.class);
Bundle bundle = new Bundle();
bundle.putString("search", s);
intent.putExtras(bundle);
@ -166,7 +166,7 @@ public class MainActivity extends AppCompatActivity implements AdapterView.OnIte
if(!trendReload.isRefreshing()) {
TrendAdapter trend = (TrendAdapter) trendList.getAdapter();
String search = trend.getDatabase().getTrendname(position);
Intent intent = new Intent(con, SearchWindow.class);
Intent intent = new Intent(con, SearchPage.class);
Bundle bundle = new Bundle();
bundle.putString("search", search);
if(search.startsWith("#")) {

4
app/src/main/java/org/nuclearfog/twidda/backend/RegisterAccount.java → app/src/main/java/org/nuclearfog/twidda/backend/Registration.java
View File

@ -6,7 +6,7 @@ import android.os.AsyncTask;
import android.widget.Toast;
import org.nuclearfog.twidda.window.LoginPage;
public class RegisterAccount extends AsyncTask<String, Void, Boolean> {
public class Registration extends AsyncTask<String, Void, Boolean> {
private Context context;
private String errMSG = "";
@ -16,7 +16,7 @@ public class RegisterAccount extends AsyncTask<String, Void, Boolean> {
* @see TwitterEngine used to Store Twitter instance
* @param context current Activity's Context.
*/
public RegisterAccount(Context context) {
public Registration(Context context) {
this.context = context;
}

4
app/src/main/java/org/nuclearfog/twidda/backend/ShowStatus.java → app/src/main/java/org/nuclearfog/twidda/backend/StatusLoader.java
View File

@ -36,7 +36,7 @@ import org.nuclearfog.twidda.window.ColorPreferences;
import org.nuclearfog.twidda.window.TweetDetail;
import org.nuclearfog.twidda.window.UserProfile;
public class ShowStatus extends AsyncTask<Long, Void, Long> implements View.OnClickListener {
public class StatusLoader extends AsyncTask<Long, Void, Long> implements View.OnClickListener {
private static final long ERROR = -1;
public static final long RETWEET = 0;
@ -68,7 +68,7 @@ public class ShowStatus extends AsyncTask<Long, Void, Long> implements View.OnCl
public ShowStatus(Context c) {
public StatusLoader(Context c) {
mTwitter = TwitterEngine.getInstance(c);
answers = new ArrayList<>();
SharedPreferences settings = c.getSharedPreferences("settings", 0);

4
app/src/main/java/org/nuclearfog/twidda/backend/SendStatus.java → app/src/main/java/org/nuclearfog/twidda/backend/StatusUpload.java
View File

@ -4,7 +4,7 @@ import android.content.Context;
import android.os.AsyncTask;
import android.widget.Toast;
public class SendStatus extends AsyncTask<Object, Void, Boolean> {
public class StatusUpload extends AsyncTask<Object, Void, Boolean> {
private Context context;
private String path;
@ -13,7 +13,7 @@ public class SendStatus extends AsyncTask<Object, Void, Boolean> {
* @param context Context of #TweetPopup
* @param path Internal Path of the Image
*/
public SendStatus(Context context, String path) {
public StatusUpload(Context context, String path) {
this.context = context;
this.path = path;
}

10
app/src/main/java/org/nuclearfog/twidda/backend/TwitterSearch.java
View File

@ -12,7 +12,7 @@ import org.nuclearfog.twidda.R;
import org.nuclearfog.twidda.database.UserDatabase;
import org.nuclearfog.twidda.viewadapter.TimelineAdapter;
import org.nuclearfog.twidda.viewadapter.UserAdapter;
import org.nuclearfog.twidda.window.SearchWindow;
import org.nuclearfog.twidda.window.SearchPage;
public class TwitterSearch extends AsyncTask<String, Void, Void> {
@ -30,10 +30,10 @@ public class TwitterSearch extends AsyncTask<String, Void, Void> {
@Override
protected void onPreExecute() {
tweetSearch = (ListView) ((SearchWindow)context).findViewById(R.id.tweet_result);
userSearch = (ListView) ((SearchWindow)context).findViewById(R.id.user_result);
tweetReload = (SwipeRefreshLayout) ((SearchWindow)context).findViewById(R.id.searchtweets);
circleLoad = (ProgressBar) ((SearchWindow)context).findViewById(R.id.search_progress);
tweetSearch = (ListView) ((SearchPage)context).findViewById(R.id.tweet_result);
userSearch = (ListView) ((SearchPage)context).findViewById(R.id.user_result);
tweetReload = (SwipeRefreshLayout) ((SearchPage)context).findViewById(R.id.searchtweets);
circleLoad = (ProgressBar) ((SearchPage)context).findViewById(R.id.search_progress);
mTwitter = TwitterEngine.getInstance(context);
}

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

@ -8,7 +8,7 @@ import android.widget.EditText;
import android.widget.Toast;
import org.nuclearfog.twidda.R;
import org.nuclearfog.twidda.backend.RegisterAccount;
import org.nuclearfog.twidda.backend.Registration;
public class LoginPage extends Activity implements View.OnClickListener {
@ -35,14 +35,14 @@ public class LoginPage extends Activity implements View.OnClickListener {
public void onClick(View v){
switch(v.getId()){
case R.id.linkButton:
RegisterAccount account = new RegisterAccount(this);
Registration account = new Registration(this);
account.execute("");
break;
case R.id.get:
String twitterPin = pin.getText().toString();
if(!twitterPin.trim().isEmpty()) {
new RegisterAccount(this).execute(twitterPin);
new Registration(this).execute(twitterPin);
} else {
Toast.makeText(getApplicationContext(),"PIN eingeben!",Toast.LENGTH_LONG).show();
}

4
app/src/main/java/org/nuclearfog/twidda/window/SearchWindow.java → app/src/main/java/org/nuclearfog/twidda/window/SearchPage.java
View File

@ -22,10 +22,10 @@ import org.nuclearfog.twidda.viewadapter.UserAdapter;
import org.nuclearfog.twidda.backend.TwitterSearch;
/**
* SearchWindow Tweets and Users
* SearchPage Tweets and Users
* @see TwitterSearch
*/
public class SearchWindow extends AppCompatActivity implements AdapterView.OnItemClickListener,
public class SearchPage extends AppCompatActivity implements AdapterView.OnItemClickListener,
SwipeRefreshLayout.OnRefreshListener, TabHost.OnTabChangeListener {
private ListView tweetSearch, userSearch;

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

@ -17,14 +17,14 @@ import android.widget.ListView;
import android.widget.TextView;
import static android.content.DialogInterface.*;
import org.nuclearfog.twidda.backend.ShowStatus;
import org.nuclearfog.twidda.backend.StatusLoader;
import org.nuclearfog.twidda.database.TweetDatabase;
import org.nuclearfog.twidda.R;
import org.nuclearfog.twidda.viewadapter.TimelineAdapter;
/**
* Detailed Tweet Window
* @see ShowStatus
* @see StatusLoader
*/
public class TweetDetail extends AppCompatActivity implements View.OnClickListener,
AdapterView.OnItemClickListener, DialogInterface.OnClickListener, SwipeRefreshLayout.OnRefreshListener {
@ -32,7 +32,7 @@ public class TweetDetail extends AppCompatActivity implements View.OnClickListen
private ListView answer_list;
private long tweetID;
private long userID;
private ShowStatus mStat, mReply;
private StatusLoader mStat, mReply;
@Override
protected void onCreate(Bundle b) {
@ -79,7 +79,7 @@ public class TweetDetail extends AppCompatActivity implements View.OnClickListen
public void onClick(View v) {
Intent intent;
Bundle bundle = new Bundle();
ShowStatus mStat = new ShowStatus(this);
StatusLoader mStat = new StatusLoader(this);
switch(v.getId()) {
case R.id.answer_button:
intent = new Intent(getApplicationContext(), TweetPopup.class);
@ -88,10 +88,10 @@ public class TweetDetail extends AppCompatActivity implements View.OnClickListen
startActivity(intent);
break;
case R.id.rt_button_detail:
mStat.execute(tweetID, ShowStatus.RETWEET);
mStat.execute(tweetID, StatusLoader.RETWEET);
break;
case R.id.fav_button_detail:
mStat.execute(tweetID, ShowStatus.FAVORITE);
mStat.execute(tweetID, StatusLoader.FAVORITE);
break;
case R.id.no_rt_detail:
intent = new Intent(getApplicationContext(), UserDetail.class);
@ -125,7 +125,7 @@ public class TweetDetail extends AppCompatActivity implements View.OnClickListen
case BUTTON_NEGATIVE:
break;
case BUTTON_POSITIVE:
new ShowStatus(this).execute(tweetID,ShowStatus.DELETE);
new StatusLoader(this).execute(tweetID, StatusLoader.DELETE);
break;
}
}
@ -146,8 +146,8 @@ public class TweetDetail extends AppCompatActivity implements View.OnClickListen
@Override
public void onRefresh() {
mReply = new ShowStatus(this);
mReply.execute(tweetID, ShowStatus.LOAD_REPLY);
mReply = new StatusLoader(this);
mReply.execute(tweetID, StatusLoader.LOAD_REPLY);
}
private void setContent() {
@ -162,9 +162,9 @@ public class TweetDetail extends AppCompatActivity implements View.OnClickListen
answer_list.setBackgroundColor(backgroundColor);
txtTw.setTextColor(fontColor);
mStat = new ShowStatus(this);
mReply = new ShowStatus(this);
mStat.execute(tweetID, ShowStatus.LOAD_TWEET);
mReply.execute(tweetID, ShowStatus.LOAD_REPLY);
mStat = new StatusLoader(this);
mReply = new StatusLoader(this);
mStat.execute(tweetID, StatusLoader.LOAD_TWEET);
mReply.execute(tweetID, StatusLoader.LOAD_REPLY);
}
}

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

@ -16,12 +16,12 @@ import android.widget.ImageView;
import android.widget.LinearLayout;
import static android.content.DialogInterface.*;
import org.nuclearfog.twidda.backend.SendStatus;
import org.nuclearfog.twidda.backend.StatusUpload;
import org.nuclearfog.twidda.R;
/**
* Tweet Window
* @see SendStatus
* @see StatusUpload
*/
public class TweetPopup extends AppCompatActivity implements View.OnClickListener,
DialogInterface.OnClickListener {
@ -129,11 +129,11 @@ public class TweetPopup extends AppCompatActivity implements View.OnClickListene
private void send() {
String tweet = tweetfield.getText().toString();
SendStatus sendTweet;
StatusUpload sendTweet;
if(imgPath == null) {
sendTweet = new SendStatus(getApplicationContext(), "");
sendTweet = new StatusUpload(getApplicationContext(), "");
} else {
sendTweet = new SendStatus(getApplicationContext(), imgPath);
sendTweet = new StatusUpload(getApplicationContext(), imgPath);
} if(inReplyId > 0) {
sendTweet.execute(tweet, inReplyId);
} else {