diff --git a/app/src/main/java/com/yingmao/clash/fragment/home/HomeFragment.kt b/app/src/main/java/com/yingmao/clash/fragment/home/HomeFragment.kt index 426bc13..f422203 100644 --- a/app/src/main/java/com/yingmao/clash/fragment/home/HomeFragment.kt +++ b/app/src/main/java/com/yingmao/clash/fragment/home/HomeFragment.kt @@ -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 diff --git a/app/src/main/res/layout/home_fragment_layout.xml b/app/src/main/res/layout/home_fragment_layout.xml index 7aea766..7202b09 100644 --- a/app/src/main/res/layout/home_fragment_layout.xml +++ b/app/src/main/res/layout/home_fragment_layout.xml @@ -5,18 +5,18 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@drawable/ic_index_bg" - > + tools:ignore="MissingConstraints"> + app:layout_constraintTop_toTopOf="parent"> + + android:textSize="16sp" + android:textStyle="bold" /> @@ -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"> + android:textSize="16sp" /> - + + - - + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> - - + + + + + + - - + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> - + + + + + + app:layout_constraintTop_toBottomOf="@+id/llLink"> + app:layout_constraintTop_toTopOf="parent" /> - - \ No newline at end of file