diff --git a/app/src/main/java/com/gh/base/BaseActivity_TabLayout.java b/app/src/main/java/com/gh/base/BaseActivity_TabLayout.java index f4d680fc22..a87f0bc785 100644 --- a/app/src/main/java/com/gh/base/BaseActivity_TabLayout.java +++ b/app/src/main/java/com/gh/base/BaseActivity_TabLayout.java @@ -33,6 +33,9 @@ public abstract class BaseActivity_TabLayout extends ToolBarActivity implements protected NoScrollableViewPager mViewPager; @BindView(R.id.activity_tab_indicator) protected TabIndicatorView mTabIndicatorView; + @Nullable + @BindView(R.id.dividerLine) + protected View mDividerLineView; protected List mFragmentsList; diff --git a/app/src/main/java/com/gh/base/fragment/BaseFragment_TabLayout.java b/app/src/main/java/com/gh/base/fragment/BaseFragment_TabLayout.java index 1782994211..4f2d620a41 100644 --- a/app/src/main/java/com/gh/base/fragment/BaseFragment_TabLayout.java +++ b/app/src/main/java/com/gh/base/fragment/BaseFragment_TabLayout.java @@ -40,6 +40,9 @@ public abstract class BaseFragment_TabLayout extends NormalFragment implements V protected NoScrollableViewPager mViewPager; @BindView(R.id.fragment_tab_indicator) protected TabIndicatorView mTabIndicatorView; + @Nullable + @BindView(R.id.dividerLine) + protected View mDividerLineView; protected List mFragmentsList; diff --git a/app/src/main/java/com/gh/gamecenter/WebActivity.kt b/app/src/main/java/com/gh/gamecenter/WebActivity.kt index 8516fa909d..6f84ba500d 100644 --- a/app/src/main/java/com/gh/gamecenter/WebActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/WebActivity.kt @@ -172,6 +172,7 @@ open class WebActivity : NormalActivity() { val bundle = Bundle() bundle.putString(EntranceUtils.KEY_URL, url) bundle.putBoolean(WebFragment.KEY_IS_BIND_WECHAT, true) + bundle.putBoolean(WebFragment.KEY_LEAVE_WEB_PAGE_TO_HANDLE_BACK_PRESSED, true) return getTargetIntent( context, WebActivity::class.java, diff --git a/app/src/main/java/com/gh/gamecenter/collection/CollectionWrapperFragment.java b/app/src/main/java/com/gh/gamecenter/collection/CollectionWrapperFragment.java index 3f798950e8..b6a7220724 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/CollectionWrapperFragment.java +++ b/app/src/main/java/com/gh/gamecenter/collection/CollectionWrapperFragment.java @@ -1,6 +1,7 @@ package com.gh.gamecenter.collection; import android.os.Bundle; +import android.view.View; import com.gh.base.fragment.BaseFragment_TabLayout; import com.gh.common.util.EntranceUtils; @@ -10,6 +11,7 @@ import com.gh.gamecenter.manager.UserManager; import java.util.List; +import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; /** @@ -31,6 +33,14 @@ public class CollectionWrapperFragment extends BaseFragment_TabLayout { return fragment; } + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + if (mDividerLineView != null) { + mDividerLineView.setVisibility(View.VISIBLE); + } + } + @Override protected int getLayoutId() { return R.layout.fragment_no_padding_tablayout_viewpager; diff --git a/app/src/main/java/com/gh/gamecenter/history/HistoryWrapperFragment.kt b/app/src/main/java/com/gh/gamecenter/history/HistoryWrapperFragment.kt index 77b06ff92a..55c9e01ac8 100644 --- a/app/src/main/java/com/gh/gamecenter/history/HistoryWrapperFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/history/HistoryWrapperFragment.kt @@ -2,6 +2,7 @@ package com.gh.gamecenter.history import android.os.Bundle import android.view.MenuItem +import android.view.View import android.widget.TextView import androidx.fragment.app.Fragment import com.gh.base.fragment.BaseFragment_TabLayout @@ -32,6 +33,7 @@ class HistoryWrapperFragment : BaseFragment_TabLayout() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + mDividerLineView?.visibility = View.VISIBLE mViewModel = viewModelProvider() initMenu(R.menu.menu_manage) @@ -117,5 +119,5 @@ class HistoryWrapperFragment : BaseFragment_TabLayout() { } } } - + } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/info/InfoWrapperFragment.java b/app/src/main/java/com/gh/gamecenter/info/InfoWrapperFragment.java index f10bdca8de..c8051638cb 100644 --- a/app/src/main/java/com/gh/gamecenter/info/InfoWrapperFragment.java +++ b/app/src/main/java/com/gh/gamecenter/info/InfoWrapperFragment.java @@ -68,6 +68,9 @@ public class InfoWrapperFragment extends BaseFragment_TabLayout { @Override public void onViewCreated(View view, @Nullable Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); + if (mDividerLineView != null) { + mDividerLineView.setVisibility(View.VISIBLE); + } } @Override diff --git a/app/src/main/java/com/gh/gamecenter/info/StrategyFragment.java b/app/src/main/java/com/gh/gamecenter/info/StrategyFragment.java index 27f82abd7b..916f8117fe 100644 --- a/app/src/main/java/com/gh/gamecenter/info/StrategyFragment.java +++ b/app/src/main/java/com/gh/gamecenter/info/StrategyFragment.java @@ -42,9 +42,11 @@ import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; + import butterknife.BindView; import butterknife.OnClick; import io.reactivex.android.schedulers.AndroidSchedulers; @@ -102,6 +104,7 @@ public class StrategyFragment extends BaseFragment implements SwipeRefreshLayout mSwipeRefreshLayout.setColorSchemeResources(R.color.theme); mSwipeRefreshLayout.setOnRefreshListener(this); + mCachedView.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.white)); mStrategyAdapter = new StrategyAdapter(getContext(), this, this); mLayoutManager = new LinearLayoutManager(getContext()); diff --git a/app/src/main/java/com/gh/gamecenter/mygame/MyFollowedGameFragment.kt b/app/src/main/java/com/gh/gamecenter/mygame/MyFollowedGameFragment.kt index 3384f82f88..b412ec6b0e 100644 --- a/app/src/main/java/com/gh/gamecenter/mygame/MyFollowedGameFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/mygame/MyFollowedGameFragment.kt @@ -11,10 +11,7 @@ import butterknife.BindView import butterknife.OnClick import com.gh.base.OnRequestCallBackListener import com.gh.common.exposure.ExposureListener -import com.gh.common.util.goneIf -import com.gh.common.util.ifLogin -import com.gh.common.util.toDrawable -import com.gh.common.util.viewModelProvider +import com.gh.common.util.* import com.gh.common.view.Concern_LinearLayout import com.gh.common.view.CustomDividerItemDecoration import com.gh.gamecenter.ConcernActivity @@ -74,6 +71,7 @@ class MyFollowedGameFragment : ListFragment // 不需要分页 mListRv.clearOnScrollListeners() mListRv.addOnScrollListener(mExposureListener!!) + mListRv.setBackgroundColor(R.color.white.toColor()) recommendRecyclerView.setHasFixedSize(true) recommendRecyclerView.layoutManager = GridLayoutManager(context, 4) diff --git a/app/src/main/java/com/gh/gamecenter/mygame/MyGameActivity.kt b/app/src/main/java/com/gh/gamecenter/mygame/MyGameActivity.kt index 1a61e45d12..7345e85694 100644 --- a/app/src/main/java/com/gh/gamecenter/mygame/MyGameActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/mygame/MyGameActivity.kt @@ -5,6 +5,7 @@ import android.content.Intent import android.os.Bundle import android.view.Gravity import android.view.MenuItem +import android.view.View import android.widget.LinearLayout import androidx.fragment.app.Fragment import com.gh.base.BaseActivity_TabLayout @@ -22,6 +23,7 @@ class MyGameActivity : BaseActivity_TabLayout() { super.onCreate(savedInstanceState) setNavigationTitle("我的游戏") setToolbarMenu(R.menu.menu_my_game) + mDividerLineView?.visibility = View.VISIBLE showGuide() } diff --git a/app/src/main/java/com/gh/gamecenter/mygame/MyReservationFragment.kt b/app/src/main/java/com/gh/gamecenter/mygame/MyReservationFragment.kt index b53e95167e..00dbaf4d13 100644 --- a/app/src/main/java/com/gh/gamecenter/mygame/MyReservationFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/mygame/MyReservationFragment.kt @@ -10,6 +10,7 @@ import butterknife.BindView import butterknife.OnClick import com.gh.common.exposure.ExposureListener import com.gh.common.util.ifLogin +import com.gh.common.util.toColor import com.gh.common.util.toDrawable import com.gh.common.util.viewModelProvider import com.gh.common.view.CustomDividerItemDecoration @@ -54,6 +55,7 @@ class MyReservationFragment : ListFragment() super.onViewCreated(view, savedInstanceState) mListRv.addOnScrollListener(mExposureListener!!) + mListRv.setBackgroundColor(R.color.white.toColor()) } override fun onStart() { diff --git a/app/src/main/java/com/gh/gamecenter/mygame/PlayedGameAdapter.kt b/app/src/main/java/com/gh/gamecenter/mygame/PlayedGameAdapter.kt index 0c50bc8146..df6ede36c1 100644 --- a/app/src/main/java/com/gh/gamecenter/mygame/PlayedGameAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/mygame/PlayedGameAdapter.kt @@ -147,6 +147,7 @@ open class PlayedGameAdapter(context: Context, holder.initItemPadding() holder.initFooterViewHolder(mViewModel, mIsLoading, mIsNetworkError, mIsOver) holder.hint.setTextColor(R.color.text_subtitleDesc.toColor()) + holder.itemView.setBackgroundColor(R.color.white.toColor()) } } } diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/MyArticleFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/article/MyArticleFragment.kt index 4d1a412944..3675c97779 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/MyArticleFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/MyArticleFragment.kt @@ -4,12 +4,10 @@ import android.app.Activity import android.content.Intent import android.os.Bundle import android.view.MenuItem +import android.view.View import androidx.lifecycle.ViewModelProviders import androidx.recyclerview.widget.RecyclerView -import com.gh.common.util.EntranceUtils -import com.gh.common.util.checkStoragePermissionBeforeAction -import com.gh.common.util.ifLogin -import com.gh.common.util.toDrawable +import com.gh.common.util.* import com.gh.common.view.CustomDividerItemDecoration import com.gh.gamecenter.R import com.gh.gamecenter.baselist.ListFragment @@ -80,6 +78,11 @@ class MyArticleFragment : ListFragment + + - - + + + + - - diff --git a/app/src/main/res/layout/news_image1_item.xml b/app/src/main/res/layout/news_image1_item.xml index 84edbb7fe1..1e8bf7cf51 100644 --- a/app/src/main/res/layout/news_image1_item.xml +++ b/app/src/main/res/layout/news_image1_item.xml @@ -3,6 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" + xmlns:app="http://schemas.android.com/apk/res-auto" android:background="@drawable/reuse_listview_item_style" android:orientation="horizontal" android:paddingLeft="16dp" @@ -24,7 +25,8 @@ android:id="@+id/news_image1_thumb" style="@style/frescoStyle" android:layout_width="80dp" - android:layout_height="60dp" /> + android:layout_height="60dp" + app:roundedCornerRadius="8dp"/> + android:layout_weight="1" + app:roundedCornerRadius="8dp"/> + android:layout_weight="1" + app:roundedCornerRadius="8dp"/> + android:layout_weight="1" + app:roundedCornerRadius="8dp"/> diff --git a/app/src/main/res/layout/news_image3_item.xml b/app/src/main/res/layout/news_image3_item.xml index 47ccf05934..ea7df54335 100644 --- a/app/src/main/res/layout/news_image3_item.xml +++ b/app/src/main/res/layout/news_image3_item.xml @@ -42,6 +42,7 @@ style="@style/frescoStyle" android:layout_width="match_parent" android:layout_height="wrap_content" + fresco:roundedCornerRadius="8dp" fresco:viewAspectRatio="3" />