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

Commit d2714f5

Browse files
amcodingamcoding
committed
Adds an arrow in front of a expandable stream to expand and contract that stream.
1 parent b596202 commit d2714f5

File tree

5 files changed

+83
-40
lines changed

5 files changed

+83
-40
lines changed

‎app/src/main/java/com/zulip/android/activities/ExpandableStreamDrawerAdapter.java‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,19 @@ public Cursor getChildrenCursor(Cursor groupCursor) {
4040
ZLog.logException(e);
4141
}
4242
MatrixCursor matrixCursor = new MatrixCursor(new String[]{"subject", "_id"});
43-
44-
for (String[] result : results) {
45-
try {
46-
matrixCursor.addRow(new String[]{result[0], String.valueOf(groupCursor.getInt(0))});
47-
} catch (Exception e) {
48-
ZLog.logException(e);
43+
if (results.size() == 0){
44+
try {
45+
matrixCursor.addRow(new String[]{"(no topic)", String.valueOf(0)});
46+
} catch (Exception e) {
47+
ZLog.logException(e);
48+
}
49+
}else{
50+
for (String[] result: results){
51+
try {
52+
matrixCursor.addRow(new String[]{result[0], String.valueOf(0)});
53+
} catch (Exception e) {
54+
ZLog.logException(e);
55+
}
4956
}
5057
}
5158
return matrixCursor;

‎app/src/main/java/com/zulip/android/activities/ZulipActivity.java‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
import android.view.View;
5757
import android.view.ViewPropertyAnimator;
5858
import android.view.WindowManager;
59+
import android.view.animation.AccelerateDecelerateInterpolator;
5960
import android.view.animation.Interpolator;
6061
import android.view.inputmethod.InputMethodManager;
6162
import android.widget.AdapterView;
@@ -211,6 +212,8 @@ public void onReceive(Context contenxt, Intent intent) {
211212
private ImageView ivSearchStreamCancel;
212213
private ListView peopleDrawer;
213214
private Toast toast;
215+
private boolean expanded_stream = false;
216+
214217
//
215218
private String streamSearchFilterKeyword = "";
216219
private SimpleCursorAdapter.ViewBinder peopleBinder = new SimpleCursorAdapter.ViewBinder() {
@@ -1235,10 +1238,22 @@ public boolean onGroupClick(ExpandableListView expandableListView, View view, in
12351238
String streamName = ((TextView) view.findViewById(R.id.name)).getText().toString();
12361239
doNarrowToLastRead(streamName);
12371240
drawerLayout.openDrawer(GravityCompat.START);
1241+
ImageView imageView = (ImageView) view.findViewById(R.id.stream_expand_arrow);
1242+
float deg = (imageView.getRotation() == 180F) ? 0F : 180F;
1243+
imageView.animate().rotation(deg).setInterpolator(new AccelerateDecelerateInterpolator());
1244+
12381245
if (previousClick != -1 && expandableListView.getCount() > previousClick) {
12391246
expandableListView.collapseGroup(previousClick);
12401247
}
1241-
expandableListView.expandGroup(position);
1248+
1249+
if ((previousClick == position) && expanded_stream) {
1250+
expandableListView.collapseGroup(position);
1251+
expanded_stream = false;
1252+
} else {
1253+
expandableListView.expandGroup(position);
1254+
expanded_stream = true;
1255+
}
1256+
12421257
previousClick = position;
12431258
onNarrowFillSendBoxStream(streamName, "", false);
12441259
return true;

‎app/src/main/java/com/zulip/android/util/StreamSpan.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ public StreamSpan(String streamId, int color) {
3030
@Override
3131
public void onClick(View widget) {
3232
Context context = widget.getContext().getApplicationContext();
33-
3433
// get stream name from streamId string
3534
String streamName = null;
3635
if (StringUtils.isNumeric(streamId)) {

‎app/src/main/res/drawable/ic_keyboard_arrow_down_black_24dp.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24.0"
5+
android:viewportHeight="24.0">
6+
<path
7+
android:fillColor="#5b5656"
8+
android:pathData="M7.41,7.84L12,12.42l4.59,-4.58L18,9.25l-6,6 -6,-6z"/>
9+
</vector>

‎app/src/main/res/layout/stream_tile_new.xml‎

Lines changed: 45 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,56 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
2+
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
android:layout_width="match_parent"
44
android:layout_height="48dp"
55
android:orientation="horizontal">
66

7-
<View
8-
android:id="@+id/stream_dot"
9-
android:layout_width="16dp"
10-
android:layout_height="16dp"
11-
android:layout_centerVertical="true"
7+
<LinearLayout
8+
android:layout_width="0dp"
9+
android:layout_height="wrap_content"
1210
android:layout_gravity="center_vertical"
13-
android:layout_marginLeft="16dp"
14-
android:background="@drawable/dot" />
11+
android:layout_weight="1">
1512

16-
<TextView
17-
android:id="@+id/unread_group"
18-
android:layout_width="wrap_content"
19-
android:layout_height="wrap_content"
20-
android:layout_alignParentEnd="true"
21-
android:layout_alignParentRight="true"
22-
android:layout_alignTop="@+id/stream_dot"
23-
android:layout_gravity="center_vertical|end"
24-
android:layout_marginEnd="30dp"
25-
android:layout_marginRight="30dp"
26-
android:text="1"
27-
android:visibility="gone" />
13+
<View
14+
android:id="@+id/stream_dot"
15+
android:layout_width="16dp"
16+
android:layout_height="16dp"
17+
android:layout_gravity="center_vertical"
18+
android:layout_marginLeft="16dp"
19+
android:background="@drawable/dot" />
2820

29-
<TextView
30-
android:id="@+id/name"
21+
<TextView
22+
android:id="@+id/unread_group"
23+
android:layout_width="0dp"
24+
android:layout_height="wrap_content"
25+
android:layout_alignParentEnd="true"
26+
android:layout_alignParentRight="true"
27+
android:layout_alignTop="@+id/stream_dot"
28+
android:layout_gravity="center_vertical|end"
29+
android:layout_marginEnd="30dp"
30+
android:layout_marginRight="30dp"
31+
android:layout_weight="1"
32+
android:text="1"
33+
android:visibility="gone" />
34+
35+
<TextView
36+
android:id="@+id/name"
37+
android:layout_width="wrap_content"
38+
android:layout_height="wrap_content"
39+
android:layout_gravity="center_vertical"
40+
android:layout_marginLeft="20dp"
41+
android:layout_marginStart="20dp"
42+
android:gravity="center_vertical"
43+
android:text="MyStream"
44+
android:textColor="@color/colorTextPrimary"
45+
android:textSize="18sp" />
46+
</LinearLayout>
47+
48+
<ImageView
49+
android:id="@+id/stream_expand_arrow"
3150
android:layout_width="wrap_content"
3251
android:layout_height="wrap_content"
33-
android:layout_centerVertical="true"
34-
android:layout_gravity="center_vertical"
35-
android:layout_marginLeft="20dp"
36-
android:layout_marginStart="20dp"
37-
android:layout_toEndOf="@+id/stream_dot"
38-
android:layout_toRightOf="@+id/stream_dot"
52+
android:layout_marginRight="5dp"
53+
android:layout_marginTop="7dp"
3954
android:padding="5dp"
40-
android:text="MyStream"
41-
android:textColor="@color/colorTextPrimary"
42-
android:textSize="18sp" />
43-
</RelativeLayout>
55+
android:src="@drawable/ic_keyboard_arrow_down_black_24dp" />
56+
</LinearLayout>

0 commit comments

Comments
 (0)