Skip to content

Commit

Permalink
prepare release v1.3.9
Browse files Browse the repository at this point in the history
  • Loading branch information
KenChoi authored and KenChoi committed Dec 16, 2016
1 parent c11fc20 commit 7e743ed
Show file tree
Hide file tree
Showing 33 changed files with 846 additions and 449 deletions.
5 changes: 3 additions & 2 deletions JChat/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="io.jchat.android"
android:versionCode="59"
android:versionName="1.3.8">
android:versionCode="60"
android:versionName="1.3.9">

<uses-sdk
android:minSdkVersion="9"
Expand Down Expand Up @@ -163,6 +163,7 @@
android:windowSoftInputMode="adjustResize|stateAlwaysHidden" />
<activity
android:name="io.jchat.android.activity.MainActivity"
android:launchMode="singleTask"
android:label="@string/app_name"
android:screenOrientation="portrait"
android:windowSoftInputMode="adjustPan|stateAlwaysHidden">
Expand Down
16 changes: 10 additions & 6 deletions JChat/res/drawable/accept_btn_bg.xml
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">

<item android:state_pressed="true"><shape>
<item android:state_pressed="true">
<shape>
<corners android:radius="5dp" />

<solid android:color="@color/login_btn_def_color" />
</shape></item>
<item><shape>
<solid android:color="@color/accept_btn_pressed" />
</shape>
</item>
<item>
<shape>
<corners android:radius="5dp" />

<solid android:color="@color/jmui_jpush_blue" />
</shape></item>
<solid android:color="@color/accept_btn_default" />
</shape>
</item>

</selector>
19 changes: 19 additions & 0 deletions JChat/res/drawable/refuse_btn_bg.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">

<item android:state_pressed="true">
<shape>
<corners android:radius="5dp" />

<solid android:color="@color/refuse_btn_pressed" />
</shape>
</item>
<item>
<shape>
<corners android:radius="5dp" />

<solid android:color="@color/refuse_btn_default" />
</shape>
</item>

</selector>
13 changes: 12 additions & 1 deletion JChat/res/layout/activity_friend_info.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
</FrameLayout>

<LinearLayout
android:id="@+id/name_rl"
android:id="@+id/name_ll"
style="@style/MeItemStyle">

<ImageView
Expand Down Expand Up @@ -291,6 +291,17 @@
android:text="@string/send_message"
android:textColor="@color/white"
android:textSize="@dimen/text_medium_size"/>

<Button
android:id="@+id/delete_friend_btn"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_gravity="center_horizontal"
android:layout_margin="20dp"
android:background="@drawable/chat_detail_btn_bg"
android:text="@string/friend_opt_delete"
android:textColor="@color/white"
android:textSize="@dimen/text_medium_size"/>
</LinearLayout>


Expand Down
3 changes: 2 additions & 1 deletion JChat/res/layout/activity_friend_recommend.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
<ListView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/friend_recommend_list_view">
android:id="@+id/friend_recommend_list_view"
android:divider="@null">

</ListView>

Expand Down
10 changes: 4 additions & 6 deletions JChat/res/layout/dialog_add_friend_to_conv_list.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:layout_gravity="center"
android:text="添加好友"
android:text="@string/add_friend"
android:textSize="18sp"
android:textColor="@color/green"
/>
Expand All @@ -21,7 +21,6 @@
android:id="@+id/divide_view"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_below="@+id/dialog_name"
android:layout_margin="10dp"
android:background="@color/jmui_chat_detail_split_line_color" />

Expand All @@ -30,7 +29,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:textColor="@color/gray"
android:text="输入你要添加的好友用户名"/>
android:text="@string/input_friend_username_hint"/>

<EditText
android:id="@+id/user_name_et"
Expand All @@ -48,15 +47,14 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_below="@+id/nick_name_hint"
android:orientation="horizontal">

<Button
android:id="@+id/jmui_cancel_btn"
android:layout_height="50dp"
android:layout_width="0dip"
android:layout_weight="1"
android:text="取消"
android:text="@string/jmui_cancel"
android:textColor="#808080"
android:background="@drawable/jmui_dialog_bottom_left_btn"
/>
Expand All @@ -66,7 +64,7 @@
android:layout_height="50dp"
android:layout_width="0dp"
android:layout_weight="1"
android:text="确定"
android:text="@string/jmui_confirm"
android:textColor="#808080"
android:background="@drawable/jmui_dialog_bottom_right_btn"
/>
Expand Down
62 changes: 62 additions & 0 deletions JChat/res/layout/dialog_refuse_invitation.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
<?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="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:paddingTop="10dp"
android:background="@drawable/jmui_dialog_default_style">

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/send_refuse_reason_title"
android:textSize="@dimen/text_medium_size"
android:textColor="@color/green"/>

