Skip to content

Commit

Permalink
update RxFeature.
Browse files Browse the repository at this point in the history
  • Loading branch information
Vondear authored and Vondear committed Apr 25, 2019
1 parent bc80a0f commit 9a77bcf
Show file tree
Hide file tree
Showing 14 changed files with 19 additions and 8 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">

<!--<gradient android:angle="270" android:endColor="#A8C3B0"
android:startColor="#C6CFCE"/>-->
<!--<size android:height="60dp" android:width="320dp" />-->
<solid android:color="#4169E1"/>
<corners android:radius="8dp" />
<!-- <stroke android:width="1dp" android:color="#000000" />-->

</shape>
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<!--<gradient android:angle="270" android:endColor="#A8C3B0"
android:startColor="#C6CFCE"/>-->
<!--<size android:height="60dp" android:width="320dp" />-->
<solid android:color="@color/blue"/>
<solid android:color="#3F51B5"/>
<corners android:radius="8dp" />
<!-- <stroke android:width="1dp" android:color="#000000" />-->

Expand Down
12 changes: 6 additions & 6 deletions RxFeature/src/main/res/layout/activity_code_tool.xml
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@
android:id="@+id/iv_create_qr_code"
android:layout_width="40dp"
android:layout_height="40dp"
android:src="@drawable/next" />
android:src="@drawable/next_code_tool" />
</LinearLayout>

<LinearLayout
Expand All @@ -241,7 +241,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:src="@drawable/transparent_bg"
android:src="@drawable/transparent_bg_code_tool"
android:visibility="gone" />

<TextView
Expand All @@ -258,7 +258,7 @@
android:id="@+id/ll_bar_root"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/c"
android:background="#cccccc"
android:gravity="center_horizontal"
android:orientation="vertical"
android:paddingTop="10dp"
Expand All @@ -278,7 +278,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
android:digits="@string/number_letter"
android:digits="0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
android:gravity="center"
android:hint="请输入条形码文字内容"
android:padding="10dp"
Expand All @@ -293,7 +293,7 @@
android:id="@+id/iv_create_bar_code"
android:layout_width="40dp"
android:layout_height="40dp"
android:src="@drawable/next" />
android:src="@drawable/next_code_tool" />
</LinearLayout>

<LinearLayout
Expand All @@ -312,7 +312,7 @@
android:layout_gravity="center"
android:layout_marginTop="30dp"
android:layout_marginBottom="30dp"
android:src="@drawable/transparent_bg"
android:src="@drawable/transparent_bg_code_tool"
android:visibility="gone" />

<TextView
Expand Down
2 changes: 1 addition & 1 deletion RxFeature/src/main/res/layout/activity_scaner_code.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
android:layout_height="match_parent"
android:layout_alignParentTop="true"
android:layout_margin="5dp"
android:background="@drawable/kakalib_scan_ray"
android:background="@drawable/rxtool_scan_ray"
android:contentDescription="@string/app_name"/>
</RelativeLayout>

Expand Down

0 comments on commit 9a77bcf

Please sign in to comment.