mirror of
https://github.com/nextcloud/talk-android.git
synced 2024-11-27 17:08:34 +03:00
Migrate to updated popup bubble
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
parent
efaf576168
commit
9fc7182790
4 changed files with 33 additions and 17 deletions
|
@ -35,9 +35,11 @@ import android.content.Context
|
|||
import android.content.Intent
|
||||
import android.content.pm.PackageManager
|
||||
import android.content.res.AssetFileDescriptor
|
||||
import android.content.res.ColorStateList
|
||||
import android.content.res.Resources
|
||||
import android.database.Cursor
|
||||
import android.graphics.Bitmap
|
||||
import android.graphics.Color
|
||||
import android.graphics.drawable.ColorDrawable
|
||||
import android.media.MediaPlayer
|
||||
import android.media.MediaRecorder
|
||||
|
@ -645,6 +647,9 @@ class ChatController(args: Bundle) :
|
|||
}
|
||||
}
|
||||
|
||||
binding.popupBubbleView.setTextColor(Color.WHITE)
|
||||
binding.popupBubbleView.setIconTint(ColorStateList.valueOf(Color.WHITE))
|
||||
|
||||
binding.messageInputView.setPadding(0, 0, 0, 0)
|
||||
|
||||
binding.messagesListView.addOnScrollListener(object : RecyclerView.OnScrollListener() {
|
||||
|
|
|
@ -31,7 +31,9 @@ import android.content.ClipData;
|
|||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.content.res.ColorStateList;
|
||||
import android.graphics.Bitmap;
|
||||
import android.graphics.Color;
|
||||
import android.net.Uri;
|
||||
import android.os.Build;
|
||||
import android.os.Bundle;
|
||||
|
@ -101,7 +103,7 @@ import com.nextcloud.talk.utils.bundle.BundleKeys;
|
|||
import com.nextcloud.talk.utils.database.user.CapabilitiesUtilNew;
|
||||
import com.nextcloud.talk.utils.preferences.AppPreferences;
|
||||
import com.nextcloud.talk.utils.rx.SearchViewObservable;
|
||||
import com.webianks.library.PopupBubble;
|
||||
import com.nextcloud.ui.popupbubble.PopupBubble;
|
||||
import com.yarolegovich.lovelydialog.LovelySaveStateHandler;
|
||||
import com.yarolegovich.lovelydialog.LovelyStandardDialog;
|
||||
|
||||
|
@ -806,6 +808,9 @@ public class ConversationsListController extends BaseController implements Flexi
|
|||
recyclerView.smoothScrollToPosition(nextUnreadConversationScrollPosition);
|
||||
}
|
||||
});
|
||||
|
||||
newMentionPopupBubble.setTextColor(Color.WHITE);
|
||||
newMentionPopupBubble.setIconTint(ColorStateList.valueOf(Color.WHITE));
|
||||
}
|
||||
|
||||
private void checkToShowUnreadBubble() {
|
||||
|
|
|
@ -90,19 +90,22 @@
|
|||
app:outcomingTimeTextSize="12sp"
|
||||
app:textAutoLink="all" />
|
||||
|
||||
<com.webianks.library.PopupBubble
|
||||
<com.nextcloud.ui.popupbubble.PopupBubble
|
||||
android:id="@+id/popupBubbleView"
|
||||
android:theme="@style/Button.Primary"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:layout_centerHorizontal="true"
|
||||
android:layout_margin="16dp"
|
||||
android:paddingStart="0dp"
|
||||
android:paddingEnd="8dp"
|
||||
app:pb_backgroundColor="@color/colorPrimary"
|
||||
app:pb_icon="@drawable/ic_baseline_arrow_downward_24px"
|
||||
app:pb_text="@string/nc_new_messages"
|
||||
app:pb_textColor="@color/textColorOnPrimaryBackground" />
|
||||
android:layout_marginStart="@dimen/dialog_padding"
|
||||
android:layout_marginTop="16dp"
|
||||
android:layout_marginEnd="@dimen/dialog_padding"
|
||||
android:layout_marginBottom="16dp"
|
||||
android:minHeight="@dimen/min_size_clickable_area"
|
||||
android:text="@string/nc_new_messages"
|
||||
app:background="@color/colorPrimary"
|
||||
app:cornerRadius="@dimen/button_corner_radius"
|
||||
app:icon="@drawable/ic_baseline_arrow_downward_24px" />
|
||||
|
||||
</RelativeLayout>
|
||||
|
||||
|
|
|
@ -121,17 +121,20 @@
|
|||
app:srcCompat="@drawable/ic_add_white_24px"
|
||||
app:tint="@color/white" />
|
||||
|
||||
<com.webianks.library.PopupBubble
|
||||
<com.nextcloud.ui.popupbubble.PopupBubble
|
||||
android:id="@+id/newMentionPopupBubble"
|
||||
android:theme="@style/Button.Primary"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="bottom|center"
|
||||
android:layout_margin="16dp"
|
||||
android:paddingStart="0dp"
|
||||
android:paddingEnd="8dp"
|
||||
app:pb_backgroundColor="@color/colorPrimary"
|
||||
app:pb_icon="@drawable/ic_baseline_arrow_downward_24px"
|
||||
app:pb_text="@string/nc_new_mention"
|
||||
app:pb_textColor="@color/textColorOnPrimaryBackground" />
|
||||
android:layout_marginStart="88dp"
|
||||
android:layout_marginTop="16dp"
|
||||
android:layout_marginEnd="88dp"
|
||||
android:layout_marginBottom="16dp"
|
||||
android:minHeight="@dimen/min_size_clickable_area"
|
||||
android:text="@string/nc_new_mention"
|
||||
app:background="@color/colorPrimary"
|
||||
app:cornerRadius="@dimen/button_corner_radius"
|
||||
app:icon="@drawable/ic_baseline_arrow_downward_24px" />
|
||||
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
||||
|
|
Loading…
Reference in a new issue