From 4e7626ff416299a35d3ce283ffa4dc39d43e32bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=8E=89=E4=B9=85?= <1484288157@qq.com> Date: Mon, 22 Jun 2020 17:50:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B8=B8=E6=88=8F=E4=B8=8A=E4=BC=A0UI=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GameResourcePolicyDialogFragment.kt | 5 +- .../game/upload/GameUploadFragment.kt | 2 + .../layout/dialog_game_resource_policy.xml | 10 +-- .../main/res/layout/fragment_game_upload.xml | 70 ++++++++----------- 4 files changed, 42 insertions(+), 45 deletions(-) diff --git a/app/src/main/java/com/gh/gamecenter/game/upload/GameResourcePolicyDialogFragment.kt b/app/src/main/java/com/gh/gamecenter/game/upload/GameResourcePolicyDialogFragment.kt index ad3d75b7f7..089066a648 100644 --- a/app/src/main/java/com/gh/gamecenter/game/upload/GameResourcePolicyDialogFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/game/upload/GameResourcePolicyDialogFragment.kt @@ -10,6 +10,7 @@ import android.widget.TextView import com.gh.base.fragment.BaseDialogFragment import com.gh.common.DefaultJsApi import com.gh.common.util.MtaHelper +import com.gh.common.util.dip2px import com.gh.gamecenter.BuildConfig import com.gh.gamecenter.R import wendu.dsbridge.DWebView @@ -89,8 +90,8 @@ class GameResourcePolicyDialogFragment : BaseDialogFragment() { override fun onStart() { super.onStart() - val width = requireContext().resources.displayMetrics.widthPixels * 0.8 + val width = requireContext().resources.displayMetrics.widthPixels - 60F.dip2px() val height = ViewGroup.LayoutParams.WRAP_CONTENT - dialog?.window?.setLayout(width.toInt(), height) + dialog?.window?.setLayout(width, height) } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/game/upload/GameUploadFragment.kt b/app/src/main/java/com/gh/gamecenter/game/upload/GameUploadFragment.kt index a5b029892e..e4a7629388 100644 --- a/app/src/main/java/com/gh/gamecenter/game/upload/GameUploadFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/game/upload/GameUploadFragment.kt @@ -432,6 +432,7 @@ class GameUploadFragment : NormalFragment() { if (obj is InstallGameEntity) run { mInstallGameEntity = obj chooseGameLl.background = null + chooseGameLl.setPadding(0, 0, 0, 0) chooseGameIconIv.visibility = View.GONE tv_choose.text = mInstallGameEntity.packageName } @@ -491,6 +492,7 @@ class GameUploadFragment : NormalFragment() { this.gameVersion = version } chooseGameLl.background = null + chooseGameLl.setPadding(0, 0, 0, 0) chooseGameIconIv.visibility = View.GONE tv_choose.text = packageName } diff --git a/app/src/main/res/layout/dialog_game_resource_policy.xml b/app/src/main/res/layout/dialog_game_resource_policy.xml index f0f34614e8..d6ce6fc7e5 100644 --- a/app/src/main/res/layout/dialog_game_resource_policy.xml +++ b/app/src/main/res/layout/dialog_game_resource_policy.xml @@ -6,8 +6,8 @@ xmlns:tools="http://schemas.android.com/tools" android:gravity="center" android:paddingTop="22dp" - android:paddingLeft="20dp" - android:paddingRight="20dp" + android:paddingLeft="10dp" + android:paddingRight="10dp" android:paddingBottom="20dp" android:background="@drawable/background_shape_white_radius_6"> @@ -19,7 +19,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" android:textColor="@color/text_333333" - android:textSize="16dp" + android:textSize="16sp" android:textStyle="bold" tools:text="光环助手资源协议"/> @@ -39,6 +39,7 @@ android:layout_height="40dp" android:text="不同意" android:layout_marginTop="20dp" + android:layout_marginLeft="10dp" android:textSize="14sp" android:textColor="@color/text_333333" android:gravity="center" @@ -53,11 +54,12 @@ android:layout_height="40dp" android:text="同意" android:layout_marginTop="20dp" + android:layout_marginRight="10dp" android:textSize="14sp" android:textColor="@color/white" android:gravity="center" android:background="@drawable/button_blue_oval" - android:layout_marginLeft="40dp" + android:layout_marginLeft="20dp" app:layout_constraintStart_toEndOf="@+id/refuseTv" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@+id/webView" diff --git a/app/src/main/res/layout/fragment_game_upload.xml b/app/src/main/res/layout/fragment_game_upload.xml index 00dd072f45..c94d0c7bb4 100644 --- a/app/src/main/res/layout/fragment_game_upload.xml +++ b/app/src/main/res/layout/fragment_game_upload.xml @@ -93,19 +93,19 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingLeft="20dp" - android:paddingTop="20dp" - android:paddingRight="16dp" - android:paddingBottom="14dp" + android:layout_marginTop="20dp" + android:layout_marginBottom="14dp" android:text="游戏图标*" android:textColor="@color/text_333333" android:textSize="14sp" + app:layout_constraintBottom_toTopOf="@+id/gameIconRv" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -244,7 +243,7 @@ + android:layout_height="56dp"> @@ -307,7 +304,7 @@ + android:layout_height="56dp"> @@ -385,7 +379,7 @@ + android:layout_height="56dp"> @@ -535,19 +526,19 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingLeft="20dp" - android:paddingTop="16dp" - android:paddingRight="20dp" - android:paddingBottom="14dp" + android:layout_marginTop="16dp" + android:layout_marginBottom="14dp" android:text="游戏图片*" android:textColor="@color/text_333333" android:textSize="14sp" + app:layout_constraintBottom_toTopOf="@+id/rv_screenshot" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" />