diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/TwitterSearch.java b/app/src/main/java/org/nuclearfog/twidda/backend/TwitterSearch.java index 5e830b8f..5efa873e 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/TwitterSearch.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/TwitterSearch.java @@ -111,10 +111,5 @@ public class TwitterSearch extends AsyncTask { searchAdapter.notifyDataSetChanged(); userAdapter.notifyDataSetChanged(); tweetReload.setRefreshing(false); - connect.dismiss(); - } - - public interface OnDismiss { - void dismiss(); } } \ No newline at end of file diff --git a/app/src/main/java/org/nuclearfog/twidda/window/SearchPage.java b/app/src/main/java/org/nuclearfog/twidda/window/SearchPage.java index 7c6a73b5..ee9ec5ba 100644 --- a/app/src/main/java/org/nuclearfog/twidda/window/SearchPage.java +++ b/app/src/main/java/org/nuclearfog/twidda/window/SearchPage.java @@ -1,7 +1,6 @@ package org.nuclearfog.twidda.window; import android.annotation.SuppressLint; -import android.app.Dialog; import android.content.Intent; import android.os.Bundle; import android.support.v4.widget.SwipeRefreshLayout; @@ -15,7 +14,6 @@ import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; -import android.view.Window; import android.view.animation.Animation; import android.view.animation.TranslateAnimation; import android.widget.TabHost; @@ -24,7 +22,6 @@ import android.widget.TabHost.OnTabChangeListener; import org.nuclearfog.twidda.R; import org.nuclearfog.twidda.backend.GlobalSettings; import org.nuclearfog.twidda.backend.TwitterSearch; -import org.nuclearfog.twidda.backend.TwitterSearch.OnDismiss; import org.nuclearfog.twidda.backend.listitems.Tweet; import org.nuclearfog.twidda.backend.listitems.TwitterUser; import org.nuclearfog.twidda.viewadapter.TimelineRecycler; @@ -32,13 +29,12 @@ import org.nuclearfog.twidda.viewadapter.TimelineRecycler.OnItemClicked; import org.nuclearfog.twidda.viewadapter.UserRecycler; public class SearchPage extends AppCompatActivity implements UserRecycler.OnItemClicked, - OnRefreshListener, OnTabChangeListener, OnItemClicked, OnDismiss { + OnRefreshListener, OnTabChangeListener, OnItemClicked { private RecyclerView tweetSearch,userSearch; private SwipeRefreshLayout tweetReload; private TwitterSearch mSearch; private TabHost tabhost; - private Dialog popup; private View lastView; private String search = ""; private int tabIndex = 0; @@ -60,7 +56,6 @@ public class SearchPage extends AppCompatActivity implements UserRecycler.OnItem if(getSupportActionBar() != null) getSupportActionBar().setDisplayShowTitleEnabled(false); - popup = new Dialog(this); tweetSearch = findViewById(R.id.tweet_result); tweetSearch.setLayoutManager(new LinearLayoutManager(this)); tweetSearch.setBackgroundColor(background); @@ -85,8 +80,6 @@ public class SearchPage extends AppCompatActivity implements UserRecycler.OnItem mSearch.cancel(true); tweetReload.setRefreshing(false); } - if (popup.isShowing()) - popup.dismiss(); super.onPause(); } @@ -223,29 +216,7 @@ public class SearchPage extends AppCompatActivity implements UserRecycler.OnItem @SuppressLint("InflateParams") private void getContent() { mSearch = new TwitterSearch(this); + tweetReload.setRefreshing(true); mSearch.execute(search); - - popup.requestWindowFeature(Window.FEATURE_NO_TITLE); - popup.setCanceledOnTouchOutside(false); - if (popup.getWindow() != null) - popup.getWindow().setBackgroundDrawableResource(android.R.color.transparent); - View load = getLayoutInflater().inflate(R.layout.item_load, null, false); - View cancelButton = load.findViewById(R.id.kill_button); - popup.setContentView(load); - cancelButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (mSearch != null && !mSearch.isCancelled()) - mSearch.cancel(true); - popup.dismiss(); - } - }); - popup.show(); - } - - @Override - public void dismiss() { - if (popup != null) - popup.dismiss(); } } \ No newline at end of file diff --git a/app/src/main/java/org/nuclearfog/twidda/window/TweetDetail.java b/app/src/main/java/org/nuclearfog/twidda/window/TweetDetail.java index fb5b21d4..8e32296f 100644 --- a/app/src/main/java/org/nuclearfog/twidda/window/TweetDetail.java +++ b/app/src/main/java/org/nuclearfog/twidda/window/TweetDetail.java @@ -220,6 +220,8 @@ public class TweetDetail extends AppCompatActivity implements OnClickListener, txtTw.setTextColor(fontColor); new StatusLoader(this).execute(tweetID, StatusLoader.LOAD_DB); mStat = new StatusLoader(this); + + answerReload.setRefreshing(true); mReply = new StatusLoader(this); mStat.execute(tweetID, StatusLoader.LOAD_TWEET); mReply.execute(tweetID, StatusLoader.LOAD_REPLY); diff --git a/app/src/main/java/org/nuclearfog/twidda/window/UserProfile.java b/app/src/main/java/org/nuclearfog/twidda/window/UserProfile.java index 32012129..167479dc 100644 --- a/app/src/main/java/org/nuclearfog/twidda/window/UserProfile.java +++ b/app/src/main/java/org/nuclearfog/twidda/window/UserProfile.java @@ -261,6 +261,8 @@ public class UserProfile extends AppCompatActivity implements OnClickListener, mProfile = new ProfileLoader(this); mTweets = new ProfileLoader(this); mFavorites = new ProfileLoader(this); + homeReload.setRefreshing(true); + favoriteReload.setRefreshing(true); mProfile.execute(userId, ProfileLoader.GET_INF); mTweets.execute(userId, ProfileLoader.GET_TWEETS,1L); mFavorites.execute(userId, ProfileLoader.GET_FAVORS, 1L); diff --git a/app/src/main/res/layout/imagepreview.xml b/app/src/main/res/layout/imagepreview.xml index 426e32f0..ab85ab24 100644 --- a/app/src/main/res/layout/imagepreview.xml +++ b/app/src/main/res/layout/imagepreview.xml @@ -23,4 +23,5 @@ android:layout_height="32dp" android:background="@drawable/right" android:visibility="invisible" /> + \ No newline at end of file diff --git a/app/src/main/res/layout/item_load.xml b/app/src/main/res/layout/item_load.xml index 28fa950e..5a307dcf 100644 --- a/app/src/main/res/layout/item_load.xml +++ b/app/src/main/res/layout/item_load.xml @@ -18,4 +18,5 @@ android:layout_gravity="center" android:contentDescription="@string/progress_kill" android:src="@drawable/cross" /> + \ No newline at end of file diff --git a/app/src/main/res/layout/item_trend.xml b/app/src/main/res/layout/item_trend.xml index ab6cc5cb..24b02fae 100644 --- a/app/src/main/res/layout/item_trend.xml +++ b/app/src/main/res/layout/item_trend.xml @@ -27,7 +27,7 @@ android:layout_weight="1" android:singleLine="true" android:textSize="20sp" /> + - - + \ No newline at end of file diff --git a/app/src/main/res/layout/item_tweet.xml b/app/src/main/res/layout/item_tweet.xml index 5ba70bc4..a40f3459 100644 --- a/app/src/main/res/layout/item_tweet.xml +++ b/app/src/main/res/layout/item_tweet.xml @@ -26,6 +26,7 @@ android:layout_height="@dimen/profile_small" android:layout_gravity="center_vertical" android:contentDescription="@string/profile_image" /> + + + + diff --git a/app/src/main/res/layout/mainpage.xml b/app/src/main/res/layout/mainpage.xml index ed56aa01..ba8c131a 100644 --- a/app/src/main/res/layout/mainpage.xml +++ b/app/src/main/res/layout/mainpage.xml @@ -38,6 +38,7 @@ android:id="@+id/tl_list" android:layout_width="match_parent" android:layout_height="match_parent" /> + + + diff --git a/app/src/main/res/layout/profilepage.xml b/app/src/main/res/layout/profilepage.xml index c6ca3d6b..3125b1aa 100644 --- a/app/src/main/res/layout/profilepage.xml +++ b/app/src/main/res/layout/profilepage.xml @@ -44,6 +44,7 @@ android:layout_height="@dimen/profile_image" android:layout_marginEnd="5dp" android:contentDescription="@string/profile_image" /> + + + + @@ -188,7 +192,6 @@ android:fillViewport="true" app:layout_behavior="android.support.design.widget.AppBarLayout$ScrollingViewBehavior"> - + + diff --git a/app/src/main/res/layout/searchpage.xml b/app/src/main/res/layout/searchpage.xml index f2fb91ea..17f5416d 100644 --- a/app/src/main/res/layout/searchpage.xml +++ b/app/src/main/res/layout/searchpage.xml @@ -1,6 +1,7 @@ + - \ No newline at end of file diff --git a/app/src/main/res/layout/settingpage.xml b/app/src/main/res/layout/settingpage.xml index b0ba93c3..7896ba38 100644 --- a/app/src/main/res/layout/settingpage.xml +++ b/app/src/main/res/layout/settingpage.xml @@ -74,6 +74,7 @@ android:layout_margin="5dp" android:layout_weight="1" android:text="@string/highlight" /> + + \ No newline at end of file diff --git a/app/src/main/res/layout/userpage.xml b/app/src/main/res/layout/userpage.xml index 7d2159c4..9a207609 100644 --- a/app/src/main/res/layout/userpage.xml +++ b/app/src/main/res/layout/userpage.xml @@ -11,8 +11,6 @@ - - + android:layout_height="match_parent" /> \ No newline at end of file