Merge branch 'NextAlone:dev' into dev

LiuYi0526 · Jan 10, 2024 · 1006dc9 · 1006dc9
2 parents fec926e + 02efbc3
commit 1006dc9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 11 deletions.
diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/OSMDroidMapsProvider.java b/TMessagesProj/src/main/java/org/telegram/messenger/OSMDroidMapsProvider.java
@@ -513,7 +513,7 @@ public void setTag(Object tag) {
         @Override
         public LatLng getPosition() {
             GeoPoint pos = this.marker.getPosition();
-            return new LatLng(pos.getLatitude(), pos.getLatitude());
+            return new LatLng(pos.getLatitude(), pos.getLongitude());
         }
 
         @Override

diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMessageCell.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMessageCell.java
@@ -1570,14 +1570,14 @@ public void drawStatusWithImage(Canvas canvas, ImageReceiver imageReceiver, int
         int xCenterRegion = x - spaceLeft;
         int yCenterRegion = y - spaceLeft;
         int colorOnline = diff > 0
-                ? Theme.getColor(Theme.key_chats_onlineCircle)
+                ? Theme.getColor(Theme.key_chats_onlineCircle, resourcesProvider)
                 : diff > -15 * 60
                 ? android.graphics.Color.argb(255, 234, 234, 30)
                 : diff > -30 * 60
                 ? android.graphics.Color.argb(255, 234, 132, 30)
                 : diff > -60 * 60
                 ? android.graphics.Color.argb(255, 234, 30, 30)
-                : 0;
+                : Theme.getColor(Theme.key_chats_onlineCircle, resourcesProvider);
         Paint paint = new Paint(Paint.ANTI_ALIAS_FLAG);
         paint.setColor(colorOnline);
         canvas.save();

diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/SharedMediaLayout.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/SharedMediaLayout.java
@@ -1670,14 +1670,6 @@ public void onClick(View view) {
         actionModeLayout.addView(selectedMessagesCountTextView, LayoutHelper.createLinear(0, LayoutHelper.MATCH_PARENT, 1.0f, 18, 0, 0, 0));
         actionModeViews.add(selectedMessagesCountTextView);
 
-        gotoItem = new ActionBarMenuItem(context, null, getThemedColor(Theme.key_actionBarActionModeDefaultSelector), getThemedColor(Theme.key_actionBarActionModeDefaultIcon), false);
-        gotoItem.setIcon(R.drawable.msg_message);
-        gotoItem.setContentDescription(LocaleController.getString("AccDescrGoToMessage", R.string.AccDescrGoToMessage));
-        gotoItem.setDuplicateParentStateEnabled(false);
-        actionModeLayout.addView(gotoItem, new LinearLayout.LayoutParams(AndroidUtilities.dp(54), ViewGroup.LayoutParams.MATCH_PARENT));
-        actionModeViews.add(gotoItem);
-        gotoItem.setOnClickListener(v -> onActionBarItemClick(v, gotochat));
-
         if (!DialogObject.isEncryptedDialog(dialog_id)) {
             forwardNoQuoteItem = new ActionBarMenuItem(context, null, Theme.getColor(Theme.key_actionBarActionModeDefaultSelector), Theme.getColor(Theme.key_windowBackgroundWhiteGrayText2), false);
             forwardNoQuoteItem.setIcon(R.drawable.msg_forward_noquote);