Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@lygttpod
lygttpod committed Dec 22, 2016
2 parents b780d70 + 348a960 commit 74d5abf
Show file tree
Hide file tree
Showing 7 changed files with 640 additions and 118 deletions.
214 changes: 115 additions & 99 deletions app/src/main/res/layout/common_textview_layout.xml
View file
Original file line number Diff line number Diff line change
@@ -1,126 +1,142 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:ctv="http://schemas.android.com/apk/res-auto"
xmlns:wave="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">

<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:orientation="vertical"
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.allen.library.CommonTextView
android:layout_width="match_parent"
android:layout_height="50dp"
ctv:cLeftTextString="清除缓存"
ctv:cRightIconResForDrawableRight="@drawable/arrow_right_red"
ctv:cRightTextColor="@color/colorAccent"
ctv:cRightTextString="20.5M"
ctv:cShowDividerLineType="both"
ctv:cUseRipple="true" />

<com.allen.library.CommonTextView
android:layout_width="match_parent"
android:layout_height="50dp"
ctv:cCenterTextString="中间文字"
ctv:cLeftTextString="左边文字"
ctv:cRightTextString="右边文字" />
<com.allen.library.CommonTextView
android:layout_width="match_parent"
android:layout_height="60dp"
ctv:cShowDividerLineType="bottom"
ctv:cCenterTextString="年龄\n250"
ctv:cLeftTextViewLineSpacingExtra="8dp"
ctv:cCenterTextViewLineSpacingExtra="8dp"
ctv:cRightTextViewLineSpacingExtra="8dp"
ctv:cSetSingleLine="false"
ctv:cLeftTextString="姓名\n欧阳峰鸟"
ctv:cRightTextString="学籍\n北京科技大学" />

<com.allen.library.CommonTextView
android:layout_width="match_parent"
android:layout_height="60dp"
ctv:cShowDividerLineType="bottom"
ctv:cLeftIconResForDrawableLeft="@drawable/head_default"
ctv:cLeftTextViewLineSpacingExtra="8dp"
ctv:cCenterTextViewLineSpacingExtra="8dp"
ctv:cRightTextViewLineSpacingExtra="8dp"
ctv:cSetSingleLine="false"
ctv:cLeftTextString="姓名\n欧阳峰"
ctv:cLeftTextViewGravity="left_center"
ctv:cRightTextString="已实名"
ctv:cRightTextColor="@color/colorAccent"
ctv:cRightIconResForDrawableRight="@drawable/arrow_right_red"/>


<com.allen.library.CommonTextView
android:layout_width="match_parent"
android:layout_height="50dp"
ctv:cLeftIconResForDrawableLeft="@drawable/scatter_time"
ctv:cLeftTextString="起息时间"
ctv:cRightIconResForDrawableRight="@drawable/arrow_right_red"
ctv:cRightTextString="T+1日" />

<com.allen.library.CommonTextView
android:layout_width="match_parent"
android:layout_height="55dp"
ctv:cCenterIconResForDrawableTop="@drawable/scatter_use"
ctv:cCenterTextString="还款方式"
ctv:cLeftIconResForDrawableTop="@drawable/scatter_time"
ctv:cLeftTextString="起息时间"
ctv:cRightIconResForDrawableTop="@drawable/scatter_type"
ctv:cRightTextString="截至日期" />

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
android:layout_height="match_parent"
android:orientation="vertical">

<com.allen.library.CommonTextView
android:layout_width="0dp"
android:layout_height="80dp"
android:layout_weight="1"
ctv:cCenterIconResForDrawableTop="@mipmap/ic_launcher"
ctv:cCenterTextString="文字"
android:layout_width="match_parent"
android:layout_height="60dp"
ctv:cLeftBottomTextColor="@color/colorAccent"
ctv:cLeftBottomTextSize="13sp"
ctv:cLeftBottomTextString="188******88"
ctv:cLeftImageViewDrawableRes="@drawable/head_default"
ctv:cLeftTopTextColor="@color/colorPrimary"
ctv:cLeftTopTextSize="15sp"
ctv:cLeftTopTextString="张三"
ctv:cRightIconResForDrawableRight="@drawable/arrow_right_red"
ctv:cRightTextColor="@color/colorAccent"
ctv:cRightTextString="已实名"
ctv:cUseRipple="true" />


<com.allen.library.CommonTextView
android:layout_width="match_parent"
android:layout_height="60dp"
ctv:cCenterTextString="年龄\n250"
ctv:cCenterTextViewLineSpacingExtra="8dp"
ctv:cLeftTextString="姓名\n欧阳峰鸟"
ctv:cLeftTextViewLineSpacingExtra="8dp"
ctv:cRightTextString="学籍\n北京科技大学"
ctv:cRightTextViewLineSpacingExtra="8dp"
ctv:cSetSingleLine="false"
ctv:cShowDividerLineType="bottom" />

<com.allen.library.CommonTextView
android:layout_width="match_parent"
android:layout_height="60dp"
ctv:cCenterTextViewLineSpacingExtra="8dp"
ctv:cLeftIconResForDrawableLeft="@drawable/head_default"
ctv:cLeftTextString="姓名\n欧阳峰"
ctv:cLeftTextViewGravity="left_center"
ctv:cLeftTextViewLineSpacingExtra="8dp"
ctv:cRightIconResForDrawableRight="@drawable/arrow_right_red"
ctv:cRightTextColor="@color/colorAccent"
ctv:cRightTextString="已实名"
ctv:cRightTextViewLineSpacingExtra="8dp"
ctv:cSetSingleLine="false"
ctv:cShowDividerLineType="bottom" />


