klaus/sodalive-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

카울리 - 무료 충전 버튼 크기 수정, 캔 내역에 무료 충전 버튼 추가

Browse Source
This commit is contained in:
klaus
2023-10-27 22:22:58 +09:00
parent dc3240f224
commit cc73f471d2
7 changed files with 58 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
app/src/main/res/layout/activity_can_status.xml
View File

@@ -13,7 +13,7 @@
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_above="@+id/fl_charge_can"
android:layout_above="@+id/ll_charge_can"
android:layout_below="@+id/toolbar">
<LinearLayout
@@ -165,39 +165,50 @@
</androidx.core.widget.NestedScrollView>
<FrameLayout
android:id="@+id/fl_charge_can"
<LinearLayout
android:id="@+id/ll_charge_can"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:background="@drawable/bg_top_round_corner_16_7_222222">
android:background="@drawable/bg_top_round_corner_16_7_222222"
android:paddingHorizontal="13.3dp">
<LinearLayout
android:id="@+id/ll_charge_can"
android:layout_width="match_parent"
<TextView
android:id="@+id/tv_free_charge_can"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="13.3dp"
android:layout_marginVertical="13.7dp"
android:background="@drawable/bg_round_corner_10_80d8ff"
android:layout_gravity="center"
android:layout_marginEnd="8dp"
android:layout_weight="1"
android:background="@drawable/bg_round_corner_10_b1ef2c"
android:fontFamily="@font/gmarket_sans_bold"
android:gravity="center"
android:paddingVertical="16dp">
android:paddingVertical="16dp"
android:text="무료충전"
android:textColor="@color/black"
android:textSize="18.3sp" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@null"
android:src="@drawable/ic_can" />
<FrameLayout
android:id="@+id/fl_charge_can"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginVertical="13.7dp"
android:layout_weight="2"
android:background="@drawable/bg_round_corner_10_80d8ff"
android:paddingVertical="16dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="6.7dp"
android:layout_gravity="center"
android:drawablePadding="6.7dp"
android:fontFamily="@font/gmarket_sans_bold"
android:gravity="center"
android:text="충전하기"
android:textColor="@color/color_1313bc"
android:textSize="18.3sp" />
</LinearLayout>
</FrameLayout>
android:textSize="18.3sp"
app:drawableStartCompat="@drawable/ic_can" />
</FrameLayout>
</LinearLayout>
</RelativeLayout>