Skip to content

A
AloqaIM-Android
Commit f2791a03 authored by Tiago Cunha's avatar Tiago Cunha
Browse files
Options

Added unread mode

parent 9bc47756
Show whitespace changes
Inline Side-by-side
Showing with 156 additions and 104 deletions
app/src/main/java/chat/rocket/android/fragment/sidebar/SidebarMainFragment.java
View file @ f2791a03
......@@ -7,16 +7,14 @@ import android.widget.CompoundButton;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.jakewharton.rxbinding.view.RxView;
import com.jakewharton.rxbinding.widget.RxCompoundButton;
import chat.rocket.android.R;
import chat.rocket.android.RocketChatCache;
import chat.rocket.android.api.MethodCallHelper;
import chat.rocket.android.fragment.AbstractFragment;
import chat.rocket.android.fragment.sidebar.dialog.AbstractAddRoomDialogFragment;
import chat.rocket.android.fragment.sidebar.dialog.AddChannelDialogFragment;
import chat.rocket.android.fragment.sidebar.dialog.AddDirectMessageDialogFragment;
import chat.rocket.android.fragment.sidebar.dialog.AddChannelDialogFragment;
import chat.rocket.android.helper.LogcatIfError;
import chat.rocket.android.helper.TextUtils;
import chat.rocket.android.layouthelper.chatroom.RoomListManager;
......@@ -29,6 +27,9 @@ import chat.rocket.android.realm_helper.RealmObjectObserver;
import chat.rocket.android.realm_helper.RealmStore;
import chat.rocket.android.renderer.UserRenderer;
import com.jakewharton.rxbinding.view.RxView;
import com.jakewharton.rxbinding.widget.RxCompoundButton;
public class SidebarMainFragment extends AbstractFragment {
private String serverConfigId;
......@@ -75,7 +76,7 @@ public class SidebarMainFragment extends AbstractFragment {
currentUserObserver = realmHelper
.createObjectObserver(User::queryCurrentUser)
.setOnUpdateListener(this::onRenderCurrentUser);
.setOnUpdateListener(this::onCurrentUser);
methodCallHelper = new MethodCallHelper(getContext(), serverConfigId);
}
......@@ -103,6 +104,8 @@ public class SidebarMainFragment extends AbstractFragment {
setupAddChannelButton();
roomListManager = new RoomListManager(
rootView.findViewById(R.id.unread_title),
(LinearLayout) rootView.findViewById(R.id.unread_container),
(LinearLayout) rootView.findViewById(R.id.channels_container),
(LinearLayout) rootView.findViewById(R.id.direct_messages_container));
roomListManager.setOnItemClickListener(view -> {
......@@ -142,6 +145,11 @@ public class SidebarMainFragment extends AbstractFragment {
}
}
private void onCurrentUser(User user) {
onRenderCurrentUser(user);
updateRoomListMode(user);
}
private void onRenderCurrentUser(User user) {
if (user != null && !TextUtils.isEmpty(hostname)) {
new UserRenderer(getContext(), user)
......@@ -151,6 +159,13 @@ public class SidebarMainFragment extends AbstractFragment {
}
}
private void updateRoomListMode(User user) {
if (user == null || user.getSettings() == null || user.getSettings().getPreferences() == null) {
return;
}
roomListManager.setUnreadRoomMode(user.getSettings().getPreferences().isUnreadRoomsMode());
}
private void setupLogoutButton() {
rootView.findViewById(R.id.btn_logout).setOnClickListener(view -> {
if (methodCallHelper != null) {
......
app/src/main/java/chat/rocket/android/layouthelper/chatroom/RoomListManager.java
View file @ f2791a03
......@@ -3,61 +3,60 @@ package chat.rocket.android.layouthelper.chatroom;
import android.view.View;
import android.view.ViewGroup;
import java.util.List;
import chat.rocket.android.helper.TextUtils;
import chat.rocket.android.model.ddp.RoomSubscription;
import chat.rocket.android.widget.internal.RoomListItemView;
import java.util.List;
/**
* Utility class for mapping Room list into channel list ViewGroup.
*/
public class RoomListManager {
private View unreadTitle;
private ViewGroup unreadRoomsContainer;
private ViewGroup channelsContainer;
private ViewGroup dmContainer;
private boolean unreadRoomMode = false;
private List<RoomSubscription> roomSubscriptionList;
/**
* Callback interface for List item clicked.
*/
public interface OnItemClickListener {
void onItemClick(RoomListItemView roomListItemView);
}
private OnItemClickListener listener;
/**
* constructor with three ViewGroups.
*/
public RoomListManager(View unreadTitle, ViewGroup unreadRoomsContainer,
ViewGroup channelsContainer, ViewGroup dmContainer) {
this(unreadTitle, unreadRoomsContainer, channelsContainer, dmContainer, false);
}
/**
* constructor with two ViewGroups.
*/
public RoomListManager(ViewGroup channelsContainer, ViewGroup dmContainer) {
public RoomListManager(View unreadTitle, ViewGroup unreadRoomsContainer,
ViewGroup channelsContainer, ViewGroup dmContainer,
boolean unreadRoomMode) {
this.unreadTitle = unreadTitle;
this.unreadRoomsContainer = unreadRoomsContainer;
this.channelsContainer = channelsContainer;
this.dmContainer = dmContainer;
}
private static void removeItemIfExists(ViewGroup parent, String roomName) {
for (int i = 0; i < parent.getChildCount(); i++) {
RoomListItemView roomListItemView = (RoomListItemView) parent.getChildAt(i);
if (roomName.equals(roomListItemView.getRoomName())) {
parent.removeViewAt(i);
break;
}
}
this.unreadRoomMode = unreadRoomMode;
}
/**
* update ViewGroups with room list.
*/
public void setRooms(List<RoomSubscription> roomSubscriptionList) {
removeDeletedItem(channelsContainer, roomSubscriptionList);
removeDeletedItem(dmContainer, roomSubscriptionList);
for (RoomSubscription roomSubscription : roomSubscriptionList) {
String name = roomSubscription.getName();
if (TextUtils.isEmpty(name)) {
continue;
}
String type = roomSubscription.getType();
if (RoomSubscription.TYPE_CHANNEL.equals(type)
|| RoomSubscription.TYPE_PRIVATE.equals(type)) {
insertOrUpdateItem(channelsContainer, roomSubscription);
removeItemIfExists(dmContainer, name);
} else if (RoomSubscription.TYPE_DIRECT_MESSAGE.equals(type)) {
removeItemIfExists(channelsContainer, name);
insertOrUpdateItem(dmContainer, roomSubscription);
}
}
this.roomSubscriptionList = roomSubscriptionList;
updateRoomsList();
}
/**
......@@ -86,6 +85,11 @@ public class RoomListManager {
}
}
public void setUnreadRoomMode(boolean unreadRoomMode) {
this.unreadRoomMode = unreadRoomMode;
updateRoomsList();
}
private void insertOrUpdateItem(ViewGroup parent, RoomSubscription roomSubscription) {
final String roomName = roomSubscription.getName();
......@@ -129,10 +133,47 @@ public class RoomListManager {
}
}
/**
* Callback interface for List item clicked.
*/
public interface OnItemClickListener {
void onItemClick(RoomListItemView roomListItemView);
private void updateRoomsList() {
removeDeletedItem(unreadRoomsContainer, roomSubscriptionList);
removeDeletedItem(channelsContainer, roomSubscriptionList);
removeDeletedItem(dmContainer, roomSubscriptionList);
for (RoomSubscription roomSubscription : roomSubscriptionList) {
String name = roomSubscription.getName();
if (TextUtils.isEmpty(name)) {
continue;
}
String type = roomSubscription.getType();
if (unreadRoomMode && roomSubscription.getUnread() > 0) {
insertOrUpdateItem(unreadRoomsContainer, roomSubscription);
removeItemIfExists(channelsContainer, name);
removeItemIfExists(dmContainer, name);
} else if (RoomSubscription.TYPE_CHANNEL.equals(type)
|| RoomSubscription.TYPE_PRIVATE.equals(type)) {
removeItemIfExists(unreadRoomsContainer, name);
insertOrUpdateItem(channelsContainer, roomSubscription);
removeItemIfExists(dmContainer, name);
} else if (RoomSubscription.TYPE_DIRECT_MESSAGE.equals(type)) {
removeItemIfExists(unreadRoomsContainer, name);
removeItemIfExists(channelsContainer, name);
insertOrUpdateItem(dmContainer, roomSubscription);
}
}
boolean showUnread = unreadRoomMode && unreadRoomsContainer.getChildCount() != 0;
unreadTitle.setVisibility(showUnread ? View.VISIBLE : View.GONE);
unreadRoomsContainer.setVisibility(showUnread ? View.VISIBLE : View.GONE);
}
private static void removeItemIfExists(ViewGroup parent, String roomName) {
for (int i = 0; i < parent.getChildCount(); i++) {
RoomListItemView roomListItemView = (RoomListItemView) parent.getChildAt(i);
if (roomName.equals(roomListItemView.getRoomName())) {
parent.removeViewAt(i);
break;
}
}
}
}
app/src/main/java/chat/rocket/android/model/ddp/User.java
View file @ f2791a03
......@@ -22,6 +22,7 @@ public class User extends RealmObject {
private String status;
private double utcOffset;
private RealmList<Email> emails;
private Settings settings;
public static RealmQuery<User> queryCurrentUser(Realm realm) {
return realm.where(User.class).isNotEmpty("emails");
......@@ -66,4 +67,8 @@ public class User extends RealmObject {
public void setEmails(RealmList<Email> emails) {
this.emails = emails;
}
public Settings getSettings() {
return settings;
}
}
app/src/main/java/chat/rocket/android/service/RocketChatWebSocketThread.java
View file @ f2791a03
......@@ -140,7 +140,7 @@ public class RocketChatWebSocketThread extends HandlerThread {
* synchronize the state of the thread with ServerConfig.
*/
@DebugLog
public void keepalive() {
public void keepAlive() {
if (ddpClient == null || !ddpClient.isConnected()) {
defaultRealm.executeTransaction(realm -> {
ServerConfig config = realm.where(ServerConfig.class)
......@@ -242,9 +242,9 @@ public class RocketChatWebSocketThread extends HandlerThread {
Object obj = ctor.newInstance(appContext, hostname, serverConfigRealm, ddpClient);
if (obj instanceof Registrable) {
Registrable registerable = (Registrable) obj;
registerable.register();
listeners.add(registerable);
Registrable registrable = (Registrable) obj;
registrable.register();
listeners.add(registrable);
}
} catch (Exception exception) {
RCLog.w(exception, "Failed to register listeners!!");
......@@ -260,8 +260,8 @@ public class RocketChatWebSocketThread extends HandlerThread {
Iterator<Registrable> iterator = listeners.iterator();
while (iterator.hasNext()) {
Registrable registerable = iterator.next();
registerable.unregister();
Registrable registrable = iterator.next();
registrable.unregister();
iterator.remove();
}
if (ddpClient != null) {
......
app/src/main/res/layout/fragment_sidebar_main.xml
View file @ f2791a03
......@@ -3,8 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:theme="@style/AppTheme.Dark"
>
android:theme="@style/AppTheme.Dark">
<LinearLayout
android:id="@+id/user_info_container"
......@@ -16,26 +15,22 @@
android:foreground="?attr/selectableItemBackground"
android:gravity="center_vertical"
android:orientation="horizontal"
android:padding="@dimen/margin_16"
>
android:padding="@dimen/margin_16">
<ImageView
android:id="@+id/current_user_status"
android:layout_width="8dp"
android:layout_height="8dp"
android:src="@drawable/userstatus_online"
/>
android:src="@drawable/userstatus_online" />
<Space
android:layout_width="@dimen/margin_8"
android:layout_height="wrap_content"
/>
android:layout_height="wrap_content" />
<ImageView
android:id="@+id/current_user_avatar"
android:layout_width="48dp"
android:layout_height="48dp"
/>
android:layout_height="48dp" />
<TextView
android:id="@+id/current_user_name"
......@@ -46,14 +41,12 @@
android:layout_marginRight="@dimen/margin_8"
android:layout_weight="1"
android:textSize="14sp"
tools:text="John Doe"
/>
tools:text="John Doe" />
<chat.rocket.android.widget.DownUpToggleView
android:id="@+id/toggle_user_action"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
/>
android:layout_height="wrap_content" />
</LinearLayout>
......@@ -62,21 +55,37 @@
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_below="@+id/user_info_container"
android:background="?attr/colorPrimary"
>
android:background="?attr/colorPrimary">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingStart="?attr/listPreferredItemPaddingLeft"
>
android:paddingStart="?attr/listPreferredItemPaddingLeft">
<TextView
android:id="@+id/unread_title"
android:layout_marginTop="@dimen/margin_8"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:minHeight="48dp"
android:alpha="0.62"
android:text="@string/fragment_sidebar_main_unread_rooms_title"
android:textAppearance="@style/TextAppearance.AppCompat.Body2"
android:textStyle="bold" />
<LinearLayout
android:id="@+id/unread_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="?attr/listPreferredItemPaddingRight"
android:orientation="vertical" />
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_8"
>
android:layout_marginTop="@dimen/margin_8">
<TextView
android:layout_width="wrap_content"
......@@ -85,8 +94,7 @@
android:alpha="0.62"
android:text="@string/fragment_sidebar_main_channels_title"
android:textAppearance="@style/TextAppearance.AppCompat.Body2"
android:textStyle="bold"
/>
android:textStyle="bold" />
<chat.rocket.android.widget.FontAwesomeButton
android:id="@+id/btn_add_channel"
......@@ -95,8 +103,7 @@
android:layout_height="48dp"
android:layout_gravity="end|center_vertical"
android:text="@string/fa_plus"
android:textSize="12dp"
/>
android:textSize="12dp" />
</FrameLayout>
......@@ -105,14 +112,12 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="?attr/listPreferredItemPaddingRight"
android:orientation="vertical"
/>
android:orientation="vertical" />
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_8"
>
android:layout_marginTop="@dimen/margin_8">
<TextView
android:layout_width="wrap_content"
......@@ -121,8 +126,7 @@
android:alpha="0.62"
android:text="@string/fragment_sidebar_main_direct_messages_title"
android:textAppearance="@style/TextAppearance.AppCompat.Body2"
android:textStyle="bold"
/>
android:textStyle="bold" />
<chat.rocket.android.widget.FontAwesomeButton
android:id="@+id/btn_add_direct_message"
......@@ -131,8 +135,7 @@
android:layout_height="48dp"
android:layout_gravity="end|center_vertical"
android:text="@string/fa_plus"
android:textSize="12dp"
/>
android:textSize="12dp" />
</FrameLayout>
......@@ -141,8 +144,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="?attr/listPreferredItemPaddingRight"
android:orientation="vertical"
/>
android:orientation="vertical" />
</LinearLayout>
</android.support.v4.widget.NestedScrollView>
......@@ -156,14 +158,12 @@
android:background="?attr/colorPrimaryDark"
android:elevation="2dp"
android:visibility="gone"
tools:visibility="visible"
>
tools:visibility="gone">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
>
android:orientation="vertical">
<TextView
android:id="@+id/btn_status_online"
......@@ -172,8 +172,7 @@
android:drawableLeft="@drawable/userstatus_online"
android:drawablePadding="16dp"
android:text="@string/user_status_online"
android:textAppearance="?attr/textAppearanceListItemSmall"
/>
android:textAppearance="?attr/textAppearanceListItemSmall" />
<TextView
android:id="@+id/btn_status_away"
......@@ -182,8 +181,7 @@
android:drawableLeft="@drawable/userstatus_away"
android:drawablePadding="16dp"
android:text="@string/user_status_away"
android:textAppearance="?attr/textAppearanceListItemSmall"
/>
android:textAppearance="?attr/textAppearanceListItemSmall" />
<TextView
android:id="@+id/btn_status_busy"
......@@ -192,8 +190,7 @@
android:drawableLeft="@drawable/userstatus_busy"
android:drawablePadding="16dp"
android:text="@string/user_status_busy"
android:textAppearance="?attr/textAppearanceListItemSmall"
/>
android:textAppearance="?attr/textAppearanceListItemSmall" />
<TextView
android:id="@+id/btn_status_invisible"
......@@ -202,24 +199,20 @@
android:drawableLeft="@drawable/userstatus_offline"
android:drawablePadding="16dp"
android:text="@string/user_status_invisible"
android:textAppearance="?attr/textAppearanceListItemSmall"
/>
android:textAppearance="?attr/textAppearanceListItemSmall" />
<chat.rocket.android.widget.DividerView
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
android:layout_height="wrap_content" />
<LinearLayout
android:id="@+id/btn_logout"
style="@style/sidebar_list_item"
android:orientation="horizontal"
>
android:orientation="horizontal">
<FrameLayout
android:layout_width="48dp"
android:layout_height="match_parent"
>
android:layout_height="match_parent">
<chat.rocket.android.widget.FontAwesomeTextView
android:layout_width="16dp"
......@@ -227,16 +220,14 @@
android:layout_gravity="center"
android:gravity="center"
android:text="@string/fa_sign_out"
android:textSize="14dp"
/>
android:textSize="14dp" />
</FrameLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/fragment_sidebar_main_logout_title"
android:textAppearance="?attr/textAppearanceListItemSmall"
/>
android:textAppearance="?attr/textAppearanceListItemSmall" />
</LinearLayout>
</LinearLayout>
</android.support.v4.widget.NestedScrollView>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023