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

bugfix, cleanup

This commit is contained in:
NudeDude 2018-08-14 11:57:49 +02:00
parent 8c9c230582
commit c902503037
4 changed files with 39 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,7 +39,7 @@ public class MainActivity extends AppCompatActivity implements OnRefreshListener
private MenuItem profile, tweet, search, setting;
private SearchView searchQuery;
private GlobalSettings settings;
private MainPage home;
private MainPage home, trend, mention;
private View lastTab;
private Toolbar toolbar;
private TabHost tabhost;
@ -108,6 +108,7 @@ public class MainActivity extends AppCompatActivity implements OnRefreshListener
super.onActivityResult(reqCode,returnCode,i);
if(reqCode == REQ_CODE) {
if (returnCode != RESULT_OK) {
overridePendingTransition(0, 0);
finish();
}
}
@ -151,7 +152,6 @@ public class MainActivity extends AppCompatActivity implements OnRefreshListener
case R.id.action_tweet:
intent = new Intent(this, TweetPopup.class);
intent.putExtra("TweetID", -1);
startActivity(intent);
return true;
@ -171,7 +171,13 @@ public class MainActivity extends AppCompatActivity implements OnRefreshListener
if (home != null && !home.isCancelled()) {
home.cancel(true);
timelineReload.setRefreshing(false);
}
if (trend != null && !trend.isCancelled()) {
trend.cancel(true);
trendReload.setRefreshing(false);
}
if (mention != null && !mention.isCancelled()) {
mention.cancel(true);
mentionReload.setRefreshing(false);
}
super.onPause();
@ -201,25 +207,24 @@ public class MainActivity extends AppCompatActivity implements OnRefreshListener
@Override
public void onRefresh() {
home = new MainPage(MainActivity.this);
switch (tabIndex) {
case 0:
home = new MainPage(MainActivity.this);
home.execute(MainPage.HOME,1);
break;
case 1:
home.execute(MainPage.TRND,1);
trend = new MainPage(MainActivity.this);
trend.execute(MainPage.TRND, 1);
break;
case 2:
home.execute(MainPage.MENT,1);
mention = new MainPage(MainActivity.this);
mention.execute(MainPage.MENT, 1);
break;
}
}
@Override
public void onTabChanged(String tabId) {
mentionReload.setRefreshing(false);
trendReload.setRefreshing(false);
timelineReload.setRefreshing(false);
searchQuery.onActionViewCollapsed();
animate();
tabIndex = tabhost.getCurrentTab();
@ -276,11 +281,10 @@ public class MainActivity extends AppCompatActivity implements OnRefreshListener
Intent intent = new Intent(this, SearchPage.class);
if(search.startsWith("#")) {
intent.putExtra("Addition", search);
intent.putExtra("search", search);
} else {
search = '\"'+ search + '\"';
intent.putExtra("search", search);
search = '\"' + search + '\"';
}
intent.putExtra("search", search);
startActivity(intent);
}
break;
@ -292,7 +296,6 @@ public class MainActivity extends AppCompatActivity implements OnRefreshListener
if(tweet.embedded != null) {
tweet = tweet.embedded;
}
Intent intent = new Intent(this, TweetDetail.class);
intent.putExtra("tweetID", tweet.tweetID);
intent.putExtra("userID", tweet.user.userID);

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

@ -82,14 +82,25 @@ public class SearchPage extends AppCompatActivity implements UserRecycler.OnItem
@Override
protected void onPause() {
if (mSearch != null && !mSearch.isCancelled()) {
mSearch.cancel(true);
tweetReload.setRefreshing(false);
if (tweetReload.isRefreshing()) {
mSearch.cancel(true);
tweetReload.setRefreshing(false);
}
}
if (popup.isShowing())
popup.dismiss();
super.onPause();
}
@Override
protected void onDestroy() {
if (mSearch != null && !mSearch.isCancelled()) {
mSearch.cancel(true);
tweetReload.setRefreshing(false);
}
super.onDestroy();
}
@Override
public void onBackPressed() {
if(tabIndex == 1) {
@ -176,9 +187,6 @@ public class SearchPage extends AppCompatActivity implements UserRecycler.OnItem
public void onTabChanged(String tabId) {
animate();
tabIndex = tabhost.getCurrentTab();
if(tabIndex == 1) {
tweetReload.setRefreshing(false);
}
}
private void setTabs(TabHost tabhost) {

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

@ -89,9 +89,6 @@ public class TweetDetail extends AppCompatActivity implements OnClickListener,
@Override
protected void onPause() {
if (mStat != null && !mStat.isCancelled()) {
mStat.cancel(true);
}
if (mReply != null && !mReply.isCancelled()) {
mReply.cancel(true);
answerReload.setRefreshing(false);
@ -99,6 +96,14 @@ public class TweetDetail extends AppCompatActivity implements OnClickListener,
super.onPause();
}
@Override
protected void onDestroy() {
if (mStat != null && !mStat.isCancelled()) {
mStat.cancel(true);
}
super.onDestroy();
}
@Override
public boolean onCreateOptionsMenu(Menu m) {
getMenuInflater().inflate(R.menu.tweet, m);

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

@ -180,8 +180,6 @@ public class UserProfile extends AppCompatActivity implements OnClickListener,
@Override
public void onTabChanged(String tabId) {
homeReload.setRefreshing(false);
favoriteReload.setRefreshing(false);
animate();
tabIndex = mTab.getCurrentTab();
}
@ -234,14 +232,14 @@ public class UserProfile extends AppCompatActivity implements OnClickListener,
leftOut.setDuration(ANIM_DUR);
rightOut.setDuration(ANIM_DUR);
View currentView = mTab.getCurrentView();
View currentTab = mTab.getCurrentView();
if( mTab.getCurrentTab() > tabIndex ) {
lastView.setAnimation(leftOut);
currentView.setAnimation(rightIn);
currentTab.setAnimation(rightIn);
} else {
lastView.setAnimation(rightOut);
currentView.setAnimation(leftIn);
currentTab.setAnimation(leftIn);
}
lastView = mTab.getCurrentView();
}