From c355bc2b799d09c694c624bea3522f870583d736 Mon Sep 17 00:00:00 2001 From: lyr <15622190878@163.com> Date: Sun, 24 Oct 2021 17:32:06 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=85=89=E7=8E=AF=E5=8A=A9=E6=89=8BV5?= =?UTF-8?q?.4.0=E3=80=91=E9=AA=A8=E6=9E=B6=E5=B1=8F=20UI=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=EF=BC=88=E9=A6=96=E9=A1=B5&=E7=A4=BE=E5=8C=BA?= =?UTF-8?q?=EF=BC=89https://git.ghzs.com/pm/halo-app-issues/-/issues/1575?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gh/common/util/EntranceUtils.java | 1 + .../catalog/NewCatalogListFragment.kt | 8 +- .../catalog/SpecialCatalogFragment.kt | 21 + .../category/CategoryDirectoryFragment.kt | 13 +- .../category2/CategoryV2ListFragment.kt | 8 +- .../forum/home/ForumActivityFragment.kt | 10 + .../forum/home/ForumArticleListFragment.kt | 21 +- .../forum/home/ForumArticleListViewModel.kt | 10 +- .../gh/gamecenter/forum/home/ForumFragment.kt | 25 +- .../detail/ColumnCollectionDetailFragment.kt | 13 + .../servers/GameServersPublishFragment.kt | 13 +- .../servers/GameServersTestFragment.kt | 24 +- .../gamecenter/subject/SubjectListFragment.kt | 18 +- .../subject/tab/SubjectTabFragment.kt | 2 + .../com/gh/gamecenter/tag/TagsListFragment.kt | 11 +- .../res/drawable/bg_skeleton_radius_12.xml | 6 + .../res/layout/fragment_amway_skeleton.xml | 38 +- .../res/layout/fragment_amway_skeleton_al.xml | 33 +- .../res/layout/fragment_category_skeleton.xml | 822 +----------------- .../fragment_column_collection_detail.xml | 4 +- app/src/main/res/layout/fragment_forum.xml | 5 + .../res/layout/fragment_forum_activity.xml | 5 + .../fragment_forum_activity_skeleton.xml | 20 + .../main/res/layout/fragment_forum_list.xml | 5 + .../layout/fragment_forum_list_skeleton.xml | 24 + .../res/layout/fragment_forum_skeleton.xml | 74 ++ .../main/res/layout/fragment_game_servers.xml | 140 +-- .../layout/fragment_game_servers_publish.xml | 150 ++-- .../layout/fragment_game_servers_skeleton.xml | 18 + ...ragment_special_catalog_first_skeleton.xml | 28 + ...agment_special_catalog_second_skeleton.xml | 20 + ...subject_collection_double_row_skeleton.xml | 32 + ...subject_collection_single_row_skeleton.xml | 28 + .../fragment_subject_detail_skeleton.xml | 57 ++ .../res/layout/fragment_subject_skeleton.xml | 46 +- .../layout/fragment_subject_tab_skeleton.xml | 42 + .../res/layout/fragment_tags_skeleton.xml | 37 + .../main/res/layout/item_skeleton_amway.xml | 118 +++ .../item_skeleton_catalog_simple_game.xml | 24 + .../layout/item_skeleton_catalog_subject.xml | 59 ++ ...em_skeleton_catalog_subject_collection.xml | 42 + .../res/layout/item_skeleton_category.xml | 88 ++ .../main/res/layout/item_skeleton_forum.xml | 26 + .../layout/item_skeleton_forum_activity.xml | 28 + .../layout/item_skeleton_forum_article.xml | 94 ++ .../item_skeleton_forum_article_ask.xml | 1 - .../res/layout/item_skeleton_forum_title.xml | 24 + .../item_skeleton_forum_with_button.xml | 34 + .../res/layout/item_skeleton_game_servers.xml | 34 + .../layout/item_skeleton_horizontal_forum.xml | 27 + .../item_skeleton_horizontal_forum_list.xml | 39 + .../res/layout/item_skeleton_order_game.xml | 55 ++ ...skeleton_subject_collection_double_row.xml | 27 + ...skeleton_subject_collection_single_row.xml | 9 + .../res/layout/item_skeleton_tags_game.xml | 51 ++ 55 files changed, 1571 insertions(+), 1041 deletions(-) create mode 100644 app/src/main/res/drawable/bg_skeleton_radius_12.xml create mode 100644 app/src/main/res/layout/fragment_forum_activity_skeleton.xml create mode 100644 app/src/main/res/layout/fragment_forum_list_skeleton.xml create mode 100644 app/src/main/res/layout/fragment_forum_skeleton.xml create mode 100644 app/src/main/res/layout/fragment_game_servers_skeleton.xml create mode 100644 app/src/main/res/layout/fragment_special_catalog_first_skeleton.xml create mode 100644 app/src/main/res/layout/fragment_special_catalog_second_skeleton.xml create mode 100644 app/src/main/res/layout/fragment_subject_collection_double_row_skeleton.xml create mode 100644 app/src/main/res/layout/fragment_subject_collection_single_row_skeleton.xml create mode 100644 app/src/main/res/layout/fragment_subject_detail_skeleton.xml create mode 100644 app/src/main/res/layout/fragment_subject_tab_skeleton.xml create mode 100644 app/src/main/res/layout/fragment_tags_skeleton.xml create mode 100644 app/src/main/res/layout/item_skeleton_amway.xml create mode 100644 app/src/main/res/layout/item_skeleton_catalog_simple_game.xml create mode 100644 app/src/main/res/layout/item_skeleton_catalog_subject.xml create mode 100644 app/src/main/res/layout/item_skeleton_catalog_subject_collection.xml create mode 100644 app/src/main/res/layout/item_skeleton_category.xml create mode 100644 app/src/main/res/layout/item_skeleton_forum.xml create mode 100644 app/src/main/res/layout/item_skeleton_forum_activity.xml create mode 100644 app/src/main/res/layout/item_skeleton_forum_article.xml create mode 100644 app/src/main/res/layout/item_skeleton_forum_title.xml create mode 100644 app/src/main/res/layout/item_skeleton_forum_with_button.xml create mode 100644 app/src/main/res/layout/item_skeleton_game_servers.xml create mode 100644 app/src/main/res/layout/item_skeleton_horizontal_forum.xml create mode 100644 app/src/main/res/layout/item_skeleton_horizontal_forum_list.xml create mode 100644 app/src/main/res/layout/item_skeleton_order_game.xml create mode 100644 app/src/main/res/layout/item_skeleton_subject_collection_double_row.xml create mode 100644 app/src/main/res/layout/item_skeleton_subject_collection_single_row.xml create mode 100644 app/src/main/res/layout/item_skeleton_tags_game.xml diff --git a/app/src/main/java/com/gh/common/util/EntranceUtils.java b/app/src/main/java/com/gh/common/util/EntranceUtils.java index b3acef7d19..e8d1191975 100644 --- a/app/src/main/java/com/gh/common/util/EntranceUtils.java +++ b/app/src/main/java/com/gh/common/util/EntranceUtils.java @@ -169,6 +169,7 @@ public class EntranceUtils { public static final String KEY_COMMUNITY_DATA = "communityData"; public static final String KEY_TRACE_EVENT = "trace_event"; public static final String KEY_SUBJECT_DATA = "subjectData"; + public static final String KEY_SUBJECT_TYPE = "subjectType"; public static final String KEY_USER_ID = "user_id"; public static final String KEY_QUESTION_TAG = "question_tag"; public static final String KEY_COLUMN_ID = "column_id"; diff --git a/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListFragment.kt b/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListFragment.kt index 4c2fcba964..7b8ca2de2d 100644 --- a/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListFragment.kt @@ -95,7 +95,13 @@ class NewCatalogListFragment : ListFragment mExposureListener = ExposureListener(this, mAdapter!!) mListRv.addOnScrollListener(mExposureListener) - mSkeletonScreen = Skeleton.bind(mBinding.listSkeleton).shimmer(false).load(R.layout.fragment_subject_skeleton).show() + mSkeletonScreen = Skeleton.bind(mBinding.listSkeleton) + .shimmer(true) + .angle(Constants.SHIMMER_ANGLE) + .color(R.color.skeleton_shimmer_color) + .duration(Constants.SHIMMER_DURATION) + .load(R.layout.fragment_tags_skeleton) + .show() } private fun initSortType() { diff --git a/app/src/main/java/com/gh/gamecenter/catalog/SpecialCatalogFragment.kt b/app/src/main/java/com/gh/gamecenter/catalog/SpecialCatalogFragment.kt index 906f4aa374..31113edc6d 100644 --- a/app/src/main/java/com/gh/gamecenter/catalog/SpecialCatalogFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/catalog/SpecialCatalogFragment.kt @@ -3,13 +3,18 @@ package com.gh.gamecenter.catalog import android.graphics.Color import android.os.Bundle import android.view.View +import com.ethanhua.skeleton.Skeleton +import com.gh.common.constant.Constants import com.gh.common.exposure.ExposureListener import com.gh.common.util.EntranceUtils import com.gh.common.util.viewModelProvider +import com.gh.gamecenter.R import com.gh.gamecenter.baselist.ListFragment +import kotterknife.bindView class SpecialCatalogFragment : ListFragment() { + private val mListSkeleton by bindView(R.id.list_skeleton) private var mCatalogId = "" private var mCatalogTitle = "" private var mIsCategoryV2 = false // 是否为新分类2.0 @@ -18,6 +23,8 @@ class SpecialCatalogFragment : ListFragment(SpecialCatalogViewModel.Factory( mCatalogId, @@ -32,6 +39,8 @@ class SpecialCatalogFragment : ListFragment mListRv.addOnScrollListener(ExposureListener(this, provideListAdapter())) - mSkeletonScreen = Skeleton.bind(mBinding?.listSkeleton).shimmer(false).load(R.layout.fragment_subject_skeleton).show() + mSkeletonScreen = Skeleton.bind(mBinding?.listSkeleton) + .shimmer(true) + .angle(Constants.SHIMMER_ANGLE) + .color(R.color.skeleton_shimmer_color) + .duration(Constants.SHIMMER_DURATION) + .load(R.layout.fragment_tags_skeleton) + .show() mBinding?.resetTv?.setOnClickListener { mCategoryViewModel?.run { diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/ForumActivityFragment.kt b/app/src/main/java/com/gh/gamecenter/forum/home/ForumActivityFragment.kt index 7b0083a9a6..eba493446b 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/home/ForumActivityFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/home/ForumActivityFragment.kt @@ -3,6 +3,8 @@ package com.gh.gamecenter.forum.home import android.view.View import android.view.ViewGroup import android.widget.CheckedTextView +import com.ethanhua.skeleton.Skeleton +import com.gh.common.constant.Constants import com.gh.common.util.NewLogUtils import com.gh.common.util.dip2px import com.gh.common.util.observeNonNull @@ -36,6 +38,14 @@ class ForumActivityFragment: LazyListFragment() private var mPath = "" private var mIsFirst = true private var mHaveLoadLoginData = false @@ -60,8 +63,17 @@ class ForumArticleListFragment : LazyListFragment(application) { private val mForumDao = AppDatabase.getInstance(HaloApp.getInstance()).forumDao() - val recordForumsLiveData = MutableLiveData>() + val recordForumsLiveData = MutableLiveData, Boolean>>() var recordForums = arrayListOf() var recordStatusForums = arrayListOf() var sort: String = "time.comment"//排序 time.edit 最新发布 time.comment 最新回复 @@ -60,11 +60,11 @@ class ForumArticleListViewModel(application: Application) : ListViewModel() @@ -50,6 +54,14 @@ class GameServersPublishFragment : LazyFragment() { override fun initRealView() { super.initRealView() + mSkeleton = Skeleton.bind(mBinding?.skeleton) + .shimmer(true) + .angle(Constants.SHIMMER_ANGLE) + .color(R.color.skeleton_shimmer_color) + .duration(Constants.SHIMMER_DURATION) + .load(R.layout.fragment_game_servers_skeleton) + .show() + mBinding?.run { serverStatus.text = "游戏分类" serverTime.text = "开服时间" @@ -68,7 +80,6 @@ class GameServersPublishFragment : LazyFragment() { } } - val bundle = arguments bundle?.putString(EntranceUtils.KEY_TYPE, "开服") mContentFragment = childFragmentManager.findFragmentByTag(GameServersContentFragment::class.java.simpleName) as? GameServersContentFragment diff --git a/app/src/main/java/com/gh/gamecenter/servers/GameServersTestFragment.kt b/app/src/main/java/com/gh/gamecenter/servers/GameServersTestFragment.kt index 3c7a9fbc93..d8530cb907 100644 --- a/app/src/main/java/com/gh/gamecenter/servers/GameServersTestFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/servers/GameServersTestFragment.kt @@ -11,7 +11,10 @@ import androidx.recyclerview.widget.DefaultItemAnimator import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import androidx.viewpager.widget.ViewPager +import com.ethanhua.skeleton.Skeleton +import com.ethanhua.skeleton.ViewSkeletonScreen import com.gh.base.fragment.LazyFragment +import com.gh.common.constant.Constants import com.gh.common.exposure.ExposureListener import com.gh.common.exposure.ExposureSource import com.gh.common.util.* @@ -37,6 +40,7 @@ class GameServersTestFragment : LazyFragment() { private var mSubBinding: FragmentKaifuContentBinding? = null private var mViewModel: GameServersTestViewModel? = null private var mAdapter: GameServersTestAdapter? = null + private var mSkeleton: ViewSkeletonScreen? = null private var mExposureListener: ExposureListener? = null @@ -91,7 +95,6 @@ class GameServersTestFragment : LazyFragment() { setNavigationTitle(title) mViewModel?.testTitle = title ?: "总开测表" - mViewModel?.load() mViewModel?.listLiveData?.observe(this, Observer { if (it.isEmpty()) { showNoContentError() @@ -124,6 +127,15 @@ class GameServersTestFragment : LazyFragment() { mSubBinding = mBinding?.layoutFragmentContent + mSkeleton = Skeleton.bind(mBinding?.skeleton) + .shimmer(true) + .angle(Constants.SHIMMER_ANGLE) + .color(R.color.skeleton_shimmer_color) + .duration(Constants.SHIMMER_DURATION) + .load(R.layout.fragment_game_servers_skeleton) + .show() + mViewModel?.load() + if (isStandalonePage()) { showStandaloneFilter() } else { @@ -388,14 +400,20 @@ class GameServersTestFragment : LazyFragment() { mSubBinding?.recyclerView?.visibility = View.GONE mSubBinding?.reuseNoneData?.visibility = View.GONE mSubBinding?.noConnectionContainer?.root?.visibility = View.VISIBLE - mSubBinding?.noConnectionContainer?.root?.setOnClickListener { resetFilter() } + mSubBinding?.noConnectionContainer?.root?.setOnClickListener { + mSkeleton?.show() + resetFilter() + } mSubBinding?.loadingContainer?.root?.visibility = View.GONE } private fun showNoContentError() { mSubBinding?.recyclerView?.visibility = View.GONE mSubBinding?.reuseNoneData?.visibility = View.VISIBLE - mSubBinding?.reuseNoneData?.setOnClickListener { resetFilter() } + mSubBinding?.reuseNoneData?.setOnClickListener { + mSkeleton?.show() + resetFilter() + } mSubBinding?.loadingContainer?.root?.visibility = View.GONE mSubBinding?.noConnectionContainer?.root?.visibility = View.GONE } diff --git a/app/src/main/java/com/gh/gamecenter/subject/SubjectListFragment.kt b/app/src/main/java/com/gh/gamecenter/subject/SubjectListFragment.kt index f91c123cc2..f0bb78ee89 100644 --- a/app/src/main/java/com/gh/gamecenter/subject/SubjectListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/subject/SubjectListFragment.kt @@ -90,13 +90,19 @@ class SubjectListFragment : LazyListFragment() mIsColumnCollection = arguments?.getBoolean(EntranceUtils.KEY_IS_COLUMN_COLLECTION, false) ?: false super.onFragmentFirstVisible() (mListViewModel as SubjectListViewModel).lastPageDataMap = arguments?.get(SubjectFragment.LAST_PAGE_DATA) as? HashMap + + val skeletonLayoutId = when (arguments?.getString(EntranceUtils.KEY_SUBJECT_TYPE) ?: "") { + "detail" -> R.layout.fragment_subject_detail_skeleton + "tab" -> R.layout.fragment_subject_tab_skeleton + else -> R.layout.fragment_subject_skeleton + } mSkeletonScreen = Skeleton - .bind(mCachedView.findViewById(R.id.list_skeleton)) - .shimmer(true) - .angle(Constants.SHIMMER_ANGLE) - .color(R.color.skeleton_shimmer_color) - .duration(Constants.SHIMMER_DURATION) - .load(R.layout.fragment_subject_skeleton).show() + .bind(mCachedView.findViewById(R.id.list_skeleton)) + .shimmer(true) + .angle(Constants.SHIMMER_ANGLE) + .color(R.color.skeleton_shimmer_color) + .duration(Constants.SHIMMER_DURATION) + .load(skeletonLayoutId).show() mListViewModel.load(LoadType.REFRESH) } diff --git a/app/src/main/java/com/gh/gamecenter/subject/tab/SubjectTabFragment.kt b/app/src/main/java/com/gh/gamecenter/subject/tab/SubjectTabFragment.kt index dd76a8e9ce..217d031257 100644 --- a/app/src/main/java/com/gh/gamecenter/subject/tab/SubjectTabFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/subject/tab/SubjectTabFragment.kt @@ -56,6 +56,7 @@ class SubjectTabFragment : BaseFragment() { UrlFilterUtils.getFilterQuery("tags", tag) } bundle?.putParcelable(EntranceUtils.KEY_SUBJECT_DATA, copyData) + bundle?.putString(EntranceUtils.KEY_SUBJECT_TYPE, "detail") element.arguments = bundle fragments.add(element) } @@ -68,6 +69,7 @@ class SubjectTabFragment : BaseFragment() { ?: SubjectListFragment() val bundle = arguments?.clone() as Bundle? bundle?.putParcelable(EntranceUtils.KEY_SUBJECT_DATA, subjectData) + bundle?.putString(EntranceUtils.KEY_SUBJECT_TYPE, "tab") element.arguments = bundle fragments.add(element) diff --git a/app/src/main/java/com/gh/gamecenter/tag/TagsListFragment.kt b/app/src/main/java/com/gh/gamecenter/tag/TagsListFragment.kt index 899aa3bd5b..23d5f1339d 100644 --- a/app/src/main/java/com/gh/gamecenter/tag/TagsListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/tag/TagsListFragment.kt @@ -6,6 +6,7 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import butterknife.BindView import com.ethanhua.skeleton.Skeleton +import com.gh.common.constant.Constants import com.gh.common.exposure.ExposureListener import com.gh.common.exposure.ExposureSource import com.gh.common.util.DialogUtils @@ -66,6 +67,14 @@ class TagsListFragment : ListFragment() { setNavigationTitle("标签详情") + mSkeletonScreen = Skeleton.bind(skeletonView) + .shimmer(true) + .angle(Constants.SHIMMER_ANGLE) + .color(R.color.skeleton_shimmer_color) + .duration(Constants.SHIMMER_DURATION) + .load(R.layout.fragment_tags_skeleton) + .show() + mTag = arguments?.getString(TagsActivity.TAG) ?: "" val source = arguments?.getString(TagsActivity.SOURCE) ?: "" when (arguments?.getString(TagsActivity.FROM) ?: TagsActivity.From.OTHERS) { @@ -106,8 +115,6 @@ class TagsListFragment : ListFragment() { }) mListRv.addOnScrollListener(mExposureListener!!) - - mSkeletonScreen = Skeleton.bind(skeletonView).shimmer(false).load(R.layout.fragment_subject_skeleton).show() } override fun onResume() { diff --git a/app/src/main/res/drawable/bg_skeleton_radius_12.xml b/app/src/main/res/drawable/bg_skeleton_radius_12.xml new file mode 100644 index 0000000000..b0f83e524c --- /dev/null +++ b/app/src/main/res/drawable/bg_skeleton_radius_12.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_amway_skeleton.xml b/app/src/main/res/layout/fragment_amway_skeleton.xml index 65ad8283a4..02fa7bfeaf 100644 --- a/app/src/main/res/layout/fragment_amway_skeleton.xml +++ b/app/src/main/res/layout/fragment_amway_skeleton.xml @@ -1,22 +1,26 @@ - - + android:layout_height="wrap_content" + android:scrollbars="none"> - + android:layout_height="match_parent" + android:paddingLeft="20dp" + android:paddingRight="20dp" + android:orientation="vertical"> - + - + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_amway_skeleton_al.xml b/app/src/main/res/layout/fragment_amway_skeleton_al.xml index 03a2eb4013..4b5dd310d3 100644 --- a/app/src/main/res/layout/fragment_amway_skeleton_al.xml +++ b/app/src/main/res/layout/fragment_amway_skeleton_al.xml @@ -1,23 +1,22 @@ - + android:layout_height="wrap_content" + android:scrollbars="none"> - + android:layout_height="match_parent" + android:paddingTop="101dp" + android:paddingLeft="20dp" + android:paddingRight="20dp" + android:orientation="vertical"> - + - + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_category_skeleton.xml b/app/src/main/res/layout/fragment_category_skeleton.xml index 504f61bf9f..fe2d1707b1 100644 --- a/app/src/main/res/layout/fragment_category_skeleton.xml +++ b/app/src/main/res/layout/fragment_category_skeleton.xml @@ -1,815 +1,27 @@ - - + + android:layout_width="match_parent" + android:layout_height="match_parent" + android:paddingTop="4dp" + android:orientation="vertical"> - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_column_collection_detail.xml b/app/src/main/res/layout/fragment_column_collection_detail.xml index b848bca908..f722040ffc 100644 --- a/app/src/main/res/layout/fragment_column_collection_detail.xml +++ b/app/src/main/res/layout/fragment_column_collection_detail.xml @@ -3,7 +3,9 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_forum_list.xml b/app/src/main/res/layout/fragment_forum_list.xml index 153756f715..4438cb3269 100644 --- a/app/src/main/res/layout/fragment_forum_list.xml +++ b/app/src/main/res/layout/fragment_forum_list.xml @@ -5,6 +5,11 @@ android:layout_width="match_parent" android:layout_height="match_parent"> + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_forum_skeleton.xml b/app/src/main/res/layout/fragment_forum_skeleton.xml new file mode 100644 index 0000000000..b28c92d0d6 --- /dev/null +++ b/app/src/main/res/layout/fragment_forum_skeleton.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_game_servers.xml b/app/src/main/res/layout/fragment_game_servers.xml index 6c049e36d5..fffe089f29 100644 --- a/app/src/main/res/layout/fragment_game_servers.xml +++ b/app/src/main/res/layout/fragment_game_servers.xml @@ -1,74 +1,84 @@ - - - - - - - - + android:layout_height="match_parent" /> - + android:layout_height="match_parent"> - \ No newline at end of file + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_game_servers_publish.xml b/app/src/main/res/layout/fragment_game_servers_publish.xml index bddfe8dc64..98fe2675e8 100644 --- a/app/src/main/res/layout/fragment_game_servers_publish.xml +++ b/app/src/main/res/layout/fragment_game_servers_publish.xml @@ -1,81 +1,91 @@ - - - - - - - + android:layout_height="match_parent" /> - + android:layout_height="match_parent"> - + - \ No newline at end of file + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_game_servers_skeleton.xml b/app/src/main/res/layout/fragment_game_servers_skeleton.xml new file mode 100644 index 0000000000..ec51c87716 --- /dev/null +++ b/app/src/main/res/layout/fragment_game_servers_skeleton.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_special_catalog_first_skeleton.xml b/app/src/main/res/layout/fragment_special_catalog_first_skeleton.xml new file mode 100644 index 0000000000..1d77aedd85 --- /dev/null +++ b/app/src/main/res/layout/fragment_special_catalog_first_skeleton.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_special_catalog_second_skeleton.xml b/app/src/main/res/layout/fragment_special_catalog_second_skeleton.xml new file mode 100644 index 0000000000..7027460610 --- /dev/null +++ b/app/src/main/res/layout/fragment_special_catalog_second_skeleton.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_subject_collection_double_row_skeleton.xml b/app/src/main/res/layout/fragment_subject_collection_double_row_skeleton.xml new file mode 100644 index 0000000000..4bd1c74ea1 --- /dev/null +++ b/app/src/main/res/layout/fragment_subject_collection_double_row_skeleton.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_subject_collection_single_row_skeleton.xml b/app/src/main/res/layout/fragment_subject_collection_single_row_skeleton.xml new file mode 100644 index 0000000000..adeb6c2bdb --- /dev/null +++ b/app/src/main/res/layout/fragment_subject_collection_single_row_skeleton.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_subject_detail_skeleton.xml b/app/src/main/res/layout/fragment_subject_detail_skeleton.xml new file mode 100644 index 0000000000..e718228379 --- /dev/null +++ b/app/src/main/res/layout/fragment_subject_detail_skeleton.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_subject_skeleton.xml b/app/src/main/res/layout/fragment_subject_skeleton.xml index 9a0f0a9f0f..bd885223f4 100644 --- a/app/src/main/res/layout/fragment_subject_skeleton.xml +++ b/app/src/main/res/layout/fragment_subject_skeleton.xml @@ -1,5 +1,5 @@ + @@ -9,48 +9,28 @@ android:layout_height="match_parent" android:orientation="vertical"> - + - + - + - + - + - + - + - + - + - + - + - - - + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_subject_tab_skeleton.xml b/app/src/main/res/layout/fragment_subject_tab_skeleton.xml new file mode 100644 index 0000000000..eec757b171 --- /dev/null +++ b/app/src/main/res/layout/fragment_subject_tab_skeleton.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_tags_skeleton.xml b/app/src/main/res/layout/fragment_tags_skeleton.xml new file mode 100644 index 0000000000..178eb6ef39 --- /dev/null +++ b/app/src/main/res/layout/fragment_tags_skeleton.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_skeleton_amway.xml b/app/src/main/res/layout/item_skeleton_amway.xml new file mode 100644 index 0000000000..bc1ddc70f8 --- /dev/null +++ b/app/src/main/res/layout/item_skeleton_amway.xml @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_skeleton_catalog_simple_game.xml b/app/src/main/res/layout/item_skeleton_catalog_simple_game.xml new file mode 100644 index 0000000000..db60e4982d --- /dev/null +++ b/app/src/main/res/layout/item_skeleton_catalog_simple_game.xml @@ -0,0 +1,24 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_skeleton_catalog_subject.xml b/app/src/main/res/layout/item_skeleton_catalog_subject.xml new file mode 100644 index 0000000000..3681c1ff44 --- /dev/null +++ b/app/src/main/res/layout/item_skeleton_catalog_subject.xml @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_skeleton_catalog_subject_collection.xml b/app/src/main/res/layout/item_skeleton_catalog_subject_collection.xml new file mode 100644 index 0000000000..6223086498 --- /dev/null +++ b/app/src/main/res/layout/item_skeleton_catalog_subject_collection.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_skeleton_category.xml b/app/src/main/res/layout/item_skeleton_category.xml new file mode 100644 index 0000000000..967f1cc8be --- /dev/null +++ b/app/src/main/res/layout/item_skeleton_category.xml @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/item_skeleton_forum.xml b/app/src/main/res/layout/item_skeleton_forum.xml new file mode 100644 index 0000000000..a389d83792 --- /dev/null +++ b/app/src/main/res/layout/item_skeleton_forum.xml @@ -0,0 +1,26 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_skeleton_forum_activity.xml b/app/src/main/res/layout/item_skeleton_forum_activity.xml new file mode 100644 index 0000000000..bc65700eb9 --- /dev/null +++ b/app/src/main/res/layout/item_skeleton_forum_activity.xml @@ -0,0 +1,28 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_skeleton_forum_article.xml b/app/src/main/res/layout/item_skeleton_forum_article.xml new file mode 100644 index 0000000000..6718549de0 --- /dev/null +++ b/app/src/main/res/layout/item_skeleton_forum_article.xml @@ -0,0 +1,94 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_skeleton_forum_article_ask.xml b/app/src/main/res/layout/item_skeleton_forum_article_ask.xml index a142e8ce5f..9fc451c5bb 100644 --- a/app/src/main/res/layout/item_skeleton_forum_article_ask.xml +++ b/app/src/main/res/layout/item_skeleton_forum_article_ask.xml @@ -6,7 +6,6 @@ android:orientation="vertical" android:padding="16dp"> - diff --git a/app/src/main/res/layout/item_skeleton_forum_title.xml b/app/src/main/res/layout/item_skeleton_forum_title.xml new file mode 100644 index 0000000000..2c3f99a154 --- /dev/null +++ b/app/src/main/res/layout/item_skeleton_forum_title.xml @@ -0,0 +1,24 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_skeleton_forum_with_button.xml b/app/src/main/res/layout/item_skeleton_forum_with_button.xml new file mode 100644 index 0000000000..3633359015 --- /dev/null +++ b/app/src/main/res/layout/item_skeleton_forum_with_button.xml @@ -0,0 +1,34 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_skeleton_game_servers.xml b/app/src/main/res/layout/item_skeleton_game_servers.xml new file mode 100644 index 0000000000..f5e2b6e5e4 --- /dev/null +++ b/app/src/main/res/layout/item_skeleton_game_servers.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/item_skeleton_horizontal_forum.xml b/app/src/main/res/layout/item_skeleton_horizontal_forum.xml new file mode 100644 index 0000000000..99e2dead80 --- /dev/null +++ b/app/src/main/res/layout/item_skeleton_horizontal_forum.xml @@ -0,0 +1,27 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_skeleton_horizontal_forum_list.xml b/app/src/main/res/layout/item_skeleton_horizontal_forum_list.xml new file mode 100644 index 0000000000..d2072558d3 --- /dev/null +++ b/app/src/main/res/layout/item_skeleton_horizontal_forum_list.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_skeleton_order_game.xml b/app/src/main/res/layout/item_skeleton_order_game.xml new file mode 100644 index 0000000000..b23594bdef --- /dev/null +++ b/app/src/main/res/layout/item_skeleton_order_game.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_skeleton_subject_collection_double_row.xml b/app/src/main/res/layout/item_skeleton_subject_collection_double_row.xml new file mode 100644 index 0000000000..5f92a0d395 --- /dev/null +++ b/app/src/main/res/layout/item_skeleton_subject_collection_double_row.xml @@ -0,0 +1,27 @@ + + + + + + + diff --git a/app/src/main/res/layout/item_skeleton_subject_collection_single_row.xml b/app/src/main/res/layout/item_skeleton_subject_collection_single_row.xml new file mode 100644 index 0000000000..e1946a1f93 --- /dev/null +++ b/app/src/main/res/layout/item_skeleton_subject_collection_single_row.xml @@ -0,0 +1,9 @@ + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_skeleton_tags_game.xml b/app/src/main/res/layout/item_skeleton_tags_game.xml new file mode 100644 index 0000000000..65581ad46f --- /dev/null +++ b/app/src/main/res/layout/item_skeleton_tags_game.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file