<com.allen.library.CommonTextView
android:layout_width="match_parent"
android:layout_height="50dp"
ctv:cLeftIconResForDrawableLeft="@drawable/scatter_time"
ctv:cLeftTextString="起息时间"
ctv:cRightIconResForDrawableRight="@drawable/arrow_right_red"
ctv:cRightTextString="T+1日" />

<com.allen.library.CommonTextView
android:layout_width="0dp"
android:layout_width="match_parent"
android:layout_height="55dp"
ctv:cCenterIconResForDrawableTop="@drawable/scatter_use"
ctv:cCenterTextString="还款方式"
ctv:cLeftIconResForDrawableTop="@drawable/scatter_time"
ctv:cLeftTextString="起息时间"
ctv:cRightIconResForDrawableTop="@drawable/scatter_type"
ctv:cRightTextString="截至日期" />

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">

<com.allen.library.CommonTextView
android:layout_width="0dp"
android:layout_height="80dp"
android:layout_weight="1"
ctv:cCenterIconResForDrawableTop="@mipmap/ic_launcher"
ctv:cCenterTextString="文字"
ctv:cUseRipple="true" />

<com.allen.library.CommonTextView
android:layout_width="0dp"
android:layout_height="80dp"
android:layout_weight="1"
ctv:cCenterIconResForDrawableTop="@mipmap/ic_launcher"
ctv:cCenterTextString="文字"
ctv:cUseRipple="true" />

<com.allen.library.CommonTextView
android:layout_width="0dp"
android:layout_height="80dp"
android:layout_weight="1"
ctv:cCenterIconResForDrawableTop="@mipmap/ic_launcher"
ctv:cCenterTextString="文字"
ctv:cUseRipple="true" />
</LinearLayout>

<com.allen.library.CommonTextView
android:layout_width="match_parent"
android:layout_height="80dp"
android:layout_weight="1"
ctv:cCenterIconResForDrawableTop="@mipmap/ic_launcher"
ctv:cCenterTextString="文字"
ctv:cCenterTextString="张三\n188******88"
ctv:cCenterTextViewGravity="center"
ctv:cLeftIconResForDrawableLeft="@mipmap/ic_launcher"
ctv:cLeftTextString="张三\n188******88"
ctv:cLeftTextViewGravity="left_center"
ctv:cRightIconResForDrawableRight="@mipmap/ic_launcher"
ctv:cRightTextString="张三\n188******88"
ctv:cRightTextViewGravity="right_center"
ctv:cSetSingleLine="false"
ctv:cShowDividerLineType="both"
ctv:cUseRipple="true" />

<com.allen.library.CommonTextView
android:layout_width="0dp"
android:layout_height="80dp"
android:layout_weight="1"
ctv:cCenterIconResForDrawableTop="@mipmap/ic_launcher"
ctv:cCenterTextString="文字"
android:layout_width="match_parent"
android:layout_height="50dp"
ctv:cCenterTextColor="@android:color/darker_gray"
ctv:cCenterTextString="请选择客户性别:"
ctv:cCenterTextViewGravity="left_center"
ctv:cLeftTextString="客户性别"
ctv:cLeftViewPaddingLeft="20dp"
ctv:cRightIconResForDrawableRight="@drawable/arrow_right_red"
ctv:cRightTextString=""
ctv:cUseRipple="true" />
</LinearLayout>

<com.allen.library.CommonTextView
android:layout_width="match_parent"
android:layout_height="80dp"
ctv:cShowDividerLineType="both"
ctv:cLeftIconResForDrawableLeft="@mipmap/ic_launcher"
ctv:cRightIconResForDrawableRight="@mipmap/ic_launcher"
ctv:cCenterTextString="张三\n188******88"
ctv:cLeftTextString="张三\n188******88"
ctv:cLeftTextViewGravity="left_center"
ctv:cRightTextString="张三\n188******88"
ctv:cCenterTextViewGravity="center"
ctv:cRightTextViewGravity="right_center"
ctv:cSetSingleLine="false"
ctv:cUseRipple="true" />

</LinearLayout>
</ScrollView>

</ScrollView>


</LinearLayout>
6 changes: 3 additions & 3 deletions app/src/main/res/layout/layout3.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@
stv:sBottomLineMargin="0dp"
stv:sLeftIconRes="@drawable/scatter_time"
stv:sIsSingLines="true"
stv:sLeftTextString="起息时间起息时间起息时间起息时间起息时间起息时间"
stv:sRightTextString="立即起息立即起息立即起息立即起息立即起息立即起息" />
stv:sLeftTextString="起息时间"
stv:sRightTextString="立即起息" />

<com.allen.library.SuperTextView
android:layout_width="match_parent"
android:layout_height="50dp"
stv:sBottomLineMargin="0dp"
stv:sLeftIconRes="@drawable/scatter_type"
stv:sLeftTextString="还款方式"
stv:sRightTextString="等额本息ADADADASDAADA1231414214141414141" />
stv:sRightTextString="等额本息" />

<com.allen.library.SuperTextView
android:layout_width="match_parent"
Expand Down
16 changes: 9 additions & 7 deletions app/src/main/res/layout/list.xml
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent">
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="100dp"
android:background="@color/colorAccent"
android:orientation="vertical">

<android.support.v7.widget.RecyclerView
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
</LinearLayout>
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
</RelativeLayout>
4 changes: 2 additions & 2 deletions library/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ android {
defaultConfig {
minSdkVersion 11
targetSdkVersion 24
versionCode 107
versionName "1.0.7"
versionCode 108
versionName "1.0.8"

testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

Expand Down
Loading

0 comments on commit 74d5abf

Please sign in to comment.