Skip to content
This repository was archived by the owner on Jun 5, 2024. It is now read-only.

Commit e10d8e8

Browse files
raedevraedev
committed
我的页面UI改版
1 parent c6aaf56 commit e10d8e8

32 files changed

+334
-290
lines changed

‎module-basic/src/main/java/com/rae/cnblogs/basic/AppDataManager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,11 @@ public long getCacheSize() {
9494
}
9595

9696
/**
97-
* 是否空间不足，条件：可用空间小于1GB
97+
* 是否空间不足，条件：可用空间小于100MB
9898
*/
9999
public boolean isInsufficient() {
100100
long size = getSDCardFreeSpace();
101-
return size < 1024 && size != -1;
101+
return size < 100 && size != -1;
102102
}
103103

104104
/**

‎module-blog/src/main/java/com/rae/cnblogs/blog/CnblogsService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ private void checkCacheSize() {
7575
double dbSize = appDataManager.getDatabaseTotalSize();
7676
Log.i("rae", "是否空间不够：" + isInsufficient + "; 数据库缓存大小：" + dbSize);
7777
// 当数据大于30MB，清空博客缓存数据
78-
if (dbSize > 30 || isInsufficient) {
78+
if (dbSize > 120 || isInsufficient) {
7979
Log.i("rae-service", "清除数据！" + dbSize);
8080
DbFactory.getInstance().clearCache();
8181
}

‎module-home/src/main/java/com/rae/cnblogs/home/MineFragment.java

Lines changed: 64 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
package com.rae.cnblogs.home;
22

3+
import android.content.Intent;
4+
import android.net.Uri;
35
import android.os.Bundle;
46
import android.support.annotation.NonNull;
57
import android.support.annotation.Nullable;
68
import android.view.View;
7-
import android.widget.CompoundButton;
89
import android.widget.ImageView;
910
import android.widget.TextView;
1011

1112
import com.alibaba.android.arouter.facade.annotation.Route;
12-
import com.kyleduo.switchbutton.SwitchButton;
1313
import com.rae.cnblogs.AppRoute;
1414
import com.rae.cnblogs.UICompat;
1515
import com.rae.cnblogs.basic.AppImageLoader;
1616
import com.rae.cnblogs.basic.AppMobclickAgent;
1717
import com.rae.cnblogs.basic.BasicFragment;
18+
import com.rae.cnblogs.dialog.ShareDialogFragment;
1819
import com.rae.cnblogs.home.mine.MineContract;
1920
import com.rae.cnblogs.home.mine.MinePresenterImpl;
2021
import com.rae.cnblogs.sdk.UserProvider;
@@ -40,20 +41,23 @@ public static MineFragment newInstance() {
4041

4142
@BindView(R2.id.tv_mine_name)
4243
TextView mDisplayNameView;
44+
4345
@BindView(R2.id.tv_follow_count)
4446
TextView mFollowCountView;
4547
@BindView(R2.id.tv_fans_count)
4648
TextView mFansCountView;
47-
@BindView(R2.id.tv_no_login)
48-
View mNoLoginTextView;
49+
4950
@BindView(R2.id.ll_follow_fans)
5051
View mFansAndFollowLayout;
5152
@BindView(R2.id.img_system_message_badge)
5253
View mSystemMessageBadgeView;
5354
@BindView(R2.id.img_feedback_badge)
5455
View mFeedbackBadgeView;
55-
@BindView(R2.id.sb_night_mode)
56-
SwitchButton mNightModeButton;
56+
// @BindView(R2.id.sb_night_mode)
57+
// SwitchButton mNightModeButton;
58+
59+
@BindView(R2.id.tv_night_mode)
60+
TextView mNightModeView;
5761

5862
private MineContract.Presenter mPresenter;
5963

@@ -73,20 +77,9 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
7377
public void onStart() {
7478
super.onStart();
7579
// 夜间模式处理
76-
mNightModeButton.setCheckedNoEvent(ThemeCompat.isNight());
80+
mNightModeView.setSelected(ThemeCompat.isNight());
7781
}
7882

79-
@Override
80-
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
81-
super.onViewCreated(view, savedInstanceState);
82-
// 夜间模式切换
83-
mNightModeButton.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
84-
@Override
85-
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
86-
ThemeCompat.switchNightMode();
87-
}
88-
});
89-
}
9083

9184
@Override
9285
protected void onLoadData() {
@@ -111,7 +104,6 @@ public void onLoadFansCount(String fans, String follows) {
111104
@Override
112105
public void onLoadUserInfo(@NonNull UserInfoBean user) {
113106
mDisplayNameView.setVisibility(View.VISIBLE);
114-
mNoLoginTextView.setVisibility(View.GONE);
115107
mFansAndFollowLayout.setVisibility(View.VISIBLE);
116108
AppImageLoader.displayAvatar(user.getAvatar(), mAvatarView);
117109
mDisplayNameView.setText(user.getDisplayName());
@@ -127,14 +119,18 @@ public void onLoginExpired() {
127119
public void onNotLogin() {
128120
// 没有登录的UI
129121
mAvatarView.setImageResource(R.drawable.boy);
130-
mDisplayNameView.setVisibility(View.GONE);
131-
mNoLoginTextView.setVisibility(View.VISIBLE);
132122
mFansAndFollowLayout.setVisibility(View.GONE);
133123
mFansCountView.setText("0");
134124
mFollowCountView.setText("0");
135125
}
136126

137127

128+
@OnClick(R2.id.tv_night_mode)
129+
public void onNightModeClick() {
130+
AppMobclickAgent.onClickEvent(getContext(), "NightMode");
131+
ThemeCompat.switchNightMode();
132+
}
133+
138134
@OnClick(R2.id.layout_account_fans)
139135
public void onFansClick() {
140136
AppRoute.routeToFans(this.getContext(), getString(R.string.me), UserProvider.getInstance().getLoginUserInfo().getBlogApp());
@@ -149,7 +145,7 @@ public void onFollowClick() {
149145
/**
150146
* 登录
151147
*/
152-
@OnClick({R2.id.img_blog_avatar, R2.id.tv_mine_name, R2.id.tv_no_login})
148+
@OnClick({R2.id.img_blog_avatar, R2.id.tv_mine_name})
153149
public void onLoginClick() {
154150
if (mPresenter.isLogin())
155151
AppRoute.routeToBlogger(getContext(), UserProvider.getInstance().getLoginUserInfo().getBlogApp());
@@ -160,26 +156,16 @@ public void onLoginClick() {
160156
/**
161157
* 我的收藏
162158
*/
163-
@OnClick(R2.id.ll_favorites)
159+
@OnClick(R2.id.tv_favorites)
164160
public void onFavoritesClick() {
165161
AppMobclickAgent.onClickEvent(getContext(), "Favorites");
166162
AppRoute.routeToFavorites(this.getActivity());
167163
}
168164

169-
/**
170-
* 问题反馈
171-
*/
172-
@OnClick(R2.id.ll_feedback)
173-
public void onFeedbackClick() {
174-
mFeedbackBadgeView.setVisibility(View.INVISIBLE);
175-
AppMobclickAgent.onClickEvent(getContext(), "Feedback");
176-
AppRoute.routeToFeedback(getContext());
177-
}
178-
179165
/**
180166
* 浏览记录
181167
*/
182-
@OnClick(R2.id.ll_history)
168+
@OnClick(R2.id.tv_history)
183169
public void onHistoryClick() {
184170
AppMobclickAgent.onClickEvent(getContext(), "History");
185171
AppRoute.routeToHistory(getContext());
@@ -197,20 +183,55 @@ public void onSystemMessageClick() {
197183
}
198184

199185
/**
200-
* 设置
186+
* 字体设置
201187
*/
202-
@OnClick(R2.id.ll_setting)
203-
public void onSettingClick() {
204-
AppRoute.routeToSetting(this.getContext());
188+
@OnClick(R2.id.ll_font_setting)
189+
public void onFontSettingClick() {
190+
AppRoute.routeToFontSetting(this.getContext());
205191
}
206192

207193
/**
208-
* 夜间模式
194+
* 意见反馈
209195
*/
210-
@OnClick(R2.id.ll_night)
211-
public void onNightClick() {
212-
AppMobclickAgent.onClickEvent(getContext(), "NightMode");
213-
mNightModeButton.performClick();
196+
@OnClick(R2.id.ll_feedback)
197+
public void onFeedbackClick() {
198+
mFeedbackBadgeView.setVisibility(View.INVISIBLE);
199+
AppMobclickAgent.onClickEvent(getContext(), "Feedback");
200+
AppRoute.routeToFeedback(getContext());
201+
}
202+
203+
/**
204+
* 分享
205+
*/
206+
@OnClick(R2.id.ll_share)
207+
public void onShareClick() {
208+
AppMobclickAgent.onClickEvent(getContext(), "ShareApp");
209+
String url = getString(R.string.share_app_url);
210+
String title = getString(R.string.share_app_title);
211+
String desc = getString(R.string.share_app_desc);
212+
ShareDialogFragment fragment = ShareDialogFragment.newInstance(url, title, desc, null, R.drawable.ic_share_app, false, false);
213+
fragment.show(getChildFragmentManager(), "shareApp");
214+
}
215+
216+
/**
217+
* 好评
218+
*/
219+
@OnClick(R2.id.ll_praises)
220+
public void onPraisesClick() {
221+
AppMobclickAgent.onClickEvent(getContext(), "Praises");
222+
try {
223+
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.market_url))));
224+
} catch (Exception e) {
225+
UICompat.failed(getContext(), getString(R.string.praises_error));
226+
}
227+
}
228+
229+
/**
230+
* 设置
231+
*/
232+
@OnClick(R2.id.ll_setting)
233+
public void onSettingClick() {
234+
AppRoute.routeToSetting(this.getContext());
214235
}
215236

216237

‎module-home/src/main/java/com/rae/cnblogs/home/SettingActivity.java

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package com.rae.cnblogs.home;
22

33
import android.content.DialogInterface;
4-
import android.content.Intent;
5-
import android.net.Uri;
64
import android.os.Bundle;
75
import android.support.annotation.Nullable;
86
import android.text.TextUtils;
@@ -18,7 +16,6 @@
1816
import com.rae.cnblogs.activity.SwipeBackBasicActivity;
1917
import com.rae.cnblogs.basic.AppMobclickAgent;
2018
import com.rae.cnblogs.dialog.DefaultDialogFragment;
21-
import com.rae.cnblogs.dialog.ShareDialogFragment;
2219
import com.rae.cnblogs.dialog.VersionDialogFragment;
2320
import com.rae.cnblogs.home.setting.SettingContract;
2421
import com.rae.cnblogs.home.setting.SettingPresenterImpl;
@@ -56,7 +53,6 @@ public class SettingActivity extends SwipeBackBasicActivity implements SettingCo
5653

5754
private SettingContract.Presenter mPresenter;
5855

59-
private ShareDialogFragment mShareDialogFragment;
6056

6157
@Override
6258
protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -150,20 +146,6 @@ public void onClick(DialogInterface dialog, int which) {
150146
.show(getSupportFragmentManager(), "Logout");
151147
}
152148

153-
/**
154-
* 分享
155-
*/
156-
@OnClick(R2.id.ll_share)
157-
public void onShareClick() {
158-
AppMobclickAgent.onClickEvent(getContext(), "ShareApp");
159-
if (mShareDialogFragment == null) {
160-
String url = getString(R.string.share_app_url);
161-
String title = getString(R.string.share_app_title);
162-
String desc = getString(R.string.share_app_desc);
163-
mShareDialogFragment = ShareDialogFragment.newInstance(url, title, desc, null, R.drawable.ic_share_app, false, false);
164-
}
165-
mShareDialogFragment.show(getSupportFragmentManager(), "shareApp");
166-
}
167149

168150
/**
169151
* 开源项目
@@ -223,24 +205,6 @@ public void onCheckUpdateClick() {
223205
mPresenter.checkUpdate();
224206
}
225207

226-
/**
227-
* 好评
228-
*/
229-
@OnClick(R2.id.praises)
230-
public void onPraisesClick() {
231-
AppMobclickAgent.onClickEvent(getContext(), "Praises");
232-
try {
233-
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.market_url))));
234-
} catch (Exception e) {
235-
UICompat.failed(this, getString(R.string.praises_error));
236-
}
237-
}
238-
239-
@OnClick(R2.id.ll_font_setting)
240-
public void onFontSettingClick() {
241-
AppRoute.routeToFontSetting(this);
242-
}
243-
244208
@OnClick(R2.id.ll_about_me)
245209
public void onAboutMeClick() {
246210
AppRoute.routeToAboutMe(this);

‎module-home/src/main/res/layout/activity_setting.xml

Lines changed: 1 addition & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -46,56 +46,6 @@
4646

4747
</LinearLayout>
4848

49-
<LinearLayout
50-
android:id="@+id/ll_font_setting"
51-
android:layout_width="match_parent"
52-
android:layout_height="wrap_content"
53-
android:gravity="center_vertical">
54-
55-
<TextView
56-
style="@style/ItemStyle"
57-
android:layout_width="0dp"
58-
android:layout_height="wrap_content"
59-
android:layout_weight="1"
60-
android:text="@string/font_setting"
61-
android:textColor="@color/ph1" />
62-
63-
</LinearLayout>
64-
65-
<LinearLayout
66-
67-
android:id="@+id/praises"
68-
android:layout_width="match_parent"
69-
android:layout_height="wrap_content"
70-
android:gravity="center_vertical">
71-
72-
<TextView
73-
style="@style/ItemStyle"
74-
android:layout_width="0dp"
75-
android:layout_height="wrap_content"
76-
android:layout_weight="1"
77-
android:text="@string/praises"
78-
android:textColor="@color/ph1" />
79-
80-
</LinearLayout>
81-
82-
<LinearLayout
83-
android:id="@+id/ll_share"
84-
android:layout_width="match_parent"
85-
android:layout_height="wrap_content"
86-
android:gravity="center_vertical">
87-
88-
<TextView
89-
style="@style/ItemStyle"
90-
android:layout_width="0dp"
91-
android:layout_height="wrap_content"
92-
android:layout_weight="1"
93-
android:text="@string/share_app"
94-
android:textColor="@color/ph1" />
95-
96-
</LinearLayout>
97-
98-
9949
<LinearLayout
10050
android:id="@+id/ll_help_center"
10151
android:layout_width="match_parent"
@@ -144,8 +94,7 @@
14494
android:id="@+id/ll_about_me"
14595
android:layout_width="match_parent"
14696
android:layout_height="wrap_content"
147-
android:gravity="center_vertical"
148-
android:visibility="gone">
97+
android:gravity="center_vertical">
14998

15099
<TextView
151100
style="@style/ItemStyle"

0 commit comments

Comments
 (0)