Merge branch 'dev-ranklist'

TMessagesProj/src/main/java/org/telegram/cricdit/adapter/NewsSearchGuessAdapter.java

@@ -19,6 +19,7 @@ import org.telegram.cricdit.ui.RankDetailActivity;
 import org.telegram.cricdit.ui.RankDetailCommentFragment;
 import org.telegram.cricdit.utils.ColorUtil;
 import org.telegram.messenger.R;
+import org.telegram.messenger.SharedConfig;
 import org.telegram.ui.ActionBar.BaseFragment;
 
 import java.util.List;
@@ -51,9 +52,12 @@ public class NewsSearchGuessAdapter extends RecyclerView.Adapter<NewsSearchGuess
             holder.textView.setCompoundDrawables(null, null, drawable,null);
         }
         holder.itemView.setOnClickListener(v -> {
+            SharedConfig.noStatusBar = true;
             NewsSearchBean.NewsGuessBean guessBean = data.get(holder.getAdapterPosition());
             Bundle bundle = new Bundle();
             bundle.putInt("rank_id",guessBean.getId());
+            bundle.putString("type", "top");
+            bundle.putString("id", guessBean.getId() + "");
             fragment.presentFragment(RankDetailCommentFragment.newInstance(bundle));
         });
     }

TMessagesProj/src/main/java/org/telegram/cricdit/adapter/NewsSearchHotAdapter.java

@@ -25,6 +25,7 @@ import org.telegram.cricdit.utils.DensityUtil;
 import org.telegram.cricdit.utils.UIUtil;
 import org.telegram.messenger.LocaleController;
 import org.telegram.messenger.R;
+import org.telegram.messenger.SharedConfig;
 import org.telegram.ui.ActionBar.BaseFragment;
 
 import java.util.List;
@@ -74,6 +75,7 @@ public class NewsSearchHotAdapter extends BaseQuickAdapter<NewsSearchBean.NewsHo
         viewFront.setBackground((index%5>2)?gdGrey:gdBlue);
         viewFront.setText(index+1 +"");
         holder.getView(R.id.rl_main).setOnClickListener(view -> {
+            SharedConfig.noStatusBar = true;
             Bundle bundle = new Bundle();
             bundle.putInt("news_id",newsHotBean.getId());
             fragment.presentFragment(new NewsDetailCommentFragment(bundle));

TMessagesProj/src/main/java/org/telegram/cricdit/ui/MagnifyImagesActivity.java

@@ -64,7 +64,7 @@ public class MagnifyImagesActivity extends BaseFragment {
         iv_save = view.findViewById(R.id.iv_save);
         recyclerView = view.findViewById(R.id.recycler);
         fl_main.setBackgroundColor(ColorUtil.COLOR_BLACK);
-        iv_bg.setColorFilter(ColorUtil.COLOR_CHECKED);
+        iv_bg.setColorFilter(ColorUtil.COLOR_BLUE_TEXT);
         recyclerView.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayoutManager.HORIZONTAL, false));
         recyclerView.setAdapter(new RecyclerAdapter(imageUrlsList));
         LinearSnapHelper snapHelper = new LinearSnapHelper();

TMessagesProj/src/main/java/org/telegram/cricdit/ui/NewsDetailActivity.java

@@ -266,10 +266,10 @@ public class NewsDetailActivity extends BaseActivity<NewsDetailPresenter> implem
                         iv.setLayoutParams(new LinearLayout.LayoutParams(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.WRAP_CONTENT));
                         iv.setPadding(0, 0, 0, UIUtil.dip2px(getContext(), 10));
                         llMoreImg.addView(iv);
-                        iv.setOnClickListener(view -> {
+                        iv.setOnClickListener(v2 -> {
                             Bundle bundle = new Bundle();
                             bundle.putStringArrayList(ImagePreviewActivity.IMAGE_INFO, new ArrayList<>(Arrays.asList(splitList)));
-                            bundle.putInt(ImagePreviewActivity.CURRENT_ITEM,  (Integer) view.getTag());
+                            bundle.putInt(ImagePreviewActivity.CURRENT_ITEM,  (Integer) v2.getTag());
                             presentFragment(new MagnifyImagesActivity(bundle));
                         });
                     }

TMessagesProj/src/main/java/org/telegram/cricdit/ui/NewsDetailCommentFragment.java

@@ -1033,10 +1033,12 @@ public class NewsDetailCommentFragment extends BaseActivity<CommentPresenter> im
                     iv.setLayoutParams(new LinearLayout.LayoutParams(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.WRAP_CONTENT));
                     iv.setPadding(0, 0, 0, UIUtil.dip2px(getContext(), 10));
                     llMoreImg.addView(iv);
-                    Bundle bundle = new Bundle();
-                    bundle.putStringArrayList(ImagePreviewActivity.IMAGE_INFO, new ArrayList<>(Arrays.asList(splitList)));
-                    bundle.putInt(ImagePreviewActivity.CURRENT_ITEM, (Integer) view.getTag());
-                    presentFragment(new MagnifyImagesActivity(bundle));
+                    iv.setOnClickListener(v2 -> {
+                        Bundle bundle = new Bundle();
+                        bundle.putStringArrayList(ImagePreviewActivity.IMAGE_INFO, new ArrayList<>(Arrays.asList(splitList)));
+                        bundle.putInt(ImagePreviewActivity.CURRENT_ITEM,  (Integer) v2.getTag());
+                        presentFragment(new MagnifyImagesActivity(bundle));
+                    });
                 }
             }
         }

TMessagesProj/src/main/java/org/telegram/cricdit/ui/NewsFragment.java

@@ -6,6 +6,8 @@ import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewConfiguration;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -39,7 +41,8 @@ public class NewsFragment implements BaseViewFragment, NewsView {
     private BaseFragment mFragment;
     private RecyclerView mRecyclerView;
     private SmartRefreshLayout smartRefreshlayout;
-    private ImageView ivBackTop;
+    private RelativeLayout ivBackTop;
+    private ImageView ivBg;
     private int page = 1, pagesize = 10, offset = 0, topNum = 0;
     private String newsType = "feed";
     private NewsAdapter adapter;
@@ -102,7 +105,7 @@ public class NewsFragment implements BaseViewFragment, NewsView {
     public void showCacheList(Throwable e) {
         ACache mACache = ACache.get(mContext);
         NewsBean data = (NewsBean) mACache.getAsObject("feed".equals(newsType) ? "cache_news_feed_list" : "cache_news_news_list");
-        if (data != null) {
+        if (data != null && adapter.getItemCount() == 0) {
             showList(data);
         } else {
             showError(e);
@@ -141,7 +144,8 @@ public class NewsFragment implements BaseViewFragment, NewsView {
         mRecyclerView = view.findViewById(R.id.mRecyclerView);
         smartRefreshlayout = view.findViewById(R.id.smart_refreshlayout);
         ivBackTop = view.findViewById(R.id.iv_back_top);
-        ivBackTop.setColorFilter(ColorUtil.COLOR_BLUE);
+        ivBg = view.findViewById(R.id.iv_bg);
+        ivBg.setColorFilter(ColorUtil.COLOR_BLUE_TEXT);
 
         LinearLayoutManager linearLayoutManager = new LinearLayoutManager(mContext);
         linearLayoutManager.setOrientation(RecyclerView.VERTICAL);

TMessagesProj/src/main/java/org/telegram/cricdit/ui/NewsSearchActivity.java

@@ -1,9 +1,12 @@
 package org.telegram.cricdit.ui;
 
 import static org.telegram.messenger.AndroidUtilities.hideKeyboard;
+import static org.telegram.messenger.AndroidUtilities.setLightStatusBar;
 import static org.telegram.messenger.AndroidUtilities.showKeyboard;
 
+import android.app.Activity;
 import android.content.Context;
+import android.graphics.Color;
 import android.graphics.drawable.GradientDrawable;
 import android.os.Build;
 import android.os.Bundle;
@@ -43,9 +46,11 @@ import org.telegram.cricdit.utils.UIUtil;
 import org.telegram.messenger.AndroidUtilities;
 import org.telegram.messenger.LocaleController;
 import org.telegram.messenger.R;
+import org.telegram.messenger.SharedConfig;
 import org.telegram.ui.ActionBar.ActionBar;
 import org.telegram.ui.ActionBar.AlertDialog;
 import org.telegram.ui.ActionBar.BaseFragment;
+import org.telegram.ui.LaunchActivity;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -103,6 +108,13 @@ public class NewsSearchActivity extends BaseFragment implements NewsSearchView {
         return null;
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+        SharedConfig.noStatusBar = false;
+        setLightStatusBar(getParentActivity().getWindow(),false);
+    }
+
     private void initView(){
         if (TextUtils.isEmpty(newsType)){finishFragment();}
         mContext = getContext();
@@ -146,7 +158,9 @@ public class NewsSearchActivity extends BaseFragment implements NewsSearchView {
         etSearch.requestFocus();
         etSearch.setFocusableInTouchMode(true);
         etSearch.setOnEditorActionListener((v, actionId, event) -> {
-            if(actionId == EditorInfo.IME_ACTION_SEARCH){toPostSearchWord();}
+            if(actionId == EditorInfo.IME_ACTION_SEARCH){
+                toPostSearchWord();
+            }
             return false;
         });
         showKeyboard(etSearch);
@@ -227,6 +241,7 @@ public class NewsSearchActivity extends BaseFragment implements NewsSearchView {
         }
 
         etSearch.setSelection(word.length());
+        hideKeyboard(etSearch);
         //不重复请求
         if(word.equals(searchedWord)){
             if(searchAdapter.getItemCount() == 0){
@@ -245,7 +260,6 @@ public class NewsSearchActivity extends BaseFragment implements NewsSearchView {
         if(!isEmpty){
             //收起键盘
             searchedWord = word;
-            hideKeyboard(etSearch);
             sPage = 1;
             searchOffset = 0;
             presenter.getSearchWordList(word,sPage,sPageSize,newsType);
@@ -300,6 +314,7 @@ public class NewsSearchActivity extends BaseFragment implements NewsSearchView {
         rvSearch.setLayoutManager(linearLayoutManager);
         searchAdapter = new NewsSearchAdapter(new ArrayList<>(),mContext,newsType);
         searchAdapter.setmOnItemClickListener((view, position, bean) -> {
+            SharedConfig.noStatusBar = true;
             NewsDetailCommentFragment.newsBean = bean;
             presentFragment(new NewsDetailCommentFragment(new Bundle()));
         });
@@ -380,4 +395,10 @@ public class NewsSearchActivity extends BaseFragment implements NewsSearchView {
         }
     }
 
+    @Override
+    public void onPause() {
+        SharedConfig.noStatusBar = true;
+        super.onPause();
+    }
+
 }

TMessagesProj/src/main/java/org/telegram/cricdit/ui/NewsTagActivity.java

@@ -5,6 +5,7 @@ import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewConfiguration;
 import android.widget.ImageView;
+import android.widget.RelativeLayout;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -33,7 +34,8 @@ public class NewsTagActivity extends BaseActivity<NewsPresenter> implements News
     private RecyclerView mRecyclerView;
     private SmartRefreshLayout smartRefreshlayout;
     private MultipleStatusView statusView;
-    private ImageView ivBackTop;
+    private RelativeLayout ivBackTop;
+    private ImageView ivBg;
     private NewsAdapter adapter;
     private int page = 1, pagesize = 10, offset = 0;
     private int distance;
@@ -56,7 +58,8 @@ public class NewsTagActivity extends BaseActivity<NewsPresenter> implements News
         smartRefreshlayout = view.findViewById(R.id.smart_refreshlayout);
         statusView = view.findViewById(R.id.status_view);
         ivBackTop = view.findViewById(R.id.iv_back_top);
-        ivBackTop.setColorFilter(ColorUtil.COLOR_BLUE);
+        ivBg = view.findViewById(R.id.iv_bg);
+        ivBg.setColorFilter(ColorUtil.COLOR_BLUE_TEXT);
 
         LinearLayoutManager linearLayoutManager = new LinearLayoutManager(getContext());
         linearLayoutManager.setOrientation(RecyclerView.VERTICAL);

TMessagesProj/src/main/java/org/telegram/cricdit/ui/RankListActivity.java

@@ -5,6 +5,7 @@ import android.os.Bundle;
 import android.view.View;
 import android.view.ViewConfiguration;
 import android.widget.ImageView;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
@@ -48,7 +49,8 @@ public class RankListActivity extends BaseTabActivity<RankListPresenter> impleme
     private View view_line_1;
     private RecyclerView rvHotRank;
     private RecyclerView rvAllRank;
-    private ImageView ivBackTop;
+    private RelativeLayout ivBackTop;
+    private ImageView ivBg;
     private int rankPage = 1, rankPageSize = 10, rankOffset = 0;
     private RankListTopAdapter hotAdapter;
     private RankListAllAdapter allAdapter;
@@ -85,6 +87,7 @@ public class RankListActivity extends BaseTabActivity<RankListPresenter> impleme
         rvHotRank = view.findViewById(R.id.rv_hot_rank);
         rvAllRank = view.findViewById(R.id.rv_all_rank);
         ivBackTop = view.findViewById(R.id.iv_back_top);
+        ivBg = view.findViewById(R.id.iv_bg);
 
         tv_title_1.setText(LocaleController.getString(R.string.top_of_the_list));
         tv_title_2.setText(LocaleController.getString(R.string.all_leaderboards));
@@ -92,7 +95,7 @@ public class RankListActivity extends BaseTabActivity<RankListPresenter> impleme
         tv_title_2.setTextColor(ColorUtil.COLOR_BLACK_TEXT);
         tv_banner_title.setTextColor(ColorUtil.COLOR_WHITE);
         view_line_1.setBackgroundColor(ColorUtil.COLOR_LINE_GRAY);
-        ivBackTop.setColorFilter(ColorUtil.COLOR_BLUE);
+        ivBg.setColorFilter(ColorUtil.COLOR_BLUE_TEXT);
 
         smartRefreshlayout.setEnableRefresh(true);
         smartRefreshlayout.setOnRefreshListener(refreshLayout -> initData());

TMessagesProj/src/main/res/layout/activity_magnify_images.xml

@@ -21,17 +21,16 @@
 
     <ImageView
         android:id="@+id/iv_bg"
-        android:layout_width="50dp"
-        android:layout_height="50dp"
+        android:layout_width="55dp"
+        android:layout_height="55dp"
         android:layout_gravity="bottom|end"
         android:layout_margin="20dp"
-        android:padding="5dp"
         android:src="@drawable/circle"/>
 
     <ImageView
         android:id="@+id/iv_save"
-        android:layout_width="50dp"
-        android:layout_height="50dp"
+        android:layout_width="55dp"
+        android:layout_height="55dp"
         android:layout_gravity="bottom|end"
         android:layout_margin="20dp"
         android:scaleType="center"

TMessagesProj/src/main/res/layout/activity_ranking_list.xml

@@ -105,15 +105,26 @@
 
     </com.scwang.smart.refresh.layout.SmartRefreshLayout>
 
-    <ImageView
+    <RelativeLayout
         android:id="@+id/iv_back_top"
-        android:layout_width="50dp"
-        android:layout_height="50dp"
-        android:src="@drawable/ic_back_top"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         android:layout_marginRight="15dp"
         android:layout_marginBottom="15dp"
-        android:visibility="gone"/>
+        android:visibility="gone">
+        <ImageView
+            android:id="@+id/iv_bg"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:layout_gravity="bottom|end"
+            android:src="@drawable/circle"/>
+        <ImageView
+            android:layout_width="25dp"
+            android:layout_height="25dp"
+            android:src="@drawable/preview_arrow"
+            android:layout_centerInParent="true"/>
+    </RelativeLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>

TMessagesProj/src/main/res/layout/fragment_detail.xml

@@ -25,16 +25,28 @@
 
     </com.scwang.smart.refresh.layout.SmartRefreshLayout>
 
-    <ImageView
+    <RelativeLayout
         android:id="@+id/iv_back_top"
-        android:layout_width="50dp"
-        android:layout_height="50dp"
-        android:src="@drawable/ic_back_top"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         android:layout_marginRight="15dp"
         android:layout_marginBottom="15dp"
-        android:visibility="gone"/>
+        android:visibility="gone">
+        <ImageView
+            android:id="@+id/iv_bg"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:layout_gravity="bottom|end"
+            android:src="@drawable/circle"/>
+        <ImageView
+            android:layout_width="25dp"
+            android:layout_height="25dp"
+            android:src="@drawable/preview_arrow"
+            android:layout_centerInParent="true"/>
+    </RelativeLayout>
+
 
     <com.classic.common.MultipleStatusView
         android:id="@+id/status_view"