v0.0.3

linsneider · Jul 18, 2017 · 840e97c · 840e97c
1 parent dbfc5a4
commit 840e97c
Show file tree

Hide file tree

Showing 9 changed files with 122 additions and 50 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -15,8 +15,8 @@ android {
         applicationId "com.sneider.diycode"
         minSdkVersion 17
         targetSdkVersion 25
-        versionCode 2
-        versionName '0.0.2'
+        versionCode 3
+        versionName '0.0.3'
         testInstrumentationRunner rootProject.ext.dependencies["androidJUnitRunner"]
         vectorDrawables.useSupportLibrary = true
         ndk {

diff --git a/app/src/main/java/com/sneider/diycode/mvp/ui/activity/SettingActivity.java b/app/src/main/java/com/sneider/diycode/mvp/ui/activity/SettingActivity.java
@@ -7,7 +7,7 @@
 import android.support.v7.widget.Toolbar;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.LinearLayout;
+import android.widget.TextView;
 
 import com.afollestad.materialdialogs.DialogAction;
 import com.afollestad.materialdialogs.MaterialDialog;
@@ -47,7 +47,7 @@ public class SettingActivity extends BaseActivity<SettingPresenter> implements S
     @BindView(R.id.toolbar) Toolbar mToolbar;
     @BindView(R.id.btn_clear_cache) SettingRowView mBtnClearCache;
     @BindView(R.id.btn_check_update) SettingRowView mBtnCheckUpdate;
-    @BindView(R.id.btn_logout) LinearLayout mBtnLogout;
+    @BindView(R.id.btn_logout) TextView mBtnLogout;
 
     @BindColor(R.color.color_4d4d4d) int color_4d4d4d;
     @BindColor(R.color.color_999999) int color_999999;
@@ -78,7 +78,8 @@ public void initData(Bundle savedInstanceState) {
     }
 
     private void setupAppCache() {
-        mBtnClearCache.setSettingDescription(
+        mBtnClearCache.setSettingDescription("0.00 B".equals(CacheDataUtils.getTotalCacheSize(this)) ?
+                getString(R.string.no_cache) :
                 MessageFormat.format(getString(R.string.total_cache_description), CacheDataUtils.getTotalCacheSize(this)));
     }
 

diff --git a/app/src/main/java/com/sneider/diycode/mvp/ui/adapter/NotificationListAdapter.java b/app/src/main/java/com/sneider/diycode/mvp/ui/adapter/NotificationListAdapter.java
@@ -125,8 +125,7 @@ public void setData(Notification data, int position) {
                         content = data.getMention().getBody_html();
                         break;
                     case "Topic":
-                        mTvTitle.setText(MessageFormat.format(mAppComponent.application().getString(R.string.create_topic),
-                                data.getTopic().getTitle()));
+                        mTvTitle.setText(R.string.create_topic);
                         content = data.getTopic().getTitle();
                         break;
                     case "NodeChanged":

diff --git a/app/src/main/res/drawable/divider.xml b/app/src/main/res/drawable/divider.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <solid android:color="@color/color_f0f0f0"/>
+
+    <size android:height="1dp"/>
+</shape>
diff --git a/app/src/main/res/layout/activity_setting.xml b/app/src/main/res/layout/activity_setting.xml
@@ -30,58 +30,85 @@
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
-            <com.sneider.diycode.widget.SettingRowView
-                android:id="@+id/btn_clear_cache"
-                style="@style/layout_setting"
-                app:rowTitle="@string/clear_cache"/>
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:paddingBottom="@dimen/spacing_s"
+                android:paddingStart="20dp"
+                android:paddingTop="@dimen/spacing_s"
+                android:text="@string/basic_setting"
+                android:textColor="@color/colorAccent"
+                android:textStyle="bold"/>
 
-            <com.sneider.diycode.widget.SettingRowView
-                android:id="@+id/btn_check_update"
-                style="@style/layout_setting"
-                app:rowTitle="@string/check_update"/>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/color_ffffff"
+                android:divider="@drawable/divider"
+                android:dividerPadding="20dp"
+                android:orientation="vertical"
+                android:showDividers="middle">
+
+                <com.sneider.diycode.widget.SettingRowView
+                    android:id="@+id/btn_clear_cache"
+                    style="@style/layout_setting"
+                    app:rowTitle="@string/clear_cache"/>
+            </LinearLayout>
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:paddingBottom="@dimen/spacing_s"
+                android:paddingStart="20dp"
+                android:paddingTop="@dimen/spacing_s"
+                android:text="@string/about_and_help"
+                android:textColor="@color/colorAccent"
+                android:textStyle="bold"/>
 
             <LinearLayout
-                android:id="@+id/btn_feedback"
-                style="@style/layout_setting"
-                android:paddingBottom="@dimen/spacing_m"
-                android:paddingTop="@dimen/spacing_m">
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/color_ffffff"
+                android:divider="@drawable/divider"
+                android:dividerPadding="20dp"
+                android:orientation="vertical"
+                android:showDividers="middle">
 
                 <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:id="@+id/btn_feedback"
+                    style="@style/layout_setting"
+                    android:paddingBottom="@dimen/spacing_m"
+                    android:paddingTop="@dimen/spacing_m"
                     android:text="@string/feedback"
                     android:textColor="@color/color_4d4d4d"
                     android:textSize="15sp"/>
-            </LinearLayout>
 
-            <LinearLayout
-                android:id="@+id/btn_contact"
-                style="@style/layout_setting"
-                android:paddingBottom="@dimen/spacing_m"
-                android:paddingTop="@dimen/spacing_m">
+                <com.sneider.diycode.widget.SettingRowView
+                    android:id="@+id/btn_check_update"
+                    style="@style/layout_setting"
+                    app:rowTitle="@string/check_update"/>
 
                 <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:id="@+id/btn_contact"
+                    style="@style/layout_setting"
+                    android:paddingBottom="@dimen/spacing_m"
+                    android:paddingTop="@dimen/spacing_m"
                     android:text="@string/contact"
                     android:textColor="@color/color_4d4d4d"
                     android:textSize="15sp"/>
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/btn_logout"
-                style="@style/layout_setting"
-                android:paddingBottom="@dimen/spacing_m"
-                android:paddingTop="@dimen/spacing_m"
-                android:visibility="gone">
 
                 <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:id="@+id/btn_logout"
+                    style="@style/layout_setting"
                     android:gravity="center"
+                    android:paddingBottom="@dimen/spacing_m"
+                    android:paddingTop="@dimen/spacing_m"
                     android:text="@string/logout"
                     android:textColor="@color/colorAccent"
-                    android:textSize="18sp"/>
+                    android:textSize="18sp"
+                    android:visibility="gone"/>
             </LinearLayout>
         </LinearLayout>
     </android.support.v4.widget.NestedScrollView>

diff --git a/app/src/main/res/layout/activity_user_detail.xml b/app/src/main/res/layout/activity_user_detail.xml
@@ -116,6 +116,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:layout_marginTop="@dimen/spacing_m"
+            android:background="@color/color_ffffff"
             android:orientation="vertical">
 
             <LinearLayout
@@ -145,6 +147,12 @@
                     android:textSize="15sp"/>
             </LinearLayout>
 
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginStart="56dp"
+                android:background="@color/color_f0f0f0"/>
+
             <LinearLayout
                 android:id="@+id/ll_favorite"
                 style="@style/layout_user_info">
@@ -172,6 +180,12 @@
                     android:textSize="15sp"/>
             </LinearLayout>
 
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginStart="56dp"
+                android:background="@color/color_f0f0f0"/>
+
             <LinearLayout
                 android:id="@+id/ll_reply"
                 style="@style/layout_user_info">
@@ -199,6 +213,12 @@
                     android:textSize="15sp"/>
             </LinearLayout>
 
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginStart="56dp"
+                android:background="@color/color_f0f0f0"/>
+
             <LinearLayout
                 android:id="@+id/ll_share"
                 style="@style/layout_user_info">
@@ -225,6 +245,12 @@
                     android:textSize="15sp"/>
             </LinearLayout>
 
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginStart="56dp"
+                android:background="@color/color_f0f0f0"/>
+
             <LinearLayout
                 android:id="@+id/ll_follower"
                 style="@style/layout_user_info">
@@ -252,6 +278,12 @@
                     android:textSize="15sp"/>
             </LinearLayout>
 
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginStart="56dp"
+                android:background="@color/color_f0f0f0"/>
+
             <LinearLayout
                 android:id="@+id/ll_following"
                 style="@style/layout_user_info">
@@ -279,6 +311,12 @@
                     android:textSize="15sp"/>
             </LinearLayout>
 
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginStart="56dp"
+                android:background="@color/color_f0f0f0"/>
+
             <LinearLayout
                 android:id="@+id/ll_block"
                 style="@style/layout_user_info"

diff --git a/app/src/main/res/layout/view_setting_row.xml b/app/src/main/res/layout/view_setting_row.xml
@@ -17,7 +17,7 @@
         android:id="@+id/setting_description"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/spacing_xs"
+        android:layout_marginTop="@dimen/spacing_xxs"
         android:textColor="@color/color_62646c"
-        android:textSize="12sp"/>
+        android:textSize="13sp"/>
 </LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -6,7 +6,6 @@
 
     <item name="tag_first" type="id"/>
     <item name="tag_second" type="id"/>
-    <item name="tag_third" type="id"/>
     <item name="glide_tag" type="id"/>
     <item name="drawable_callback_tag" type="id"/>
 
@@ -130,7 +129,7 @@
     <string name="what_number">第{0}位会员</string>
     <string name="add_success">创建成功</string>
     <string name="add_failed">创建失败</string>
-    <string name="get_reply_failed">获取评论内容失败</string>
+    <string name="get_reply_failed">获取回复内容失败</string>
     <string name="upload_success">图片上传成功</string>
     <string name="upload_failed">图片上传失败</string>
     <string name="post_success">发布成功</string>
@@ -155,12 +154,15 @@
     <string name="what_reply">共收到{0}条回复</string>
     <string name="what_who_reply">{0}条回复 • 最后由{1}于{2}回复</string>
     <string name="info_deleted">相关信息已删除</string>
-    <string name="reply_at">在帖子"{0}"回复了:</string>
+    <string name="reply_at">在帖子\"{0}\"回复了:</string>
     <string name="mention_you">提及你:</string>
-    <string name="create_topic">创建了帖子: {0}</string>
-    <string name="what_create_topic">你发布的话题"{0}"由于内容原因</string>
-    <string name="what_node_moved">被管理员移到了"{0}"节点，请注意查看节点说明。</string>
+    <string name="create_topic">创建了帖子:</string>
+    <string name="what_create_topic">你发布的话题\"{0}\"由于内容原因</string>
+    <string name="what_node_moved">被管理员移到了\"{0}\"节点，请注意查看节点说明。</string>
     <string name="your_share">你的分享</string>
     <string name="no_content">暂无内容</string>
     <string name="what_floor">#{0}</string>
+    <string name="basic_setting">基本设置</string>
+    <string name="about_and_help">关于与帮助</string>
+    <string name="no_cache">当前没有缓存</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -45,7 +45,6 @@
     <style name="layout_user_info">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">48dp</item>
-        <item name="android:layout_marginTop">12dp</item>
         <item name="android:background">@drawable/bg_recycler</item>
         <item name="android:gravity">center_vertical</item>
         <item name="android:orientation">horizontal</item>
@@ -58,7 +57,6 @@
     <style name="layout_setting">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_marginTop">12dp</item>
         <item name="android:background">@drawable/bg_recycler</item>
         <item name="android:paddingEnd">20dp</item>
         <item name="android:paddingStart">20dp</item>