gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-03-06 22:29:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move pin to favorites

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2018-08-08 21:18:52 +02:00
parent 28c6898080
commit 5dcd8479c3
11 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.java
View File

@ -133,7 +133,7 @@ public class ConversationItem extends AbstractFlexibleItem<ConversationItem.Conv
holder.passwordProtectedRoomImageView.setVisibility(View.GONE);
}
if (conversation.isPinned()) {
if (conversation.isFavorite()) {
holder.pinnedConversationImageView.setVisibility(View.VISIBLE);
} else {
holder.pinnedConversationImageView.setVisibility(View.GONE);
@ -294,7 +294,7 @@ public class ConversationItem extends AbstractFlexibleItem<ConversationItem.Conv
ImageView onlineIndicator;
@BindView(R.id.passwordProtectedRoomImageView)
ImageView passwordProtectedRoomImageView;
@BindView(R.id.pinnedConversationImageView)
@BindView(R.id.favoriteConversationImageView)
ImageView pinnedConversationImageView;
ConversationItemViewHolder(View view, FlexibleAdapter adapter) {

12
app/src/main/java/com/nextcloud/talk/api/NcApi.java
View File

@ -292,14 +292,14 @@ public interface NcApi {
// Url is: /api/{apiVersion}/room/{token}/pin
@POST
Observable<GenericOverall> pinConversation(@Header("Authorization") String authorization,
@Url String url);
// Url is: /api/{apiVersion}/room/{token}/pin
@DELETE
Observable<GenericOverall> unpinConversation(@Header("Authorization") String authorization,
Observable<GenericOverall> addConversationToFavorites(@Header("Authorization") String authorization,
@Url String url);
// Url is: /api/{apiVersion}/room/{token}/favorites
@DELETE
Observable<GenericOverall> removeConversationFromFavorites(@Header("Authorization") String authorization,
@Url String url);
@GET
Observable<NotificationOverall> getNotification(@Header("Authorization") String authorization,
@Url String url);

2
app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java
View File

@ -296,7 +296,7 @@ public class ConversationsListController extends BaseController implements Searc
Conversation conversation1 = ((ConversationItem) o1).getModel();
Conversation conversation2 = ((ConversationItem) o2).getModel();
return new CompareToBuilder()
.append(conversation2.isPinned(), conversation1.isPinned())
.append(conversation2.isFavorite(), conversation1.isFavorite())
.append(conversation2.getLastActivity(), conversation1.getLastActivity())
.toComparison();
});

10
app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/CallMenuController.java
View File

@ -132,12 +132,12 @@ public class CallMenuController extends BaseController implements FlexibleAdapte
menuItems.add(new MenuItem(getResources().getString(R.string.nc_configure_room), 0, null));
}
if (conversation.isPinned()) {
menuItems.add(new MenuItem(getResources().getString(R.string.nc_unpin), 97, getResources()
.getDrawable(R.drawable.ic_unpin_grey600_24px)));
if (conversation.isFavorite()) {
menuItems.add(new MenuItem(getResources().getString(R.string.nc_remove_from_favorites), 97, getResources()
.getDrawable(R.drawable.ic_star_border_grey600_24dp)));
} else {
menuItems.add(new MenuItem(getResources().getString(R.string.nc_pin_to_top), 98, getResources()
.getDrawable(R.drawable.ic_pin_grey600_24px)));
menuItems.add(new MenuItem(getResources().getString(R.string.nc_add_to_favorites), 98, getResources()
.getDrawable(R.drawable.ic_star_grey600_24dp)));
}
if (conversation.isNameEditable()) {

4
app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/OperationsMenuController.java
View File

@ -319,14 +319,14 @@ public class OperationsMenuController extends BaseController {
case 97:
case 98:
if (operationCode == 97) {
ncApi.unpinConversation(credentials, ApiUtils.getUrlForConversationPin(currentUser.getBaseUrl(),
ncApi.removeConversationFromFavorites(credentials, ApiUtils.getUrlForConversationFavorites(currentUser.getBaseUrl(),
conversation.getToken()))
.subscribeOn(Schedulers.newThread())
.observeOn(AndroidSchedulers.mainThread())
.retry(1)
.subscribe(operationsObserver);
} else {
ncApi.pinConversation(credentials, ApiUtils.getUrlForConversationPin(currentUser.getBaseUrl(),
ncApi.addConversationToFavorites(credentials, ApiUtils.getUrlForConversationFavorites(currentUser.getBaseUrl(),
conversation.getToken()))
.subscribeOn(Schedulers.newThread())
.observeOn(AndroidSchedulers.mainThread())

4
app/src/main/java/com/nextcloud/talk/models/json/rooms/Conversation.java
View File

@ -64,8 +64,8 @@ public class Conversation {
@JsonField(name = "sessionId")
public String sessionId;
public String password;
@JsonField(name = "isPinned")
public boolean isPinned;
@JsonField(name = "isFavorite")
public boolean isFavorite;
@JsonField(name = "lastActivity")
public long lastActivity;
@JsonField(name = "unreadMessages")

4
app/src/main/java/com/nextcloud/talk/utils/ApiUtils.java
View File

@ -188,8 +188,8 @@ public class ApiUtils {
getApplicationContext().getResources().getString(R.string.nc_push_server_url) + "/devices";
}
public static String getUrlForConversationPin(String baseUrl, String roomToken) {
return baseUrl + ocsApiVersion + "/room/" + roomToken + "/pin";
public static String getUrlForConversationFavorites(String baseUrl, String roomToken) {
return baseUrl + ocsApiVersion + "/room/" + roomToken + "/favorite";
}
public static String getUrlForNotificationWithId(String baseUrl, String notificationId) {

4
app/src/main/res/drawable/ic_unpin_grey600_24px.xml → app/src/main/res/drawable/ic_star_border_grey600_24dp.xml
View File

@ -19,7 +19,7 @@
-->
<vector android:autoMirrored="true" android:height="24dp"
android:viewportHeight="16" android:viewportWidth="16"
android:viewportHeight="24.0" android:viewportWidth="24.0"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#757575" android:pathData="m13.683,1.9302c-1.7747,1.1748 -9.7908,6.3442 -11.559,7.5293 -0.3983,0.3381 0.0222,1.1076 0.5227,0.9383 0.4818,-0.2294 0.8972,-0.5739 1.3516,-0.8515 1.3851,-0.9134 9.0066,-5.8291 10.384,-6.7542 0.4077,-0.35 -0.0238,-1.1431 -0.5515,-0.9338 -0.0551,0.0189 -0.1022,0.0415 -0.148,0.072zM6.5388,1.5625c-1.1008,-0.065 -2.2066,0.1586 -3.1582,0.7578l3.3223,2.7871c1.1454,-0.754 2.2875,-1.5127 3.4336,-2.2656 -0.1566,-0.0995 -0.3045,-0.212 -0.4648,-0.3047 -0.9347,-0.5559 -2.032,-0.9096 -3.1328,-0.9746zM12.7966,5.0898c-2.3982,1.5806 -4.8015,3.1551 -7.1992,4.7363 -0.1388,0.0848 -0.2695,0.1831 -0.4063,0.2715l-2.7734,4.377 7.4727,-6.8105 3.668,3.0605c0.2737,0.2947 0.7762,0.692 0.9004,0.0391 0.5762,-1.3354 0.2622,-2.8828 -0.4551,-4.0996 -0.3501,-0.5629 -0.765,-1.0799 -1.207,-1.5742z"/>
<path android:fillColor="#757575" android:pathData="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z"/>
</vector>

4
app/src/main/res/drawable/ic_pin_grey600_24px.xml → app/src/main/res/drawable/ic_star_grey600_24dp.xml
View File

@ -19,7 +19,7 @@
-->
<vector android:autoMirrored="true" android:height="24dp"
android:viewportHeight="16" android:viewportWidth="16"
android:viewportHeight="24.0" android:viewportWidth="24.0"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#757575" android:pathData="m2.4185,14.474 l5.3626,-8.4634 -4.3995,-3.6912s3.3518,-2.4413 7.9548,1.3624c5.3458,4.4175 2.8373,7.5555 2.8373,7.5555l-4.2827,-3.5744z"/>
<path android:fillColor="#757575" android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"/>
</vector>

6
app/src/main/res/layout/rv_item_conversation_with_last_message.xml
View File

@ -131,17 +131,17 @@
android:layout_width="12dp"
android:layout_height="12dp"
android:layout_marginBottom="4dp"
android:layout_toStartOf="@id/pinnedConversationImageView"
android:layout_toStartOf="@id/favoriteConversationImageView"
android:src="@drawable/ic_lock_grey600_24px"
android:visibility="visible"/>
<ImageView
android:id="@+id/pinnedConversationImageView"
android:id="@+id/favoriteConversationImageView"
android:layout_width="12dp"
android:layout_height="12dp"
android:layout_marginBottom="4dp"
android:layout_alignParentEnd="true"
android:src="@drawable/ic_pin_grey600_24px"
android:src="@drawable/ic_star_grey600_24dp"
android:visibility="visible"/>
</RelativeLayout>

4
app/src/main/res/values/strings.xml
View File

@ -102,8 +102,8 @@
<string name="nc_new_conversation">New conversation</string>
<string name="nc_join_via_link">Join via link</string>
<string name="nc_join_via_web">Join via web</string>
<string name="nc_pin_to_top">Pin to top</string>
<string name="nc_unpin">Unpin</string>
<string name="nc_add_to_favorites">Add to favorites</string>
<string name="nc_remove_from_favorites">Remove from favorites</string>
<!-- Contacts -->
<string name="nc_select_contacts">Select contacts</string>