Merge pull request #11 from troyliu0105/master

add logo and update about

README.md

@@ -2,6 +2,8 @@
 
 [中文介绍](README.z.md)
 
+![logo](http://7xk54v.com1.z0.glb.clouddn.com/images/logo/icon.png)
+
 >**Building Blocks** with Zhihu Daily API as a source of data; OptionsMenu as extensions of the entry; Design Support Library as UI design leader.I know, it sounds cool！
 
 ### How to use
@@ -58,27 +60,21 @@ Think about it, it is not very exciting? So hurry **Star** and **Fork** it! Your
 
 ## Contributors
 
-- [troyliu0105](https://github.com/troyliu0105) 
-
-
-## Help
-
-Because I have not learned how to use Sketch, so the icon of Building Blocks still default.
-
-If you happen to find her, and just no place to play your talent, then, ask you for her design a beautiful icon it :)
+- [troyliu0105](https://github.com/troyliu0105)
+- logo: [Mao](http://weibo.com/cat93/) & troyliu0105
 
 ## Contact Me
 
-Born in 1992, now a student of Southeast University, master of software engineerin. Loving technology, programming, reading and sports. 
+Born in 1992, now a student of Southeast University, master of software engineerin. Loving technology, programming, reading and sports.
 
 I will graduate in June 2017, expect the internship or full-time job in Android or iOS.
 
-If you have any questions or want to make friends with me, please feel free to contact me : [imtangqi#gmail.com](mailto:imtangqi@gmail.com "Welcome to contact me") 
+If you have any questions or want to make friends with me, please feel free to contact me : [imtangqi#gmail.com](mailto:imtangqi@gmail.com "Welcome to contact me")
 
 ## Project Home
 
 [http://itangqi.me/2015/09/03/building-blocks/](http://itangqi.me/2015/09/03/building-blocks/)
 
 ## License
 
-[GPLv3](/LICENSE)
+[GPLv3](/LICENSE)

README.z.md

@@ -1,6 +1,8 @@
 Building Blocks - 积木
 =====================
 
+![logo](http://7xk54v.com1.z0.glb.clouddn.com/images/logo/icon.png)
+
 >**积木** - 一个以知乎日报作为数据展现内容；以抽屉菜单作为功能扩展入口；依循 Material Design 作为主导设计 UI 的应用；我知道，这听起来就很酷！
 
 ### How to use - 如何使用
@@ -58,15 +60,8 @@ Building Blocks - 积木
 
 ## Contributors
 
-- [troyliu0105](https://github.com/troyliu0105) 
-
-## Help - 帮帮我
-
-天生不是做设计的料，至今还没学会 Sketch，更别说 PS 了，所以，「积木」的「应用图标」至今还缺省着。
-
-不愿将就的我，愿意等，如果你正好发现了她，又愿意赏脸施展下你的才华，那么不妨为她设计个漂亮的图标吧：）
-
-你能在下面找到我的联系方式，在此我先替她谢过啦！！！
+- [troyliu0105](https://github.com/troyliu0105)
+- logo: [Mao](http://weibo.com/cat93/) & troyliu0105
 
 ## Contact - 联系我
 

app/src/main/AndroidManifest.xml

@@ -19,7 +19,7 @@
     <application
         android:name=".application.App"
         android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@drawable/icon"
         android:label="@string/app_name"
         android:theme="@style/Base.Theme.AppTheme">
 

app/src/main/java/me/itangqi/buildingblocks/ui/activity/AboutActivity.java

@@ -5,6 +5,7 @@
 import android.support.design.widget.CollapsingToolbarLayout;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
+import android.text.method.LinkMovementMethod;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -26,9 +27,14 @@
 
 public class AboutActivity extends AppCompatActivity implements SwipeBackActivityBase {
 
-    @Bind(R.id.toolbar) Toolbar mToolbar;
-    @Bind(R.id.tv_version) TextView mVersionTextView;
-    @Bind(R.id.collapsing_toolbar) CollapsingToolbarLayout mCollapsingToolbarLayout;
+    @Bind(R.id.toolbar)
+    Toolbar mToolbar;
+    @Bind(R.id.tv_version)
+    TextView mVersionTextView;
+    @Bind(R.id.collapsing_toolbar)
+    CollapsingToolbarLayout mCollapsingToolbarLayout;
+    @Bind(R.id.about_thanks_to)
+    TextView mThanksTo;
 
     private SwipeBackActivityHelper mHelper;
 
@@ -44,7 +50,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         setSupportActionBar(mToolbar);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-
+        mThanksTo.setMovementMethod(LinkMovementMethod.getInstance());
         mHelper = new SwipeBackActivityHelper(this);
         mHelper.onActivityCreate();
     }

app/src/main/res/layout/activity_about.xml

@@ -31,7 +31,7 @@
                     android:layout_width="96dp"
                     android:layout_height="96dp"
                     android:layout_marginTop="@dimen/margin_24dp"
-                    android:src="@mipmap/ic_launcher"/>
+                    android:src="@drawable/icon"/>
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -108,7 +108,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="12dp"
                 android:layout_marginTop="12dp"
-                android:text="@string/about_help_me"
+                android:text="@string/about_thanks_to"
                 android:textColor="@color/secondary_text"/>
 
             <RelativeLayout
@@ -118,9 +118,10 @@
                 android:padding="16dp">
 
                 <TextView
+                    android:id="@+id/about_thanks_to"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/about_help_me_detail"
+                    android:text="@string/about_thanks_to_detail"
                     android:textColor="@color/secondary_text"
                     android:textSize="14sp"
                     tools:ignore="HardcodedText"/>

app/src/main/res/values/strings.xml

@@ -25,8 +25,8 @@
     <string name="about_developers">关于我</string>
     <string name="about_developer_description">一个 Android 菜鸟</string>
     <string name="about_open_source_lis">感谢开源</string>
-    <string name="about_help_me">帮帮我</string>
-    <string name="about_help_me_detail">天生不是做设计的料，至今还没学会 Sketch，更别说 PS 了，所以，「积木」的「应用图标」至今还缺省着。\n\n不愿将就的我，愿意等，如果你正好发现了她，又正好没处发挥你的才华的话，那么不妨为她设计个漂亮的图标吧：）\n\n你能在下面找到我的联系方式，在此我先替她谢过啦！！！</string>
+    <string name="about_thanks_to">特别鸣谢</string>
+    <string name="about_thanks_to_detail">感谢<a href="http://weibo.com/cat93/">Mao</a>设计的图标</string>
     <string name="about_introduce_and_help">介绍与帮助</string>
     <string name="about_open_source_libraries_list">com.orhanobut:logger:1.10\ncom.jakewharton:butterknife:7.0.1\ncom.soundcloud.android:android-crop:1.0.0@aar\ncom.loopj.android:android-async-http:1.4.8\ncom.github.bumptech.glide:glide:3.6.1\nme.imid.swipebacklayout.lib:library:1.0.0</string>