diff --git a/app/src/main/java/com/gh/common/constant/Config.java b/app/src/main/java/com/gh/common/constant/Config.java index 11791eb252..689c5e8a38 100644 --- a/app/src/main/java/com/gh/common/constant/Config.java +++ b/app/src/main/java/com/gh/common/constant/Config.java @@ -82,6 +82,8 @@ public class Config { public static final int VIDEO_PAGE_SIZE = 21; // 视频列表大多都是一行3个 public static boolean isShow() { + if (SPUtils.getBoolean(Constants.SP_TEENAGER_MODEL)) return false; + if (getPreferences().getBoolean(FIX_DOWNLOAD_KEY, false)) return true; if (!isExistDownloadFilter()) return false; @@ -312,7 +314,9 @@ public class Config { if (!getPreferences().getBoolean(Config.FIX_DOWNLOAD_KEY, false) && Config.isShow()) { getPreferences().edit().putBoolean(Config.FIX_DOWNLOAD_KEY, true).apply(); } - EventBus.getDefault().post(new EBReuse("Refresh")); + if (!SPUtils.getBoolean(Constants.SP_TEENAGER_MODEL)) { + EventBus.getDefault().post(new EBReuse("Refresh")); + } } }); diff --git a/app/src/main/java/com/gh/common/constant/Constants.java b/app/src/main/java/com/gh/common/constant/Constants.java index 8c85137fa0..090168d8f1 100644 --- a/app/src/main/java/com/gh/common/constant/Constants.java +++ b/app/src/main/java/com/gh/common/constant/Constants.java @@ -157,6 +157,7 @@ public class Constants { //游戏详情推荐弹窗 public static final String SP_RECOMMEND_POPUP = "recommend_popup"; + public static final String SP_TEENAGER_MODEL = "teenager_model"; // 使用浏览器安装开关 diff --git a/app/src/main/java/com/gh/common/util/DetailDownloadUtils.java b/app/src/main/java/com/gh/common/util/DetailDownloadUtils.java index 9b60dae37e..c11ffe05d7 100644 --- a/app/src/main/java/com/gh/common/util/DetailDownloadUtils.java +++ b/app/src/main/java/com/gh/common/util/DetailDownloadUtils.java @@ -37,6 +37,12 @@ public class DetailDownloadUtils { return; } + if (SPUtils.getBoolean(Constants.SP_TEENAGER_MODEL)) { + viewHolder.mDownloadPb.setText("查看"); + viewHolder.mDownloadPb.setDownloadType(DownloadProgressBar.DownloadType.TEENAGER_MODEL); + return; + } + if (viewHolder.gameEntity.isReservable()) { if (!ReservationRepository.thisGameHasBeenReserved(viewHolder.gameEntity.getId())) { diff --git a/app/src/main/java/com/gh/common/util/DownloadItemUtils.kt b/app/src/main/java/com/gh/common/util/DownloadItemUtils.kt index 62f1b8fd1b..3a636797c4 100644 --- a/app/src/main/java/com/gh/common/util/DownloadItemUtils.kt +++ b/app/src/main/java/com/gh/common/util/DownloadItemUtils.kt @@ -11,6 +11,7 @@ import androidx.collection.ArrayMap import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView import com.gh.common.constant.Config +import com.gh.common.constant.Constants import com.gh.common.dialog.CertificationDialog import com.gh.common.dialog.DeviceRemindDialog import com.gh.common.dialog.PackageCheckDialogFragment @@ -168,6 +169,11 @@ object DownloadItemUtils { ) { // 控制是否显示下载按钮 downloadBtn.goneIf(!Config.isShowDownload(gameEntity.id) || context.getString(R.string.app_name) == gameEntity.name) + // 青少年模式显示查看 + if (SPUtils.getBoolean(Constants.SP_TEENAGER_MODEL)) { + downloadBtn.text = "查看" + return + } if (gameEntity.isReservable) { downloadBtn.apply { if (!ReservationRepository.thisGameHasBeenReserved(gameEntity.id)) { @@ -497,6 +503,24 @@ object DownloadItemUtils { GamePermissionDialogFragment::class.java.simpleName ) as GamePermissionDialogFragment? gamePermissionDialogFragment?.dismissAllowingStateLoss() + if (SPUtils.getBoolean(Constants.SP_TEENAGER_MODEL)) { + downloadBtn.setOnClickListener { + DialogHelper.showDialog( + context, + "提示", + "当前处于儿童/青少年模式， \n暂不提供游戏下载", + "退出青少年模式", + "关闭", + {}, + {}, + DialogHelper.Config( + centerTitle = true, + centerContent = true + ) + ) + } + return + } if (gameEntity.isReservable) { if (!ReservationRepository.thisGameHasBeenReserved(gameEntity.id)) { downloadBtn.setOnClickListener { diff --git a/app/src/main/java/com/gh/common/view/DownloadProgressBar.java b/app/src/main/java/com/gh/common/view/DownloadProgressBar.java index 2c10c2c542..f6351ffb35 100644 --- a/app/src/main/java/com/gh/common/view/DownloadProgressBar.java +++ b/app/src/main/java/com/gh/common/view/DownloadProgressBar.java @@ -40,6 +40,7 @@ public class DownloadProgressBar extends ProgressBar { RESERVED, H5_GAME, UPDATING, + TEENAGER_MODEL, XAPK_UNZIPPING, XAPK_SUCCESS, @@ -229,6 +230,10 @@ public class DownloadProgressBar extends ProgressBar { setProgressDrawable(getResources().getDrawable(R.drawable.progressbar_xapk_detail_style)); mDefaultColor = ContextCompat.getColor(getContext(), R.color.white); break; + case TEENAGER_MODEL: + setProgressDrawable(getResources().getDrawable(R.drawable.download_button_normal_style)); + mDefaultColor = ContextCompat.getColor(getContext(), R.color.white); + break; } mDownloadType = downloadType; diff --git a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java index 3ba7d515d5..42e5b3af50 100644 --- a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java @@ -44,6 +44,7 @@ import com.gh.download.DownloadManager; import com.gh.gamecenter.entity.AuthDialogEntity; import com.gh.gamecenter.entity.DeviceDialogEntity; import com.gh.gamecenter.entity.PrivacyPolicyEntity; +import com.gh.gamecenter.eventbus.EBTeenagerModelStatus; import com.gh.gamecenter.manager.FilterManager; import com.gh.gamecenter.retrofit.BiResponse; import com.gh.gamecenter.retrofit.Response; @@ -52,6 +53,7 @@ import com.halo.assistant.HaloApp; import com.lightgame.download.DownloadEntity; import com.lightgame.download.FileUtils; +import org.greenrobot.eventbus.EventBus; import org.jetbrains.annotations.NotNull; import org.json.JSONObject; @@ -376,6 +378,7 @@ public class SplashScreenActivity extends BaseActivity { private void prefetchData() { AppExecutor.getIoExecutor().execute(() -> { + if (HaloApp.getInstance().isBrandNewInstall) getTeenagerModel(); Config.getGhzsSettings(); deviceDialogSetting(); getFilterDetailTags(); @@ -408,6 +411,30 @@ public class SplashScreenActivity extends BaseActivity { }); } + @SuppressLint("CheckResult") + private void getTeenagerModel() { + RetrofitManager.getInstance(HaloApp.getInstance().getApplication()) + .getApi().getTeenagerModel(HaloApp.getInstance().getGid()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new BiResponse() { + @Override + public void onSuccess(ResponseBody data) { + try { + boolean preStatus = SPUtils.getBoolean(Constants.SP_TEENAGER_MODEL); + JSONObject object = new JSONObject(data.string()); + boolean curStatus = "open".equals(object.getString("status")); + SPUtils.setBoolean(Constants.SP_TEENAGER_MODEL, curStatus); + if (preStatus != curStatus) { + EventBus.getDefault().post(new EBTeenagerModelStatus()); + } + } catch (Throwable e) { + e.printStackTrace(); + } + } + }); + } + @AfterPermissionGranted(REQUEST_PERMISSION_TAG) private void checkAndRequestPermission() { if (EasyPermissions.hasPermissions(this, mPermissions)) { diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/DetailViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/DetailViewHolder.java index 23f677652e..0685379e04 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/DetailViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/DetailViewHolder.java @@ -23,6 +23,7 @@ import com.gh.common.util.CheckLoginUtils; import com.gh.common.util.DataLogUtils; import com.gh.common.util.DataUtils; import com.gh.common.util.DetailDownloadUtils; +import com.gh.common.util.DialogHelper; import com.gh.common.util.DialogUtils; import com.gh.common.util.DownloadDialogHelper; import com.gh.common.util.EnergyTaskHelper; @@ -336,6 +337,16 @@ public class DetailViewHolder { case UPDATING: Utils.toast(mViewHolder.context, "正在加急更新版本，敬请后续留意"); break; + case TEENAGER_MODEL: + DialogHelper.showCenterDialog( + mViewHolder.context, + "提示", "当前处于儿童/青少年模式， \n暂不提供游戏下载", "退出青少年模式", "关闭", + () -> { + }, + () -> { + } + ); + break; default: if (!mGameEntity.getApk().isEmpty()) { Intent intent = DownloadManagerActivity.getDownloadMangerIntent(mViewHolder.context, diff --git a/app/src/main/java/com/gh/gamecenter/eventbus/EBTeenagerModelStatus.java b/app/src/main/java/com/gh/gamecenter/eventbus/EBTeenagerModelStatus.java new file mode 100644 index 0000000000..2b4e87f35e --- /dev/null +++ b/app/src/main/java/com/gh/gamecenter/eventbus/EBTeenagerModelStatus.java @@ -0,0 +1,3 @@ +package com.gh.gamecenter.eventbus; + +public class EBTeenagerModelStatus { } diff --git a/app/src/main/java/com/gh/gamecenter/fragment/SearchToolbarFragment.java b/app/src/main/java/com/gh/gamecenter/fragment/SearchToolbarFragment.java index 3a2d973019..df688b82b5 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/SearchToolbarFragment.java +++ b/app/src/main/java/com/gh/gamecenter/fragment/SearchToolbarFragment.java @@ -1,6 +1,7 @@ package com.gh.gamecenter.fragment; import android.content.Intent; +import android.graphics.Color; import android.os.Bundle; import android.text.TextUtils; import android.view.Menu; @@ -21,6 +22,7 @@ import androidx.lifecycle.ViewModelProviders; import com.gh.base.SearchBarHint; import com.gh.base.fragment.BaseLazyFragment; import com.gh.common.constant.Config; +import com.gh.common.constant.Constants; import com.gh.common.databind.BindingAdapters; import com.gh.common.util.CheckLoginUtils; import com.gh.common.util.DataCollectionUtils; @@ -30,6 +32,7 @@ import com.gh.common.util.EntranceUtils; import com.gh.common.util.IntegralLogHelper; import com.gh.common.util.LogUtils; import com.gh.common.util.MtaHelper; +import com.gh.common.util.SPUtils; import com.gh.download.DownloadManager; import com.gh.gamecenter.BuildConfig; import com.gh.gamecenter.DownloadManagerActivity; @@ -40,6 +43,7 @@ import com.gh.gamecenter.energy.EnergyCenterActivity; import com.gh.gamecenter.entity.GameUpdateEntity; import com.gh.gamecenter.eventbus.EBDownloadStatus; import com.gh.gamecenter.eventbus.EBReuse; +import com.gh.gamecenter.eventbus.EBTeenagerModelStatus; import com.gh.gamecenter.message.MessageUnreadViewModel; import com.gh.gamecenter.packagehelper.PackageViewModel; import com.halo.assistant.HaloApp; @@ -74,6 +78,10 @@ public class SearchToolbarFragment extends BaseLazyFragment implements View.OnCl ImageView mSignView; @BindView(R.id.home_actionbar) View mContainer; + @BindView(R.id.actionbar_search_right) + ImageView mSearchRightView; + @BindView(R.id.actionbar_teenager_model) + View mTeenagerModelView; private MessageUnreadViewModel mUnreadViewModel; private PackageViewModel mPackageViewModel; @@ -210,12 +218,6 @@ public class SearchToolbarFragment extends BaseLazyFragment implements View.OnCl mMessageUnread.setVisibility(View.GONE); } }); - - if (BuildConfig.DEBUG || BuildConfig.BUILD_TIME != 0) { - mSignView.setVisibility(View.VISIBLE); - } else { - mSignView.setVisibility(View.GONE); - } } @Override @@ -238,14 +240,31 @@ public class SearchToolbarFragment extends BaseLazyFragment implements View.OnCl view.findViewById(R.id.actionbar_notification).setOnClickListener(this); view.findViewById(R.id.actionbar_search_rl).setOnClickListener(this); + if (BuildConfig.DEBUG || BuildConfig.BUILD_TIME != 0) { + mSignView.setVisibility(View.VISIBLE); + } else { + mSignView.setVisibility(View.GONE); + } + if (Config.isShow()) { mDownloadView.setVisibility(View.VISIBLE); } else { mDownloadView.setVisibility(View.INVISIBLE); } + if (SPUtils.getBoolean(Constants.SP_TEENAGER_MODEL)) { + mTeenagerModelView.setVisibility(View.VISIBLE); + mSearchContainerView.setVisibility(View.GONE); + mSearchRightView.setVisibility(View.VISIBLE); + } else { + mTeenagerModelView.setVisibility(View.GONE); + mSearchContainerView.setVisibility(View.VISIBLE); + mSearchRightView.setVisibility(View.GONE); + } + mSearchHintTv.setOnClickListener(this); mSignView.setOnClickListener(this); + mSearchRightView.setOnClickListener(this); } @Override @@ -270,6 +289,7 @@ public class SearchToolbarFragment extends BaseLazyFragment implements View.OnCl break; case R.id.actionbar_search_input: case R.id.actionbar_search_rl: + case R.id.actionbar_search_right: DataUtils.onEvent(getActivity(), "主页", "搜索框"); MtaHelper.onEvent("首页_点击", "顶栏", "搜索"); DataCollectionUtils.uploadClick(getActivity(), "搜索框", "主页"); @@ -299,6 +319,8 @@ public class SearchToolbarFragment extends BaseLazyFragment implements View.OnCl startActivity(EnergyCenterActivity.Companion.getIntent(requireContext())); break; + case R.id.actionbar_teenager_model: + break; } } @@ -319,6 +341,11 @@ public class SearchToolbarFragment extends BaseLazyFragment implements View.OnCl setDownloadHint(mPackageViewModel.getFilterSameUpdateLiveData().getValue()); } + @Subscribe(threadMode = ThreadMode.MAIN) + public void onEventMainThread(EBTeenagerModelStatus status) { + initActionBar(mCachedView); + } + private void setDownloadHint(List updateList) { String count = DownloadManager.getInstance(requireContext()).getDownloadOrUpdateCount(updateList); if (count != null) { @@ -363,12 +390,20 @@ public class SearchToolbarFragment extends BaseLazyFragment implements View.OnCl ((ImageView) mCachedView.findViewById(R.id.actionbar_iv_search)).setImageResource(R.drawable.toolbar_search_icon_light); ((ImageView) mCachedView.findViewById(R.id.actionbar_download)).setImageResource(R.drawable.toolbar_download_light); ((ImageView) mCachedView.findViewById(R.id.actionbar_message)).setImageResource(R.drawable.toolbar_message_light); + ((ImageView) mCachedView.findViewById(R.id.actionbar_teenager_model_iv)).setImageResource(R.drawable.toolbar_teenager_light); + ((TextView) mCachedView.findViewById(R.id.actionbar_teenager_model_tv)).setTextColor(Color.WHITE); + mSearchRightView.setImageResource(R.drawable.toolbar_search_light); + mTeenagerModelView.setBackgroundResource(R.drawable.button_round_1a000000); mSearchHintTv.setHintTextColor(ContextCompat.getColor(requireContext(), R.color.search_text_color_light)); mSearchContainerView.setBackgroundResource(R.drawable.home_search_bg_light); } else { ((ImageView) mCachedView.findViewById(R.id.actionbar_iv_search)).setImageResource(R.drawable.toolbar_search_icon); ((ImageView) mCachedView.findViewById(R.id.actionbar_download)).setImageResource(R.drawable.toolbar_download); ((ImageView) mCachedView.findViewById(R.id.actionbar_message)).setImageResource(R.drawable.toolbar_message); + ((ImageView) mCachedView.findViewById(R.id.actionbar_teenager_model_iv)).setImageResource(R.drawable.toolbar_teenager); + ((TextView) mCachedView.findViewById(R.id.actionbar_teenager_model_tv)).setTextColor(ContextCompat.getColor(requireContext(), R.color.text_666666)); + mSearchRightView.setImageResource(R.drawable.toolbar_search); + mTeenagerModelView.setBackgroundResource(R.drawable.button_round_f2f4f7); mSearchHintTv.setHintTextColor(ContextCompat.getColor(requireContext(), R.color.search_text_color_default)); mSearchContainerView.setBackgroundResource(R.drawable.home_search_bg); } diff --git a/app/src/main/java/com/gh/gamecenter/personal/PersonalFunctionAdapter.kt b/app/src/main/java/com/gh/gamecenter/personal/PersonalFunctionAdapter.kt index 0904de6c0d..8386b6e1f6 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/PersonalFunctionAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/personal/PersonalFunctionAdapter.kt @@ -288,6 +288,8 @@ class PersonalFunctionAdapter(val context: Context, val groupName: String, var m CheckLoginUtils.checkLogin(context, "我的光环-视频数据") {} } } + "青少年模式" -> { + } else -> { DirectUtils.directToLinkPage(context, linkEntity, "", "我的光环") } diff --git a/app/src/main/java/com/gh/gamecenter/personal/PersonalViewModel.kt b/app/src/main/java/com/gh/gamecenter/personal/PersonalViewModel.kt index 5ea40bc4ce..66d7b945c4 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/PersonalViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/personal/PersonalViewModel.kt @@ -58,7 +58,8 @@ class PersonalViewModel(application: Application) : AndroidViewModel(application Triple("微信提醒", R.drawable.personal_wechat_remind, "微信提醒"), Triple("安装包清理", R.drawable.personal_package_chean, "安装包清理"), Triple("分享光环", R.drawable.personal_share, "分享光环"), - Triple("设置", R.drawable.personal_setting, "设置") + Triple("设置", R.drawable.personal_setting, "设置"), + Triple("青少年模式", R.drawable.personal_teenager_model, "青少年模式") ) init { diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java b/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java index 2ed80ad668..ab29dd9739 100644 --- a/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java +++ b/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java @@ -3222,4 +3222,10 @@ public interface ApiService { */ @GET("home/common_collection/{collection_id}") Observable getCommonCollectionDetail(@Path("collection_id") String collectionId); + + /** + * 获取青少年模式状态 + */ + @GET("api_go/teen_mode/status") + Single getTeenagerModel(@Query("android_id") String gid); } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchGameIndexAdapter.kt b/app/src/main/java/com/gh/gamecenter/search/SearchGameIndexAdapter.kt index 88a82a4656..c9c1192fa8 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchGameIndexAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameIndexAdapter.kt @@ -4,11 +4,13 @@ import android.content.Context import android.util.SparseArray import android.view.Gravity import android.view.LayoutInflater +import android.view.View import android.view.ViewGroup import android.widget.LinearLayout import android.widget.TextView import androidx.collection.ArrayMap import androidx.recyclerview.widget.RecyclerView +import com.gh.common.constant.Constants import com.gh.common.constant.ItemViewType import com.gh.common.exposure.ExposureEvent import com.gh.common.exposure.ExposureSource @@ -284,32 +286,37 @@ class SearchGameIndexAdapter(context: Context, ) } - DownloadItemUtils.setOnClickListener( - mContext, - binding.gameItemIncluded.downloadBtn, - gameEntity, - holder.adapterPosition, - this, - StringUtils.buildString( - entrance, - "+(搜索-列表[", - key, - "=", - type, - "=", - (holder.getAdapterPosition() + 1).toString(), - "])" - ), - "搜索-列表:" + gameEntity.name!!, - exposureEvent, - null, - null, - object : EmptyCallback { - override fun onCallback() { - Util_System_Keyboard.hideSoftKeyboardByIBinder( - mContext, - binding.gameItemIncluded.downloadBtn.windowToken - ) + + if (SPUtils.getBoolean(Constants.SP_TEENAGER_MODEL)) { + binding.gameItemIncluded.downloadBtn.visibility = View.GONE + } else { + binding.gameItemIncluded.downloadBtn.visibility = View.VISIBLE + DownloadItemUtils.setOnClickListener( + mContext, + binding.gameItemIncluded.downloadBtn, + gameEntity, + holder.adapterPosition, + this, + StringUtils.buildString( + entrance, + "+(搜索-列表[", + key, + "=", + type, + "=", + (holder.getAdapterPosition() + 1).toString(), + "])" + ), + "搜索-列表:" + gameEntity.name!!, + exposureEvent, + null, + null, + object : EmptyCallback { + override fun onCallback() { + Util_System_Keyboard.hideSoftKeyboardByIBinder( + mContext, + binding.gameItemIncluded.downloadBtn.windowToken + ) if (searchMap[gameEntity.id] == null) { EventBus.getDefault() @@ -322,25 +329,26 @@ class SearchGameIndexAdapter(context: Context, // MtaHelper.onEvent("游戏搜索", "自动搜索", key) } - LogUtils.uploadSearchClick( - "search_click", - "搜索页", - key, - SearchType.fromString(type).toChinese(), - gameEntity.id, - gameEntity.name, - gameEntity.shouldUseMirrorInfo() - ) + LogUtils.uploadSearchClick( + "search_click", + "搜索页", + key, + SearchType.fromString(type).toChinese(), + gameEntity.id, + gameEntity.name, + gameEntity.shouldUseMirrorInfo() + ) + } } - } - ) + ) - DownloadItemUtils.updateItem( - mContext, - gameEntity, - GameViewHolder(binding.gameItemIncluded), - true - ) + DownloadItemUtils.updateItem( + mContext, + gameEntity, + GameViewHolder(binding.gameItemIncluded), + true + ) + } } else if (holder is SearchHistoryViewHolder) { holder.searchHistoryName.text = gameEntity.name holder.itemView.setOnClickListener { diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchGameResultAdapter.kt b/app/src/main/java/com/gh/gamecenter/search/SearchGameResultAdapter.kt index 0c2b5bea2f..0c40eba0fa 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchGameResultAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameResultAdapter.kt @@ -9,6 +9,7 @@ import android.widget.LinearLayout import android.widget.TextView import androidx.collection.ArrayMap import androidx.recyclerview.widget.RecyclerView +import com.gh.common.constant.Constants import com.gh.common.constant.ItemViewType import com.gh.common.exposure.ExposureEvent import com.gh.common.exposure.ExposureSource @@ -345,7 +346,12 @@ class SearchGameResultAdapter(context: Context, } } - DownloadItemUtils.setOnClickListener( + + if (SPUtils.getBoolean(Constants.SP_TEENAGER_MODEL)) { + binding.gameItemIncluded.downloadBtn.visibility = View.GONE + } else { + binding.gameItemIncluded.downloadBtn.visibility = View.VISIBLE + DownloadItemUtils.setOnClickListener( mContext, binding.gameItemIncluded.downloadBtn, gameEntity, @@ -379,9 +385,10 @@ class SearchGameResultAdapter(context: Context, } } } - ) + ) - DownloadItemUtils.updateItem(mContext, gameEntity, GameViewHolder(binding.gameItemIncluded), true) + DownloadItemUtils.updateItem(mContext, gameEntity, GameViewHolder(binding.gameItemIncluded), true) + } } private fun getContentTagView(content: String, width: Int, marginRight: Int, clickListener: () -> Unit): TextView { diff --git a/app/src/main/res/drawable-xxxhdpi/personal_teenager_model.webp b/app/src/main/res/drawable-xxxhdpi/personal_teenager_model.webp new file mode 100644 index 0000000000..1003703540 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/personal_teenager_model.webp differ diff --git a/app/src/main/res/drawable-xxxhdpi/toolbar_search.webp b/app/src/main/res/drawable-xxxhdpi/toolbar_search.webp new file mode 100644 index 0000000000..06aa2a00f3 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/toolbar_search.webp differ diff --git a/app/src/main/res/drawable-xxxhdpi/toolbar_search_light.webp b/app/src/main/res/drawable-xxxhdpi/toolbar_search_light.webp new file mode 100644 index 0000000000..c9fa43d6fa Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/toolbar_search_light.webp differ diff --git a/app/src/main/res/drawable-xxxhdpi/toolbar_teenager.webp b/app/src/main/res/drawable-xxxhdpi/toolbar_teenager.webp new file mode 100644 index 0000000000..3f4eb1a3e3 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/toolbar_teenager.webp differ diff --git a/app/src/main/res/drawable-xxxhdpi/toolbar_teenager_light.webp b/app/src/main/res/drawable-xxxhdpi/toolbar_teenager_light.webp new file mode 100644 index 0000000000..c59a49afdd Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/toolbar_teenager_light.webp differ diff --git a/app/src/main/res/drawable/button_round_1a000000.xml b/app/src/main/res/drawable/button_round_1a000000.xml new file mode 100644 index 0000000000..b2dd803ce5 --- /dev/null +++ b/app/src/main/res/drawable/button_round_1a000000.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/button_round_f2f4f7.xml b/app/src/main/res/drawable/button_round_f2f4f7.xml new file mode 100644 index 0000000000..a7bd6a9a52 --- /dev/null +++ b/app/src/main/res/drawable/button_round_f2f4f7.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_toolbar.xml b/app/src/main/res/layout/fragment_toolbar.xml index 4d5c332d4a..90eb926d1c 100644 --- a/app/src/main/res/layout/fragment_toolbar.xml +++ b/app/src/main/res/layout/fragment_toolbar.xml @@ -1,5 +1,6 @@ - + + + + + + + + + + + android:layout_marginRight="52dp"> - \ No newline at end of file + \ No newline at end of file