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

code cleanup

This commit is contained in:
NudeDude 2019-03-02 15:00:06 +01:00
parent bebb53b601
commit 7e6f33c45c
7 changed files with 59 additions and 57 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

@ -317,7 +317,7 @@ public class MainActivity extends AppCompatActivity implements OnRefreshListener
public void onItemClick(RecyclerView parent, int position) {
switch (parent.getId()) {
case R.id.tl_list:
if (timelineAdapter != null && !timelineReload.isRefreshing()) {
if (!timelineReload.isRefreshing()) {
Tweet tweet = timelineAdapter.getData().get(position);
if (tweet.getEmbeddedTweet() != null)
tweet = tweet.getEmbeddedTweet();
@ -326,7 +326,7 @@ public class MainActivity extends AppCompatActivity implements OnRefreshListener
break;
case R.id.tr_list:
if (trendsAdapter != null && !trendReload.isRefreshing()) {
if (!trendReload.isRefreshing()) {
String search = trendsAdapter.getData().get(position).getName();
Intent intent = new Intent(this, SearchPage.class);
if (!search.startsWith("#"))
@ -337,7 +337,7 @@ public class MainActivity extends AppCompatActivity implements OnRefreshListener
break;
case R.id.m_list:
if (mentionAdapter != null && !mentionReload.isRefreshing()) {
if (!mentionReload.isRefreshing()) {
Tweet tweet = mentionAdapter.getData().get(position);
if (tweet.getEmbeddedTweet() != null)
tweet = tweet.getEmbeddedTweet();

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

@ -38,6 +38,8 @@ public class SearchPage extends AppCompatActivity implements OnRefreshListener,
OnTabChangeListener, OnItemClickListener {
private RecyclerView tweetSearch, userSearch;
private TimelineAdapter searchAdapter;
private UserAdapter userAdapter;
private SwipeRefreshLayout tweetReload;
private GlobalSettings settings;
private TwitterSearch mSearch;
@ -100,12 +102,12 @@ public class SearchPage extends AppCompatActivity implements OnRefreshListener,
protected void onStart() {
super.onStart();
if (mSearch == null) {
TimelineAdapter searchAdapter = new TimelineAdapter(this);
searchAdapter = new TimelineAdapter(this);
searchAdapter.setColor(settings.getHighlightColor(), settings.getFontColor());
searchAdapter.toggleImage(settings.getImageLoad());
tweetSearch.setAdapter(searchAdapter);
UserAdapter userAdapter = new UserAdapter(this);
userAdapter = new UserAdapter(this);
userAdapter.toggleImage(settings.getImageLoad());
userAdapter.setColor(settings.getFontColor());
userSearch.setAdapter(userAdapter);
@ -174,27 +176,26 @@ public class SearchPage extends AppCompatActivity implements OnRefreshListener,
@Override
public void onItemClick(RecyclerView rv, int position) {
if (!tweetReload.isRefreshing())
if (rv.getId() == R.id.tweet_result) {
TimelineAdapter tweetAdapter = (TimelineAdapter) tweetSearch.getAdapter();
if (tweetAdapter != null) {
Tweet tweet = tweetAdapter.getData().get(position);
Intent intent = new Intent(this, TweetDetail.class);
intent.putExtra("tweetID", tweet.getId());
intent.putExtra("userID", tweet.getUser().getId());
intent.putExtra("username", tweet.getUser().getScreenname());
startActivity(intent);
}
} else {
UserAdapter userAdapter = (UserAdapter) userSearch.getAdapter();
if (userAdapter != null) {
if (!tweetReload.isRefreshing()) {
switch (rv.getId()) {
case R.id.tweet_result:
Tweet tweet = searchAdapter.getData().get(position);
Intent tweetdetail = new Intent(this, TweetDetail.class);
tweetdetail.putExtra("tweetID", tweet.getId());
tweetdetail.putExtra("userID", tweet.getUser().getId());
tweetdetail.putExtra("username", tweet.getUser().getScreenname());
startActivity(tweetdetail);
break;
case R.id.user_result:
TwitterUser user = userAdapter.getData().get(position);
Intent intent = new Intent(this, UserProfile.class);
intent.putExtra("userID", user.getId());
intent.putExtra("username", user.getScreenname());
startActivity(intent);
}
Intent userprofile = new Intent(this, UserProfile.class);
userprofile.putExtra("userID", user.getId());
userprofile.putExtra("username", user.getScreenname());
startActivity(userprofile);
break;
}
}
}

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

@ -27,7 +27,6 @@ import org.nuclearfog.tag.Tagger.OnTagClickListener;
import org.nuclearfog.twidda.R;
import org.nuclearfog.twidda.adapter.OnItemClickListener;
import org.nuclearfog.twidda.adapter.TimelineAdapter;
import org.nuclearfog.twidda.backend.ImageLoad;
import org.nuclearfog.twidda.backend.StatusLoader;
import org.nuclearfog.twidda.backend.items.Tweet;
import org.nuclearfog.twidda.database.GlobalSettings;
@ -38,7 +37,6 @@ import static android.os.AsyncTask.Status.RUNNING;
* Detailed Tweet Activity
*
* @see StatusLoader
* @see ImageLoad
*/
public class TweetDetail extends AppCompatActivity implements OnClickListener,
OnItemClickListener, OnRefreshListener, OnTagClickListener {
@ -47,6 +45,7 @@ public class TweetDetail extends AppCompatActivity implements OnClickListener,
private static final int TWEET = 2;
private RecyclerView answer_list;
private TimelineAdapter answerAdapter;
private StatusLoader mStat;
private GlobalSettings settings;
private SwipeRefreshLayout answerReload;
@ -106,7 +105,7 @@ public class TweetDetail extends AppCompatActivity implements OnClickListener,
protected void onStart() {
super.onStart();
if (mStat == null) {
TimelineAdapter answerAdapter = new TimelineAdapter(this);
answerAdapter = new TimelineAdapter(this);
answerAdapter.toggleImage(settings.getImageLoad());
answerAdapter.setColor(settings.getHighlightColor(), settings.getFontColor());
answer_list.setAdapter(answerAdapter);
@ -249,9 +248,8 @@ public class TweetDetail extends AppCompatActivity implements OnClickListener,
@Override
public void onItemClick(RecyclerView rv, int position) {
TimelineAdapter timeLineAdapter = (TimelineAdapter) answer_list.getAdapter();
if (timeLineAdapter != null && !answerReload.isRefreshing()) {
Tweet tweet = timeLineAdapter.getData().get(position);
if (!answerReload.isRefreshing()) {
Tweet tweet = answerAdapter.getData().get(position);
Intent intent = new Intent(this, TweetDetail.class);
intent.putExtra("tweetID", tweet.getId());
intent.putExtra("userID", tweet.getUser().getId());

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

@ -47,6 +47,7 @@ public class UserProfile extends AppCompatActivity implements OnRefreshListener,
private ProfileLoader mProfile;
private GlobalSettings settings;
private RecyclerView homeList, favoriteList;
private TimelineAdapter tweetAdapter, favAdapter;
private SwipeRefreshLayout homeReload, favoriteReload;
private View lastTab, tweetUnderline, favorUnderline;
private TextView tweetCount, favorCount;
@ -121,15 +122,15 @@ public class UserProfile extends AppCompatActivity implements OnRefreshListener,
protected void onStart() {
super.onStart();
if (mProfile == null) {
TimelineAdapter homeTl = new TimelineAdapter(this);
homeTl.setColor(settings.getHighlightColor(), settings.getFontColor());
homeTl.toggleImage(settings.getImageLoad());
homeList.setAdapter(homeTl);
tweetAdapter = new TimelineAdapter(this);
tweetAdapter.setColor(settings.getHighlightColor(), settings.getFontColor());
tweetAdapter.toggleImage(settings.getImageLoad());
homeList.setAdapter(tweetAdapter);
TimelineAdapter homeFav = new TimelineAdapter(this);
homeFav.setColor(settings.getHighlightColor(), settings.getFontColor());
homeFav.toggleImage(settings.getImageLoad());
favoriteList.setAdapter(homeFav);
favAdapter = new TimelineAdapter(this);
favAdapter.setColor(settings.getHighlightColor(), settings.getFontColor());
favAdapter.toggleImage(settings.getImageLoad());
favoriteList.setAdapter(favAdapter);
mProfile = new ProfileLoader(this);
mProfile.execute(userId, 0L);
@ -327,22 +328,24 @@ public class UserProfile extends AppCompatActivity implements OnRefreshListener,
@Override
public void onItemClick(RecyclerView parent, int position) {
if (parent.getId() == R.id.ht_list) {
TimelineAdapter tweetAdapter = (TimelineAdapter) homeList.getAdapter();
if (tweetAdapter != null && !homeReload.isRefreshing()) {
Tweet tweet = tweetAdapter.getData().get(position);
if (tweet.getEmbeddedTweet() != null)
tweet = tweet.getEmbeddedTweet();
openTweet(tweet.getId(), tweet.getUser().getId(), tweet.getUser().getScreenname());
}
} else {
TimelineAdapter tweetAdapter = (TimelineAdapter) favoriteList.getAdapter();
if (tweetAdapter != null && !favoriteReload.isRefreshing()) {
Tweet tweet = tweetAdapter.getData().get(position);
if (tweet.getEmbeddedTweet() != null)
tweet = tweet.getEmbeddedTweet();
openTweet(tweet.getId(), tweet.getUser().getId(), tweet.getUser().getScreenname());
}
switch (parent.getId()) {
case R.id.ht_list:
if (!homeReload.isRefreshing()) {
Tweet tweet = tweetAdapter.getData().get(position);
if (tweet.getEmbeddedTweet() != null)
tweet = tweet.getEmbeddedTweet();
openTweet(tweet.getId(), tweet.getUser().getId(), tweet.getUser().getScreenname());
}
break;
case R.id.hf_list:
if (!favoriteReload.isRefreshing()) {
Tweet tweet = favAdapter.getData().get(position);
if (tweet.getEmbeddedTweet() != null)
tweet = tweet.getEmbeddedTweet();
openTweet(tweet.getId(), tweet.getUser().getId(), tweet.getUser().getScreenname());
}
break;
}
}

2
app/src/main/res/layout/page_settings.xml
View File

@ -181,7 +181,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/button_margin"
android:text="@string/database"
android:text="@string/user_data"
android:textSize="18sp" />
<View

2
app/src/main/res/values-de-rDE/strings.xml
View File

@ -12,7 +12,6 @@
<string name="color_settings">Farbeinstellungen</string>
<string name="data_load">Datenverbrauch</string>
<string name="trend_setting">Trendeinstellung</string>
<string name="database">Datenbank</string>
<string name="profile">Profil</string>
<string name="register_link">PIN aufrufen</string>
<string name="profile_image">profilbild</string>
@ -109,4 +108,5 @@
<string name="upload_button">hochladen</string>
<string name="exit_confirm">Änderungen verwerfen?</string>
<string name="toggle_answer">Antworten laden</string>
<string name="user_data">Nutzerdaten</string>
</resources>

2
app/src/main/res/values/strings.xml
View File

@ -25,7 +25,6 @@
<string name="followback">follows you</string>
<string name="data_load">data consumption</string>
<string name="trend_setting">trend setting</string>
<string name="database">database</string>
<string name="profile">profile</string>
<string name="register_link">get PIN!</string>
<string name="image">load images</string>
@ -117,4 +116,5 @@
<string name="upload_button">upload</string>
<string name="exit_confirm">discard changes?</string>
<string name="toggle_answer">Load answer</string>
<string name="user_data">User data</string>
</resources>