bugfix, cleanup
This commit is contained in:
parent
8c9c230582
commit
c902503037
|
@ -39,7 +39,7 @@ public class MainActivity extends AppCompatActivity implements OnRefreshListener
|
||||||
private MenuItem profile, tweet, search, setting;
|
private MenuItem profile, tweet, search, setting;
|
||||||
private SearchView searchQuery;
|
private SearchView searchQuery;
|
||||||
private GlobalSettings settings;
|
private GlobalSettings settings;
|
||||||
private MainPage home;
|
private MainPage home, trend, mention;
|
||||||
private View lastTab;
|
private View lastTab;
|
||||||
private Toolbar toolbar;
|
private Toolbar toolbar;
|
||||||
private TabHost tabhost;
|
private TabHost tabhost;
|
||||||
|
@ -108,6 +108,7 @@ public class MainActivity extends AppCompatActivity implements OnRefreshListener
|
||||||
super.onActivityResult(reqCode,returnCode,i);
|
super.onActivityResult(reqCode,returnCode,i);
|
||||||
if(reqCode == REQ_CODE) {
|
if(reqCode == REQ_CODE) {
|
||||||
if (returnCode != RESULT_OK) {
|
if (returnCode != RESULT_OK) {
|
||||||
|
overridePendingTransition(0, 0);
|
||||||
finish();
|
finish();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -151,7 +152,6 @@ public class MainActivity extends AppCompatActivity implements OnRefreshListener
|
||||||
|
|
||||||
case R.id.action_tweet:
|
case R.id.action_tweet:
|
||||||
intent = new Intent(this, TweetPopup.class);
|
intent = new Intent(this, TweetPopup.class);
|
||||||
intent.putExtra("TweetID", -1);
|
|
||||||
startActivity(intent);
|
startActivity(intent);
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
|
@ -171,7 +171,13 @@ public class MainActivity extends AppCompatActivity implements OnRefreshListener
|
||||||
if (home != null && !home.isCancelled()) {
|
if (home != null && !home.isCancelled()) {
|
||||||
home.cancel(true);
|
home.cancel(true);
|
||||||
timelineReload.setRefreshing(false);
|
timelineReload.setRefreshing(false);
|
||||||
|
}
|
||||||
|
if (trend != null && !trend.isCancelled()) {
|
||||||
|
trend.cancel(true);
|
||||||
trendReload.setRefreshing(false);
|
trendReload.setRefreshing(false);
|
||||||
|
}
|
||||||
|
if (mention != null && !mention.isCancelled()) {
|
||||||
|
mention.cancel(true);
|
||||||
mentionReload.setRefreshing(false);
|
mentionReload.setRefreshing(false);
|
||||||
}
|
}
|
||||||
super.onPause();
|
super.onPause();
|
||||||
|
@ -201,25 +207,24 @@ public class MainActivity extends AppCompatActivity implements OnRefreshListener
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onRefresh() {
|
public void onRefresh() {
|
||||||
home = new MainPage(MainActivity.this);
|
|
||||||
switch (tabIndex) {
|
switch (tabIndex) {
|
||||||
case 0:
|
case 0:
|
||||||
|
home = new MainPage(MainActivity.this);
|
||||||
home.execute(MainPage.HOME,1);
|
home.execute(MainPage.HOME,1);
|
||||||
break;
|
break;
|
||||||
case 1:
|
case 1:
|
||||||
home.execute(MainPage.TRND,1);
|
trend = new MainPage(MainActivity.this);
|
||||||
|
trend.execute(MainPage.TRND, 1);
|
||||||
break;
|
break;
|
||||||
case 2:
|
case 2:
|
||||||
home.execute(MainPage.MENT,1);
|
mention = new MainPage(MainActivity.this);
|
||||||
|
mention.execute(MainPage.MENT, 1);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onTabChanged(String tabId) {
|
public void onTabChanged(String tabId) {
|
||||||
mentionReload.setRefreshing(false);
|
|
||||||
trendReload.setRefreshing(false);
|
|
||||||
timelineReload.setRefreshing(false);
|
|
||||||
searchQuery.onActionViewCollapsed();
|
searchQuery.onActionViewCollapsed();
|
||||||
animate();
|
animate();
|
||||||
tabIndex = tabhost.getCurrentTab();
|
tabIndex = tabhost.getCurrentTab();
|
||||||
|
@ -276,11 +281,10 @@ public class MainActivity extends AppCompatActivity implements OnRefreshListener
|
||||||
Intent intent = new Intent(this, SearchPage.class);
|
Intent intent = new Intent(this, SearchPage.class);
|
||||||
if(search.startsWith("#")) {
|
if(search.startsWith("#")) {
|
||||||
intent.putExtra("Addition", search);
|
intent.putExtra("Addition", search);
|
||||||
intent.putExtra("search", search);
|
|
||||||
} else {
|
} else {
|
||||||
search = '\"'+ search + '\"';
|
search = '\"' + search + '\"';
|
||||||
intent.putExtra("search", search);
|
|
||||||
}
|
}
|
||||||
|
intent.putExtra("search", search);
|
||||||
startActivity(intent);
|
startActivity(intent);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -292,7 +296,6 @@ public class MainActivity extends AppCompatActivity implements OnRefreshListener
|
||||||
if(tweet.embedded != null) {
|
if(tweet.embedded != null) {
|
||||||
tweet = tweet.embedded;
|
tweet = tweet.embedded;
|
||||||
}
|
}
|
||||||
|
|
||||||
Intent intent = new Intent(this, TweetDetail.class);
|
Intent intent = new Intent(this, TweetDetail.class);
|
||||||
intent.putExtra("tweetID", tweet.tweetID);
|
intent.putExtra("tweetID", tweet.tweetID);
|
||||||
intent.putExtra("userID", tweet.user.userID);
|
intent.putExtra("userID", tweet.user.userID);
|
||||||
|
|
|
@ -82,14 +82,25 @@ public class SearchPage extends AppCompatActivity implements UserRecycler.OnItem
|
||||||
@Override
|
@Override
|
||||||
protected void onPause() {
|
protected void onPause() {
|
||||||
if (mSearch != null && !mSearch.isCancelled()) {
|
if (mSearch != null && !mSearch.isCancelled()) {
|
||||||
mSearch.cancel(true);
|
if (tweetReload.isRefreshing()) {
|
||||||
tweetReload.setRefreshing(false);
|
mSearch.cancel(true);
|
||||||
|
tweetReload.setRefreshing(false);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (popup.isShowing())
|
if (popup.isShowing())
|
||||||
popup.dismiss();
|
popup.dismiss();
|
||||||
super.onPause();
|
super.onPause();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onDestroy() {
|
||||||
|
if (mSearch != null && !mSearch.isCancelled()) {
|
||||||
|
mSearch.cancel(true);
|
||||||
|
tweetReload.setRefreshing(false);
|
||||||
|
}
|
||||||
|
super.onDestroy();
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onBackPressed() {
|
public void onBackPressed() {
|
||||||
if(tabIndex == 1) {
|
if(tabIndex == 1) {
|
||||||
|
@ -176,9 +187,6 @@ public class SearchPage extends AppCompatActivity implements UserRecycler.OnItem
|
||||||
public void onTabChanged(String tabId) {
|
public void onTabChanged(String tabId) {
|
||||||
animate();
|
animate();
|
||||||
tabIndex = tabhost.getCurrentTab();
|
tabIndex = tabhost.getCurrentTab();
|
||||||
if(tabIndex == 1) {
|
|
||||||
tweetReload.setRefreshing(false);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void setTabs(TabHost tabhost) {
|
private void setTabs(TabHost tabhost) {
|
||||||
|
|
|
@ -89,9 +89,6 @@ public class TweetDetail extends AppCompatActivity implements OnClickListener,
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onPause() {
|
protected void onPause() {
|
||||||
if (mStat != null && !mStat.isCancelled()) {
|
|
||||||
mStat.cancel(true);
|
|
||||||
}
|
|
||||||
if (mReply != null && !mReply.isCancelled()) {
|
if (mReply != null && !mReply.isCancelled()) {
|
||||||
mReply.cancel(true);
|
mReply.cancel(true);
|
||||||
answerReload.setRefreshing(false);
|
answerReload.setRefreshing(false);
|
||||||
|
@ -99,6 +96,14 @@ public class TweetDetail extends AppCompatActivity implements OnClickListener,
|
||||||
super.onPause();
|
super.onPause();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onDestroy() {
|
||||||
|
if (mStat != null && !mStat.isCancelled()) {
|
||||||
|
mStat.cancel(true);
|
||||||
|
}
|
||||||
|
super.onDestroy();
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onCreateOptionsMenu(Menu m) {
|
public boolean onCreateOptionsMenu(Menu m) {
|
||||||
getMenuInflater().inflate(R.menu.tweet, m);
|
getMenuInflater().inflate(R.menu.tweet, m);
|
||||||
|
|
|
@ -180,8 +180,6 @@ public class UserProfile extends AppCompatActivity implements OnClickListener,
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onTabChanged(String tabId) {
|
public void onTabChanged(String tabId) {
|
||||||
homeReload.setRefreshing(false);
|
|
||||||
favoriteReload.setRefreshing(false);
|
|
||||||
animate();
|
animate();
|
||||||
tabIndex = mTab.getCurrentTab();
|
tabIndex = mTab.getCurrentTab();
|
||||||
}
|
}
|
||||||
|
@ -234,14 +232,14 @@ public class UserProfile extends AppCompatActivity implements OnClickListener,
|
||||||
leftOut.setDuration(ANIM_DUR);
|
leftOut.setDuration(ANIM_DUR);
|
||||||
rightOut.setDuration(ANIM_DUR);
|
rightOut.setDuration(ANIM_DUR);
|
||||||
|
|
||||||
View currentView = mTab.getCurrentView();
|
View currentTab = mTab.getCurrentView();
|
||||||
|
|
||||||
if( mTab.getCurrentTab() > tabIndex ) {
|
if( mTab.getCurrentTab() > tabIndex ) {
|
||||||
lastView.setAnimation(leftOut);
|
lastView.setAnimation(leftOut);
|
||||||
currentView.setAnimation(rightIn);
|
currentTab.setAnimation(rightIn);
|
||||||
} else {
|
} else {
|
||||||
lastView.setAnimation(rightOut);
|
lastView.setAnimation(rightOut);
|
||||||
currentView.setAnimation(leftIn);
|
currentTab.setAnimation(leftIn);
|
||||||
}
|
}
|
||||||
lastView = mTab.getCurrentView();
|
lastView = mTab.getCurrentView();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue