Commit 87c891a8 authored by wanglei's avatar wanglei

...

parent e0ce8b51
...@@ -4,10 +4,12 @@ import com.base.browserwhite.databinding.ActivityFeedbackBinding ...@@ -4,10 +4,12 @@ import com.base.browserwhite.databinding.ActivityFeedbackBinding
import com.base.browserwhite.ui.activity.BaseActivity import com.base.browserwhite.ui.activity.BaseActivity
class FeedbackActivity : BaseActivity<ActivityFeedbackBinding>() { class FeedbackActivity : BaseActivity<ActivityFeedbackBinding>() {
override val binding: ActivityFeedbackBinding
get() = TODO("Not yet implemented") override val binding: ActivityFeedbackBinding by lazy {
ActivityFeedbackBinding.inflate(layoutInflater)
}
override fun initView() { override fun initView() {
TODO("Not yet implemented")
} }
} }
...@@ -150,11 +150,11 @@ class Splash2Activity : BaseActivity<ActivitySplash2Binding>(), ...@@ -150,11 +150,11 @@ class Splash2Activity : BaseActivity<ActivitySplash2Binding>(),
} }
} else { } else {
if (isAgree) { if (isAgree) {
AnimationUtils.startAlphaAnimation(binding.pb, 800, null) { AnimationUtils.startAlphaAnimation(binding.pb, 400, null) {
callback.invoke() callback.invoke()
} }
} else { } else {
AnimationUtils.startAlphaAnimation(binding.idTvStart, 1200, { AnimationUtils.startAlphaAnimation(binding.idTvStart, 400, {
val set1 = AnimatorSet() val set1 = AnimatorSet()
// 创建缩放动画的ObjectAnimator // 创建缩放动画的ObjectAnimator
val scaleUpAnimator1 = ObjectAnimator.ofFloat(binding.idTvStart, "scaleX", 1f, 0.95f, 1.05f) val scaleUpAnimator1 = ObjectAnimator.ofFloat(binding.idTvStart, "scaleX", 1f, 0.95f, 1.05f)
......
...@@ -25,6 +25,8 @@ import com.base.browserwhite.databinding.DialogDeleteTipBinding ...@@ -25,6 +25,8 @@ import com.base.browserwhite.databinding.DialogDeleteTipBinding
import com.base.browserwhite.databinding.DialogMediaMoreBinding import com.base.browserwhite.databinding.DialogMediaMoreBinding
import com.base.browserwhite.databinding.DialogMyAccountBinding import com.base.browserwhite.databinding.DialogMyAccountBinding
import com.base.browserwhite.databinding.DialogSearchEngineBinding import com.base.browserwhite.databinding.DialogSearchEngineBinding
import com.base.browserwhite.ui.activity.about.AboutActivity
import com.base.browserwhite.ui.activity.feedback.FeedbackActivity
import com.base.browserwhite.ui.views.DialogViews.showSearchEngineDialog import com.base.browserwhite.ui.views.DialogViews.showSearchEngineDialog
import com.base.browserwhite.utils.ActivityLauncher import com.base.browserwhite.utils.ActivityLauncher
import com.base.browserwhite.utils.AppPreferences import com.base.browserwhite.utils.AppPreferences
...@@ -168,6 +170,12 @@ object DialogViews { ...@@ -168,6 +170,12 @@ object DialogViews {
binding.clClearRecord.setOnClickListener { binding.clClearRecord.setOnClickListener {
showCleanRecordDialog() showCleanRecordDialog()
} }
binding.clFeedback.setOnClickListener {
startActivity(Intent(this, FeedbackActivity::class.java))
}
binding.clAbout.setOnClickListener {
startActivity(Intent(this, AboutActivity::class.java))
}
binding.tvCancel.setOnClickListener { binding.tvCancel.setOnClickListener {
dialog.dismiss() dialog.dismiss()
......
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#F3F4F6" />
<corners android:radius="18dp" />
</shape>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<stroke android:width="0.5dp" android:color="#C3C6D6" />
<corners android:radius="15dp"/>
</shape>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<stroke
android:width="0.5dp"
android:color="#CACDDB" />
<corners android:radius="15dp" />
</shape>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/main" android:id="@+id/main"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="#EAEFF2"
android:orientation="vertical"
tools:context=".ui.activity.feedback.FeedbackActivity"> tools:context=".ui.activity.feedback.FeedbackActivity">
<FrameLayout <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/white"
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
<LinearLayout <LinearLayout
...@@ -50,10 +53,132 @@ ...@@ -50,10 +53,132 @@
android:layout_height="35dp" android:layout_height="35dp"
android:layout_gravity="center_vertical|end" android:layout_gravity="center_vertical|end"
android:layout_marginEnd="16dp" android:layout_marginEnd="16dp"
android:background="@drawable/bg_f3f4f6_18"
android:enabled="false" android:enabled="false"
android:gravity="center"
android:src="@drawable/bg_delete_download" android:src="@drawable/bg_delete_download"
tools:ignore="ContentDescription" /> android:text="Submit"
android:textColor="#AEAEB0"
android:textSize="16sp"
tools:ignore="ContentDescription,HardcodedText" />
</FrameLayout> </FrameLayout>
</androidx.constraintlayout.widget.ConstraintLayout> <FrameLayout
\ No newline at end of file android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="176dp"
android:layout_gravity="center_horizontal"
android:layout_marginHorizontal="15dp"
android:layout_marginTop="15dp"
android:layout_marginBottom="30dp"
android:background="@drawable/bg_stroke_c3c6d6_15"
android:orientation="vertical">
<EditText
android:id="@+id/edit"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginHorizontal="15dp"
android:layout_marginTop="15dp"
android:layout_weight="1"
android:background="@null"
android:gravity="top"
android:hint="Write down your question"
tools:ignore="Autofill,HardcodedText,TextFields" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:layout_marginEnd="15dp"
android:layout_marginBottom="15dp"
android:text="0/500"
tools:ignore="HardcodedText" />
</LinearLayout>
</FrameLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:background="@color/white">
<TextView
android:id="@+id/tv_tip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="21dp"
android:text="Upload screenshot(optional)"
android:textColor="@color/black"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="HardcodedText" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="20dp"
android:text="0/3"
android:textColor="#79797B"
android:textSize="15sp"
app:layout_constraintBottom_toBottomOf="@id/tv_tip"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/tv_tip"
tools:ignore="HardcodedText" />
<FrameLayout
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_marginTop="14dp"
android:layout_marginBottom="25dp"
android:background="@drawable/bg_stroke_cacddb_15"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="@id/tv_tip"
app:layout_constraintTop_toBottomOf="@id/tv_tip">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:src="@mipmap/taijian_feedback"
tools:ignore="ContentDescription" />
</FrameLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:background="@color/white">
<EditText
android:id="@+id/edit_email"
android:layout_width="match_parent"
android:layout_height="55dp"
android:layout_marginHorizontal="15dp"
android:layout_marginVertical="25dp"
android:background="@drawable/bg_stroke_cacddb_15"
android:gravity="center_vertical"
android:hint="Email Address"
android:inputType="textEmailAddress"
android:paddingStart="16dp"
android:textColor="@color/black"
android:textSize="15sp"
tools:ignore="Autofill,HardcodedText,RtlSymmetry" />
</FrameLayout>
</LinearLayout>
\ No newline at end of file
...@@ -340,6 +340,7 @@ ...@@ -340,6 +340,7 @@
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_feedback"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
...@@ -386,6 +387,7 @@ ...@@ -386,6 +387,7 @@
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_about"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
......
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