fix uimain布局
This commit is contained in:
cyh
parent
6ab8634813
commit
966a73918a
|
|
@ -89,7 +89,7 @@ class HomeFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispatcher
|
|||
private lateinit var mainAtyVM: MainAtyVM
|
||||
private lateinit var tvNotice: MarqueeTextView
|
||||
private lateinit var llNoticeBackground: LinearLayout
|
||||
private lateinit var llIntelligentMode: LinearLayout
|
||||
private lateinit var llIntelligentMode: ConstraintLayout
|
||||
private lateinit var acceleratedStartup: AppCompatImageView
|
||||
private lateinit var countryIv: AppCompatImageView
|
||||
private lateinit var nodeNameTv: TextView
|
||||
|
|
@ -98,7 +98,7 @@ class HomeFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispatcher
|
|||
private lateinit var tvProxyMode: TextView
|
||||
private lateinit var tvExpirationTime: TextView
|
||||
private lateinit var refreshExpire: ImageView
|
||||
private lateinit var llLine: LinearLayout
|
||||
private lateinit var llLine: ConstraintLayout
|
||||
private lateinit var clActivity: ConstraintLayout
|
||||
private lateinit var clMember: ConstraintLayout
|
||||
|
||||
|
|
|
|||
|
|
@ -5,18 +5,18 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="@drawable/ic_index_bg"
|
||||
>
|
||||
tools:ignore="MissingConstraints">
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/llCustomer"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
android:layout_marginStart="41dp"
|
||||
android:layout_marginTop="60dp"
|
||||
android:layout_marginTop="48dp"
|
||||
android:orientation="horizontal"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
>
|
||||
app:layout_constraintTop_toTopOf="parent">
|
||||
|
||||
<androidx.appcompat.widget.AppCompatImageView
|
||||
android:id="@+id/ivCustomer"
|
||||
android:layout_width="wrap_content"
|
||||
|
|
@ -28,30 +28,29 @@
|
|||
android:id="@+id/tvCustomer"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:layout_marginStart="5dp"
|
||||
android:text="@string/kefu"
|
||||
android:textColor="@color/blue_0136CB"
|
||||
android:textStyle="bold"
|
||||
android:textSize="14sp"
|
||||
android:layout_gravity="center"
|
||||
/>
|
||||
android:textSize="16sp"
|
||||
android:textStyle="bold" />
|
||||
</LinearLayout>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvBinding"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:padding="5dp"
|
||||
android:text="@string/login"
|
||||
android:textColor="@color/blue_0136CB"
|
||||
android:layout_marginEnd="34dp"
|
||||
android:paddingStart="12dp"
|
||||
android:paddingEnd="12dp"
|
||||
android:paddingTop="5dp"
|
||||
android:visibility="gone"
|
||||
android:textSize="13sp"
|
||||
android:layout_marginBottom="5dp"
|
||||
android:background="@drawable/home_login_splash_bg"
|
||||
android:padding="5dp"
|
||||
android:paddingStart="12dp"
|
||||
android:paddingTop="5dp"
|
||||
android:paddingEnd="12dp"
|
||||
android:text="@string/login"
|
||||
android:textColor="@color/blue_0136CB"
|
||||
android:textSize="13sp"
|
||||
android:visibility="gone"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/llCustomer"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="@+id/llCustomer" />
|
||||
|
|
@ -61,114 +60,146 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="40dp"
|
||||
android:layout_marginEnd="40dp"
|
||||
android:layout_marginTop="10dp"
|
||||
android:layout_marginEnd="40dp"
|
||||
android:background="@drawable/home_notice_splash_bg"
|
||||
android:gravity="center"
|
||||
android:orientation="horizontal"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/llCustomer"
|
||||
>
|
||||
app:layout_constraintTop_toBottomOf="@+id/llCustomer">
|
||||
|
||||
<com.yingmao.clash.util.MarqueeTextView
|
||||
android:id="@+id/tvNotice"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="50dp"
|
||||
android:layout_marginEnd="50dp"
|
||||
android:layout_marginStart="@dimen/dp_15"
|
||||
android:layout_marginEnd="@dimen/dp_15"
|
||||
android:ellipsize="marquee"
|
||||
android:focusable="true"
|
||||
android:focusableInTouchMode="true"
|
||||
android:marqueeRepeatLimit="marquee_forever"
|
||||
android:padding="10dp"
|
||||
android:textSize="16sp"
|
||||
android:scrollHorizontally="true"
|
||||
android:singleLine="true"
|
||||
android:text="新会员充值优惠，畅享未来更多精彩"
|
||||
android:textColor="@color/blue_0136CB"
|
||||
/>
|
||||
android:textSize="16sp" />
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/llLink"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginStart="36dp"
|
||||
android:layout_marginTop="15dp"
|
||||
android:layout_marginEnd="36dp"
|
||||
android:baselineAligned="false"
|
||||
android:orientation="horizontal"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/llNoticeBackground"
|
||||
android:layout_marginStart="36dp"
|
||||
android:layout_marginEnd="36dp"
|
||||
android:layout_marginTop="15dp"
|
||||
>
|
||||
<LinearLayout
|
||||
app:layout_constraintHeight_percent="0.135"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/llNoticeBackground">
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:id="@+id/llIntelligentMode"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_gravity="center"
|
||||
android:layout_weight="1"
|
||||
android:translationZ="1dp"
|
||||
android:background="@drawable/home_mode_bg"
|
||||
android:orientation="vertical"
|
||||
android:translationZ="1dp"
|
||||
tools:ignore="UselessParent">
|
||||
<androidx.appcompat.widget.AppCompatImageView
|
||||
android:id="@+id/iv_proxy_mode"
|
||||
android:layout_width="53dp"
|
||||
android:layout_height="53dp"
|
||||
android:src="@drawable/smart"
|
||||
android:layout_gravity="center"
|
||||
android:layout_marginStart="39dp"
|
||||
android:layout_marginEnd="39dp"
|
||||
android:layout_marginTop="@dimen/dp_10"
|
||||
/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_proxy_model"
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:layout_marginTop="5dp"
|
||||
android:layout_marginBottom="@dimen/dp_10"
|
||||
android:text="@string/IntelligentMode"
|
||||
android:textColor="@color/blue_0136CB"
|
||||
android:textSize="16sp"
|
||||
android:textStyle="bold" />
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent">
|
||||
|
||||
</LinearLayout>
|
||||
<LinearLayout
|
||||
<androidx.appcompat.widget.AppCompatImageView
|
||||
android:id="@+id/iv_proxy_mode"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:layout_gravity="center"
|
||||
android:layout_marginStart="39dp"
|
||||
android:layout_marginEnd="39dp"
|
||||
android:src="@drawable/smart"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintHeight_percent="0.55"
|
||||
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintWidth_percent="0.55" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_proxy_model"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:layout_marginTop="5dp"
|
||||
android:layout_marginBottom="@dimen/dp_10"
|
||||
android:text="@string/IntelligentMode"
|
||||
android:textColor="@color/blue_0136CB"
|
||||
android:textSize="16sp"
|
||||
android:textStyle="bold"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/iv_proxy_mode" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:id="@+id/llLine"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_marginStart="12dp"
|
||||
android:layout_weight="1"
|
||||
android:background="@drawable/home_link_bg"
|
||||
android:layout_marginStart="12dp"
|
||||
android:orientation="vertical"
|
||||
tools:ignore="UselessParent">
|
||||
<androidx.appcompat.widget.AppCompatImageView
|
||||
android:id="@+id/countryIv"
|
||||
android:layout_width="53dp"
|
||||
android:layout_height="53dp"
|
||||
android:src="@drawable/ic_s_location"
|
||||
android:layout_gravity="center"
|
||||
android:layout_marginStart="39dp"
|
||||
android:layout_marginEnd="39dp"
|
||||
android:layout_marginTop="@dimen/dp_10"
|
||||
/>
|
||||
<TextView
|
||||
android:id="@+id/nodeNameTv"
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/AutomaticSelection"
|
||||
android:layout_gravity="center"
|
||||
android:layout_marginTop="5dp"
|
||||
android:textStyle="bold"
|
||||
android:textSize="16sp"
|
||||
android:textColor="@color/blue_0136CB"
|
||||
android:layout_marginBottom="@dimen/dp_10"
|
||||
/>
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent">
|
||||
|
||||
</LinearLayout>
|
||||
<androidx.appcompat.widget.AppCompatImageView
|
||||
android:id="@+id/countryIv"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:layout_gravity="center"
|
||||
android:layout_marginStart="39dp"
|
||||
android:layout_marginEnd="39dp"
|
||||
android:src="@drawable/ic_s_location"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintHeight_percent="0.55"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintWidth_percent="0.55" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/nodeNameTv"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:layout_marginTop="5dp"
|
||||
android:layout_marginBottom="@dimen/dp_10"
|
||||
android:text="@string/AutomaticSelection"
|
||||
android:textColor="@color/blue_0136CB"
|
||||
android:textSize="16sp"
|
||||
android:textStyle="bold"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/countryIv" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
</LinearLayout>
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
|
|
@ -181,23 +212,21 @@
|
|||
android:background="@drawable/home_pay_bg"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/llLink"
|
||||
>
|
||||
app:layout_constraintTop_toBottomOf="@+id/llLink">
|
||||
|
||||
<ImageView
|
||||
android:layout_marginStart="5dp"
|
||||
android:id="@+id/refresh_expire_iv"
|
||||
android:layout_width="25dp"
|
||||
android:layout_height="25dp"
|
||||
android:contentDescription="@string/confirm"
|
||||
android:src="@drawable/refresh2"
|
||||
android:layout_marginStart="5dp"
|
||||
android:layout_marginTop="10dp"
|
||||
android:layout_marginEnd="16dp"
|
||||
android:layout_marginBottom="10dp"
|
||||
android:contentDescription="@string/confirm"
|
||||
android:src="@drawable/refresh2"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
/>
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvExpirationTimeTxt"
|
||||
|
|
@ -229,8 +258,10 @@
|
|||
|
||||
<androidx.appcompat.widget.AppCompatImageView
|
||||
android:id="@+id/acceleratedStartup"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
app:layout_constraintHeight_percent="0.255"
|
||||
app:layout_constraintWidth_percent="0.588"
|
||||
android:layout_marginTop="27dp"
|
||||
android:scaleType="centerInside"
|
||||
android:src="@drawable/accelerate_selector"
|
||||
|
|
@ -242,7 +273,7 @@
|
|||
android:id="@+id/clActivity"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="48dp"
|
||||
android:layout_marginTop="25dp"
|
||||
android:layout_marginEnd="36dp"
|
||||
android:background="@drawable/home_activity_bg"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
|
|
@ -298,25 +329,23 @@
|
|||
android:id="@+id/tvGetMember"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="6dp"
|
||||
android:text="@string/getMember"
|
||||
android:textColor="@color/bule_1F22B8"
|
||||
android:textSize="13sp"
|
||||
android:layout_marginTop="6dp"
|
||||
android:textStyle="bold" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvGetMemberStr"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="6dp"
|
||||
android:text="@string/MoreWonderful"
|
||||
android:textColor="@color/blue_0136CB"
|
||||
android:layout_marginBottom="6dp"
|
||||
android:textSize="12sp" />
|
||||
|
||||
</LinearLayout>
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
|
||||
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
Loading…
Reference in New Issue