Commit ec3c08dd authored by jyx's avatar jyx

UI 样式优化

parent 74dc5d6e
......@@ -14,7 +14,6 @@ import com.mints.flowbox.ad.express.ExpressManager
import com.mints.flowbox.ad.wifi.AppOutWifiAdManager
import com.mints.flowbox.ui.activitys.base.BaseActivity
import kotlinx.android.synthetic.main.activity_boost_fast.*
import kotlinx.android.synthetic.main.activity_boost_fast.container
import kotlinx.android.synthetic.main.activity_boost_fast.fl_ad
import kotlinx.android.synthetic.main.activity_boost_fast.iv_close
import kotlinx.android.synthetic.main.activity_screen.*
......@@ -56,17 +55,17 @@ class BoostFastActivity : BaseActivity() {
}
private fun startAnim() {
val colorAnim = ObjectAnimator.ofInt(
container,
"backgroundColor",
RED.toInt(),
BLUE.toInt(),
CYAN.toInt(),
GREEN.toInt()
)
colorAnim.duration = 3000
colorAnim.setEvaluator(ArgbEvaluator())
colorAnim.repeatMode = ValueAnimator.REVERSE
// val colorAnim = ObjectAnimator.ofInt(
// container,
// "backgroundColor",
// RED.toInt(),
// BLUE.toInt(),
// CYAN.toInt(),
// GREEN.toInt()
// )
// colorAnim.duration = 3000
// colorAnim.setEvaluator(ArgbEvaluator())
// colorAnim.repeatMode = ValueAnimator.REVERSE
when (mType) {
TransparentActivity.TIMING_TYPE_BOOST -> ccav_speed.setCenterImageView(R.mipmap.ic_app_out_timing_boost)
......@@ -78,7 +77,7 @@ class BoostFastActivity : BaseActivity() {
}
ccav_speed.startAnimation()
colorAnim.start()
// colorAnim.start()
Handler(Looper.getMainLooper()).postDelayed(
{
......@@ -89,15 +88,15 @@ class BoostFastActivity : BaseActivity() {
Handler(Looper.getMainLooper()).postDelayed({ updateUi() }, 3000)
colorAnim.addListener(object : Animator.AnimatorListener {
override fun onAnimationStart(animation: Animator?) {}
override fun onAnimationEnd(animation: Animator?) {
}
override fun onAnimationCancel(animation: Animator?) {}
override fun onAnimationRepeat(animation: Animator?) {}
})
// colorAnim.addListener(object : Animator.AnimatorListener {
// override fun onAnimationStart(animation: Animator?) {}
//
// override fun onAnimationEnd(animation: Animator?) {
// }
//
// override fun onAnimationCancel(animation: Animator?) {}
// override fun onAnimationRepeat(animation: Animator?) {}
// })
}
private fun updateUi() {
......
......@@ -43,7 +43,7 @@
android:layout_alignParentEnd="true"
android:layout_gravity="end|center_vertical"
android:layout_marginEnd="10dp"
android:src="@mipmap/ic_close"
android:src="@mipmap/ic_close_app_out"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
......
......@@ -12,19 +12,6 @@
android:orientation="vertical"
android:visibility="gone">
<TextView
android:layout_width="78dp"
android:layout_height="wrap_content"
android:layout_gravity="top"
android:layout_marginStart="10dp"
android:layout_marginTop="30dp"
android:drawablePadding="4dp"
android:gravity="center_vertical"
android:text="@string/appName"
android:textColor="@color/color_40000000"
android:textSize="12sp"
app:drawableStartCompat="@drawable/ic_launcher_app_out" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="100dp"
......@@ -35,12 +22,12 @@
<ImageView
android:id="@+id/iv_close"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_width="22dp"
android:layout_height="22dp"
android:layout_alignParentEnd="true"
android:layout_marginTop="10dp"
android:layout_marginEnd="10dp"
android:src="@mipmap/ic_close" />
android:src="@mipmap/ic_close_app_out" />
<TextView
android:id="@+id/tvContent"
......@@ -63,6 +50,19 @@
</RelativeLayout>
<TextView
android:layout_width="78dp"
android:layout_height="wrap_content"
android:layout_gravity="top"
android:layout_marginStart="20dp"
android:layout_marginTop="10dp"
android:drawablePadding="4dp"
android:gravity="center_vertical"
android:text="@string/appName"
android:textColor="@color/color_40000000"
android:textSize="12sp"
app:drawableStartCompat="@drawable/ic_launcher_app_out" />
<com.mints.flowbox.ui.widgets.RoundRectLayout
android:id="@+id/fl_ad"
android:layout_width="wrap_content"
......@@ -74,14 +74,14 @@
</androidx.appcompat.widget.LinearLayoutCompat>
<View
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="50dp"
android:layout_marginTop="150dp"
android:layout_marginEnd="50dp"
android:layout_marginBottom="150dp" />
<!-- <View-->
<!-- android:id="@+id/container"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="match_parent"-->
<!-- android:layout_marginStart="50dp"-->
<!-- android:layout_marginTop="200dp"-->
<!-- android:layout_marginEnd="50dp"-->
<!-- android:layout_marginBottom="200dp" />-->
<com.mints.flowbox.ui.widgets.CircleCleanAnimationView
android:id="@+id/ccav_speed"
......
......@@ -42,7 +42,7 @@
android:layout_alignParentEnd="true"
android:layout_gravity="end|center_vertical"
android:layout_marginEnd="10dp"
android:src="@mipmap/ic_activity_quit"
android:src="@mipmap/ic_close_app_out"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment