Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings
This repository was archived by the owner on Jun 5, 2024. It is now read-only.

Commit 3fe91d0

Browse files
committed
commit
1 parent 2533868 commit 3fe91d0

File tree

4 files changed

+167
-88
lines changed

4 files changed

+167
-88
lines changed

‎module-discover/src/main/java/com/rae/cnblogs/discover/ui/AntUserAuthActivity.java

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
import android.content.Intent;
44
import android.os.Bundle;
55
import android.support.annotation.Nullable;
6-
import android.telephony.PhoneNumberFormattingTextWatcher;
6+
import android.text.Editable;
7+
import android.text.TextWatcher;
78
import android.widget.Button;
89
import android.widget.EditText;
910
import android.widget.TextView;
@@ -14,8 +15,8 @@
1415
import com.rae.cnblogs.activity.SwipeBackBasicActivity;
1516
import com.rae.cnblogs.discover.R;
1617
import com.rae.cnblogs.discover.R2;
17-
import com.rae.cnblogs.discover.presenter.IAntUserAuthContract;
1818
import com.rae.cnblogs.discover.presenter.AntUserAuthPresenterImpl;
19+
import com.rae.cnblogs.discover.presenter.IAntUserAuthContract;
1920

2021
import butterknife.BindView;
2122
import butterknife.OnClick;
@@ -47,12 +48,21 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
4748
setTitle(" ");
4849
mPresenter = new AntUserAuthPresenterImpl(this);
4950
mPresenter.start();
50-
mPhoneView.addTextChangedListener(new PhoneNumberFormattingTextWatcher() {
51+
mPhoneView.addTextChangedListener(new TextWatcher() {
52+
@Override
53+
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
54+
55+
}
56+
5157
@Override
5258
public void onTextChanged(CharSequence s, int start, int before, int count) {
53-
super.onTextChanged(s, start, before, count);
5459
mSendButton.setEnabled(s.length() > 12);
5560
}
61+
62+
@Override
63+
public void afterTextChanged(Editable s) {
64+
65+
}
5666
});
5767
}
5868

‎module-discover/src/main/res/layout/activity_ant_column_detail.xml

Lines changed: 117 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
xmlns:app="http://schemas.android.com/apk/res-auto"
44
android:layout_width="match_parent"
55
android:layout_height="match_parent"
6-
android:background="@color/white">
6+
android:background="@color/white"
7+
android:fitsSystemWindows="true">
78

89
<android.support.design.widget.AppBarLayout
910
android:layout_width="match_parent"
@@ -25,26 +26,28 @@
2526
android:layout_height="260dp"
2627
android:scaleType="centerCrop"
2728
android:src="@drawable/bg_blogger_blur"
29+
app:layout_collapseMode="parallax"
30+
app:layout_collapseParallaxMultiplier="0.7"
2831
app:layout_constraintEnd_toEndOf="parent"
2932
app:layout_constraintStart_toStartOf="parent"
3033
app:layout_constraintTop_toTopOf="parent" />
3134

32-
3335
<!--黑色遮罩层-->
3436
<ImageView
3537
android:layout_width="match_parent"
3638
android:layout_height="match_parent"
37-
android:background="#3C000000" />
38-
39+
android:background="#3C000000"
40+
app:layout_collapseMode="parallax"
41+
app:layout_collapseParallaxMultiplier="0.7" />
3942

4043
<!--返回-->
4144
<android.support.v7.widget.Toolbar
4245
android:id="@+id/tool_bar"
4346
android:layout_width="match_parent"
4447
android:layout_height="wrap_content"
45-
android:fitsSystemWindows="true"
4648
android:gravity="center"
4749
app:layout_collapseMode="pin"
50+
app:layout_collapseParallaxMultiplier="1"
4851
app:navigationIcon="@drawable/icon_back_white">
4952

5053
<!--分享-->
@@ -56,13 +59,14 @@
5659

5760
</android.support.v7.widget.Toolbar>
5861

59-
6062
<!--标题-->
6163
<LinearLayout
6264
android:layout_width="match_parent"
6365
android:layout_height="wrap_content"
6466
android:layout_gravity="bottom"
65-
android:orientation="vertical">
67+
android:orientation="vertical"
68+
app:layout_collapseMode="parallax"
69+
app:layout_collapseParallaxMultiplier="0.7">
6670

6771
<TextView
6872
android:id="@+id/tv_title"
@@ -84,96 +88,125 @@
8488
android:textColor="#FFFFFFFF"
8589
android:textSize="14sp" />
8690
</LinearLayout>
87-
</android.support.design.widget.CollapsingToolbarLayout>
88-
8991

90-
<LinearLayout
91-
android:layout_width="match_parent"
92-
android:layout_height="wrap_content"
93-
android:gravity="center"
94-
android:paddingTop="14dp"
95-
android:paddingBottom="14dp">
9692

97-
<RelativeLayout
98-
android:layout_width="0dp"
93+
<!---->
94+
<LinearLayout
95+
android:layout_width="match_parent"
9996
android:layout_height="wrap_content"
100-
android:layout_weight="1"
101-
android:gravity="center">
102-
103-
<TextView
104-
android:id="@+id/tv_article_num"
105-
android:layout_width="wrap_content"
106-
android:layout_height="wrap_content"
107-
android:text="10"
108-
android:textColor="@color/black"
109-
android:textSize="18sp" />
97+
android:gravity="center"
98+
android:paddingTop="14dp"
99+
android:paddingBottom="14dp">
110100

111-
<TextView
112-
android:id="@+id/textView"
113-
android:layout_width="wrap_content"
101+
<RelativeLayout
102+
android:layout_width="0dp"
114103
android:layout_height="wrap_content"
115-
android:layout_alignBaseline="@+id/tv_article_num"
116-
android:layout_marginStart="5dp"
117-
android:layout_toEndOf="@+id/tv_article_num"
118-
android:text="讲"
119-
android:textColor="@color/black"
120-
android:textSize="12sp" />
121-
122-
<TextView
123-
android:id="@+id/textView2"
124-
android:layout_width="wrap_content"
104+
android:layout_weight="1"
105+
android:gravity="center">
106+
107+
<TextView
108+
android:id="@+id/tv_article_num"
109+
android:layout_width="wrap_content"
110+
android:layout_height="wrap_content"
111+
android:text="10"
112+
android:textColor="@color/black"
113+
android:textSize="18sp" />
114+
115+
<TextView
116+
android:id="@+id/textView"
117+
android:layout_width="wrap_content"
118+
android:layout_height="wrap_content"
119+
android:layout_alignBaseline="@+id/tv_article_num"
120+
android:layout_marginStart="5dp"
121+
android:layout_toEndOf="@+id/tv_article_num"
122+
android:text="讲"
123+
android:textColor="@color/black"
124+
android:textSize="12sp" />
125+
126+
<TextView
127+
android:id="@+id/textView2"
128+
android:layout_width="wrap_content"
129+
android:layout_height="wrap_content"
130+
android:layout_below="@+id/tv_article_num"
131+
android:text="总讲数"
132+
android:textColor="#FF9B9B9B"
133+
android:textSize="12sp" />
134+
</RelativeLayout>
135+
136+
<View
137+
android:layout_width="1dp"
138+
android:layout_height="match_parent"
139+
android:background="#FFF0F0F0" />
140+
141+
<RelativeLayout
142+
android:layout_width="0dp"
125143
android:layout_height="wrap_content"
126-
android:layout_below="@+id/tv_article_num"
127-
android:text="总讲数"
128-
android:textColor="#FF9B9B9B"
129-
android:textSize="12sp" />
130-
</RelativeLayout>
131-
132-
<View
133-
android:layout_width="1dp"
134-
android:layout_height="match_parent"
135-
android:background="#FFF0F0F0" />
144+
android:layout_weight="1"
145+
android:gravity="center">
146+
147+
<TextView
148+
android:id="@+id/tv_sub_num"
149+
android:layout_width="wrap_content"
150+
android:layout_height="wrap_content"
151+
android:text="10"
152+
android:textColor="@color/black"
153+
android:textSize="18sp" />
154+
155+
<TextView
156+
android:layout_width="wrap_content"
157+
android:layout_height="wrap_content"
158+
android:layout_alignBaseline="@+id/tv_sub_num"
159+
android:layout_marginStart="5dp"
160+
android:layout_toEndOf="@+id/tv_sub_num"
161+
android:text="人"
162+
android:textColor="@color/black"
163+
android:textSize="12sp" />
164+
165+
<TextView
166+
android:layout_width="wrap_content"
167+
android:layout_height="wrap_content"
168+
android:layout_below="@+id/tv_sub_num"
169+
android:text="订阅数"
170+
android:textColor="#FF9B9B9B"
171+
android:textSize="12sp" />
172+
</RelativeLayout>
173+
</LinearLayout>
136174

137-
<RelativeLayout
138-
android:layout_width="0dp"
139-
android:layout_height="wrap_content"
140-
android:layout_weight="1"
141-
android:gravity="center">
175+
</android.support.design.widget.CollapsingToolbarLayout>
142176

143-
<TextView
144-
android:id="@+id/tv_sub_num"
145-
android:layout_width="wrap_content"
146-
android:layout_height="wrap_content"
147-
android:text="10"
148-
android:textColor="@color/black"
149-
android:textSize="18sp" />
150177

151-
<TextView
152-
android:layout_width="wrap_content"
153-
android:layout_height="wrap_content"
154-
android:layout_alignBaseline="@+id/tv_sub_num"
155-
android:layout_marginStart="5dp"
156-
android:layout_toEndOf="@+id/tv_sub_num"
157-
android:text="人"
158-
android:textColor="@color/black"
159-
android:textSize="12sp" />
178+
</android.support.design.widget.AppBarLayout>
160179

161-
<TextView
162-
android:layout_width="wrap_content"
163-
android:layout_height="wrap_content"
164-
android:layout_below="@+id/tv_sub_num"
165-
android:text="订阅数"
166-
android:textColor="#FF9B9B9B"
167-
android:textSize="12sp" />
168-
</RelativeLayout>
169-
</LinearLayout>
180+
<!--<android.support.v7.widget.RecyclerView-->
181+
<!--android:layout_width="match_parent"-->
182+
<!--android:layout_height="wrap_content"-->
183+
<!--android:background="@color/dividerColor"-->
184+
<!--app:layout_behavior="@string/appbar_scrolling_view_behavior" />-->
170185

171-
</android.support.design.widget.AppBarLayout>
172186

173-
<ImageView
187+
<LinearLayout
174188
android:layout_width="match_parent"
175189
android:layout_height="wrap_content"
176-
android:src="@color/dividerPrimary"
177-
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
190+
android:layout_gravity="bottom"
191+
android:background="@drawable/public_top_divider_while_primary"
192+
android:gravity="center"
193+
android:paddingStart="48dp"
194+
android:paddingTop="12dp"
195+
android:paddingEnd="48dp"
196+
android:paddingBottom="12dp">
197+
198+
<Button
199+
android:id="@+id/btn_send"
200+
android:layout_width="match_parent"
201+
android:layout_height="wrap_content"
202+
android:background="@drawable/bg_ant_button_default"
203+
android:text="@string/subscribe_now"
204+
android:textColor="@color/text_color_ant_button_default"
205+
android:textSize="16sp"
206+
app:layout_constraintLeft_toLeftOf="parent"
207+
app:layout_constraintTop_toBottomOf="@+id/et_phone" />
208+
209+
210+
</LinearLayout>
178211

179212
</android.support.design.widget.CoordinatorLayout>

‎module-discover/src/main/res/values/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@
66
<string name="label_ant_user_contract">用户协议</string>
77
<string name="label_kb">知识库</string>
88
<string name="label_question_detail">博问详情</string>
9+
<string name="subscribe_now">加入学习</string>
910
</resources>
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<?xml version="1.0" encoding="utf-8"?><!--公共的白色底部分割线背景-->
2+
<selector xmlns:android="http://schemas.android.com/apk/res/android">
3+
4+
<item android:state_pressed="true">
5+
<layer-list>
6+
7+
<!--分割线颜色-->
8+
<item>
9+
<color android:color="@color/dividerColor" />
10+
</item>
11+
12+
<item android:top="0.5dp">
13+
<color android:color="@color/white" />
14+
</item>
15+
16+
17+
</layer-list>
18+
</item>
19+
<item>
20+
21+
<layer-list>
22+
23+
<!--分割线颜色-->
24+
<item>
25+
<color android:color="@color/dividerColor" />
26+
</item>
27+
28+
<item android:top="0.5dp">
29+
<color android:color="@color/white" />
30+
</item>
31+
32+
33+
</layer-list>
34+
</item>
35+
</selector>

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /