diff --git a/app/src/main/java/com/gc/materialdesign/views/CustomView.java b/app/src/main/java/com/gc/materialdesign/views/CustomView.java deleted file mode 100644 index fa6f0f9334..0000000000 --- a/app/src/main/java/com/gc/materialdesign/views/CustomView.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.gc.materialdesign.views; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Color; -import android.util.AttributeSet; -import android.widget.RelativeLayout; - -public class CustomView extends RelativeLayout { - - - final static String MATERIALDESIGNXML = "http://schemas.android.com/apk/res-auto"; - final static String ANDROIDXML = "http://schemas.android.com/apk/res/android"; - - final int disabledBackgroundColor = Color.parseColor("#E2E2E2"); - // Indicate if user touched this view the last time - public boolean isLastTouch = false; - int beforeBackground; - boolean animation = false; - - public CustomView(Context context, AttributeSet attrs) { - super(context, attrs); - } - - @Override - public void setEnabled(boolean enabled) { - super.setEnabled(enabled); - if (enabled) - setBackgroundColor(beforeBackground); - else - setBackgroundColor(disabledBackgroundColor); - invalidate(); - } - - @Override - protected void onDraw(Canvas canvas) { - super.onDraw(canvas); - if (animation) - invalidate(); - } - - @Override - protected void onAnimationStart() { - super.onAnimationStart(); - animation = true; - } - - @Override - protected void onAnimationEnd() { - super.onAnimationEnd(); - animation = false; - } -} diff --git a/app/src/main/java/com/gc/materialdesign/views/ProgressBarCircularIndeterminate.java b/app/src/main/java/com/gc/materialdesign/views/ProgressBarCircularIndeterminate.java deleted file mode 100644 index 315b2ae793..0000000000 --- a/app/src/main/java/com/gc/materialdesign/views/ProgressBarCircularIndeterminate.java +++ /dev/null @@ -1,175 +0,0 @@ -package com.gc.materialdesign.views; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.PorterDuff; -import android.graphics.PorterDuffXfermode; -import android.graphics.RectF; -import android.util.AttributeSet; - -import androidx.core.content.ContextCompat; - -public class ProgressBarCircularIndeterminate extends CustomView { - - final static String ANDROIDXML = "http://schemas.android.com/apk/res/android"; - - int backgroundColor = Color.parseColor("#1E88E5"); - float radius1 = 0; - float radius2 = 0; - int cont = 0; - boolean firstAnimationOver = false; - int arcD = 1; - int arcO = 0; - float rotateAngle = 0; - int limite = 0; - - public ProgressBarCircularIndeterminate(Context context, AttributeSet attrs) { - super(context, attrs); - setAttributes(attrs); - } - - // Set atributtes of XML to View - protected void setAttributes(AttributeSet attrs) { - - setMinimumHeight(Utils.dpToPx(32, getResources())); - setMinimumWidth(Utils.dpToPx(32, getResources())); - - // Set background Color - // Color by resource - int bacgroundColor = attrs.getAttributeResourceValue(ANDROIDXML, "background", -1); - if (bacgroundColor != -1) { - setBackgroundColor(ContextCompat.getColor(getContext(), bacgroundColor)); - } else { - // Color by hexadecimal - int background = attrs.getAttributeIntValue(ANDROIDXML, "background", -1); - if (background != -1) { - setBackgroundColor(background); - } else { - setBackgroundColor(Color.parseColor("#1E88E5")); - } - } - - setMinimumHeight(Utils.dpToPx(3, getResources())); - - } - - // Set color of background - public void setBackgroundColor(int color) { - super.setBackgroundColor(ContextCompat.getColor(getContext(), android.R.color.transparent)); - if (isEnabled()) { - beforeBackground = backgroundColor; - } - this.backgroundColor = color; - } - - @Override - protected void onDraw(Canvas canvas) { - super.onDraw(canvas); - if (!firstAnimationOver) { - drawFirstAnimation(canvas); - } - if (cont > 0) { - drawSecondAnimation(canvas); - } - invalidate(); - - } - - /** - * Draw first animation of view - * - * @param canvas - */ - private void drawFirstAnimation(Canvas canvas) { - if (radius1 < getWidth() / 2) { - Paint paint = new Paint(); - paint.setAntiAlias(true); - paint.setColor(makePressColor()); - radius1 = (radius1 >= getWidth() / 2) ? (float) getWidth() / 2 : radius1 + 1; - canvas.drawCircle(getWidth() / 2, getHeight() / 2, radius1, paint); - } else { - Bitmap bitmap = Bitmap.createBitmap(canvas.getWidth(), canvas.getHeight(), Bitmap.Config.ARGB_8888); - Canvas temp = new Canvas(bitmap); - Paint paint = new Paint(); - paint.setAntiAlias(true); - paint.setColor(makePressColor()); - temp.drawCircle(getWidth() / 2, getHeight() / 2, getHeight() / 2, paint); - Paint transparentPaint = new Paint(); - transparentPaint.setAntiAlias(true); - transparentPaint.setColor(ContextCompat.getColor(getContext(), android.R.color.transparent)); - transparentPaint.setXfermode(new PorterDuffXfermode( - PorterDuff.Mode.CLEAR)); - if (cont >= 50) { - radius2 = (radius2 >= getWidth() / 2) ? (float) getWidth() / 2 : radius2 + 1; - } else { - radius2 = (radius2 >= getWidth() / 2 - Utils.dpToPx(4, getResources())) ? - (float) getWidth() / 2 - Utils.dpToPx(4, getResources()) : radius2 + 1; - } - temp.drawCircle(getWidth() / 2, getHeight() / 2, radius2, transparentPaint); - canvas.drawBitmap(bitmap, 0, 0, new Paint()); - if (radius2 >= getWidth() / 2 - Utils.dpToPx(4, getResources())) { - cont++; - } - if (radius2 >= getWidth() / 2) { - firstAnimationOver = true; - } - } - } - - /** - * Draw second animation of view - * - * @param canvas - */ - private void drawSecondAnimation(Canvas canvas) { - if (arcO == limite) { - arcD += 6; - } - if (arcD >= 290 || arcO > limite) { - arcO += 6; - arcD -= 6; - } - if (arcO > limite + 290) { - limite = arcO; - arcO = limite; - arcD = 1; - } - rotateAngle += 4; - canvas.rotate(rotateAngle, getWidth() / 2, getHeight() / 2); - - Bitmap bitmap = Bitmap.createBitmap(canvas.getWidth(), canvas.getHeight(), Bitmap.Config.ARGB_8888); - Canvas temp = new Canvas(bitmap); - Paint paint = new Paint(); - paint.setAntiAlias(true); - paint.setColor(backgroundColor); - // temp.drawARGB(0, 0, 0, 255); - temp.drawArc(new RectF(0, 0, getWidth(), getHeight()), arcO, arcD, true, paint); - Paint transparentPaint = new Paint(); - transparentPaint.setAntiAlias(true); - transparentPaint.setColor(ContextCompat.getColor(getContext(), android.R.color.transparent)); - transparentPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.CLEAR)); - temp.drawCircle(getWidth() / 2, getHeight() / 2, (getWidth() / 2) - - Utils.dpToPx(4, getResources()), transparentPaint); - - canvas.drawBitmap(bitmap, 0, 0, new Paint()); - } - - /** - * Make a dark color to ripple effect - * - * @return - */ - protected int makePressColor() { - int r = (this.backgroundColor >> 16) & 0xFF; - int g = (this.backgroundColor >> 8) & 0xFF; - int b = (this.backgroundColor >> 0) & 0xFF; - // r = (r+90 > 245) ? 245 : r+90; - // g = (g+90 > 245) ? 245 : g+90; - // b = (b+90 > 245) ? 245 : b+90; - return Color.argb(128, r, g, b); - } - -} diff --git a/app/src/main/java/com/gc/materialdesign/views/Utils.java b/app/src/main/java/com/gc/materialdesign/views/Utils.java deleted file mode 100644 index b8aa1a7b93..0000000000 --- a/app/src/main/java/com/gc/materialdesign/views/Utils.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.gc.materialdesign.views; - -import android.content.res.Resources; -import android.util.TypedValue; -import android.view.View; - -public class Utils { - - - /** - * Convert Dp to Pixel - */ - public static int dpToPx(float dp, Resources resources) { - float px = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, resources.getDisplayMetrics()); - return (int) px; - } - - public static int getRelativeTop(View myView) { -// if (myView.getParent() == myView.getRootView()) - if (myView.getId() == android.R.id.content) - return myView.getTop(); - else - return myView.getTop() + getRelativeTop((View) myView.getParent()); - } - - public static int getRelativeLeft(View myView) { -// if (myView.getParent() == myView.getRootView()) - if (myView.getId() == android.R.id.content) - return myView.getLeft(); - else - return myView.getLeft() + getRelativeLeft((View) myView.getParent()); - } - -} diff --git a/app/src/main/java/com/gh/gamecenter/ToolBoxActivity.java b/app/src/main/java/com/gh/gamecenter/ToolBoxActivity.java index 268342f8bf..cb88a96dfd 100644 --- a/app/src/main/java/com/gh/gamecenter/ToolBoxActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ToolBoxActivity.java @@ -3,11 +3,6 @@ package com.gh.gamecenter; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import androidx.annotation.NonNull; -import com.google.android.material.appbar.AppBarLayout; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.view.View; import android.view.inputmethod.EditorInfo; @@ -15,7 +10,6 @@ import android.widget.EditText; import android.widget.LinearLayout; import android.widget.TextView; -import com.gc.materialdesign.views.ProgressBarCircularIndeterminate; import com.gh.base.BaseActivity; import com.gh.base.OnRequestCallBackListener; import com.gh.common.util.EntranceUtils; @@ -23,9 +17,14 @@ import com.gh.common.util.TextHelper; import com.gh.common.view.VerticalItemDecoration; import com.gh.gamecenter.adapter.ToolBoxRvAdapter; import com.gh.gamecenter.suggest.SuggestType; +import com.google.android.material.appbar.AppBarLayout; import com.lightgame.utils.Util_System_Keyboard; import com.lightgame.utils.Utils; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import butterknife.BindView; import butterknife.OnClick; @@ -54,8 +53,8 @@ public class ToolBoxActivity extends BaseActivity implements SwipeRefreshLayout. LinearLayout mNoConnection; @BindView(R.id.toolbox_refresh) SwipeRefreshLayout mRefresh; - @BindView(R.id.toolbox_loading) - ProgressBarCircularIndeterminate mLoading; + @BindView(R.id.reuse_ll_loading) + View mLoading; private LinearLayoutManager mLayoutManager; private ToolBoxRvAdapter mRvAdapter; diff --git a/app/src/main/java/com/gh/gamecenter/baselist/ListActivity.java b/app/src/main/java/com/gh/gamecenter/baselist/ListActivity.java index 17dc939708..4e2ab6f68a 100644 --- a/app/src/main/java/com/gh/gamecenter/baselist/ListActivity.java +++ b/app/src/main/java/com/gh/gamecenter/baselist/ListActivity.java @@ -1,17 +1,9 @@ package com.gh.gamecenter.baselist; -import androidx.lifecycle.Observer; -import androidx.lifecycle.ViewModelProviders; import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.DefaultItemAnimator; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.LinearLayout; -import com.gc.materialdesign.views.ProgressBarCircularIndeterminate; import com.gh.base.BaseActivity; import com.gh.common.view.VerticalItemDecoration; import com.gh.gamecenter.R; @@ -21,6 +13,13 @@ import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.util.List; +import androidx.annotation.Nullable; +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProviders; +import androidx.recyclerview.widget.DefaultItemAnimator; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import butterknife.BindView; import io.reactivex.Observable; import io.reactivex.Single; @@ -35,8 +34,8 @@ public abstract class ListActivity(), OnTitleClickListener { @BindView(R.id.subject_list) lateinit var mRvSubject: RecyclerView - @BindView(R.id.subject_pb_loading) + @BindView(R.id.reuse_ll_loading) lateinit var mPbSubject: View @BindView(R.id.reuse_no_connection) lateinit var reuse_no_connection: View diff --git a/app/src/main/java/com/gh/gamecenter/game/GameFragment.kt b/app/src/main/java/com/gh/gamecenter/game/GameFragment.kt index 1fd809fca7..1f4a472188 100644 --- a/app/src/main/java/com/gh/gamecenter/game/GameFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/game/GameFragment.kt @@ -43,16 +43,17 @@ class GameFragment : NormalFragment() { const val SHOULD_SHOW_OPENING_DIALOG = "show_opening_dialog" } + private val mNoConn by bindView(R.id.reuse_no_connection) + private val mLoading by bindView(R.id.reuse_ll_loading) + private var mBinding: FragmentGameBinding? = null private var mSkeleton: ViewSkeletonScreen? = null - private val mNoConn by bindView(R.id.reuse_no_connection) - private var mViewModel: GameViewModel? = null private var mListAdapter: GameFragmentAdapter? = null - private var mLayoutManager: androidx.recyclerview.widget.LinearLayoutManager? = null + private var mLayoutManager: LinearLayoutManager? = null private lateinit var mExposureListener: ExposureListener @@ -84,6 +85,7 @@ class GameFragment : NormalFragment() { mBinding?.loadStatus = it mListAdapter?.setLoadStatus(it) mNoConn.visibility = if (it == LoadStatus.INIT_FAILED) View.VISIBLE else View.GONE + mLoading.visibility = if (it == LoadStatus.INIT_LOADING) View.VISIBLE else View.GONE if (it != LoadStatus.INIT_LOADING) { mSkeleton?.hide() } else { diff --git a/app/src/main/java/com/gh/gamecenter/info/ConcernFragment.java b/app/src/main/java/com/gh/gamecenter/info/ConcernFragment.java index 8c00b4641e..c7887d5240 100644 --- a/app/src/main/java/com/gh/gamecenter/info/ConcernFragment.java +++ b/app/src/main/java/com/gh/gamecenter/info/ConcernFragment.java @@ -3,11 +3,6 @@ package com.gh.gamecenter.info; import android.app.Activity; import android.content.Intent; import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.view.MenuItem; import android.view.View; @@ -15,7 +10,6 @@ import android.widget.LinearLayout; import android.widget.RelativeLayout; import android.widget.TextView; -import com.gc.materialdesign.views.ProgressBarCircularIndeterminate; import com.gh.base.BaseActivity; import com.gh.base.OnRequestCallBackListener; import com.gh.common.util.ApkActiveUtils; @@ -53,6 +47,11 @@ import org.greenrobot.eventbus.ThreadMode; import java.util.ArrayList; import java.util.List; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.GridLayoutManager; +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; @@ -70,8 +69,8 @@ public class ConcernFragment extends NormalFragment implements SwipeRefreshLayou SwipeRefreshLayout refreshLayout; @BindView(R.id.news1_rv_list) RecyclerView recyclerView; - @BindView(R.id.news1_pb_loading) - ProgressBarCircularIndeterminate loadingLayout; + @BindView(R.id.reuse_ll_loading) + View loadingLayout; @BindView(R.id.reuse_no_connection) LinearLayout noConnectionLayout; @BindView(R.id.news1_ll_empty) 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 25fd61337c..b8a300fb47 100644 --- a/app/src/main/java/com/gh/gamecenter/info/StrategyFragment.java +++ b/app/src/main/java/com/gh/gamecenter/info/StrategyFragment.java @@ -2,9 +2,6 @@ package com.gh.gamecenter.info; import android.app.Dialog; import android.content.Intent; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.view.View; import android.view.ViewGroup; @@ -13,7 +10,6 @@ import android.widget.LinearLayout; import android.widget.RelativeLayout; import android.widget.TextView; -import com.gc.materialdesign.views.ProgressBarCircularIndeterminate; import com.gh.base.fragment.BaseFragment; import com.gh.common.util.ApkActiveUtils; import com.gh.common.util.CheckLoginUtils; @@ -45,6 +41,9 @@ import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; +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; @@ -71,8 +70,8 @@ public class StrategyFragment extends BaseFragment implements SwipeRefreshLayout LinearLayout mNoConnection; @BindView(R.id.strategy_refresh) SwipeRefreshLayout mSwipeRefreshLayout; - @BindView(R.id.strategy_loading) - ProgressBarCircularIndeterminate mLoading; + @BindView(R.id.reuse_ll_loading) + View mLoading; private Dialog dialog; private LinearLayoutManager mLayoutManager; diff --git a/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuVpFragment.java b/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuVpFragment.java index d96602c0af..ca42f75b2c 100644 --- a/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuVpFragment.java +++ b/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuVpFragment.java @@ -1,12 +1,6 @@ package com.gh.gamecenter.kaifu; import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.viewpager.widget.ViewPager; -import androidx.recyclerview.widget.DefaultItemAnimator; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.LinearSmoothScroller; -import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.util.DisplayMetrics; import android.view.View; @@ -16,7 +10,6 @@ import android.widget.LinearLayout; import android.widget.RelativeLayout; import android.widget.TextView; -import com.gc.materialdesign.views.ProgressBarCircularIndeterminate; import com.gh.base.fragment.BaseFragment; import com.gh.common.exposure.ExposureListener; import com.gh.common.util.DisplayUtils; @@ -40,6 +33,12 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.DefaultItemAnimator; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.LinearSmoothScroller; +import androidx.recyclerview.widget.RecyclerView; +import androidx.viewpager.widget.ViewPager; import butterknife.BindView; import butterknife.OnClick; @@ -56,8 +55,8 @@ public class KaiFuVpFragment extends BaseFragment { ImageView mKaifuItemHeaderIv; @BindView(R.id.kaifu_item_time) LinearLayout mKaiFuTimeLl; - @BindView(R.id.kaifu_pb_loading) - ProgressBarCircularIndeterminate mLoading; + @BindView(R.id.reuse_ll_loading) + View mLoading; @BindView(R.id.reuse_no_connection) LinearLayout mNoConn; @BindView(R.id.reuse_none_data) diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao2Fragment.java b/app/src/main/java/com/gh/gamecenter/libao/Libao2Fragment.java index 86e3126cca..598103610f 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao2Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao2Fragment.java @@ -2,15 +2,10 @@ package com.gh.gamecenter.libao; import android.content.Intent; import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; -import com.gc.materialdesign.views.ProgressBarCircularIndeterminate; import com.gh.base.fragment.BaseFragment; import com.gh.common.util.CheckLoginUtils; import com.gh.common.view.VerticalItemDecoration; @@ -25,6 +20,10 @@ import com.gh.gamecenter.eventbus.EBUISwitch; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import butterknife.BindView; import butterknife.OnClick; @@ -39,8 +38,8 @@ public class Libao2Fragment extends BaseFragment implements SwipeRefreshLayout.O SwipeRefreshLayout mRefreshLayout; @BindView(R.id.libao2_rv_list) RecyclerView mRecyclerView; - @BindView(R.id.libao2_pb_loading) - ProgressBarCircularIndeterminate mLoadingLayout; + @BindView(R.id.reuse_ll_loading) + View mLoadingLayout; @BindView(R.id.reuse_no_connection) LinearLayout mNoConnectionLayout; @BindView(R.id.reuse_none_data) diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao3Fragment.java b/app/src/main/java/com/gh/gamecenter/libao/Libao3Fragment.java index 84c9c29a67..6b6cee8417 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao3Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao3Fragment.java @@ -1,16 +1,10 @@ package com.gh.gamecenter.libao; import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; -import com.gc.materialdesign.views.ProgressBarCircularIndeterminate; import com.gh.base.fragment.BaseFragment; import com.gh.common.util.CheckLoginUtils; import com.gh.common.view.VerticalItemDecoration; @@ -21,6 +15,11 @@ import com.gh.gamecenter.eventbus.EBUISwitch; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; +import androidx.annotation.Nullable; +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; @@ -35,8 +34,8 @@ public class Libao3Fragment extends BaseFragment implements SwipeRefreshLayout.O SwipeRefreshLayout mRefreshLayout; @BindView(R.id.libao3_rv_list) RecyclerView mRecyclerView; - @BindView(R.id.libao3_pb_loading) - ProgressBarCircularIndeterminate mLoadingLayout; + @BindView(R.id.reuse_ll_loading) + View mLoadingLayout; @BindView(R.id.reuse_none_data) LinearLayout mEmptyLayout; @BindView(R.id.reuse_no_connection) diff --git a/app/src/main/java/com/gh/gamecenter/libao/LibaoNewFragment.java b/app/src/main/java/com/gh/gamecenter/libao/LibaoNewFragment.java index e6e155662f..8c78e8c1c6 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/LibaoNewFragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/LibaoNewFragment.java @@ -2,12 +2,6 @@ package com.gh.gamecenter.libao; import android.content.Intent; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.fragment.app.Fragment; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.LinearLayout; import android.widget.RelativeLayout; @@ -15,7 +9,6 @@ import android.widget.TextView; import com.ethanhua.skeleton.Skeleton; import com.ethanhua.skeleton.ViewSkeletonScreen; -import com.gc.materialdesign.views.ProgressBarCircularIndeterminate; import com.gh.base.fragment.BaseFragment; import com.gh.common.view.SwipeLayout; import com.gh.common.view.VerticalItemDecoration; @@ -26,6 +19,12 @@ import com.gh.gamecenter.eventbus.EBReuse; import org.greenrobot.eventbus.EventBus; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import butterknife.BindView; import butterknife.OnClick; @@ -39,8 +38,8 @@ public class LibaoNewFragment extends BaseFragment implements SwipeRefreshLayout RecyclerView mRecyclerView; @BindView(R.id.libao1_rv_history) RecyclerView mHistoryRv; - @BindView(R.id.libao1_pb_loading) - ProgressBarCircularIndeterminate mLoadingLayout; + @BindView(R.id.reuse_ll_loading) + View mLoadingLayout; @BindView(R.id.reuse_no_connection) LinearLayout mNoConnectionLayout; @BindView(R.id.reuse_none_data) diff --git a/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchFragment.java b/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchFragment.java index 23add2db06..e952544dab 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchFragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchFragment.java @@ -1,14 +1,9 @@ package com.gh.gamecenter.libao; import android.content.Intent; -import androidx.fragment.app.Fragment; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.LinearLayout; -import com.gc.materialdesign.views.ProgressBarCircularIndeterminate; import com.gh.base.fragment.BaseFragment; import com.gh.common.view.VerticalItemDecoration; import com.gh.gamecenter.LibaoDetailActivity; @@ -18,6 +13,10 @@ import com.gh.gamecenter.eventbus.EBReuse; import org.greenrobot.eventbus.EventBus; +import androidx.fragment.app.Fragment; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import butterknife.BindView; import butterknife.OnClick; @@ -31,8 +30,8 @@ public class LibaoSearchFragment extends BaseFragment implements SwipeRefreshLay @BindView(R.id.libao_search_rv_list) RecyclerView mRecyclerView; - @BindView(R.id.libao_search_pb_loading) - ProgressBarCircularIndeterminate mLoading; + @BindView(R.id.reuse_ll_loading) + View mLoading; @BindView(R.id.reuse_no_connection) LinearLayout mNoConnection; @BindView(R.id.reuse_none_data) diff --git a/app/src/main/java/com/gh/gamecenter/qa/AskFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/AskFragment.kt index 9131f1603d..8903ab5a1d 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/AskFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/AskFragment.kt @@ -82,7 +82,7 @@ class AskFragment : BaseFragment() { lateinit var mNoConn: View @BindView(R.id.ask_tabbar) lateinit var mAskTabBar: View - @BindView(R.id.ask_loading) + @BindView(R.id.reuse_ll_loading) lateinit var mLoading: View @BindView(R.id.select_game_hint) lateinit var mSelectGameHint: View diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailActivity.kt index f84a595968..be0d3ed7b9 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailActivity.kt @@ -3,21 +3,21 @@ package com.gh.gamecenter.qa.article.detail import android.annotation.SuppressLint import android.app.Activity import android.app.Dialog -import androidx.lifecycle.Lifecycle -import androidx.lifecycle.Observer -import androidx.lifecycle.ViewModelProviders import android.content.Context import android.content.Intent import android.graphics.Color import android.graphics.drawable.ColorDrawable import android.os.Bundle -import androidx.core.content.ContextCompat import android.text.TextUtils import android.view.* import android.view.animation.LinearInterpolator import android.webkit.JavascriptInterface import android.widget.ImageView import android.widget.TextView +import androidx.core.content.ContextCompat +import androidx.lifecycle.Lifecycle +import androidx.lifecycle.Observer +import androidx.lifecycle.ViewModelProviders import butterknife.OnClick import com.gh.base.BaseActivity import com.gh.common.AppExecutor @@ -55,6 +55,7 @@ class ArticleDetailActivity : BaseActivity() { private val mNoneData by bindView(R.id.reuse_none_data) private val mNoConn by bindView(R.id.reuse_no_connection) private val mNoDataText by bindView(R.id.reuse_tv_none_data) + private val mLoading by bindView(R.id.reuse_ll_loading) private val mArticleImgs = ArrayList() @@ -152,9 +153,10 @@ class ArticleDetailActivity : BaseActivity() { mNoConn.visibility = View.VISIBLE mNoneData.visibility = View.GONE } + + mLoading.visibility = View.GONE mBinding.articleDetailContent.visibility = View.GONE mBinding.includedLayout?.containerControl?.visibility = View.GONE - mBinding.articleDetailLoading.visibility = View.GONE mBinding.articleDetailLine3.visibility = View.GONE } } @@ -350,7 +352,7 @@ class ArticleDetailActivity : BaseActivity() { } R.id.reuse_no_connection -> { mNoConn.visibility = View.GONE - mBinding.articleDetailLoading.visibility = View.VISIBLE + mLoading.visibility = View.VISIBLE mViewModel.getArticleDetail() } R.id.article_detail_follow -> { @@ -663,7 +665,7 @@ class ArticleDetailActivity : BaseActivity() { } mNoConn.visibility = View.GONE - mBinding.articleDetailLoading.visibility = View.GONE + mLoading.visibility = View.GONE mBinding.articleDetailContent.visibility = View.VISIBLE mBinding.includedLayout?.containerControl?.visibility = View.VISIBLE mBinding.articleDetailLine3.visibility = View.VISIBLE diff --git a/app/src/main/java/com/gh/gamecenter/qa/column/detail/AskColumnDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/column/detail/AskColumnDetailActivity.kt index da57fd405f..e4eb8941b3 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/column/detail/AskColumnDetailActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/column/detail/AskColumnDetailActivity.kt @@ -3,8 +3,6 @@ package com.gh.gamecenter.qa.column.detail import android.content.Context import android.content.Intent import android.os.Bundle -import com.google.android.material.appbar.AppBarLayout -import androidx.fragment.app.Fragment import android.view.MenuItem import android.view.View import android.view.ViewGroup @@ -25,6 +23,7 @@ import com.gh.gamecenter.qa.entity.AskTagGroupsEntity import com.gh.gamecenter.qa.search.AskSearchActivity import com.gh.gamecenter.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager +import com.google.android.material.appbar.AppBarLayout import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers import kotterknife.bindView @@ -40,7 +39,7 @@ class AskColumnDetailActivity : BaseActivity() { private val mBarBack by bindView(R.id.bar_back) private val mQuestionTagBar by bindView(R.id.normal_toolbar_container) private val mColumnBar by bindView(R.id.search_actionbar) - private val mLoading by bindView(R.id.column_detail_loading) + private val mLoading by bindView(R.id.reuse_ll_loading) private val mNoConn by bindView(R.id.reuse_no_connection) private val mAppBar by bindView(R.id.column_detail_appbar) private val mNoData by bindView(R.id.reuse_none_data) diff --git a/app/src/main/java/com/gh/gamecenter/qa/newest/AskQuestionsNewFragment.java b/app/src/main/java/com/gh/gamecenter/qa/newest/AskQuestionsNewFragment.java index 3dbe19ee61..5968ca930b 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/newest/AskQuestionsNewFragment.java +++ b/app/src/main/java/com/gh/gamecenter/qa/newest/AskQuestionsNewFragment.java @@ -1,14 +1,8 @@ package com.gh.gamecenter.qa.newest; import android.app.Activity; -import androidx.lifecycle.Observer; -import androidx.lifecycle.ViewModelProviders; import android.content.Intent; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import com.google.android.material.tabs.TabLayout; -import androidx.viewpager.widget.ViewPager; import android.view.LayoutInflater; import android.view.View; import android.widget.TextView; @@ -23,11 +17,17 @@ import com.gh.gamecenter.manager.UserManager; import com.gh.gamecenter.qa.entity.AskTagGroupsEntity; import com.gh.gamecenter.qa.tags.AskQuestionsNewViewModel; import com.gh.gamecenter.qa.tags.AskTagPagerFragmentAdapter; +import com.google.android.material.tabs.TabLayout; import com.halo.assistant.HaloApp; import com.lightgame.view.NoScrollableViewPager; import java.util.List; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProviders; +import androidx.viewpager.widget.ViewPager; import butterknife.BindView; import butterknife.OnClick; @@ -49,7 +49,7 @@ public class AskQuestionsNewFragment extends BaseFragment { View mAppBar; @BindView(R.id.reuse_no_connection) View mNoConn; - @BindView(R.id.list_loading) + @BindView(R.id.reuse_ll_loading) View mLoading; private AskQuestionsNewViewModel mModel; diff --git a/app/src/main/java/com/gh/gamecenter/qa/recommends/AskRecommendWrapperFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/recommends/AskRecommendWrapperFragment.kt index 230a03098d..f1443742bd 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/recommends/AskRecommendWrapperFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/recommends/AskRecommendWrapperFragment.kt @@ -2,20 +2,18 @@ package com.gh.gamecenter.qa.recommends import android.app.Activity import android.app.Dialog -import androidx.lifecycle.Observer -import androidx.lifecycle.ViewModelProviders import android.content.Intent import android.graphics.drawable.ColorDrawable import android.os.Bundle import android.os.Message -import com.google.android.material.appbar.AppBarLayout -import androidx.fragment.app.Fragment -import androidx.fragment.app.FragmentTransaction -import androidx.viewpager.widget.ViewPager import android.view.Gravity import android.view.LayoutInflater import android.view.View import android.widget.TextView +import androidx.fragment.app.FragmentTransaction +import androidx.lifecycle.Observer +import androidx.lifecycle.ViewModelProviders +import androidx.viewpager.widget.ViewPager import com.gh.base.fragment.BaseFragment import com.gh.common.util.DisplayUtils import com.gh.common.util.MtaHelper @@ -26,12 +24,13 @@ import com.gh.gamecenter.entity.LinkEntity import com.gh.gamecenter.manager.UserManager import com.gh.gamecenter.qa.AskFragment.Companion.COMMUNITIES_SELECT_REQUEST import com.gh.gamecenter.qa.recommends.newest.RecommendNewestFragment +import com.google.android.material.appbar.AppBarLayout import kotterknife.bindView class AskRecommendWrapperFragment : BaseFragment() { private val mAppBar by bindView(R.id.recommend_subject_bar) - private val mSubjectViewPager by bindView(R.id.ask_recommends_subject_vp) + private val mSubjectViewPager by bindView(R.id.ask_recommends_subject_vp) private val mChangeBtn by bindView(R.id.ask_recommend_change) val refreshLayout by bindView(R.id.refresh_layout) @@ -214,7 +213,7 @@ class AskRecommendWrapperFragment : BaseFragment() { transaction.commitAllowingStateLoss() } - private fun alterFragment(transaction: androidx.fragment.app.FragmentTransaction, cls: Class): T? { + private fun alterFragment(transaction: FragmentTransaction, cls: Class): T? { val findFragmentByTag = childFragmentManager.findFragmentByTag(cls.simpleName) var fragmentByTag: T? = if (findFragmentByTag != null) { findFragmentByTag as T diff --git a/app/src/main/java/com/gh/gamecenter/subject/SubjectActivity.kt b/app/src/main/java/com/gh/gamecenter/subject/SubjectActivity.kt index bf1bdc8a56..6cdfc93e60 100644 --- a/app/src/main/java/com/gh/gamecenter/subject/SubjectActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/subject/SubjectActivity.kt @@ -1,12 +1,11 @@ package com.gh.gamecenter.subject -import androidx.lifecycle.Observer -import androidx.lifecycle.ViewModelProviders import android.content.Context import android.content.Intent import android.os.Bundle -import androidx.fragment.app.Fragment import android.view.View +import androidx.lifecycle.Observer +import androidx.lifecycle.ViewModelProviders import com.gh.base.BaseActivity import com.gh.common.util.DataUtils import com.gh.common.util.EntranceUtils @@ -20,7 +19,7 @@ import kotterknife.bindView class SubjectActivity : BaseActivity() { - private val mLoading by bindView(R.id.list_loading) + private val mLoading by bindView(R.id.reuse_ll_loading) private val mNoConn by bindView(R.id.reuse_no_connection) private var mViewModel: SubjectViewModel? = null diff --git a/app/src/main/res/layout/activity_article_detail.xml b/app/src/main/res/layout/activity_article_detail.xml index a8519bfdec..42d6cd5839 100644 --- a/app/src/main/res/layout/activity_article_detail.xml +++ b/app/src/main/res/layout/activity_article_detail.xml @@ -1,222 +1,223 @@ - + - + - + name = "detail" + type = "com.gh.gamecenter.qa.entity.ArticleDetailEntity" /> + + android:layout_width = "match_parent" + android:layout_height = "match_parent" > - + + android:id = "@+id/article_detail_content" + android:layout_width = "match_parent" + android:layout_height = "match_parent" + android:layout_above = "@+id/container_control" + android:layout_below = "@+id/normal_toolbar_container" + android:background = "@android:color/white" + android:visibility = "visible" > + android:layout_width = "match_parent" + android:layout_height = "wrap_content" + android:paddingBottom = "50dp" > + android:id = "@+id/article_detail_line" + android:layout_width = "match_parent" + android:layout_height = "8dp" + android:background = "@color/background" /> + android:id = "@+id/article_detail_title" + android:layout_width = "match_parent" + android:layout_height = "wrap_content" + android:gravity = "center_vertical" + android:paddingLeft = "18dp" + android:paddingTop = "20dp" + android:paddingRight = "18dp" + android:paddingBottom = "20dp" + android:text = "@{detail.title}" + android:textColor = "@color/black" + android:textSize = "16sp" + android:textStyle = "bold" + app:layout_constraintTop_toBottomOf = "@id/article_detail_line" /> + android:id = "@+id/article_detail_line2" + android:layout_width = "match_parent" + android:layout_height = "@dimen/cutting_line" + android:background = "@color/cutting_line" + app:layout_constraintTop_toBottomOf = "@id/article_detail_title" /> + android:id = "@+id/article_detail_usericon_container" + android:layout_width = "30dp" + android:layout_height = "30dp" + android:layout_marginLeft = "20dp" + android:layout_marginTop = "15dp" + app:layout_constraintLeft_toLeftOf = "parent" + app:layout_constraintTop_toBottomOf = "@id/article_detail_line2" > + android:id = "@+id/article_detail_usericon" + style = "@style/frescoCircleStyle" + imageIcon = "@{detail.user.icon}" + android:layout_width = "30dp" + android:layout_height = "30dp" + fresco:roundAsCircle = "true" /> + android:id = "@+id/article_detail_badge" + imageIcon = "@{detail.user.auth.icon}" + visibleGone = "@{detail.user.auth != null}" + android:layout_width = "10dp" + android:layout_height = "10dp" + android:layout_alignParentRight = "true" + android:layout_alignParentBottom = "true" /> - + + android:id = "@+id/article_detail_username" + android:layout_width = "wrap_content" + android:layout_height = "wrap_content" + android:layout_marginLeft = "10dp" + android:maxLength = "10" + android:text = "@{detail.user.name}" + android:textColor = "@color/title" + android:textSize = "14sp" + app:layout_constraintBottom_toTopOf = "@+id/article_detail_Rd" + app:layout_constraintLeft_toRightOf = "@id/article_detail_usericon_container" + app:layout_constraintTop_toBottomOf = "@id/article_detail_line2" /> + android:id = "@+id/tv_follow_hint" + android:layout_width = "wrap_content" + android:layout_height = "wrap_content" + android:layout_marginRight = "5dp" + android:text = "喜欢就关注吧→" + android:textColor = "@color/theme" + android:textSize = "12sp" + android:visibility = "gone" + app:layout_constraintBottom_toBottomOf = "@+id/article_detail_follow" + app:layout_constraintRight_toLeftOf = "@+id/article_detail_follow" + app:layout_constraintTop_toTopOf = "@+id/article_detail_follow" + tools:visibility = "visible" /> + android:id = "@+id/article_detail_follow" + android:layout_width = "60dp" + android:layout_height = "25dp" + android:layout_marginRight = "20dp" + android:background = "@drawable/button_normal_style" + android:gravity = "center" + android:textColor = "@android:color/white" + android:textSize = "11sp" + android:visibility = "gone" + app:layout_constraintBottom_toTopOf = "@+id/article_detail_Rd" + app:layout_constraintRight_toLeftOf = "parent" + app:layout_constraintTop_toBottomOf = "@id/article_detail_line2" + tools:text = "关注" + tools:visibility = "visible" /> + android:id = "@+id/article_detail_Rd" + android:layout_width = "match_parent" + android:layout_height = "wrap_content" + android:layout_marginTop = "15dp" + app:layout_constraintLeft_toLeftOf = "parent" + app:layout_constraintRight_toRightOf = "parent" + app:layout_constraintTop_toBottomOf = "@id/article_detail_usericon_container" /> + android:id = "@+id/article_detail_time" + android:layout_width = "wrap_content" + android:layout_height = "wrap_content" + android:layout_marginTop = "53dp" + android:layout_marginRight = "20dp" + android:gravity = "right" + android:textColor = "@color/title" + android:textSize = "12sp" + app:layout_constraintRight_toRightOf = "parent" + app:layout_constraintTop_toBottomOf = "@id/article_detail_Rd" + tools:text = "发布于1分钟前" /> + android:id = "@+id/article_detail_gh_des" + android:layout_width = "wrap_content" + android:layout_height = "wrap_content" + android:layout_marginRight = "20dp" + android:gravity = "right" + android:paddingTop = "6dp" + android:paddingBottom = "25dp" + android:text = "@string/copyright_footnote" + android:textColor = "@color/title" + android:textSize = "12sp" + app:layout_constraintRight_toRightOf = "parent" + app:layout_constraintTop_toBottomOf = "@id/article_detail_time" /> + android:layout_width = "match_parent" + android:layout_height = "wrap_content" + android:paddingLeft = "18dp" + android:paddingRight = "18dp" + android:scrollbars = "none" + app:layout_constraintTop_toBottomOf = "@id/article_detail_gh_des" > - + android:id = "@+id/article_detail_tags" + android:layout_width = "match_parent" + android:layout_height = "wrap_content" + android:orientation = "horizontal" /> + - - - - - - - - + + + android:id = "@+id/includedLayout" + layout = "@layout/piece_article_bottom" /> + + + + + layout = "@layout/reuse_no_connection" + android:layout_width = "match_parent" + android:layout_height = "match_parent" + android:layout_below = "@+id/normal_toolbar_container" /> - - - \ No newline at end of file + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_ask_column_detail.xml b/app/src/main/res/layout/activity_ask_column_detail.xml index 406fbef1ec..4742bea8b1 100644 --- a/app/src/main/res/layout/activity_ask_column_detail.xml +++ b/app/src/main/res/layout/activity_ask_column_detail.xml @@ -158,12 +158,11 @@ app:layout_constraintBottom_toBottomOf = "parent" app:layout_constraintTop_toBottomOf = "@id/column_detail_appbar" /> - + diff --git a/app/src/main/res/layout/activity_editor_insert_game.xml b/app/src/main/res/layout/activity_editor_insert_game.xml index 566da2f971..f6af1fef4c 100644 --- a/app/src/main/res/layout/activity_editor_insert_game.xml +++ b/app/src/main/res/layout/activity_editor_insert_game.xml @@ -42,12 +42,11 @@ - + - + diff --git a/app/src/main/res/layout/activity_plugin.xml b/app/src/main/res/layout/activity_plugin.xml index 14c70a724d..c7b33e1370 100644 --- a/app/src/main/res/layout/activity_plugin.xml +++ b/app/src/main/res/layout/activity_plugin.xml @@ -15,12 +15,11 @@ android:layout_width = "match_parent" android:layout_height = "match_parent" /> - + diff --git a/app/src/main/res/layout/activity_rating_reply.xml b/app/src/main/res/layout/activity_rating_reply.xml index 754c6dd961..664a2a1768 100644 --- a/app/src/main/res/layout/activity_rating_reply.xml +++ b/app/src/main/res/layout/activity_rating_reply.xml @@ -22,12 +22,11 @@ android:layout_height = "wrap_content" /> - + diff --git a/app/src/main/res/layout/activity_subject.xml b/app/src/main/res/layout/activity_subject.xml index de96398afa..4a57c5e02a 100644 --- a/app/src/main/res/layout/activity_subject.xml +++ b/app/src/main/res/layout/activity_subject.xml @@ -15,12 +15,11 @@ android:layout_width = "match_parent" android:layout_height = "match_parent" /> - + diff --git a/app/src/main/res/layout/activity_toolbox.xml b/app/src/main/res/layout/activity_toolbox.xml index d01e88b555..6e4d7e56ba 100644 --- a/app/src/main/res/layout/activity_toolbox.xml +++ b/app/src/main/res/layout/activity_toolbox.xml @@ -42,12 +42,11 @@ - + - + + android:id = "@+id/list_refresh" + android:layout_width = "match_parent" + android:layout_height = "match_parent" > + android:layout_width = "match_parent" + android:layout_height = "match_parent" + android:orientation = "vertical" > + android:id = "@+id/link_tv" + android:layout_width = "match_parent" + android:layout_height = "40dp" + android:layout_marginTop = "8dp" + android:background = "@android:color/white" + android:drawableLeft = "@drawable/article_link" + android:drawablePadding = "12dp" + android:gravity = "center_vertical" + android:paddingLeft = "20dp" + android:singleLine = "true" + android:textColor = "@color/theme" + android:textSize = "13dp" + android:visibility = "gone" + tools:visibility = "visible" /> + android:id = "@+id/list_rv" + android:layout_width = "match_parent" + android:layout_height = "wrap_content" + android:clipToPadding = "false" + android:paddingTop = "8dp" /> - + - + - + - + - + - + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_article.xml b/app/src/main/res/layout/fragment_article.xml index c4e9dd2b17..26efe4b0c5 100644 --- a/app/src/main/res/layout/fragment_article.xml +++ b/app/src/main/res/layout/fragment_article.xml @@ -14,12 +14,11 @@ android:layout_height = "wrap_content" /> - + diff --git a/app/src/main/res/layout/fragment_ask.xml b/app/src/main/res/layout/fragment_ask.xml index ab58dbe19c..69d2a3badd 100644 --- a/app/src/main/res/layout/fragment_ask.xml +++ b/app/src/main/res/layout/fragment_ask.xml @@ -161,12 +161,11 @@ - + + android:background = "@android:color/white" > + android:layout_below = "@id/ask_appbar" /> - + diff --git a/app/src/main/res/layout/fragment_ask_questions_recommends.xml b/app/src/main/res/layout/fragment_ask_questions_recommends.xml index f7548d547a..4ad5414aca 100644 --- a/app/src/main/res/layout/fragment_ask_questions_recommends.xml +++ b/app/src/main/res/layout/fragment_ask_questions_recommends.xml @@ -9,12 +9,11 @@ android:layout_width = "match_parent" android:layout_height = "match_parent" /> - + diff --git a/app/src/main/res/layout/fragment_ask_search.xml b/app/src/main/res/layout/fragment_ask_search.xml index 7cc014690f..2617fff799 100644 --- a/app/src/main/res/layout/fragment_ask_search.xml +++ b/app/src/main/res/layout/fragment_ask_search.xml @@ -43,12 +43,11 @@ android:layout_height = "match_parent" /> - - + diff --git a/app/src/main/res/layout/fragment_comment_list.xml b/app/src/main/res/layout/fragment_comment_list.xml index d1b3bc16e6..25feac92f4 100644 --- a/app/src/main/res/layout/fragment_comment_list.xml +++ b/app/src/main/res/layout/fragment_comment_list.xml @@ -14,12 +14,11 @@ android:layout_height = "wrap_content" /> - + diff --git a/app/src/main/res/layout/fragment_game.xml b/app/src/main/res/layout/fragment_game.xml index 464bf0a743..963bac6b5b 100644 --- a/app/src/main/res/layout/fragment_game.xml +++ b/app/src/main/res/layout/fragment_game.xml @@ -1,6 +1,6 @@ - + @@ -41,12 +41,11 @@ android:layout_width = "match_parent" android:layout_height = "match_parent" /> - + android:layout_width = "wrap_content" + android:layout_height = "wrap_content" + android:layout_centerInParent = "true" /> diff --git a/app/src/main/res/layout/fragment_info_concern.xml b/app/src/main/res/layout/fragment_info_concern.xml index 5ad045261e..2b3be8b165 100644 --- a/app/src/main/res/layout/fragment_info_concern.xml +++ b/app/src/main/res/layout/fragment_info_concern.xml @@ -21,12 +21,11 @@ android:layout_height="wrap_content" /> - + - + diff --git a/app/src/main/res/layout/fragment_info_original.xml b/app/src/main/res/layout/fragment_info_original.xml index 00d9bd9ab8..9d9d34dd01 100644 --- a/app/src/main/res/layout/fragment_info_original.xml +++ b/app/src/main/res/layout/fragment_info_original.xml @@ -14,12 +14,11 @@ android:layout_height = "wrap_content" /> - + diff --git a/app/src/main/res/layout/fragment_info_strategy.xml b/app/src/main/res/layout/fragment_info_strategy.xml index 33d9475e6a..9d57014880 100644 --- a/app/src/main/res/layout/fragment_info_strategy.xml +++ b/app/src/main/res/layout/fragment_info_strategy.xml @@ -52,12 +52,11 @@ android:layout_height = "match_parent" /> - + diff --git a/app/src/main/res/layout/fragment_kaifu_vp.xml b/app/src/main/res/layout/fragment_kaifu_vp.xml index f4350ed0e7..887ec9d1e1 100644 --- a/app/src/main/res/layout/fragment_kaifu_vp.xml +++ b/app/src/main/res/layout/fragment_kaifu_vp.xml @@ -12,12 +12,11 @@ layout = "@layout/kaifu_item_time" android:visibility = "gone" /> - + diff --git a/app/src/main/res/layout/fragment_libao2.xml b/app/src/main/res/layout/fragment_libao2.xml index 841672f957..27145a698e 100644 --- a/app/src/main/res/layout/fragment_libao2.xml +++ b/app/src/main/res/layout/fragment_libao2.xml @@ -14,12 +14,11 @@ android:layout_height = "wrap_content" /> - + diff --git a/app/src/main/res/layout/fragment_libao3.xml b/app/src/main/res/layout/fragment_libao3.xml index 5f50eef3b3..e8139e026c 100644 --- a/app/src/main/res/layout/fragment_libao3.xml +++ b/app/src/main/res/layout/fragment_libao3.xml @@ -14,12 +14,11 @@ android:layout_height = "wrap_content" /> - + diff --git a/app/src/main/res/layout/fragment_libao_new.xml b/app/src/main/res/layout/fragment_libao_new.xml index 839c8d5b2a..78370648fc 100644 --- a/app/src/main/res/layout/fragment_libao_new.xml +++ b/app/src/main/res/layout/fragment_libao_new.xml @@ -30,12 +30,11 @@ android:layout_height = "match_parent" android:overScrollMode = "never" /> - + diff --git a/app/src/main/res/layout/fragment_libao_serach.xml b/app/src/main/res/layout/fragment_libao_serach.xml index 73101ae601..d679b8399d 100644 --- a/app/src/main/res/layout/fragment_libao_serach.xml +++ b/app/src/main/res/layout/fragment_libao_serach.xml @@ -9,12 +9,11 @@ android:layout_height = "match_parent" android:overScrollMode = "never" /> - + diff --git a/app/src/main/res/layout/fragment_list_base.xml b/app/src/main/res/layout/fragment_list_base.xml index e5fd73f10c..8c445c6abc 100644 --- a/app/src/main/res/layout/fragment_list_base.xml +++ b/app/src/main/res/layout/fragment_list_base.xml @@ -14,12 +14,11 @@ android:layout_height = "wrap_content" /> - + diff --git a/app/src/main/res/layout/fragment_list_base_skeleton.xml b/app/src/main/res/layout/fragment_list_base_skeleton.xml index 4ccd275eaa..722de95103 100644 --- a/app/src/main/res/layout/fragment_list_base_skeleton.xml +++ b/app/src/main/res/layout/fragment_list_base_skeleton.xml @@ -19,12 +19,11 @@ android:layout_width = "match_parent" android:layout_height = "match_parent" /> - + diff --git a/app/src/main/res/layout/fragment_list_base_skeleton_no_loading.xml b/app/src/main/res/layout/fragment_list_base_skeleton_no_loading.xml index d8112cbac5..6aaac7dec0 100644 --- a/app/src/main/res/layout/fragment_list_base_skeleton_no_loading.xml +++ b/app/src/main/res/layout/fragment_list_base_skeleton_no_loading.xml @@ -14,12 +14,11 @@ android:layout_height = "wrap_content" /> - + diff --git a/app/src/main/res/layout/fragment_list_nodate_skip.xml b/app/src/main/res/layout/fragment_list_nodate_skip.xml index 192a19eee0..ca638d7976 100644 --- a/app/src/main/res/layout/fragment_list_nodate_skip.xml +++ b/app/src/main/res/layout/fragment_list_nodate_skip.xml @@ -32,12 +32,11 @@ - + diff --git a/app/src/main/res/layout/fragment_questionsdetail.xml b/app/src/main/res/layout/fragment_questionsdetail.xml index 06484e3f48..9469c8259d 100644 --- a/app/src/main/res/layout/fragment_questionsdetail.xml +++ b/app/src/main/res/layout/fragment_questionsdetail.xml @@ -18,11 +18,10 @@ android:layout_height = "wrap_content" /> - + app:layout_constraintBottom_toBottomOf = "parent" > - + - + diff --git a/app/src/main/res/layout/fragment_subject.xml b/app/src/main/res/layout/fragment_subject.xml index 53d1e78db0..aa1d38b9aa 100644 --- a/app/src/main/res/layout/fragment_subject.xml +++ b/app/src/main/res/layout/fragment_subject.xml @@ -14,12 +14,11 @@ android:layout_height = "7dp" android:background = "@drawable/shadow_down" /> - + diff --git a/app/src/main/res/layout/fragment_tools.xml b/app/src/main/res/layout/fragment_tools.xml index b0eeb5382c..801e97bafc 100644 --- a/app/src/main/res/layout/fragment_tools.xml +++ b/app/src/main/res/layout/fragment_tools.xml @@ -14,13 +14,11 @@ android:layout_height = "wrap_content" /> - - + diff --git a/app/src/main/res/layout/fragment_vote.xml b/app/src/main/res/layout/fragment_vote.xml index 0a73b5337f..368edec336 100644 --- a/app/src/main/res/layout/fragment_vote.xml +++ b/app/src/main/res/layout/fragment_vote.xml @@ -1,28 +1,28 @@ + android:layout_height = "match_parent" > + android:layout_height = "match_parent" + android:layout_below = "@id/tv_ad" > - + @@ -43,8 +42,8 @@ android:id = "@+id/reuse_none_data" android:layout_width = "wrap_content" android:layout_height = "wrap_content" - android:visibility="gone" - android:layout_centerInParent = "true" > + android:layout_centerInParent = "true" + android:visibility = "gone" > - + android:layout_marginRight = "70dp" /> diff --git a/app/src/main/res/layout/viewimage_normal_item.xml b/app/src/main/res/layout/viewimage_normal_item.xml index 0e252502c4..4d37ef4ec7 100644 --- a/app/src/main/res/layout/viewimage_normal_item.xml +++ b/app/src/main/res/layout/viewimage_normal_item.xml @@ -11,12 +11,11 @@ fresco:actualImageScaleType = "fitCenter" fresco:placeholderImage = "@drawable/occupy2" /> - \ No newline at end of file