<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_margin="10dp"
android:background="@color/jmui_chat_detail_split_line_color" />

<EditText
android:id="@+id/reason_et"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:textCursorDrawable="@drawable/jmui_text_cursor_bg"
android:textSize="20sp"
android:maxLines="4"
android:padding="5dp"
android:textColor="@color/black"/>

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

<Button
android:id="@+id/cancel_btn"
android:layout_height="50dp"
android:layout_width="0dip"
android:layout_weight="1"
android:text="@string/jmui_cancel"
android:textColor="#808080"
android:background="@drawable/jmui_dialog_bottom_left_btn"
/>

<Button
android:id="@+id/send_btn"
android:layout_height="50dp"
android:layout_width="0dp"
android:layout_weight="1"
android:text="@string/jmui_send"
android:textColor="#808080"
android:background="@drawable/jmui_dialog_bottom_right_btn"
/>
</LinearLayout>

</LinearLayout>
118 changes: 72 additions & 46 deletions JChat/res/layout/item_friend_recomend.xml
View file
Original file line number Diff line number Diff line change
@@ -1,66 +1,92 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
android:id="@+id/friend_verify_item_ll"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:background="#ffffff"
android:padding="10dp">
android:background="@drawable/jmui_list_item_bg">

<io.jchat.android.chatting.CircleImageView
android:layout_width="50dp"
android:layout_height="50dp"
android:id="@+id/item_head_icon"
android:src="@drawable/jmui_head_icon"/>

<RelativeLayout
android:layout_width="0dp"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginTop="2dp"
android:paddingLeft="10dp"
android:paddingRight="10dp">
android:orientation="horizontal"
android:gravity="center"
android:padding="10dp">

<io.jchat.android.chatting.CircleImageView
android:layout_width="50dp"
android:layout_height="50dp"
android:id="@+id/item_head_icon"
android:src="@drawable/jmui_head_icon"/>

<LinearLayout
android:id="@+id/title_layout"
android:layout_width="match_parent"
<RelativeLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:orientation="horizontal">
android:layout_weight="1"
android:layout_marginTop="2dp"
android:paddingLeft="10dp"
android:paddingRight="10dp">

<LinearLayout
android:id="@+id/title_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:orientation="horizontal">

<TextView
android:id="@+id/item_name"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:maxLines="1"
android:textColor="#000000"
android:textSize="@dimen/text_medium_size" />

</LinearLayout>

<TextView
android:id="@+id/item_name"
android:layout_width="0dp"
android:layout_weight="1"
android:id="@+id/item_reason"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/title_layout"
android:ems="10"
android:maxLines="1"
android:textColor="#000000"
android:textSize="@dimen/text_medium_size" />
android:textSize="16sp"
android:textColor="#808080" />
</RelativeLayout>

</LinearLayout>
<Button
android:id="@+id/item_add_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/accept"
android:padding="10dp"
android:textColor="@color/white"
android:layout_marginRight="10dp"
android:background="@drawable/accept_btn_bg"/>

<Button
android:id="@+id/item_refuse_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/refuse"
android:textColor="@color/white"
android:padding="10dp"
android:background="@drawable/refuse_btn_bg"/>

<TextView
android:id="@+id/item_reason"
android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/title_layout"
android:ems="10"
android:maxLines="1"
android:textSize="16sp"
android:textColor="#808080" />
</RelativeLayout>
android:id="@+id/item_state"
android:textSize="18sp"
android:visibility="gone"/>

<ImageButton
android:layout_width="30dp"
android:layout_height="30dp"
android:id="@+id/item_add_btn"
android:background="@drawable/add_btn_bg"/>
</LinearLayout>

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/item_state"
android:textSize="18sp"
android:visibility="gone"/>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@drawable/contact_divider"/>

</LinearLayout>
2 changes: 1 addition & 1 deletion JChat/res/layout/menu_title_bar_with_button.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:padding="10dp"
android:text="保存"
android:text="@string/save"
android:textSize="@dimen/text_medium_size"
android:textColor="#FFFFFF"
android:background="@drawable/jmui_back_btn_bg"/>
Expand Down
6 changes: 6 additions & 0 deletions JChat/res/values/colors.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,12 @@
<color name="send_file_action_bar">#767676</color>
<color name="send_file_action_bar_selected">#3f82dd</color>

<!-- 通讯录相关 -->
<color name="accept_btn_default">#327adf</color>
<color name="accept_btn_pressed">#0246a6</color>
<color name="refuse_btn_default">#ea6e76</color>
<color name="refuse_btn_pressed">#af5258</color>

<!-- 灰色 -->

<color name="grey">#808080</color>
Expand Down
Loading

0 comments on commit 7e743ed

Please sign in to comment.