fix: folder create activity

NextAlone · Jan 27, 2025 · dad6d90 · dad6d90
1 parent 1cd827c
commit dad6d90
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 30 deletions.
diff --git a/TMessagesProj/build.gradle b/TMessagesProj/build.gradle
@@ -15,7 +15,7 @@ repositories {
 }
 
 def verName = APP_VERSION_NAME
-def verCode = 1203
+def verCode = 1204
 
 
 def officialVer = APP_VERSION_NAME
@@ -371,7 +371,7 @@ android {
             task.enabled = false
         } else if (task.name.endsWith("GoogleServices") && task.name.contains("NoGcm")) {
             task.enabled = false
-        } else if (task.name.contains("buildCMakeDebug") && nagram_build_args.contains("skip_buildCMakeDebug")) {
+        } else if (task.name.contains("buildCMakeDebug") && nagram_build_args != null && nagram_build_args.contains("skip_buildCMakeDebug")) {
             task.enabled = false
         }
     }

diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/EditEmojiTextCell.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/EditEmojiTextCell.java
@@ -6,6 +6,8 @@
 
 import android.content.Context;
 import android.graphics.Canvas;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffColorFilter;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.text.Editable;
@@ -57,6 +59,8 @@ public class EditEmojiTextCell extends FrameLayout {
 
     private boolean allowEntities = true;
 
+    private ImageView iconImageView;
+
     final AnimatedColor limitColor;
     private int limitCount;
     final AnimatedTextView.AnimatedTextDrawable limit = new AnimatedTextView.AnimatedTextDrawable(false, true, true); {
@@ -269,6 +273,22 @@ public void onFocusChange(View v, boolean hasFocus) {
         updateLimitText();
     }
 
+    public void setOnChangeIcon(Context context, OnClickListener onChangeIcon) {
+        editTextEmoji.setLayoutParams(LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, LayoutHelper.MATCH_PARENT, (LocaleController.isRTL ? Gravity.RIGHT : Gravity.LEFT) | Gravity.CENTER_VERTICAL, LocaleController.isRTL ? 19 : 40, 0, !LocaleController.isRTL ? 19 : 40, 0));
+        iconImageView = new ImageView(context);
+        iconImageView.setFocusable(true);
+        iconImageView.setBackground(Theme.createSelectorDrawable(Theme.getColor(Theme.key_stickers_menuSelector)));
+        iconImageView.setScaleType(ImageView.ScaleType.CENTER);
+        iconImageView.setOnClickListener(onChangeIcon);
+        iconImageView.setColorFilter(new PorterDuffColorFilter(Theme.getColor(Theme.key_windowBackgroundWhiteGrayIcon), PorterDuff.Mode.MULTIPLY));
+        iconImageView.setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_NO);
+        addView(iconImageView, LayoutHelper.createFrame(48, 48, (LocaleController.isRTL ? Gravity.RIGHT : Gravity.LEFT) | Gravity.TOP, 8, 2, 8, 0));
+    }
+
+    public void setIcon(int icon, String name) {
+        iconImageView.setImageResource(icon);
+    }
+
     public void setText(CharSequence text) {
         ignoreEditText = true;
         editTextEmoji.setText(text);
@@ -313,6 +333,9 @@ protected void onDraw(Canvas canvas) {
 
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        if (iconImageView != null) {
+            iconImageView.measure(MeasureSpec.makeMeasureSpec(AndroidUtilities.dp(48), MeasureSpec.EXACTLY), MeasureSpec.makeMeasureSpec(AndroidUtilities.dp(48), MeasureSpec.EXACTLY));
+        }
         super.onMeasure(MeasureSpec.makeMeasureSpec(MeasureSpec.getSize(widthMeasureSpec), MeasureSpec.EXACTLY), heightMeasureSpec);
     }
 }
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/PollEditTextCell.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/PollEditTextCell.java
@@ -59,7 +59,6 @@ public class PollEditTextCell extends FrameLayout implements SuggestEmojiView.An
     private EditTextBoldCursor textView;
     private ImageView deleteImageView;
     private ImageView moveImageView;
-    private ImageView iconImageView;
     private SimpleTextView textView2;
     private CheckBox2 checkBox;
     private boolean showNextButton;
@@ -74,10 +73,6 @@ public PollEditTextCell(Context context, OnClickListener onDelete) {
     }
 
     public PollEditTextCell(Context context, boolean caption, int type, OnClickListener onDelete) {
-        this(context, caption, type, onDelete, null);
-    }
-
-    public PollEditTextCell(Context context, boolean caption, int type, OnClickListener onDelete, OnClickListener onChangeIcon) {
         super(context);
 
         textView = new EditTextCaption(context, null) {
@@ -183,16 +178,6 @@ public ActionMode startActionMode(ActionMode.Callback callback) {
                 }
                 onCheckBoxClick(PollEditTextCell.this, !checkBox.isChecked());
             });
