Skip to content

L
LuckyFarm
Commit 4a8701f7 authored by erwin's avatar erwin
Browse files
Options

黄军辉 

    修改UI
parent ae43040b
Hide whitespace changes
Inline Side-by-side
Showing with 125 additions and 34 deletions
app/src/main/java/com/ym/game/adapter/SigninDropsAdapter.kt
View file @ 4a8701f7
......@@ -62,13 +62,13 @@ class SigninDropsAdapter :
holder.tvDay.text = "第${data.id}天"
if (data.status == 1) {
holder.tvStatus.text = "已领取"
holder.ivStatus.setImageResource(R.mipmap.icon_main_popup_singnin_received)
holder.ivStatus.setImageResource(R.drawable.tab_1)
} else {
holder.tvStatus.text = "+${data.awardNum}"
holder.ivStatus.setImageResource(R.mipmap.icon_main_popup_singnin_receiv)
holder.ivStatus.setImageResource(R.drawable.tab_2)
}
if (data.id == 7) {
holder.ivStatus.setImageResource(R.mipmap.icon_main_popup_singnin_receiv_treasure_chest)
holder.ivStatus.setImageResource(R.drawable.tab_3)
}
}
......
app/src/main/res/drawable/item_sing_bg.xml 0 → 100644
View file @ 4a8701f7
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<corners android:radius="12dp"/>
<solid android:color="#FFF3E0"/>
</shape>
\ No newline at end of file
app/src/main/res/drawable/sing_bg_nom.xml 0 → 100644
View file @ 4a8701f7
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<corners android:radius="6dp"/>
<solid android:color="#F3D8AB"/>
</shape>
\ No newline at end of file
app/src/main/res/layout/item_signin_drops.xml
View file @ 4a8701f7
......@@ -7,47 +7,116 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_marginLeft="-4dp"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:orientation="vertical">
<TextView
android:id="@+id/tv_item_signin_day"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="6dp"
android:text="第N天"
android:textColor="#826033"
android:textSize="12sp" />
<RelativeLayout
android:id="@+id/rl_root"
android:layout_width="70dp"
android:layout_height="@dimen/dp_74">
<ImageView
android:id="@+id/iv_item_signin_status"
android:layout_width="100dp"
android:layout_height="match_parent"
android:src="@mipmap/icon_main_popup_singnin_received" />
android:layout_width="44dp"
android:layout_marginTop="6dp"
android:background="@drawable/item_sing_bg"
android:layout_height="@dimen/dp_60">
<TextView
android:id="@+id/tv_item_signin_status"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:gravity="center"
android:layout_marginLeft="4dp"
android:layout_marginRight="4dp"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:paddingTop="1dp"
android:paddingBottom="1dp"
android:background="@drawable/sing_bg_nom"
android:layout_centerHorizontal="true"
android:layout_marginBottom="5dp"
android:text="已领取"
android:textStyle="bold"
android:textColor="#99642D2D"
android:textSize="8sp" />
<ImageView
android:id="@+id/iv_item_signin_status"
android:layout_width="wrap_content"
android:src="@drawable/tab_1"
android:layout_marginTop="10dp"
android:layout_centerHorizontal="true"
android:layout_marginBottom="@dimen/dp_11"
android:text="60g"
android:textColor="#642D2D"
android:textSize="10sp" />
android:layout_height="wrap_content"
/>
</RelativeLayout>
<TextView
android:id="@+id/tv_item_signin_day"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/rl_root"
android:layout_gravity="center_horizontal"
android:layout_marginTop="6dp"
android:text="第N天"
android:textColor="#826033"
android:textSize="12.5sp" />
</LinearLayout>
</LinearLayout>
\ No newline at end of file
</LinearLayout>
<!--<?xml version="1.0" encoding="utf-8"?>-->
<!--<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:gravity="center_horizontal"-->
<!-- android:orientation="vertical">-->
<!-- <LinearLayout-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:orientation="vertical">-->
<!-- <RelativeLayout-->
<!-- android:id="@+id/rl_root"-->
<!-- android:layout_width="70dp"-->
<!-- android:layout_height="@dimen/dp_74">-->
<!-- <ImageView-->
<!-- android:id="@+id/iv_item_signin_status"-->
<!-- android:layout_width="100dp"-->
<!-- android:layout_height="match_parent"-->
<!-- android:src="@mipmap/icon_main_popup_singnin_received" />-->
<!-- <TextView-->
<!-- android:id="@+id/tv_item_signin_status"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_alignParentBottom="true"-->
<!-- android:layout_centerHorizontal="true"-->
<!-- android:layout_marginBottom="@dimen/dp_11"-->
<!-- android:text="60g"-->
<!-- android:textColor="#642D2D"-->
<!-- android:textSize="10sp" />-->
<!-- </RelativeLayout>-->
<!-- <TextView-->
<!-- android:id="@+id/tv_item_signin_day"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_below="@+id/rl_root"-->
<!-- android:layout_gravity="center_horizontal"-->
<!-- android:layout_marginTop="6dp"-->
<!-- android:text="第N天"-->
<!-- android:textColor="#826033"-->
<!-- android:textSize="12.5sp" />-->
<!-- </LinearLayout>-->
<!--</LinearLayout>-->
\ No newline at end of file
app/src/main/res/layout/layout_popup_drops.xml
View file @ 4a8701f7
......@@ -89,13 +89,22 @@
android:textStyle="bold" />
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_popup_signin_drops"
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginTop="12dp"
android:layout_marginRight="16dp" />
android:layout_marginRight="16dp"
android:padding="2dp"
android:background="@drawable/sing_bg_rili"
android:layout_height="wrap_content">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_popup_signin_drops"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
</RelativeLayout>
</LinearLayout>
......
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