diff --git a/app/src/main/res/drawable/vididinapp_feature_mine_bg_top.xml b/app/src/main/res/drawable/mine_bg_top.xml similarity index 100% rename from app/src/main/res/drawable/vididinapp_feature_mine_bg_top.xml rename to app/src/main/res/drawable/mine_bg_top.xml diff --git a/app/src/main/res/layout/vididinapp_feature_mine_fragment_mine.xml b/app/src/main/res/layout/vididinapp_feature_mine_fragment_mine.xml index 8c1ac88..1ccb494 100644 --- a/app/src/main/res/layout/vididinapp_feature_mine_fragment_mine.xml +++ b/app/src/main/res/layout/vididinapp_feature_mine_fragment_mine.xml @@ -15,7 +15,7 @@ android:id="@+id/top_background" android:layout_width="match_parent" android:layout_height="0dp" - android:background="@drawable/vididinapp_feature_mine_bg_top" + android:background="@drawable/mine_bg_top" app:layout_constraintDimensionRatio="642:360" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" @@ -36,9 +36,8 @@ android:id="@+id/avatar_view" android:layout_width="100dp" android:layout_height="100dp" - android:scaleType="centerCrop" - android:background="@color/gray3" - android:src="@mipmap/temp" + app:scaleType="centerCrop" + app:src="@mipmap/img_1" app:isCircle="true" /> @@ -91,7 +90,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:src="@mipmap/temp" /> + android:src="@mipmap/mine_privcy" /> + android:src="@mipmap/icon_arrow_right" /> @@ -131,7 +130,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:src="@mipmap/temp" /> + android:src="@mipmap/mine_version" /> + android:src="@mipmap/icon_arrow_right" /> + android:src="@mipmap/mine_feedback" /> + android:src="@mipmap/icon_arrow_right" /> diff --git a/app/src/main/res/mipmap-hdpi/img_1.png b/app/src/main/res/mipmap-hdpi/img_1.png new file mode 100644 index 0000000..b47f52c Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/img_1.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/icon_arrow_right.webp b/app/src/main/res/mipmap-xxhdpi/icon_arrow_right.webp new file mode 100644 index 0000000..28feb6f Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/icon_arrow_right.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/mine_feedback.webp b/app/src/main/res/mipmap-xxhdpi/mine_feedback.webp new file mode 100644 index 0000000..392057a Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/mine_feedback.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/mine_privcy.webp b/app/src/main/res/mipmap-xxhdpi/mine_privcy.webp new file mode 100644 index 0000000..797b834 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/mine_privcy.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/mine_version.webp b/app/src/main/res/mipmap-xxhdpi/mine_version.webp new file mode 100644 index 0000000..988ff98 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/mine_version.webp differ diff --git a/core/architecture/src/main/java/com/ama/core/architecture/widget/CircleImageView.kt b/core/architecture/src/main/java/com/ama/core/architecture/widget/CircleImageView.kt index 9a2cfd1..aca981d 100644 --- a/core/architecture/src/main/java/com/ama/core/architecture/widget/CircleImageView.kt +++ b/core/architecture/src/main/java/com/ama/core/architecture/widget/CircleImageView.kt @@ -8,6 +8,7 @@ import androidx.annotation.AttrRes import com.ama.core.architecture.R import androidx.core.content.withStyledAttributes import androidx.core.graphics.withSave +import com.ama.core.architecture.util.ResUtil class CircleImageView @JvmOverloads constructor( context: Context, @@ -16,9 +17,10 @@ class CircleImageView @JvmOverloads constructor( ) : View(context, attrs, defStyleAttr) { private var bitmap: Bitmap? = null - private val paint = Paint(Paint.ANTI_ALIAS_FLAG).apply { + private val mPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { isAntiAlias = true isDither = true + color = ResUtil.getColor(R.color.gray_9) } private val drawRect = RectF() private var scaleType = ScaleType.CENTER_CROP @@ -39,17 +41,15 @@ class CircleImageView @JvmOverloads constructor( context.withStyledAttributes( attrs, R.styleable.ProtoImageView, defStyleAttr, 0 ) { - val srcResource = getResourceId(R.styleable.ProtoImageView_src, 0) if (srcResource != 0) { setImageResource(srcResource) } - val scaleTypeIndex = getInt(R.styleable.ProtoImageView_imageScaleType, 2) + val scaleTypeIndex = getInt(R.styleable.ProtoImageView_scaleType, 2) scaleType = ScaleType.values().getOrElse(scaleTypeIndex) { ScaleType.CENTER_CROP } roundRadius = getDimension(R.styleable.ProtoImageView_roundRadius, 0f) isCircle = getBoolean(R.styleable.ProtoImageView_isCircle, false) - } } @@ -149,7 +149,8 @@ class CircleImageView @JvmOverloads constructor( if (isCircle || roundRadius > 0) { clipPath(path) } - drawBitmap(bitmap, null, drawRect, paint) + drawRect(drawRect, mPaint) + drawBitmap(bitmap, null, drawRect, mPaint) } } diff --git a/core/architecture/src/main/res/values/attrs.xml b/core/architecture/src/main/res/values/attrs.xml index 4f02ae7..94a1e41 100644 --- a/core/architecture/src/main/res/values/attrs.xml +++ b/core/architecture/src/main/res/values/attrs.xml @@ -3,7 +3,7 @@ - + diff --git a/core/architecture/src/main/res/values/colors.xml b/core/architecture/src/main/res/values/colors.xml index 33853e0..d56c2cf 100644 --- a/core/architecture/src/main/res/values/colors.xml +++ b/core/architecture/src/main/res/values/colors.xml @@ -51,6 +51,8 @@ 00000000 #FF6B9E #FFFFFF + #333333 + #999999 \ No newline at end of file