-        } else if (onChangeIcon != null) {
-            addView(textView, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, LayoutHelper.WRAP_CONTENT, (LocaleController.isRTL ? Gravity.RIGHT : Gravity.LEFT) | Gravity.CENTER_VERTICAL, LocaleController.isRTL ? 19 : 66, 0, !LocaleController.isRTL ? 19 : 66, 0));
-            iconImageView = new ImageView(context);
-            iconImageView.setFocusable(true);
-            iconImageView.setBackground(Theme.createSelectorDrawable(Theme.getColor(Theme.key_stickers_menuSelector)));
-            iconImageView.setScaleType(ImageView.ScaleType.CENTER);
-            iconImageView.setOnClickListener(onChangeIcon);
-            iconImageView.setColorFilter(new PorterDuffColorFilter(Theme.getColor(Theme.key_windowBackgroundWhiteGrayIcon), PorterDuff.Mode.MULTIPLY));
-            iconImageView.setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_NO);
-            addView(iconImageView, LayoutHelper.createFrame(48, 48, (LocaleController.isRTL ? Gravity.RIGHT : Gravity.LEFT) | Gravity.TOP, 8, 2, 8, 0));
         } else {
             int endMargin = type == TYPE_EMOJI ? 80: 19;
             addView(textView, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, LayoutHelper.WRAP_CONTENT, (LocaleController.isRTL ? Gravity.RIGHT : Gravity.LEFT) | Gravity.CENTER_VERTICAL,  LocaleController.isRTL ? endMargin : 19, 0, LocaleController.isRTL ? 19 : endMargin, 0));
@@ -218,10 +203,6 @@ public ActionMode startActionMode(ActionMode.Callback callback) {
         }
     }
 
-    public void setIcon(int icon, String name) {
-        iconImageView.setImageResource(icon);
-    }
-
     protected void onEditTextFocusChanged(boolean focused) {
 
     }
@@ -246,9 +227,6 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         if (moveImageView != null) {
             moveImageView.measure(MeasureSpec.makeMeasureSpec(AndroidUtilities.dp(48), MeasureSpec.EXACTLY), MeasureSpec.makeMeasureSpec(AndroidUtilities.dp(48), MeasureSpec.EXACTLY));
         }
-        if (iconImageView != null) {
-            iconImageView.measure(MeasureSpec.makeMeasureSpec(AndroidUtilities.dp(48), MeasureSpec.EXACTLY), MeasureSpec.makeMeasureSpec(AndroidUtilities.dp(48), MeasureSpec.EXACTLY));
-        }
         if (textView2 != null) {
             textView2.measure(MeasureSpec.makeMeasureSpec(AndroidUtilities.dp(48), MeasureSpec.EXACTLY), MeasureSpec.makeMeasureSpec(AndroidUtilities.dp(24), MeasureSpec.EXACTLY));
         }

diff --git a/TMessagesProj/src/main/java/org/telegram/ui/FilterCreateActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/FilterCreateActivity.java
@@ -1474,6 +1474,12 @@ public int emojiCacheType() {
                             return AnimatedEmojiDrawable.CACHE_TYPE_TOGGLEABLE_EDIT;
                         }
                     };
+                    cell.setOnChangeIcon(mContext, view1 -> IconSelectorAlert.show(FilterCreateActivity.this, (emoticon) -> {
+                        newFilterEmoticon = emoticon;
+                        ((EditEmojiTextCell) view1.getParent()).setIcon(FolderIconHelper.getTabIcon(newFilterEmoticon), newFilterEmoticon);
+                        checkDoneButton(true);
+                    }));
+                    cell.setIcon(FolderIconHelper.getTabIcon(newFilterEmoticon), newFilterEmoticon);
                     cell.setAllowEntities(false);
                     cell.editTextEmoji.getEditText().setEmojiColor(getThemedColor(Theme.key_featuredStickers_addButton));
                     cell.editTextEmoji.setEmojiViewCacheType(AnimatedEmojiDrawable.CACHE_TYPE_TOGGLEABLE_EDIT);
@@ -1670,11 +1676,6 @@ public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
                     createLinkCell.setDivider(divider);
                     break;
                 }
-                case VIEW_TYPE_EDIT: {
-                    PollEditTextCell cell = (PollEditTextCell) holder.itemView;
-                    cell.setIcon(FolderIconHelper.getTabIcon(newFilterEmoticon), newFilterEmoticon);
-                    break;
-                }
                 case VIEW_TYPE_HEADER_COLOR_PREVIEW: {
                     folderTagsHeader = (HeaderCellColorPreview) holder.itemView;
                     folderTagsHeader.setPreviewText(AnimatedEmojiSpan.cloneSpans(newFilterName, -1, folderTagsHeader.getPreviewTextPaint().getFontMetricsInt(), .5f), false);
@@ -2845,7 +2846,7 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
             rightTextView.setGravity(LocaleController.isRTL ? Gravity.LEFT : Gravity.RIGHT);
             rightTextView.setTextColor(Theme.getColor(Theme.key_windowBackgroundWhiteBlueHeader, resourcesProvider));
             rightTextView.setTextSize(dpf2(15));
-            addView(rightTextView, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, 18, (LocaleController.isRTL ? Gravity.LEFT : Gravity.RIGHT) | Gravity.TOP, 22, 17, 22, 0));
+            addView(rightTextView, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, 18, (LocaleController.isRTL ? Gravity.LEFT : Gravity.RIGHT) | Gravity.TOP, 22, -20, 22, 0));
             ScaleStateListAnimator.apply(rightTextView, 0.04f, 1.2f);
         }
     }