Skip to content

A
apk
Commit ca46b69b authored by DrKLO's avatar DrKLO
Browse files
Options

More Android L design

parent 41359b14
Hide whitespace changes
Inline Side-by-side
Showing with 3075 additions and 1765 deletions
TMessagesProj/src/main/java/org/telegram/android/AndroidUtilities.java
View file @ ca46b69b
...@@ -24,7 +24,10 @@ import android.view.Surface; ...@@ -24,7 +24,10 @@ import android.view.Surface;
import android.view.View; import android.view.View;
import android.view.WindowManager; import android.view.WindowManager;
import android.view.inputmethod.InputMethodManager; import android.view.inputmethod.InputMethodManager;
import android.widget.AbsListView;
import android.widget.EdgeEffect;
import android.widget.EditText; import android.widget.EditText;
import android.widget.ListView;
import android.widget.TextView; import android.widget.TextView;
import org.telegram.messenger.FileLog; import org.telegram.messenger.FileLog;
...@@ -466,4 +469,26 @@ public class AndroidUtilities { ...@@ -466,4 +469,26 @@ public class AndroidUtilities {
} }
return size; return size;
} }
public static void setListViewEdgeEffectColor(ListView listView, int color) {
if (Build.VERSION.SDK_INT >= 21) {
try {
Field field = AbsListView.class.getDeclaredField("mEdgeGlowTop");
field.setAccessible(true);
EdgeEffect mEdgeGlowTop = (EdgeEffect) field.get(listView);
if (mEdgeGlowTop != null) {
mEdgeGlowTop.setColor(color);
}
field = AbsListView.class.getDeclaredField("mEdgeGlowBottom");
field.setAccessible(true);
EdgeEffect mEdgeGlowBottom = (EdgeEffect) field.get(listView);
if (mEdgeGlowBottom != null) {
mEdgeGlowBottom.setColor(color);
}
} catch (Exception e) {
FileLog.e("tmessages", e);
}
}
}
} }
TMessagesProj/src/main/java/org/telegram/android/MessagesController.java
View file @ ca46b69b
...@@ -110,6 +110,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -110,6 +110,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter
public static final int UPDATE_MASK_USER_PRINT = 64; public static final int UPDATE_MASK_USER_PRINT = 64;
public static final int UPDATE_MASK_USER_PHONE = 128; public static final int UPDATE_MASK_USER_PHONE = 128;
public static final int UPDATE_MASK_READ_DIALOG_MESSAGE = 256; public static final int UPDATE_MASK_READ_DIALOG_MESSAGE = 256;
public static final int UPDATE_MASK_SELECT_DIALOG = 512;
public static final int UPDATE_MASK_ALL = UPDATE_MASK_AVATAR | UPDATE_MASK_STATUS | UPDATE_MASK_NAME | UPDATE_MASK_CHAT_AVATAR | UPDATE_MASK_CHAT_NAME | UPDATE_MASK_CHAT_MEMBERS | UPDATE_MASK_USER_PRINT | UPDATE_MASK_USER_PHONE | UPDATE_MASK_READ_DIALOG_MESSAGE; public static final int UPDATE_MASK_ALL = UPDATE_MASK_AVATAR | UPDATE_MASK_STATUS | UPDATE_MASK_NAME | UPDATE_MASK_CHAT_AVATAR | UPDATE_MASK_CHAT_NAME | UPDATE_MASK_CHAT_MEMBERS | UPDATE_MASK_USER_PRINT | UPDATE_MASK_USER_PHONE | UPDATE_MASK_READ_DIALOG_MESSAGE;
public static class PrintingUser { public static class PrintingUser {
...@@ -1006,6 +1007,9 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -1006,6 +1007,9 @@ public class MessagesController implements NotificationCenter.NotificationCenter
} }
public void deleteDialog(final long did, int offset, final boolean onlyHistory) { public void deleteDialog(final long did, int offset, final boolean onlyHistory) {
if (offset == 0) {
MessagesStorage.getInstance().deleteDialog(did, onlyHistory);
}
TLRPC.TL_dialog dialog = dialogs_dict.get(did); TLRPC.TL_dialog dialog = dialogs_dict.get(did);
if (dialog != null) { if (dialog != null) {
int lower_part = (int)did; int lower_part = (int)did;
...@@ -1035,7 +1039,6 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -1035,7 +1039,6 @@ public class MessagesController implements NotificationCenter.NotificationCenter
}); });
} }
}); });
MessagesStorage.getInstance().deleteDialog(did, onlyHistory);
NotificationCenter.getInstance().postNotificationName(NotificationCenter.removeAllMessagesFromDialog, did); NotificationCenter.getInstance().postNotificationName(NotificationCenter.removeAllMessagesFromDialog, did);
NotificationCenter.getInstance().postNotificationName(NotificationCenter.dialogsNeedReload); NotificationCenter.getInstance().postNotificationName(NotificationCenter.dialogsNeedReload);
} }
...@@ -1760,7 +1763,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -1760,7 +1763,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter
TLRPC.TL_dialog dialog = dialogs_dict.get(dialog_id); TLRPC.TL_dialog dialog = dialogs_dict.get(dialog_id);
if (dialog != null) { if (dialog != null) {
dialog.unread_count = 0; dialog.unread_count = 0;
NotificationCenter.getInstance().postNotificationName(NotificationCenter.dialogsNeedReload); NotificationCenter.getInstance().postNotificationName(NotificationCenter.updateInterfaces, UPDATE_MASK_READ_DIALOG_MESSAGE);
} }
if (!popup) { if (!popup) {
NotificationsController.getInstance().processReadMessages(null, dialog_id, 0, max_positive_id, false); NotificationsController.getInstance().processReadMessages(null, dialog_id, 0, max_positive_id, false);
...@@ -1824,7 +1827,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -1824,7 +1827,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter
TLRPC.TL_dialog dialog = dialogs_dict.get(dialog_id); TLRPC.TL_dialog dialog = dialogs_dict.get(dialog_id);
if (dialog != null) { if (dialog != null) {
dialog.unread_count = 0; dialog.unread_count = 0;
NotificationCenter.getInstance().postNotificationName(NotificationCenter.dialogsNeedReload); NotificationCenter.getInstance().postNotificationName(NotificationCenter.updateInterfaces, UPDATE_MASK_READ_DIALOG_MESSAGE);
} }
HashMap<Long, Integer> dialogsToUpdate = new HashMap<Long, Integer>(); HashMap<Long, Integer> dialogsToUpdate = new HashMap<Long, Integer>();
dialogsToUpdate.put(dialog_id, 0); dialogsToUpdate.put(dialog_id, 0);
...@@ -2049,6 +2052,9 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -2049,6 +2052,9 @@ public class MessagesController implements NotificationCenter.NotificationCenter
return; return;
} }
final TLRPC.messages_StatedMessage res = (TLRPC.messages_StatedMessage) response; final TLRPC.messages_StatedMessage res = (TLRPC.messages_StatedMessage) response;
if (user.id == UserConfig.getClientUserId()) {
res.chats = null;
}
MessagesStorage.getInstance().putUsersAndChats(res.users, res.chats, true, true); MessagesStorage.getInstance().putUsersAndChats(res.users, res.chats, true, true);
AndroidUtilities.runOnUIThread(new Runnable() { AndroidUtilities.runOnUIThread(new Runnable() {
......
TMessagesProj/src/main/java/org/telegram/ui/Animation/FloatProperty.java → TMessagesProj/src/main/java/org/telegram/ui/Animation/FloatProperty10.java
View file @ ca46b69b
...@@ -15,9 +15,9 @@ ...@@ -15,9 +15,9 @@
*/ */
package org.telegram.ui.Animation; package org.telegram.ui.Animation;
public abstract class FloatProperty<T> extends Property<T, Float> { public abstract class FloatProperty10<T> extends Property<T, Float> {
public FloatProperty(String name) { public FloatProperty10(String name) {
super(Float.class, name); super(Float.class, name);
} }
......
TMessagesProj/src/main/java/org/telegram/ui/Animation/ObjectAnimator10.java
View file @ ca46b69b
...@@ -18,6 +18,8 @@ package org.telegram.ui.Animation; ...@@ -18,6 +18,8 @@ package org.telegram.ui.Animation;
import android.view.View; import android.view.View;
import org.telegram.ui.Views.ActionBar.ActionBarLayout;
import java.util.HashMap; import java.util.HashMap;
public final class ObjectAnimator10 extends ValueAnimator { public final class ObjectAnimator10 extends ValueAnimator {
...@@ -25,7 +27,7 @@ public final class ObjectAnimator10 extends ValueAnimator { ...@@ -25,7 +27,7 @@ public final class ObjectAnimator10 extends ValueAnimator {
private static final HashMap<String, Property> PROXY_PROPERTIES = new HashMap<String, Property>(); private static final HashMap<String, Property> PROXY_PROPERTIES = new HashMap<String, Property>();
static { static {
Property<View, Float> ALPHA = new FloatProperty<View>("alpha") { Property<View, Float> ALPHA = new FloatProperty10<View>("alpha") {
@Override @Override
public void setValue(View object, float value) { public void setValue(View object, float value) {
View10.wrap(object).setAlpha(value); View10.wrap(object).setAlpha(value);
...@@ -37,7 +39,7 @@ public final class ObjectAnimator10 extends ValueAnimator { ...@@ -37,7 +39,7 @@ public final class ObjectAnimator10 extends ValueAnimator {
} }
}; };
Property<View, Float> PIVOT_X = new FloatProperty<View>("pivotX") { Property<View, Float> PIVOT_X = new FloatProperty10<View>("pivotX") {
@Override @Override
public void setValue(View object, float value) { public void setValue(View object, float value) {
View10.wrap(object).setPivotX(value); View10.wrap(object).setPivotX(value);
...@@ -49,7 +51,7 @@ public final class ObjectAnimator10 extends ValueAnimator { ...@@ -49,7 +51,7 @@ public final class ObjectAnimator10 extends ValueAnimator {
} }
}; };
Property<View, Float> PIVOT_Y = new FloatProperty<View>("pivotY") { Property<View, Float> PIVOT_Y = new FloatProperty10<View>("pivotY") {
@Override @Override
public void setValue(View object, float value) { public void setValue(View object, float value) {
View10.wrap(object).setPivotY(value); View10.wrap(object).setPivotY(value);
...@@ -61,7 +63,7 @@ public final class ObjectAnimator10 extends ValueAnimator { ...@@ -61,7 +63,7 @@ public final class ObjectAnimator10 extends ValueAnimator {
} }
}; };
Property<View, Float> TRANSLATION_X = new FloatProperty<View>("translationX") { Property<View, Float> TRANSLATION_X = new FloatProperty10<View>("translationX") {
@Override @Override
public void setValue(View object, float value) { public void setValue(View object, float value) {
View10.wrap(object).setTranslationX(value); View10.wrap(object).setTranslationX(value);
...@@ -73,7 +75,7 @@ public final class ObjectAnimator10 extends ValueAnimator { ...@@ -73,7 +75,7 @@ public final class ObjectAnimator10 extends ValueAnimator {
} }
}; };
Property<View, Float> TRANSLATION_Y = new FloatProperty<View>("translationY") { Property<View, Float> TRANSLATION_Y = new FloatProperty10<View>("translationY") {
@Override @Override
public void setValue(View object, float value) { public void setValue(View object, float value) {
View10.wrap(object).setTranslationY(value); View10.wrap(object).setTranslationY(value);
...@@ -85,7 +87,7 @@ public final class ObjectAnimator10 extends ValueAnimator { ...@@ -85,7 +87,7 @@ public final class ObjectAnimator10 extends ValueAnimator {
} }
}; };
Property<View, Float> ROTATION = new FloatProperty<View>("rotation") { Property<View, Float> ROTATION = new FloatProperty10<View>("rotation") {
@Override @Override
public void setValue(View object, float value) { public void setValue(View object, float value) {
View10.wrap(object).setRotation(value); View10.wrap(object).setRotation(value);
...@@ -97,7 +99,7 @@ public final class ObjectAnimator10 extends ValueAnimator { ...@@ -97,7 +99,7 @@ public final class ObjectAnimator10 extends ValueAnimator {
} }
}; };
Property<View, Float> ROTATION_X = new FloatProperty<View>("rotationX") { Property<View, Float> ROTATION_X = new FloatProperty10<View>("rotationX") {
@Override @Override
public void setValue(View object, float value) { public void setValue(View object, float value) {
View10.wrap(object).setRotationX(value); View10.wrap(object).setRotationX(value);
...@@ -109,7 +111,7 @@ public final class ObjectAnimator10 extends ValueAnimator { ...@@ -109,7 +111,7 @@ public final class ObjectAnimator10 extends ValueAnimator {
} }
}; };
Property<View, Float> ROTATION_Y = new FloatProperty<View>("rotationY") { Property<View, Float> ROTATION_Y = new FloatProperty10<View>("rotationY") {
@Override @Override
public void setValue(View object, float value) { public void setValue(View object, float value) {
View10.wrap(object).setRotationY(value); View10.wrap(object).setRotationY(value);
...@@ -121,7 +123,7 @@ public final class ObjectAnimator10 extends ValueAnimator { ...@@ -121,7 +123,7 @@ public final class ObjectAnimator10 extends ValueAnimator {
} }
}; };
Property<View, Float> SCALE_X = new FloatProperty<View>("scaleX") { Property<View, Float> SCALE_X = new FloatProperty10<View>("scaleX") {
@Override @Override
public void setValue(View object, float value) { public void setValue(View object, float value) {
View10.wrap(object).setScaleX(value); View10.wrap(object).setScaleX(value);
...@@ -133,7 +135,7 @@ public final class ObjectAnimator10 extends ValueAnimator { ...@@ -133,7 +135,7 @@ public final class ObjectAnimator10 extends ValueAnimator {
} }
}; };
Property<View, Float> SCALE_Y = new FloatProperty<View>("scaleY") { Property<View, Float> SCALE_Y = new FloatProperty10<View>("scaleY") {
@Override @Override
public void setValue(View object, float value) { public void setValue(View object, float value) {
View10.wrap(object).setScaleY(value); View10.wrap(object).setScaleY(value);
...@@ -169,7 +171,7 @@ public final class ObjectAnimator10 extends ValueAnimator { ...@@ -169,7 +171,7 @@ public final class ObjectAnimator10 extends ValueAnimator {
} }
}; };
Property<View, Float> X = new FloatProperty<View>("x") { Property<View, Float> X = new FloatProperty10<View>("x") {
@Override @Override
public void setValue(View object, float value) { public void setValue(View object, float value) {
View10.wrap(object).setX(value); View10.wrap(object).setX(value);
...@@ -181,7 +183,7 @@ public final class ObjectAnimator10 extends ValueAnimator { ...@@ -181,7 +183,7 @@ public final class ObjectAnimator10 extends ValueAnimator {
} }
}; };
Property<View, Float> Y = new FloatProperty<View>("y") { Property<View, Float> Y = new FloatProperty10<View>("y") {
@Override @Override
public void setValue(View object, float value) { public void setValue(View object, float value) {
View10.wrap(object).setY(value); View10.wrap(object).setY(value);
......
TMessagesProj/src/main/java/org/telegram/ui/Animation/PropertyValuesHolder.java
View file @ ca46b69b
...@@ -148,10 +148,10 @@ public class PropertyValuesHolder implements Cloneable { ...@@ -148,10 +148,10 @@ public class PropertyValuesHolder implements Cloneable {
Class args[] = null; Class args[] = null;
if (valueType == null) { if (valueType == null) {
try { try {
returnVal = targetClass.getMethod(methodName, args); returnVal = targetClass.getMethod(methodName);
} catch (NoSuchMethodException e) { } catch (NoSuchMethodException e) {
try { try {
returnVal = targetClass.getDeclaredMethod(methodName, args); returnVal = targetClass.getDeclaredMethod(methodName);
returnVal.setAccessible(true); returnVal.setAccessible(true);
} catch (NoSuchMethodException e2) { } catch (NoSuchMethodException e2) {
e2.printStackTrace(); e2.printStackTrace();
...@@ -464,7 +464,7 @@ public class PropertyValuesHolder implements Cloneable { ...@@ -464,7 +464,7 @@ public class PropertyValuesHolder implements Cloneable {
static class FloatPropertyValuesHolder extends PropertyValuesHolder { static class FloatPropertyValuesHolder extends PropertyValuesHolder {
private static final HashMap<Class, HashMap<String, Integer>> sJNISetterPropertyMap = new HashMap<Class, HashMap<String, Integer>>(); private static final HashMap<Class, HashMap<String, Integer>> sJNISetterPropertyMap = new HashMap<Class, HashMap<String, Integer>>();
private FloatProperty mFloatProperty; private FloatProperty10 mFloatProperty;
FloatKeyframeSet mFloatKeyframeSet; FloatKeyframeSet mFloatKeyframeSet;
float mFloatAnimatedValue; float mFloatAnimatedValue;
...@@ -481,8 +481,8 @@ public class PropertyValuesHolder implements Cloneable { ...@@ -481,8 +481,8 @@ public class PropertyValuesHolder implements Cloneable {
mValueType = float.class; mValueType = float.class;
mKeyframeSet = keyframeSet; mKeyframeSet = keyframeSet;
mFloatKeyframeSet = (FloatKeyframeSet) mKeyframeSet; mFloatKeyframeSet = (FloatKeyframeSet) mKeyframeSet;
if (property instanceof FloatProperty) { if (property instanceof FloatProperty10) {
mFloatProperty = (FloatProperty) mProperty; mFloatProperty = (FloatProperty10) mProperty;
} }
} }
...@@ -494,8 +494,8 @@ public class PropertyValuesHolder implements Cloneable { ...@@ -494,8 +494,8 @@ public class PropertyValuesHolder implements Cloneable {
public FloatPropertyValuesHolder(Property property, float... values) { public FloatPropertyValuesHolder(Property property, float... values) {
super(property); super(property);
setFloatValues(values); setFloatValues(values);
if (property instanceof FloatProperty) { if (property instanceof FloatProperty10) {
mFloatProperty = (FloatProperty) mProperty; mFloatProperty = (FloatProperty10) mProperty;
} }
} }
......
TMessagesProj/src/main/java/org/telegram/ui/AnimationCompat/AnimatorSetProxy.java
View file @ ca46b69b
...@@ -18,6 +18,7 @@ import org.telegram.ui.Animation.AnimatorListenerAdapter10; ...@@ -18,6 +18,7 @@ import org.telegram.ui.Animation.AnimatorListenerAdapter10;
import org.telegram.ui.Animation.AnimatorSet10; import org.telegram.ui.Animation.AnimatorSet10;
import org.telegram.ui.Animation.View10; import org.telegram.ui.Animation.View10;
import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
public class AnimatorSetProxy { public class AnimatorSetProxy {
...@@ -41,6 +42,22 @@ public class AnimatorSetProxy { ...@@ -41,6 +42,22 @@ public class AnimatorSetProxy {
} }
} }
public void playTogether(ArrayList<Object> items) {
if (View10.NEED_PROXY) {
ArrayList<Animator10> animators = new ArrayList<Animator10>();
for (Object obj : items) {
animators.add((Animator10)obj);
}
((AnimatorSet10) animatorSet).playTogether(animators);
} else {
ArrayList<Animator> animators = new ArrayList<Animator>();
for (Object obj : items) {
animators.add((Animator)obj);
}
((AnimatorSet) animatorSet).playTogether(animators);
}
}
public AnimatorSetProxy setDuration(long duration) { public AnimatorSetProxy setDuration(long duration) {
if (View10.NEED_PROXY) { if (View10.NEED_PROXY) {
((AnimatorSet10) animatorSet).setDuration(duration); ((AnimatorSet10) animatorSet).setDuration(duration);
......
TMessagesProj/src/main/java/org/telegram/ui/AnimationCompat/ObjectAnimatorProxy.java
View file @ ca46b69b
...@@ -78,4 +78,36 @@ public class ObjectAnimatorProxy { ...@@ -78,4 +78,36 @@ public class ObjectAnimatorProxy {
((ObjectAnimator) objectAnimator).start(); ((ObjectAnimator) objectAnimator).start();
} }
} }
public void setAutoCancel(boolean cancel) {
if (View10.NEED_PROXY) {
((ObjectAnimator10) objectAnimator).setAutoCancel(cancel);
} else {
((ObjectAnimator) objectAnimator).setAutoCancel(cancel);
}
}
public boolean isRunning() {
if (View10.NEED_PROXY) {
return ((ObjectAnimator10) objectAnimator).isRunning();
} else {
return ((ObjectAnimator) objectAnimator).isRunning();
}
}
public void end() {
if (View10.NEED_PROXY) {
((ObjectAnimator10) objectAnimator).end();
} else {
((ObjectAnimator) objectAnimator).end();
}
}
public void cancel() {
if (View10.NEED_PROXY) {
((ObjectAnimator10) objectAnimator).cancel();
} else {
((ObjectAnimator) objectAnimator).cancel();
}
}
} }
TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatContactCell.java
View file @ ca46b69b
...@@ -72,6 +72,7 @@ public class ChatContactCell extends ChatBaseCell { ...@@ -72,6 +72,7 @@ public class ChatContactCell extends ChatBaseCell {
addContactDrawableOut = getResources().getDrawable(R.drawable.addcontact_green); addContactDrawableOut = getResources().getDrawable(R.drawable.addcontact_green);
} }
avatarImage = new ImageReceiver(this); avatarImage = new ImageReceiver(this);
avatarDrawable = new AvatarDrawable();
} }
public void setContactDelegate(ChatContactCellDelegate delegate) { public void setContactDelegate(ChatContactCellDelegate delegate) {
......
TMessagesProj/src/main/java/org/telegram/ui/Cells/DetailTextCell.java 0 → 100644
View file @ ca46b69b
/*
* This is the source code of Telegram for Android v. 1.7.x.
* It is licensed under GNU GPL v. 2 or later.
* You should have received a copy of the license in this archive (see LICENSE).
*
* Copyright Nikolai Kudashov, 2013-2014.
*/
package org.telegram.ui.Cells;
import android.content.Context;
import android.util.TypedValue;
import android.view.Gravity;
import android.widget.FrameLayout;
import android.widget.TextView;
import org.telegram.android.AndroidUtilities;
public class DetailTextCell extends FrameLayout {
private TextView textView;
public DetailTextCell(Context context) {
super(context);
textView = new TextView(context);
textView.setTextColor(0xffa3a3a3);
textView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 13);
textView.setGravity(Gravity.CENTER);
textView.setPadding(0, AndroidUtilities.dp(19), 0, AndroidUtilities.dp(19));
addView(textView);
LayoutParams layoutParams = (LayoutParams) textView.getLayoutParams();
layoutParams.width = LayoutParams.WRAP_CONTENT;
layoutParams.height = LayoutParams.WRAP_CONTENT;
layoutParams.leftMargin = AndroidUtilities.dp(17);
layoutParams.rightMargin = AndroidUtilities.dp(17);
layoutParams.gravity = Gravity.CENTER;
textView.setLayoutParams(layoutParams);
}
@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
super.onMeasure(widthMeasureSpec, MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED));
}
public void setText(String text) {
textView.setText(text);
}
}
TMessagesProj/src/main/java/org/telegram/ui/Cells/DialogCell.java
View file @ ca46b69b
...@@ -56,6 +56,7 @@ public class DialogCell extends BaseCell { ...@@ -56,6 +56,7 @@ public class DialogCell extends BaseCell {
private boolean allowPrintStrings; private boolean allowPrintStrings;
private int lastMessageDate; private int lastMessageDate;
private int unreadCount; private int unreadCount;
private boolean lastUnreadState;
private MessageObject message; private MessageObject message;
private ImageReceiver avatarImage; private ImageReceiver avatarImage;
...@@ -148,7 +149,7 @@ public class DialogCell extends BaseCell { ...@@ -148,7 +149,7 @@ public class DialogCell extends BaseCell {
errorDrawable = getResources().getDrawable(R.drawable.dialogs_warning); errorDrawable = getResources().getDrawable(R.drawable.dialogs_warning);
countDrawable = getResources().getDrawable(R.drawable.dialogs_badge); countDrawable = getResources().getDrawable(R.drawable.dialogs_badge);
groupDrawable = getResources().getDrawable(R.drawable.list_group); groupDrawable = getResources().getDrawable(R.drawable.list_group);
broadcastDrawable = getResources().getDrawable(R.drawable.broadcast); broadcastDrawable = getResources().getDrawable(R.drawable.list_broadcast);
} }
} }
...@@ -166,6 +167,7 @@ public class DialogCell extends BaseCell { ...@@ -166,6 +167,7 @@ public class DialogCell extends BaseCell {
allowPrintStrings = usePrintStrings; allowPrintStrings = usePrintStrings;
lastMessageDate = date; lastMessageDate = date;
unreadCount = unread; unreadCount = unread;
lastUnreadState = messageObject != null && messageObject.isUnread();
update(0); update(0);
} }
...@@ -584,7 +586,9 @@ public class DialogCell extends BaseCell { ...@@ -584,7 +586,9 @@ public class DialogCell extends BaseCell {
} }
} }
if ((mask & MessagesController.UPDATE_MASK_READ_DIALOG_MESSAGE) != 0) { if ((mask & MessagesController.UPDATE_MASK_READ_DIALOG_MESSAGE) != 0) {
continueUpdate = true; if (message != null && lastUnreadState != message.isUnread()) {
continueUpdate = true;
}
} }
if (!continueUpdate) { if (!continueUpdate) {
......
TMessagesProj/src/main/java/org/telegram/ui/Cells/DividerCell.java
View file @ ca46b69b
...@@ -16,12 +16,15 @@ import org.telegram.android.AndroidUtilities; ...@@ -16,12 +16,15 @@ import org.telegram.android.AndroidUtilities;
public class DividerCell extends BaseCell { public class DividerCell extends BaseCell {
Paint paint = new Paint(); private static Paint paint;
public DividerCell(Context context) { public DividerCell(Context context) {
super(context); super(context);
paint.setColor(0xffd9d9d9); if (paint == null) {
paint.setStrokeWidth(1); paint = new Paint();
paint.setColor(0xffd9d9d9);
paint.setStrokeWidth(1);
}
} }
@Override @Override
......
TMessagesProj/src/main/java/org/telegram/ui/Cells/HeaderCell.java 0 → 100644
View file @ ca46b69b
/*
* This is the source code of Telegram for Android v. 1.7.x.
* It is licensed under GNU GPL v. 2 or later.
* You should have received a copy of the license in this archive (see LICENSE).
*
* Copyright Nikolai Kudashov, 2013-2014.
*/
package org.telegram.ui.Cells;
import android.content.Context;
import android.util.AttributeSet;
import android.util.TypedValue;
import android.view.Gravity;
import android.widget.FrameLayout;
import android.widget.TextView;
import org.telegram.android.AndroidUtilities;
import org.telegram.android.LocaleController;
public class HeaderCell extends FrameLayout {
private TextView textView;
private void init() {
textView = new TextView(getContext());
textView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 15);
textView.setTypeface(AndroidUtilities.getTypeface("fonts/rmedium.ttf"));
textView.setTextColor(0xff3e90cf);
textView.setGravity((LocaleController.isRTL ? Gravity.RIGHT : Gravity.LEFT) | Gravity.CENTER_VERTICAL);
addView(textView);
FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams)textView.getLayoutParams();
layoutParams.width = FrameLayout.LayoutParams.MATCH_PARENT;
layoutParams.height = FrameLayout.LayoutParams.MATCH_PARENT;
layoutParams.leftMargin = AndroidUtilities.dp(17);
layoutParams.rightMargin = AndroidUtilities.dp(17);
layoutParams.topMargin = AndroidUtilities.dp(15);
layoutParams.gravity = LocaleController.isRTL ? Gravity.RIGHT : Gravity.LEFT;
textView.setLayoutParams(layoutParams);
}
public HeaderCell(Context context) {
super(context);
init();
}
public HeaderCell(Context context, AttributeSet attrs) {
super(context, attrs);
init();
}
public HeaderCell(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
init();
}
public HeaderCell(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
super(context, attrs, defStyleAttr, defStyleRes);
init();
}
@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
super.onMeasure(widthMeasureSpec, MeasureSpec.makeMeasureSpec(AndroidUtilities.dp(38), MeasureSpec.EXACTLY));
}
public void setText(String text) {
textView.setText(text);
}
}
TMessagesProj/src/main/java/org/telegram/ui/Cells/ProfileSearchCell.java
View file @ ca46b69b
...@@ -95,13 +95,11 @@ public class ProfileSearchCell extends BaseCell { ...@@ -95,13 +95,11 @@ public class ProfileSearchCell extends BaseCell {
offlinePaint.setTextSize(AndroidUtilities.dp(16)); offlinePaint.setTextSize(AndroidUtilities.dp(16));
offlinePaint.setColor(0xff999999); offlinePaint.setColor(0xff999999);
lockDrawable = getResources().getDrawable(R.drawable.list_secret);
linePaint = new Paint(); linePaint = new Paint();
linePaint.setColor(0xffdcdcdc); linePaint.setColor(0xffdcdcdc);
broadcastDrawable = getResources().getDrawable(R.drawable.broadcast); broadcastDrawable = getResources().getDrawable(R.drawable.list_broadcast);
lockDrawable = getResources().getDrawable(R.drawable.list_secret);
groupDrawable = getResources().getDrawable(R.drawable.list_group); groupDrawable = getResources().getDrawable(R.drawable.list_group);
} }
} }
......
TMessagesProj/src/main/java/org/telegram/ui/Cells/ShadowSectionCell.java 0 → 100644
View file @ ca46b69b
/*
* This is the source code of Telegram for Android v. 1.7.x.
* It is licensed under GNU GPL v. 2 or later.
* You should have received a copy of the license in this archive (see LICENSE).
*
* Copyright Nikolai Kudashov, 2013-2014.
*/
package org.telegram.ui.Cells;
import android.content.Context;
import android.util.AttributeSet;
import android.view.View;
import org.telegram.android.AndroidUtilities;
import org.telegram.messenger.R;
public class ShadowSectionCell extends View {
private void init() {
setBackgroundResource(R.drawable.greydivider);
}
public ShadowSectionCell(Context context) {
super(context);
init();
}
public ShadowSectionCell(Context context, AttributeSet attrs) {
super(context, attrs);
init();
}
public ShadowSectionCell(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
init();
}
public ShadowSectionCell(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
super(context, attrs, defStyleAttr, defStyleRes);
init();
}
@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
super.onMeasure(widthMeasureSpec, MeasureSpec.makeMeasureSpec(AndroidUtilities.dp(12), MeasureSpec.EXACTLY));
}
}
TMessagesProj/src/main/java/org/telegram/ui/Cells/TextCheckCell.java 0 → 100644
View file @ ca46b69b
/*
* This is the source code of Telegram for Android v. 1.7.x.
* It is licensed under GNU GPL v. 2 or later.
* You should have received a copy of the license in this archive (see LICENSE).
*
* Copyright Nikolai Kudashov, 2013-2014.
*/
package org.telegram.ui.Cells;
import android.content.Context;
import android.graphics.Canvas;
import android.graphics.Paint;
import android.util.TypedValue;
import android.view.Gravity;
import android.widget.FrameLayout;
import android.widget.TextView;
import org.telegram.android.AndroidUtilities;
import org.telegram.android.LocaleController;
import org.telegram.ui.Views.Switch;
public class TextCheckCell extends FrameLayout {
private TextView textView;
private Switch checkBox;
private static Paint paint;
private boolean needDivider;
public TextCheckCell(Context context) {
super(context);
if (paint == null) {
paint = new Paint();
paint.setColor(0xffd9d9d9);
paint.setStrokeWidth(1);
}
textView = new TextView(context);
textView.setTextColor(0xff000000);
textView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16);
textView.setLines(1);
textView.setMaxLines(1);
textView.setSingleLine(true);
textView.setGravity((LocaleController.isRTL ? Gravity.RIGHT : Gravity.LEFT) | Gravity.CENTER_VERTICAL);
addView(textView);
LayoutParams layoutParams = (LayoutParams) textView.getLayoutParams();
layoutParams.width = LayoutParams.MATCH_PARENT;
layoutParams.height = LayoutParams.MATCH_PARENT;
layoutParams.leftMargin = AndroidUtilities.dp(17);
layoutParams.rightMargin = AndroidUtilities.dp(17);
layoutParams.gravity = LocaleController.isRTL ? Gravity.RIGHT : Gravity.LEFT;
textView.setLayoutParams(layoutParams);
checkBox = new Switch(context);
checkBox.setDuplicateParentStateEnabled(false);
checkBox.setFocusable(false);
checkBox.setFocusableInTouchMode(false);
checkBox.setClickable(false);
addView(checkBox);
layoutParams = (LayoutParams) checkBox.getLayoutParams();
layoutParams.width = LayoutParams.WRAP_CONTENT;
layoutParams.height = LayoutParams.WRAP_CONTENT;
layoutParams.leftMargin = AndroidUtilities.dp(14);
layoutParams.rightMargin = AndroidUtilities.dp(14);
layoutParams.gravity = (LocaleController.isRTL ? Gravity.LEFT : Gravity.RIGHT) | Gravity.CENTER_VERTICAL;
checkBox.setLayoutParams(layoutParams);
}
@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
super.onMeasure(widthMeasureSpec, MeasureSpec.makeMeasureSpec(AndroidUtilities.dp(48) + (needDivider ? 1 : 0), MeasureSpec.EXACTLY));
}
public void setTextAndCheck(String text, boolean checked, boolean divider) {
textView.setText(text);
checkBox.setChecked(checked);
needDivider = divider;
setWillNotDraw(!divider);
}
@Override
protected void onDraw(Canvas canvas) {
if (needDivider) {
canvas.drawLine(getPaddingLeft(), getHeight() - 1, getWidth() - getPaddingRight(), getHeight() - 1, paint);
}
}
}
TMessagesProj/src/main/java/org/telegram/ui/Cells/TextDetailCell.java
View file @ ca46b69b
...@@ -39,7 +39,7 @@ public class TextDetailCell extends FrameLayout { ...@@ -39,7 +39,7 @@ public class TextDetailCell extends FrameLayout {
FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) textView.getLayoutParams(); FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) textView.getLayoutParams();
layoutParams.width = LayoutParams.WRAP_CONTENT; layoutParams.width = LayoutParams.WRAP_CONTENT;
layoutParams.height = LayoutParams.WRAP_CONTENT; layoutParams.height = LayoutParams.WRAP_CONTENT;
layoutParams.topMargin = AndroidUtilities.dp(11); layoutParams.topMargin = AndroidUtilities.dp(10);
layoutParams.leftMargin = AndroidUtilities.dp(LocaleController.isRTL ? 16 : 71); layoutParams.leftMargin = AndroidUtilities.dp(LocaleController.isRTL ? 16 : 71);
layoutParams.rightMargin = AndroidUtilities.dp(LocaleController.isRTL ? 71 : 16); layoutParams.rightMargin = AndroidUtilities.dp(LocaleController.isRTL ? 71 : 16);
layoutParams.gravity = LocaleController.isRTL ? Gravity.RIGHT : Gravity.LEFT; layoutParams.gravity = LocaleController.isRTL ? Gravity.RIGHT : Gravity.LEFT;
...@@ -56,7 +56,7 @@ public class TextDetailCell extends FrameLayout { ...@@ -56,7 +56,7 @@ public class TextDetailCell extends FrameLayout {
layoutParams = (FrameLayout.LayoutParams) valueTextView.getLayoutParams(); layoutParams = (FrameLayout.LayoutParams) valueTextView.getLayoutParams();
layoutParams.width = LayoutParams.WRAP_CONTENT; layoutParams.width = LayoutParams.WRAP_CONTENT;
layoutParams.height = LayoutParams.WRAP_CONTENT; layoutParams.height = LayoutParams.WRAP_CONTENT;
layoutParams.topMargin = AndroidUtilities.dp(36); layoutParams.topMargin = AndroidUtilities.dp(35);
layoutParams.leftMargin = AndroidUtilities.dp(LocaleController.isRTL ? 16 : 71); layoutParams.leftMargin = AndroidUtilities.dp(LocaleController.isRTL ? 16 : 71);
layoutParams.rightMargin = AndroidUtilities.dp(LocaleController.isRTL ? 71 : 16); layoutParams.rightMargin = AndroidUtilities.dp(LocaleController.isRTL ? 71 : 16);
layoutParams.gravity = LocaleController.isRTL ? Gravity.RIGHT : Gravity.LEFT; layoutParams.gravity = LocaleController.isRTL ? Gravity.RIGHT : Gravity.LEFT;
......
TMessagesProj/src/main/java/org/telegram/ui/Cells/TextDetailSettingsCell.java 0 → 100644
View file @ ca46b69b
/*
* This is the source code of Telegram for Android v. 1.7.x.
* It is licensed under GNU GPL v. 2 or later.
* You should have received a copy of the license in this archive (see LICENSE).
*
* Copyright Nikolai Kudashov, 2013-2014.
*/
package org.telegram.ui.Cells;
import android.content.Context;
import android.graphics.Canvas;
import android.graphics.Paint;
import android.util.TypedValue;
import android.view.Gravity;
import android.widget.FrameLayout;
import android.widget.TextView;
import org.telegram.android.AndroidUtilities;
import org.telegram.android.LocaleController;
public class TextDetailSettingsCell extends FrameLayout {
private TextView textView;
private TextView valueTextView;
private static Paint paint;
private boolean needDivider;
public TextDetailSettingsCell(Context context) {
super(context);
if (paint == null) {
paint = new Paint();
paint.setColor(0xffd9d9d9);
paint.setStrokeWidth(1);
}
textView = new TextView(context);
textView.setTextColor(0xff000000);
textView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16);
textView.setLines(1);
textView.setMaxLines(1);
textView.setSingleLine(true);
textView.setGravity((LocaleController.isRTL ? Gravity.RIGHT : Gravity.LEFT) | Gravity.CENTER_VERTICAL);
addView(textView);
LayoutParams layoutParams = (LayoutParams) textView.getLayoutParams();
layoutParams.width = LayoutParams.WRAP_CONTENT;
layoutParams.height = LayoutParams.WRAP_CONTENT;
layoutParams.topMargin = AndroidUtilities.dp(10);
layoutParams.leftMargin = AndroidUtilities.dp(17);
layoutParams.rightMargin = AndroidUtilities.dp(17);
layoutParams.gravity = LocaleController.isRTL ? Gravity.RIGHT : Gravity.LEFT;
textView.setLayoutParams(layoutParams);
valueTextView = new TextView(context);
valueTextView.setTextColor(0xff8a8a8a);
valueTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 13);
valueTextView.setLines(1);
valueTextView.setMaxLines(1);
valueTextView.setSingleLine(true);
valueTextView.setGravity((LocaleController.isRTL ? Gravity.LEFT : Gravity.RIGHT) | Gravity.CENTER_VERTICAL);
addView(valueTextView);
layoutParams = (LayoutParams) valueTextView.getLayoutParams();
layoutParams.width = LayoutParams.WRAP_CONTENT;
layoutParams.height = LayoutParams.WRAP_CONTENT;
layoutParams.topMargin = AndroidUtilities.dp(35);
layoutParams.leftMargin = AndroidUtilities.dp(17);
layoutParams.rightMargin = AndroidUtilities.dp(17);
layoutParams.gravity = LocaleController.isRTL ? Gravity.RIGHT : Gravity.LEFT;
valueTextView.setLayoutParams(layoutParams);
}
@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
super.onMeasure(widthMeasureSpec, MeasureSpec.makeMeasureSpec(AndroidUtilities.dp(64) + (needDivider ? 1 : 0), MeasureSpec.EXACTLY));
}
public void setTextAndValue(String text, String value, boolean divider) {
textView.setText(text);
valueTextView.setText(value);
needDivider = divider;
setWillNotDraw(!divider);
}
@Override
protected void onDraw(Canvas canvas) {
if (needDivider) {
canvas.drawLine(getPaddingLeft(), getHeight() - 1, getWidth() - getPaddingRight(), getHeight() - 1, paint);
}
}
}
TMessagesProj/src/main/java/org/telegram/ui/Cells/TextSettingsCell.java 0 → 100644
View file @ ca46b69b
/*
* This is the source code of Telegram for Android v. 1.7.x.
* It is licensed under GNU GPL v. 2 or later.
* You should have received a copy of the license in this archive (see LICENSE).
*
* Copyright Nikolai Kudashov, 2013-2014.
*/
package org.telegram.ui.Cells;
import android.content.Context;
import android.graphics.Canvas;
import android.graphics.Paint;
import android.util.TypedValue;
import android.view.Gravity;
import android.widget.FrameLayout;
import android.widget.TextView;
import org.telegram.android.AndroidUtilities;
import org.telegram.android.LocaleController;
public class TextSettingsCell extends FrameLayout {
private TextView textView;
private TextView valueTextView;
private static Paint paint;
private boolean needDivider;
public TextSettingsCell(Context context) {
super(context);
if (paint == null) {
paint = new Paint();
paint.setColor(0xffd9d9d9);
paint.setStrokeWidth(1);
}
textView = new TextView(context);
textView.setTextColor(0xff000000);
textView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16);
textView.setLines(1);
textView.setMaxLines(1);
textView.setSingleLine(true);
textView.setGravity((LocaleController.isRTL ? Gravity.RIGHT : Gravity.LEFT) | Gravity.CENTER_VERTICAL);
addView(textView);
LayoutParams layoutParams = (LayoutParams) textView.getLayoutParams();
layoutParams.width = LayoutParams.MATCH_PARENT;
layoutParams.height = LayoutParams.MATCH_PARENT;
layoutParams.leftMargin = AndroidUtilities.dp(17);
layoutParams.rightMargin = AndroidUtilities.dp(17);
layoutParams.gravity = LocaleController.isRTL ? Gravity.RIGHT : Gravity.LEFT;
textView.setLayoutParams(layoutParams);
valueTextView = new TextView(context);
valueTextView.setTextColor(0xff2f8cc9);
valueTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16);
valueTextView.setLines(1);
valueTextView.setMaxLines(1);
valueTextView.setSingleLine(true);
valueTextView.setGravity((LocaleController.isRTL ? Gravity.LEFT : Gravity.RIGHT) | Gravity.CENTER_VERTICAL);
addView(valueTextView);
layoutParams = (LayoutParams) valueTextView.getLayoutParams();
layoutParams.width = LayoutParams.WRAP_CONTENT;
layoutParams.height = LayoutParams.MATCH_PARENT;
layoutParams.leftMargin = AndroidUtilities.dp(17);
layoutParams.rightMargin = AndroidUtilities.dp(17);
layoutParams.gravity = LocaleController.isRTL ? Gravity.LEFT : Gravity.RIGHT;
valueTextView.setLayoutParams(layoutParams);
}
@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
super.onMeasure(widthMeasureSpec, MeasureSpec.makeMeasureSpec(AndroidUtilities.dp(48) + (needDivider ? 1 : 0), MeasureSpec.EXACTLY));
}
public void setTextColor(int color) {
textView.setTextColor(color);
}
public void setText(String text, boolean divider) {
textView.setText(text);
valueTextView.setVisibility(GONE);
needDivider = divider;
setWillNotDraw(!divider);
}
public void setTextAndValue(String text, String value, boolean divider) {
textView.setText(text);
valueTextView.setText(value);
valueTextView.setVisibility(VISIBLE);
needDivider = divider;
setWillNotDraw(!divider);
}
@Override
protected void onDraw(Canvas canvas) {
if (needDivider) {
canvas.drawLine(getPaddingLeft(), getHeight() - 1, getWidth() - getPaddingRight(), getHeight() - 1, paint);
}
}
}
TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
View file @ ca46b69b
...@@ -71,7 +71,7 @@ import org.telegram.ui.Cells.ChatBaseCell; ...@@ -71,7 +71,7 @@ import org.telegram.ui.Cells.ChatBaseCell;
import org.telegram.ui.Cells.ChatContactCell; import org.telegram.ui.Cells.ChatContactCell;
import org.telegram.ui.Cells.ChatMediaCell; import org.telegram.ui.Cells.ChatMediaCell;
import org.telegram.ui.Cells.ChatMessageCell; import org.telegram.ui.Cells.ChatMessageCell;
import org.telegram.ui.Views.ActionBar.ActionBarLayer; import org.telegram.ui.Views.ActionBar.ActionBar;
import org.telegram.ui.Views.ActionBar.ActionBarMenu; import org.telegram.ui.Views.ActionBar.ActionBarMenu;
import org.telegram.ui.Views.ActionBar.ActionBarMenuItem; import org.telegram.ui.Views.ActionBar.ActionBarMenuItem;
import org.telegram.ui.Views.AvatarDrawable; import org.telegram.ui.Views.AvatarDrawable;
...@@ -165,6 +165,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not ...@@ -165,6 +165,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
private int onlineCount = -1; private int onlineCount = -1;
private CharSequence lastPrintString; private CharSequence lastPrintString;
private TLRPC.UserStatus lastStatus;
private long chatEnterTime = 0; private long chatEnterTime = 0;
private long chatLeaveTime = 0; private long chatLeaveTime = 0;
...@@ -190,7 +191,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not ...@@ -190,7 +191,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
AdapterView.OnItemLongClickListener onItemLongClickListener = new AdapterView.OnItemLongClickListener() { AdapterView.OnItemLongClickListener onItemLongClickListener = new AdapterView.OnItemLongClickListener() {
@Override @Override
public boolean onItemLongClick(AdapterView<?> adapter, View view, int position, long id) { public boolean onItemLongClick(AdapterView<?> adapter, View view, int position, long id) {
if (!actionBarLayer.isActionModeShowed()) { if (!actionBar.isActionModeShowed()) {
createMenu(view, false); createMenu(view, false);
} }
return true; return true;
...@@ -200,7 +201,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not ...@@ -200,7 +201,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
AdapterView.OnItemClickListener onItemClickListener = new AdapterView.OnItemClickListener() { AdapterView.OnItemClickListener onItemClickListener = new AdapterView.OnItemClickListener() {
@Override @Override
public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) { public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
if (actionBarLayer.isActionModeShowed()) { if (actionBar.isActionModeShowed()) {
processRowSelect(view); processRowSelect(view);
return; return;
} }
...@@ -443,9 +444,9 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not ...@@ -443,9 +444,9 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
public View createView(LayoutInflater inflater, ViewGroup container) { public View createView(LayoutInflater inflater, ViewGroup container) {
if (fragmentView == null) { if (fragmentView == null) {
actionBarLayer.setBackButtonImage(R.drawable.ic_ab_back); actionBar.setBackButtonImage(R.drawable.ic_ab_back);
actionBarLayer.setBackOverlay(R.layout.updating_state_layout); actionBar.setBackOverlay(R.layout.updating_state_layout);
actionBarLayer.setActionBarMenuOnItemClick(new ActionBarLayer.ActionBarMenuOnItemClick() { actionBar.setActionBarMenuOnItemClick(new ActionBar.ActionBarMenuOnItemClick() {
@Override @Override
public void onItemClick(int id) { public void onItemClick(int id) {
if (id == -1) { if (id == -1) {
...@@ -453,7 +454,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not ...@@ -453,7 +454,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
} else if (id == -2) { } else if (id == -2) {
selectedMessagesIds.clear(); selectedMessagesIds.clear();
selectedMessagesCanCopyIds.clear(); selectedMessagesCanCopyIds.clear();
actionBarLayer.hideActionMode(); actionBar.hideActionMode();
updateVisibleRows(); updateVisibleRows();
} else if (id == attach_photo) { } else if (id == attach_photo) {
try { try {
...@@ -604,7 +605,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not ...@@ -604,7 +605,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
} }
selectedMessagesIds.clear(); selectedMessagesIds.clear();
selectedMessagesCanCopyIds.clear(); selectedMessagesCanCopyIds.clear();
actionBarLayer.hideActionMode(); actionBar.hideActionMode();
updateVisibleRows(); updateVisibleRows();
} else if (id == delete) { } else if (id == delete) {
ArrayList<Integer> ids = new ArrayList<Integer>(selectedMessagesIds.keySet()); ArrayList<Integer> ids = new ArrayList<Integer>(selectedMessagesIds.keySet());
...@@ -619,7 +620,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not ...@@ -619,7 +620,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
} }
} }
MessagesController.getInstance().deleteMessages(ids, random_ids, currentEncryptedChat); MessagesController.getInstance().deleteMessages(ids, random_ids, currentEncryptedChat);
actionBarLayer.hideActionMode(); actionBar.hideActionMode();
} else if (id == forward) { } else if (id == forward) {
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putBoolean("onlySelect", true); args.putBoolean("onlySelect", true);
...@@ -633,15 +634,16 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not ...@@ -633,15 +634,16 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
} }
}); });
updateTitle();
updateSubtitle(); updateSubtitle();
if (currentEncryptedChat != null) { if (currentEncryptedChat != null) {
actionBarLayer.setTitleIcon(R.drawable.ic_lock_white, AndroidUtilities.dp(4)); actionBar.setTitleIcon(R.drawable.ic_lock_white, AndroidUtilities.dp(4));
} else if (currentChat != null && currentChat.id < 0) { } else if (currentChat != null && currentChat.id < 0) {
actionBarLayer.setTitleIcon(R.drawable.broadcast2, AndroidUtilities.dp(4)); actionBar.setTitleIcon(R.drawable.broadcast2, AndroidUtilities.dp(4));
} }
ActionBarMenu menu = actionBarLayer.createMenu(); ActionBarMenu menu = actionBar.createMenu();
if (currentEncryptedChat != null) { if (currentEncryptedChat != null) {
timeItem = menu.addItemResource(chat_enc_timer, R.layout.chat_header_enc_layout); timeItem = menu.addItemResource(chat_enc_timer, R.layout.chat_header_enc_layout);
...@@ -657,7 +659,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not ...@@ -657,7 +659,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
actionModeViews.clear(); actionModeViews.clear();
final ActionBarMenu actionMode = actionBarLayer.createActionMode(); final ActionBarMenu actionMode = actionBar.createActionMode();
actionModeViews.add(actionMode.addItem(-2, R.drawable.ic_ab_done_gray, R.drawable.bar_selector_mode)); actionModeViews.add(actionMode.addItem(-2, R.drawable.ic_ab_done_gray, R.drawable.bar_selector_mode));
FrameLayout layout = new FrameLayout(actionMode.getContext()); FrameLayout layout = new FrameLayout(actionMode.getContext());
...@@ -713,7 +715,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not ...@@ -713,7 +715,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
View contentView = fragmentView.findViewById(R.id.chat_layout); View contentView = fragmentView.findViewById(R.id.chat_layout);
TextView emptyView = (TextView) fragmentView.findViewById(R.id.searchEmptyView); TextView emptyView = (TextView) fragmentView.findViewById(R.id.searchEmptyView);
emptyViewContainer = fragmentView.findViewById(R.id.empty_view); emptyViewContainer = fragmentView.findViewById(R.id.empty_view);
emptyViewContainer.setVisibility(View.GONE); emptyViewContainer.setVisibility(View.INVISIBLE);
emptyViewContainer.setOnTouchListener(new View.OnTouchListener() { emptyViewContainer.setOnTouchListener(new View.OnTouchListener() {
@Override @Override
public boolean onTouch(View v, MotionEvent event) { public boolean onTouch(View v, MotionEvent event) {
...@@ -776,7 +778,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not ...@@ -776,7 +778,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
} }
if (currentEncryptedChat != null) { if (currentEncryptedChat != null) {
emptyView.setVisibility(View.GONE); emptyView.setVisibility(View.INVISIBLE);
View secretChatPlaceholder = contentView.findViewById(R.id.secret_placeholder); View secretChatPlaceholder = contentView.findViewById(R.id.secret_placeholder);
secretChatPlaceholder.setVisibility(View.VISIBLE); secretChatPlaceholder.setVisibility(View.VISIBLE);
if (isCustomTheme) { if (isCustomTheme) {
...@@ -828,7 +830,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not ...@@ -828,7 +830,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
chatListView.setOnInterceptTouchEventListener(new LayoutListView.OnInterceptTouchEventListener() { chatListView.setOnInterceptTouchEventListener(new LayoutListView.OnInterceptTouchEventListener() {
@Override @Override
public boolean onInterceptTouchEvent(MotionEvent event) { public boolean onInterceptTouchEvent(MotionEvent event) {
if (actionBarLayer.isActionModeShowed()) { if (actionBar.isActionModeShowed()) {
return false; return false;
} }
if (event.getAction() == MotionEvent.ACTION_DOWN) { if (event.getAction() == MotionEvent.ACTION_DOWN) {
...@@ -991,7 +993,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not ...@@ -991,7 +993,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
progressView.setVisibility(View.VISIBLE); progressView.setVisibility(View.VISIBLE);
chatListView.setEmptyView(null); chatListView.setEmptyView(null);
} else { } else {
progressView.setVisibility(View.GONE); progressView.setVisibility(View.INVISIBLE);
chatListView.setEmptyView(emptyViewContainer); chatListView.setEmptyView(emptyViewContainer);
} }
...@@ -1206,8 +1208,6 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not ...@@ -1206,8 +1208,6 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
onlineCount++; onlineCount++;
} }
} }
updateSubtitle();
} }
private int getMessageType(MessageObject messageObject) { private int getMessageType(MessageObject messageObject) {
...@@ -1333,11 +1333,11 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not ...@@ -1333,11 +1333,11 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
selectedMessagesCanCopyIds.put(messageObject.messageOwner.id, messageObject); selectedMessagesCanCopyIds.put(messageObject.messageOwner.id, messageObject);
} }
} }
if (actionBarLayer.isActionModeShowed()) { if (actionBar.isActionModeShowed()) {
if (selectedMessagesIds.isEmpty()) { if (selectedMessagesIds.isEmpty()) {
actionBarLayer.hideActionMode(); actionBar.hideActionMode();
} }
actionBarLayer.createActionMode().getItem(copy).setVisibility(selectedMessagesCanCopyIds.size() != 0 ? View.VISIBLE : View.GONE); actionBar.createActionMode().getItem(copy).setVisibility(selectedMessagesCanCopyIds.size() != 0 ? View.VISIBLE : View.GONE);
} }
} }
...@@ -1360,7 +1360,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not ...@@ -1360,7 +1360,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
} }
private void updateActionModeTitle() { private void updateActionModeTitle() {
if (!actionBarLayer.isActionModeShowed()) { if (!actionBar.isActionModeShowed()) {
return; return;
} }
if (!selectedMessagesIds.isEmpty()) { if (!selectedMessagesIds.isEmpty()) {
...@@ -1368,21 +1368,23 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not ...@@ -1368,21 +1368,23 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
} }
} }
private void updateSubtitle() { private void updateTitle() {
if (currentChat != null) { if (currentChat != null) {
actionBarLayer.setTitle(currentChat.title); actionBar.setTitle(currentChat.title);
} else if (currentUser != null) { } else if (currentUser != null) {
if (currentUser.id / 1000 != 777 && currentUser.id / 1000 != 333 && ContactsController.getInstance().contactsDict.get(currentUser.id) == null && (ContactsController.getInstance().contactsDict.size() != 0 || !ContactsController.getInstance().isLoadingContacts())) { if (currentUser.id / 1000 != 777 && currentUser.id / 1000 != 333 && ContactsController.getInstance().contactsDict.get(currentUser.id) == null && (ContactsController.getInstance().contactsDict.size() != 0 || !ContactsController.getInstance().isLoadingContacts())) {
if (currentUser.phone != null && currentUser.phone.length() != 0) { if (currentUser.phone != null && currentUser.phone.length() != 0) {
actionBarLayer.setTitle(PhoneFormat.getInstance().format("+" + currentUser.phone)); actionBar.setTitle(PhoneFormat.getInstance().format("+" + currentUser.phone));
} else { } else {
actionBarLayer.setTitle(ContactsController.formatName(currentUser.first_name, currentUser.last_name)); actionBar.setTitle(ContactsController.formatName(currentUser.first_name, currentUser.last_name));
} }
} else { } else {
actionBarLayer.setTitle(ContactsController.formatName(currentUser.first_name, currentUser.last_name)); actionBar.setTitle(ContactsController.formatName(currentUser.first_name, currentUser.last_name));
} }
} }
}
private void updateSubtitle() {
CharSequence printString = MessagesController.getInstance().printingStrings.get(dialog_id); CharSequence printString = MessagesController.getInstance().printingStrings.get(dialog_id);
if (printString != null) { if (printString != null) {
printString = TextUtils.replace(printString, new String[]{"..."}, new String[]{""}); printString = TextUtils.replace(printString, new String[]{"..."}, new String[]{""});
...@@ -1392,18 +1394,18 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not ...@@ -1392,18 +1394,18 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
setTypingAnimation(false); setTypingAnimation(false);
if (currentChat != null) { if (currentChat != null) {
if (currentChat instanceof TLRPC.TL_chatForbidden) { if (currentChat instanceof TLRPC.TL_chatForbidden) {
actionBarLayer.setSubtitle(LocaleController.getString("YouWereKicked", R.string.YouWereKicked)); actionBar.setSubtitle(LocaleController.getString("YouWereKicked", R.string.YouWereKicked));
} else if (currentChat.left) { } else if (currentChat.left) {
actionBarLayer.setSubtitle(LocaleController.getString("YouLeft", R.string.YouLeft)); actionBar.setSubtitle(LocaleController.getString("YouLeft", R.string.YouLeft));
} else { } else {
int count = currentChat.participants_count; int count = currentChat.participants_count;
if (info != null) { if (info != null) {
count = info.participants.size(); count = info.participants.size();
} }
if (onlineCount > 1 && count != 0) { if (onlineCount > 1 && count != 0) {
actionBarLayer.setSubtitle(String.format("%s, %s", LocaleController.formatPluralString("Members", count), LocaleController.formatPluralString("Online", onlineCount))); actionBar.setSubtitle(String.format("%s, %s", LocaleController.formatPluralString("Members", count), LocaleController.formatPluralString("Online", onlineCount)));
} else { } else {
actionBarLayer.setSubtitle(LocaleController.formatPluralString("Members", count)); actionBar.setSubtitle(LocaleController.formatPluralString("Members", count));
} }
} }
} else if (currentUser != null) { } else if (currentUser != null) {
...@@ -1411,28 +1413,31 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not ...@@ -1411,28 +1413,31 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
if (user != null) { if (user != null) {
currentUser = user; currentUser = user;
} }
actionBarLayer.setSubtitle(LocaleController.formatUserStatus(currentUser)); if (lastStatus != user.status || lastStatus != null && user.status != null && lastStatus.expires != user.status.expires) {
lastStatus = user.status;
actionBar.setSubtitle(LocaleController.formatUserStatus(currentUser));
}
} }
} else { } else {
lastPrintString = printString; lastPrintString = printString;
actionBarLayer.setSubtitle(printString); actionBar.setSubtitle(printString);
setTypingAnimation(true); setTypingAnimation(true);
} }
} }
private void setTypingAnimation(boolean start) { private void setTypingAnimation(boolean start) {
if (actionBarLayer == null) { if (actionBar == null) {
return; return;
} }
if (start) { if (start) {
try { try {
actionBarLayer.setSubTitleIcon(0, typingDotsDrawable, AndroidUtilities.dp(4)); actionBar.setSubTitleIcon(0, typingDotsDrawable, AndroidUtilities.dp(4));
typingDotsDrawable.start(); typingDotsDrawable.start();
} catch (Exception e) { } catch (Exception e) {
FileLog.e("tmessages", e); FileLog.e("tmessages", e);
} }
} else { } else {
actionBarLayer.setSubTitleIcon(0, null, 0); actionBar.setSubTitleIcon(0, null, 0);
if (typingDotsDrawable != null) { if (typingDotsDrawable != null) {
typingDotsDrawable.stop(); typingDotsDrawable.stop();
} }
...@@ -1614,6 +1619,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not ...@@ -1614,6 +1619,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
@Override @Override
public void didReceivedNotification(int id, final Object... args) { public void didReceivedNotification(int id, final Object... args) {
if (id == NotificationCenter.messagesDidLoaded) { if (id == NotificationCenter.messagesDidLoaded) {
long did = (Long)args[0]; long did = (Long)args[0];
if (did == dialog_id) { if (did == dialog_id) {
loadsCount++; loadsCount++;
...@@ -1788,7 +1794,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not ...@@ -1788,7 +1794,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
} }
} }
chatListView.getViewTreeObserver().removeOnPreDrawListener(this); chatListView.getViewTreeObserver().removeOnPreDrawListener(this);
return false; return true;
} }
}); });
chatListView.invalidate(); chatListView.invalidate();
...@@ -1830,16 +1836,23 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not ...@@ -1830,16 +1836,23 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
} }
if (first && messages.size() > 0) { if (first && messages.size() > 0) {
if (last_message_id != 0) { final boolean wasUnreadFinal = wasUnread;
MessagesController.getInstance().markDialogAsRead(dialog_id, messages.get(0).messageOwner.id, last_message_id, 0, last_unread_date, wasUnread, false); final int last_unread_date_final = last_unread_date;
} else { AndroidUtilities.runOnUIThread(new Runnable() {
MessagesController.getInstance().markDialogAsRead(dialog_id, messages.get(0).messageOwner.id, minMessageId, 0, maxDate, wasUnread, false); @Override
} public void run() {
if (last_message_id != 0) {
MessagesController.getInstance().markDialogAsRead(dialog_id, messages.get(0).messageOwner.id, last_message_id, 0, last_unread_date_final, wasUnreadFinal, false);
} else {
MessagesController.getInstance().markDialogAsRead(dialog_id, messages.get(0).messageOwner.id, minMessageId, 0, maxDate, wasUnreadFinal, false);
}
}
}, 700);
first = false; first = false;
} }
if (progressView != null) { if (progressView != null) {
progressView.setVisibility(View.GONE); progressView.setVisibility(View.INVISIBLE);
} }
} }
} else if (id == NotificationCenter.emojiDidLoaded) { } else if (id == NotificationCenter.emojiDidLoaded) {
...@@ -1848,10 +1861,20 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not ...@@ -1848,10 +1861,20 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
} }
} else if (id == NotificationCenter.updateInterfaces) { } else if (id == NotificationCenter.updateInterfaces) {
int updateMask = (Integer)args[0]; int updateMask = (Integer)args[0];
if ((updateMask & MessagesController.UPDATE_MASK_NAME) != 0 || (updateMask & MessagesController.UPDATE_MASK_STATUS) != 0 || (updateMask & MessagesController.UPDATE_MASK_CHAT_NAME) != 0 || (updateMask & MessagesController.UPDATE_MASK_CHAT_MEMBERS) != 0) { if ((updateMask & MessagesController.UPDATE_MASK_NAME) != 0 || (updateMask & MessagesController.UPDATE_MASK_CHAT_NAME) != 0) {
updateSubtitle(); updateTitle();
}
boolean updateSubtitle = false;
if ((updateMask & MessagesController.UPDATE_MASK_CHAT_MEMBERS) != 0) {
updateSubtitle = true;
updateOnlineCount(); updateOnlineCount();
} }
if ((updateMask & MessagesController.UPDATE_MASK_STATUS) != 0) {
updateSubtitle = true;
}
if (updateSubtitle) {
updateSubtitle();
}
if ((updateMask & MessagesController.UPDATE_MASK_AVATAR) != 0 || (updateMask & MessagesController.UPDATE_MASK_CHAT_AVATAR) != 0 || (updateMask & MessagesController.UPDATE_MASK_NAME) != 0) { if ((updateMask & MessagesController.UPDATE_MASK_AVATAR) != 0 || (updateMask & MessagesController.UPDATE_MASK_CHAT_AVATAR) != 0 || (updateMask & MessagesController.UPDATE_MASK_NAME) != 0) {
checkAndUpdateAvatar(); checkAndUpdateAvatar();
updateVisibleRows(); updateVisibleRows();
...@@ -2000,7 +2023,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not ...@@ -2000,7 +2023,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
} }
} }
if (progressView != null) { if (progressView != null) {
progressView.setVisibility(View.GONE); progressView.setVisibility(View.INVISIBLE);
} }
if (chatAdapter != null) { if (chatAdapter != null) {
chatAdapter.notifyDataSetChanged(); chatAdapter.notifyDataSetChanged();
...@@ -2044,7 +2067,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not ...@@ -2044,7 +2067,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
} }
} }
if (updateChat) { if (updateChat) {
updateSubtitle(); updateTitle();
checkAndUpdateAvatar(); checkAndUpdateAvatar();
} }
} }
...@@ -2092,7 +2115,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not ...@@ -2092,7 +2115,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
} }
if (messages.isEmpty()) { if (messages.isEmpty()) {
if (!endReached && !loading) { if (!endReached && !loading) {
progressView.setVisibility(View.GONE); progressView.setVisibility(View.INVISIBLE);
chatListView.setEmptyView(null); chatListView.setEmptyView(null);
if (currentEncryptedChat == null) { if (currentEncryptedChat == null) {
maxMessageId = Integer.MAX_VALUE; maxMessageId = Integer.MAX_VALUE;
...@@ -2146,6 +2169,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not ...@@ -2146,6 +2169,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
if (currentChat != null && chatId == currentChat.id) { if (currentChat != null && chatId == currentChat.id) {
info = (TLRPC.ChatParticipants)args[1]; info = (TLRPC.ChatParticipants)args[1];
updateOnlineCount(); updateOnlineCount();
updateSubtitle();
if (isBroadcast) { if (isBroadcast) {
SendMessagesHelper.getInstance().setCurrentChatInfo(info); SendMessagesHelper.getInstance().setCurrentChatInfo(info);
} }
...@@ -2213,7 +2237,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not ...@@ -2213,7 +2237,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
messages.clear(); messages.clear();
messagesByDays.clear(); messagesByDays.clear();
messagesDict.clear(); messagesDict.clear();
progressView.setVisibility(View.GONE); progressView.setVisibility(View.INVISIBLE);
chatListView.setEmptyView(emptyViewContainer); chatListView.setEmptyView(emptyViewContainer);
if (currentEncryptedChat == null) { if (currentEncryptedChat == null) {
maxMessageId = Integer.MAX_VALUE; maxMessageId = Integer.MAX_VALUE;
...@@ -2226,7 +2250,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not ...@@ -2226,7 +2250,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
minDate = 0; minDate = 0;
selectedMessagesIds.clear(); selectedMessagesIds.clear();
selectedMessagesCanCopyIds.clear(); selectedMessagesCanCopyIds.clear();
actionBarLayer.hideActionMode(); actionBar.hideActionMode();
chatAdapter.notifyDataSetChanged(); chatAdapter.notifyDataSetChanged();
} }
} else if (id == NotificationCenter.screenshotTook) { } else if (id == NotificationCenter.screenshotTook) {
...@@ -2383,15 +2407,10 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not ...@@ -2383,15 +2407,10 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
public void onResume() { public void onResume() {
super.onResume(); super.onResume();
if (parentLayout != null) {
parentLayout.getDrawerLayoutContainer().setStatusBarColor(0xff54759e);
}
getParentActivity().getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE); getParentActivity().getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
checkActionBarMenu(); checkActionBarMenu();
if (chatAdapter != null) {
chatAdapter.notifyDataSetChanged();
}
NotificationsController.getInstance().setOpennedDialogId(dialog_id); NotificationsController.getInstance().setOpennedDialogId(dialog_id);
if (scrollToTopOnResume) { if (scrollToTopOnResume) {
if (scrollToTopUnReadOnResume && scrollToMessage != null) { if (scrollToTopUnReadOnResume && scrollToMessage != null) {
...@@ -2462,7 +2481,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not ...@@ -2462,7 +2481,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
@Override @Override
public void onPause() { public void onPause() {
super.onPause(); super.onPause();
actionBarLayer.hideActionMode(); actionBar.hideActionMode();
chatActivityEnterView.hideEmojiPopup(); chatActivityEnterView.hideEmojiPopup();
paused = true; paused = true;
NotificationsController.getInstance().setOpennedDialogId(0); NotificationsController.getInstance().setOpennedDialogId(0);
...@@ -2507,40 +2526,53 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not ...@@ -2507,40 +2526,53 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
} }
private void fixLayout(final boolean resume) { private void fixLayout(final boolean resume) {
final int lastPos = chatListView.getLastVisiblePosition(); if (avatarImageView != null) {
ViewTreeObserver obs = chatListView.getViewTreeObserver(); avatarImageView.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
obs.addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() { @Override
@Override public boolean onPreDraw() {
public boolean onPreDraw() { if (avatarImageView != null) {
if (chatListView != null) { avatarImageView.getViewTreeObserver().removeOnPreDrawListener(this);
chatListView.getViewTreeObserver().removeOnPreDrawListener(this); }
} if (getParentActivity() == null) {
if (getParentActivity() == null) { return false;
return true; }
} int height = AndroidUtilities.getCurrentActionBarHeight();
int height = AndroidUtilities.getCurrentActionBarHeight(); if (!AndroidUtilities.isTablet() && getParentActivity().getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
if (!AndroidUtilities.isTablet() && getParentActivity().getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) { selectedMessagesCountTextView.setTextSize(16);
selectedMessagesCountTextView.setTextSize(16); } else {
} else { selectedMessagesCountTextView.setTextSize(18);
selectedMessagesCountTextView.setTextSize(18); }
} if (avatarImageView != null) {
if (avatarImageView != null) { RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) avatarImageView.getLayoutParams();
RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) avatarImageView.getLayoutParams(); params.width = height;
params.width = height; params.height = height;
params.height = height; avatarImageView.setLayoutParams(params);
avatarImageView.setLayoutParams(params); }
return false;
} }
if (!resume && lastPos >= messages.size() - 1) { });
chatListView.post(new Runnable() { }
@Override if (!resume && chatListView != null) {
public void run() { final int lastPos = chatListView.getLastVisiblePosition();
chatListView.setSelectionFromTop(messages.size() - 1, -100000 - chatListView.getPaddingTop()); chatListView.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
} @Override
}); public boolean onPreDraw() {
if (chatListView == null) {
return false;
}
chatListView.getViewTreeObserver().removeOnPreDrawListener(this);
if (lastPos >= messages.size() - 1) {
chatListView.post(new Runnable() {
@Override
public void run() {
chatListView.setSelectionFromTop(messages.size() - 1, -100000 - chatListView.getPaddingTop());
}
});
}
return false;
} }
return false; });
} }
});
} }
@Override @Override
...@@ -2549,7 +2581,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not ...@@ -2549,7 +2581,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
} }
public void createMenu(View v, boolean single) { public void createMenu(View v, boolean single) {
if (actionBarLayer.isActionModeShowed()) { if (actionBar.isActionModeShowed()) {
return; return;
} }
...@@ -2702,7 +2734,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not ...@@ -2702,7 +2734,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
} }
return; return;
} }
actionBarLayer.showActionMode(); actionBar.showActionMode();
if (Build.VERSION.SDK_INT >= 11) { if (Build.VERSION.SDK_INT >= 11) {
AnimatorSet animatorSet = new AnimatorSet(); AnimatorSet animatorSet = new AnimatorSet();
ArrayList<Animator> animators = new ArrayList<Animator>(); ArrayList<Animator> animators = new ArrayList<Animator>();
...@@ -2868,7 +2900,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not ...@@ -2868,7 +2900,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
chatListView.setSelectionFromTop(messages.size() - 1, -100000 - chatListView.getPaddingTop()); chatListView.setSelectionFromTop(messages.size() - 1, -100000 - chatListView.getPaddingTop());
scrollToTopOnResume = true; scrollToTopOnResume = true;
if (AndroidUtilities.isTablet()) { if (AndroidUtilities.isTablet()) {
actionBarLayer.hideActionMode(); actionBar.hideActionMode();
} }
} }
} }
...@@ -2876,10 +2908,10 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not ...@@ -2876,10 +2908,10 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
@Override @Override
public boolean onBackPressed() { public boolean onBackPressed() {
if (actionBarLayer.isActionModeShowed()) { if (actionBar.isActionModeShowed()) {
selectedMessagesIds.clear(); selectedMessagesIds.clear();
selectedMessagesCanCopyIds.clear(); selectedMessagesCanCopyIds.clear();
actionBarLayer.hideActionMode(); actionBar.hideActionMode();
updateVisibleRows(); updateVisibleRows();
return false; return false;
} else if (chatActivityEnterView.isEmojiPopupShowing()) { } else if (chatActivityEnterView.isEmojiPopupShowing()) {
...@@ -2930,7 +2962,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not ...@@ -2930,7 +2962,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
boolean disableSelection = false; boolean disableSelection = false;
boolean selected = false; boolean selected = false;
if (actionBarLayer.isActionModeShowed()) { if (actionBar.isActionModeShowed()) {
if (selectedMessagesIds.containsKey(cell.getMessageObject().messageOwner.id)) { if (selectedMessagesIds.containsKey(cell.getMessageObject().messageOwner.id)) {
view.setBackgroundColor(0x6633b5e5); view.setBackgroundColor(0x6633b5e5);
selected = true; selected = true;
...@@ -3122,7 +3154,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not ...@@ -3122,7 +3154,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
((ChatBaseCell)view).setDelegate(new ChatBaseCell.ChatBaseCellDelegate() { ((ChatBaseCell)view).setDelegate(new ChatBaseCell.ChatBaseCellDelegate() {
@Override @Override
public void didPressedUserAvatar(ChatBaseCell cell, TLRPC.User user) { public void didPressedUserAvatar(ChatBaseCell cell, TLRPC.User user) {
if (actionBarLayer.isActionModeShowed()) { if (actionBar.isActionModeShowed()) {
processRowSelect(cell); processRowSelect(cell);
return; return;
} }
...@@ -3148,7 +3180,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not ...@@ -3148,7 +3180,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
@Override @Override
public boolean canPerformActions() { public boolean canPerformActions() {
return actionBarLayer != null && !actionBarLayer.isActionModeShowed(); return actionBar != null && !actionBar.isActionModeShowed();
} }
}); });
if (view instanceof ChatMediaCell) { if (view instanceof ChatMediaCell) {
...@@ -3248,7 +3280,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not ...@@ -3248,7 +3280,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
((ChatContactCell)view).setContactDelegate(new ChatContactCell.ChatContactCellDelegate() { ((ChatContactCell)view).setContactDelegate(new ChatContactCell.ChatContactCellDelegate() {
@Override @Override
public void didClickAddButton(ChatContactCell cell, TLRPC.User user) { public void didClickAddButton(ChatContactCell cell, TLRPC.User user) {
if (actionBarLayer.isActionModeShowed()) { if (actionBar.isActionModeShowed()) {
processRowSelect(cell); processRowSelect(cell);
return; return;
} }
...@@ -3261,7 +3293,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not ...@@ -3261,7 +3293,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
@Override @Override
public void didClickPhone(ChatContactCell cell) { public void didClickPhone(ChatContactCell cell) {
if (actionBarLayer.isActionModeShowed()) { if (actionBar.isActionModeShowed()) {
processRowSelect(cell); processRowSelect(cell);
return; return;
} }
...@@ -3326,7 +3358,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not ...@@ -3326,7 +3358,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
boolean selected = false; boolean selected = false;
boolean disableSelection = false; boolean disableSelection = false;
if (actionBarLayer.isActionModeShowed()) { if (actionBar.isActionModeShowed()) {
if (selectedMessagesIds.containsKey(message.messageOwner.id)) { if (selectedMessagesIds.containsKey(message.messageOwner.id)) {
view.setBackgroundColor(0x6633b5e5); view.setBackgroundColor(0x6633b5e5);
selected = true; selected = true;
......
TMessagesProj/src/main/java/org/telegram/ui/ChatProfileActivity.java
View file @ ca46b69b
...@@ -37,7 +37,7 @@ import org.telegram.messenger.Utilities; ...@@ -37,7 +37,7 @@ import org.telegram.messenger.Utilities;
import org.telegram.android.MessageObject; import org.telegram.android.MessageObject;
import org.telegram.ui.Adapters.BaseFragmentAdapter; import org.telegram.ui.Adapters.BaseFragmentAdapter;
import org.telegram.ui.Cells.UserCell; import org.telegram.ui.Cells.UserCell;
import org.telegram.ui.Views.ActionBar.ActionBarLayer; import org.telegram.ui.Views.ActionBar.ActionBar;
import org.telegram.ui.Views.ActionBar.ActionBarMenu; import org.telegram.ui.Views.ActionBar.ActionBarMenu;
import org.telegram.ui.Views.AvatarDrawable; import org.telegram.ui.Views.AvatarDrawable;
import org.telegram.ui.Views.AvatarUpdater; import org.telegram.ui.Views.AvatarUpdater;
...@@ -173,14 +173,14 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen ...@@ -173,14 +173,14 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen
public View createView(LayoutInflater inflater, ViewGroup container) { public View createView(LayoutInflater inflater, ViewGroup container) {
if (fragmentView == null) { if (fragmentView == null) {
actionBarLayer.setBackButtonImage(R.drawable.ic_ab_back); actionBar.setBackButtonImage(R.drawable.ic_ab_back);
actionBarLayer.setBackOverlay(R.layout.updating_state_layout); actionBar.setBackOverlay(R.layout.updating_state_layout);
if (chat_id > 0) { if (chat_id > 0) {
actionBarLayer.setTitle(LocaleController.getString("GroupInfo", R.string.GroupInfo)); actionBar.setTitle(LocaleController.getString("GroupInfo", R.string.GroupInfo));
} else { } else {
actionBarLayer.setTitle(LocaleController.getString("BroadcastList", R.string.BroadcastList)); actionBar.setTitle(LocaleController.getString("BroadcastList", R.string.BroadcastList));
} }
actionBarLayer.setActionBarMenuOnItemClick(new ActionBarLayer.ActionBarMenuOnItemClick() { actionBar.setActionBarMenuOnItemClick(new ActionBar.ActionBarMenuOnItemClick() {
@Override @Override
public void onItemClick(int id) { public void onItemClick(int id) {
if (id == -1) { if (id == -1) {
...@@ -190,7 +190,7 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen ...@@ -190,7 +190,7 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen
} }
} }
}); });
ActionBarMenu menu = actionBarLayer.createMenu(); ActionBarMenu menu = actionBar.createMenu();
View item = menu.addItemResource(done_button, R.layout.group_profile_add_member_layout); View item = menu.addItemResource(done_button, R.layout.group_profile_add_member_layout);
TextView textView = (TextView)item.findViewById(R.id.done_button); TextView textView = (TextView)item.findViewById(R.id.done_button);
if (textView != null) { if (textView != null) {
...@@ -653,7 +653,7 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen ...@@ -653,7 +653,7 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen
if (i == settingsSectionRow) { if (i == settingsSectionRow) {
((SettingsSectionLayout) view).setText(LocaleController.getString("SETTINGS", R.string.SETTINGS)); ((SettingsSectionLayout) view).setText(LocaleController.getString("SETTINGS", R.string.SETTINGS));
} else if (i == sharedMediaSectionRow) { } else if (i == sharedMediaSectionRow) {
((SettingsSectionLayout) view).setText(LocaleController.getString("SHAREDMEDIA", R.string.SHAREDMEDIA));
} else if (i == membersSectionRow) { } else if (i == membersSectionRow) {
TLRPC.Chat chat = MessagesController.getInstance().getChat(chat_id); TLRPC.Chat chat = MessagesController.getInstance().getChat(chat_id);
int count = chat.participants_count; int count = chat.participants_count;
......
TMessagesProj/src/main/java/org/telegram/ui/ChatProfileChangeNameActivity.java
View file @ ca46b69b
...@@ -52,16 +52,16 @@ public class ChatProfileChangeNameActivity extends BaseFragment { ...@@ -52,16 +52,16 @@ public class ChatProfileChangeNameActivity extends BaseFragment {
@Override @Override
public View createView(LayoutInflater inflater, ViewGroup container) { public View createView(LayoutInflater inflater, ViewGroup container) {
if (fragmentView == null) { if (fragmentView == null) {
actionBarLayer.setCustomView(R.layout.settings_do_action_layout); actionBar.setCustomView(R.layout.settings_do_action_layout);
Button cancelButton = (Button)actionBarLayer.findViewById(R.id.cancel_button); Button cancelButton = (Button) actionBar.findViewById(R.id.cancel_button);
cancelButton.setOnClickListener(new View.OnClickListener() { cancelButton.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
finishFragment(); finishFragment();
} }
}); });
doneButton = actionBarLayer.findViewById(R.id.done_button); doneButton = actionBar.findViewById(R.id.done_button);
doneButton.setOnClickListener(new View.OnClickListener() { doneButton.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
......
TMessagesProj/src/main/java/org/telegram/ui/ContactAddActivity.java
View file @ ca46b69b
...@@ -65,15 +65,15 @@ public class ContactAddActivity extends BaseFragment implements NotificationCent ...@@ -65,15 +65,15 @@ public class ContactAddActivity extends BaseFragment implements NotificationCent
@Override @Override
public View createView(LayoutInflater inflater, ViewGroup container) { public View createView(LayoutInflater inflater, ViewGroup container) {
if (fragmentView == null) { if (fragmentView == null) {
actionBarLayer.setCustomView(R.layout.settings_do_action_layout); actionBar.setCustomView(R.layout.settings_do_action_layout);
Button cancelButton = (Button)actionBarLayer.findViewById(R.id.cancel_button); Button cancelButton = (Button) actionBar.findViewById(R.id.cancel_button);
cancelButton.setOnClickListener(new View.OnClickListener() { cancelButton.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
finishFragment(); finishFragment();
} }
}); });
doneButton = actionBarLayer.findViewById(R.id.done_button); doneButton = actionBar.findViewById(R.id.done_button);
doneButton.setOnClickListener(new View.OnClickListener() { doneButton.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
......
TMessagesProj/src/main/java/org/telegram/ui/ContactsActivity.java
View file @ ca46b69b
...@@ -42,7 +42,7 @@ import org.telegram.ui.Adapters.BaseSectionsAdapter; ...@@ -42,7 +42,7 @@ import org.telegram.ui.Adapters.BaseSectionsAdapter;
import org.telegram.ui.Adapters.ContactsActivityAdapter; import org.telegram.ui.Adapters.ContactsActivityAdapter;
import org.telegram.ui.Adapters.ContactsActivitySearchAdapter; import org.telegram.ui.Adapters.ContactsActivitySearchAdapter;
import org.telegram.ui.Cells.UserCell; import org.telegram.ui.Cells.UserCell;
import org.telegram.ui.Views.ActionBar.ActionBarLayer; import org.telegram.ui.Views.ActionBar.ActionBar;
import org.telegram.ui.Views.ActionBar.ActionBarMenu; import org.telegram.ui.Views.ActionBar.ActionBarMenu;
import org.telegram.ui.Views.ActionBar.ActionBarMenuItem; import org.telegram.ui.Views.ActionBar.ActionBarMenuItem;
import org.telegram.ui.Views.ActionBar.BaseFragment; import org.telegram.ui.Views.ActionBar.BaseFragment;
...@@ -117,15 +117,15 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter ...@@ -117,15 +117,15 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
searching = false; searching = false;
searchWas = false; searchWas = false;
actionBarLayer.setBackButtonImage(R.drawable.ic_ab_back); actionBar.setBackButtonImage(R.drawable.ic_ab_back);
actionBarLayer.setBackOverlay(R.layout.updating_state_layout); actionBar.setBackOverlay(R.layout.updating_state_layout);
if (destroyAfterSelect) { if (destroyAfterSelect) {
actionBarLayer.setTitle(LocaleController.getString("SelectContact", R.string.SelectContact)); actionBar.setTitle(LocaleController.getString("SelectContact", R.string.SelectContact));
} else { } else {
actionBarLayer.setTitle(LocaleController.getString("Contacts", R.string.Contacts)); actionBar.setTitle(LocaleController.getString("Contacts", R.string.Contacts));
} }
actionBarLayer.setActionBarMenuOnItemClick(new ActionBarLayer.ActionBarMenuOnItemClick() { actionBar.setActionBarMenuOnItemClick(new ActionBar.ActionBarMenuOnItemClick() {
@Override @Override
public void onItemClick(int id) { public void onItemClick(int id) {
if (id == -1) { if (id == -1) {
...@@ -134,7 +134,7 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter ...@@ -134,7 +134,7 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
} }
}); });
ActionBarMenu menu = actionBarLayer.createMenu(); ActionBarMenu menu = actionBar.createMenu();
menu.addItem(0, R.drawable.ic_ab_search).setIsSearchField(true).setActionBarMenuItemSearchListener(new ActionBarMenuItem.ActionBarMenuItemSearchListener() { menu.addItem(0, R.drawable.ic_ab_search).setIsSearchField(true).setActionBarMenuItemSearchListener(new ActionBarMenuItem.ActionBarMenuItemSearchListener() {
@Override @Override
public void onSearchExpand() { public void onSearchExpand() {
......
TMessagesProj/src/main/java/org/telegram/ui/CountrySelectActivity.java
View file @ ca46b69b
...@@ -25,7 +25,7 @@ import org.telegram.android.LocaleController; ...@@ -25,7 +25,7 @@ import org.telegram.android.LocaleController;
import org.telegram.messenger.R; import org.telegram.messenger.R;
import org.telegram.messenger.Utilities; import org.telegram.messenger.Utilities;
import org.telegram.ui.Adapters.BaseFragmentAdapter; import org.telegram.ui.Adapters.BaseFragmentAdapter;
import org.telegram.ui.Views.ActionBar.ActionBarLayer; import org.telegram.ui.Views.ActionBar.ActionBar;
import org.telegram.ui.Views.ActionBar.ActionBarMenu; import org.telegram.ui.Views.ActionBar.ActionBarMenu;
import org.telegram.ui.Views.ActionBar.ActionBarMenuItem; import org.telegram.ui.Views.ActionBar.ActionBarMenuItem;
import org.telegram.ui.Views.ActionBar.BaseFragment; import org.telegram.ui.Views.ActionBar.BaseFragment;
...@@ -122,11 +122,11 @@ public class CountrySelectActivity extends BaseFragment { ...@@ -122,11 +122,11 @@ public class CountrySelectActivity extends BaseFragment {
@Override @Override
public View createView(LayoutInflater inflater, ViewGroup container) { public View createView(LayoutInflater inflater, ViewGroup container) {
if (fragmentView == null) { if (fragmentView == null) {
actionBarLayer.setBackButtonImage(R.drawable.ic_ab_back); actionBar.setBackButtonImage(R.drawable.ic_ab_back);
actionBarLayer.setBackOverlay(R.layout.updating_state_layout); actionBar.setBackOverlay(R.layout.updating_state_layout);
actionBarLayer.setTitle(LocaleController.getString("ChooseCountry", R.string.ChooseCountry)); actionBar.setTitle(LocaleController.getString("ChooseCountry", R.string.ChooseCountry));
actionBarLayer.setActionBarMenuOnItemClick(new ActionBarLayer.ActionBarMenuOnItemClick() { actionBar.setActionBarMenuOnItemClick(new ActionBar.ActionBarMenuOnItemClick() {
@Override @Override
public void onItemClick(int id) { public void onItemClick(int id) {
if (id == -1) { if (id == -1) {
...@@ -135,7 +135,7 @@ public class CountrySelectActivity extends BaseFragment { ...@@ -135,7 +135,7 @@ public class CountrySelectActivity extends BaseFragment {
} }
}); });
ActionBarMenu menu = actionBarLayer.createMenu(); ActionBarMenu menu = actionBar.createMenu();
menu.addItem(0, R.drawable.ic_ab_search).setIsSearchField(true).setActionBarMenuItemSearchListener(new ActionBarMenuItem.ActionBarMenuItemSearchListener() { menu.addItem(0, R.drawable.ic_ab_search).setIsSearchField(true).setActionBarMenuItemSearchListener(new ActionBarMenuItem.ActionBarMenuItemSearchListener() {
@Override @Override
public void onSearchExpand() { public void onSearchExpand() {
......
TMessagesProj/src/main/java/org/telegram/ui/DocumentSelectActivity.java
View file @ ca46b69b
...@@ -29,7 +29,7 @@ import org.telegram.android.LocaleController; ...@@ -29,7 +29,7 @@ import org.telegram.android.LocaleController;
import org.telegram.messenger.R; import org.telegram.messenger.R;
import org.telegram.messenger.Utilities; import org.telegram.messenger.Utilities;
import org.telegram.ui.Adapters.BaseFragmentAdapter; import org.telegram.ui.Adapters.BaseFragmentAdapter;
import org.telegram.ui.Views.ActionBar.ActionBarLayer; import org.telegram.ui.Views.ActionBar.ActionBar;
import org.telegram.ui.Views.ActionBar.ActionBarMenu; import org.telegram.ui.Views.ActionBar.ActionBarMenu;
import org.telegram.ui.Views.ActionBar.ActionBarMenuItem; import org.telegram.ui.Views.ActionBar.ActionBarMenuItem;
import org.telegram.ui.Views.BackupImageView; import org.telegram.ui.Views.BackupImageView;
...@@ -130,10 +130,10 @@ public class DocumentSelectActivity extends BaseFragment { ...@@ -130,10 +130,10 @@ public class DocumentSelectActivity extends BaseFragment {
} }
if (fragmentView == null) { if (fragmentView == null) {
actionBarLayer.setBackButtonImage(R.drawable.ic_ab_back); actionBar.setBackButtonImage(R.drawable.ic_ab_back);
actionBarLayer.setBackOverlay(R.layout.updating_state_layout); actionBar.setBackOverlay(R.layout.updating_state_layout);
actionBarLayer.setTitle(LocaleController.getString("SelectFile", R.string.SelectFile)); actionBar.setTitle(LocaleController.getString("SelectFile", R.string.SelectFile));
actionBarLayer.setActionBarMenuOnItemClick(new ActionBarLayer.ActionBarMenuOnItemClick() { actionBar.setActionBarMenuOnItemClick(new ActionBar.ActionBarMenuOnItemClick() {
@Override @Override
public void onItemClick(int id) { public void onItemClick(int id) {
if (id == -1) { if (id == -1) {
...@@ -146,7 +146,7 @@ public class DocumentSelectActivity extends BaseFragment { ...@@ -146,7 +146,7 @@ public class DocumentSelectActivity extends BaseFragment {
} }
} }
}); });
ActionBarMenu menu = actionBarLayer.createMenu(); ActionBarMenu menu = actionBar.createMenu();
ActionBarMenuItem item = menu.addItem(1, R.drawable.ic_ab_other); ActionBarMenuItem item = menu.addItem(1, R.drawable.ic_ab_other);
fragmentView = inflater.inflate(R.layout.document_select_layout, container, false); fragmentView = inflater.inflate(R.layout.document_select_layout, container, false);
...@@ -168,7 +168,7 @@ public class DocumentSelectActivity extends BaseFragment { ...@@ -168,7 +168,7 @@ public class DocumentSelectActivity extends BaseFragment {
File file = item.file; File file = item.file;
if (file == null) { if (file == null) {
HistoryEntry he = history.remove(history.size() - 1); HistoryEntry he = history.remove(history.size() - 1);
actionBarLayer.setTitle(he.title); actionBar.setTitle(he.title);
if (he.dir != null) { if (he.dir != null) {
listFiles(he.dir); listFiles(he.dir);
} else { } else {
...@@ -180,12 +180,12 @@ public class DocumentSelectActivity extends BaseFragment { ...@@ -180,12 +180,12 @@ public class DocumentSelectActivity extends BaseFragment {
he.scrollItem = listView.getFirstVisiblePosition(); he.scrollItem = listView.getFirstVisiblePosition();
he.scrollOffset = listView.getChildAt(0).getTop(); he.scrollOffset = listView.getChildAt(0).getTop();
he.dir = currentDir; he.dir = currentDir;
he.title = actionBarLayer.getTitle().toString(); he.title = actionBar.getTitle().toString();
if (!listFiles(file)) { if (!listFiles(file)) {
return; return;
} }
history.add(he); history.add(he);
actionBarLayer.setTitle(item.title); actionBar.setTitle(item.title);
listView.setSelection(0); listView.setSelection(0);
} else { } else {
if (!file.canRead()) { if (!file.canRead()) {
...@@ -230,7 +230,7 @@ public class DocumentSelectActivity extends BaseFragment { ...@@ -230,7 +230,7 @@ public class DocumentSelectActivity extends BaseFragment {
public boolean onBackPressed() { public boolean onBackPressed() {
if (history.size() > 0) { if (history.size() > 0) {
HistoryEntry he = history.remove(history.size() - 1); HistoryEntry he = history.remove(history.size() - 1);
actionBarLayer.setTitle(he.title); actionBar.setTitle(he.title);
if (he.dir != null) { if (he.dir != null) {
listFiles(he.dir); listFiles(he.dir);
} else { } else {
......
TMessagesProj/src/main/java/org/telegram/ui/GroupCreateActivity.java
View file @ ca46b69b
...@@ -45,7 +45,7 @@ import org.telegram.android.NotificationCenter; ...@@ -45,7 +45,7 @@ import org.telegram.android.NotificationCenter;
import org.telegram.messenger.R; import org.telegram.messenger.R;
import org.telegram.messenger.UserConfig; import org.telegram.messenger.UserConfig;
import org.telegram.messenger.Utilities; import org.telegram.messenger.Utilities;
import org.telegram.ui.Views.ActionBar.ActionBarLayer; import org.telegram.ui.Views.ActionBar.ActionBar;
import org.telegram.ui.Views.ActionBar.ActionBarMenu; import org.telegram.ui.Views.ActionBar.ActionBarMenu;
import org.telegram.ui.Views.AvatarDrawable; import org.telegram.ui.Views.AvatarDrawable;
import org.telegram.ui.Views.BackupImageView; import org.telegram.ui.Views.BackupImageView;
...@@ -139,16 +139,16 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen ...@@ -139,16 +139,16 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen
@Override @Override
public View createView(LayoutInflater inflater, ViewGroup container) { public View createView(LayoutInflater inflater, ViewGroup container) {
if (fragmentView == null) { if (fragmentView == null) {
actionBarLayer.setBackButtonImage(R.drawable.ic_ab_back); actionBar.setBackButtonImage(R.drawable.ic_ab_back);
actionBarLayer.setBackOverlay(R.layout.updating_state_layout); actionBar.setBackOverlay(R.layout.updating_state_layout);
if (isBroadcast) { if (isBroadcast) {
actionBarLayer.setTitle(LocaleController.getString("NewBroadcastList", R.string.NewBroadcastList)); actionBar.setTitle(LocaleController.getString("NewBroadcastList", R.string.NewBroadcastList));
} else { } else {
actionBarLayer.setTitle(LocaleController.getString("NewGroup", R.string.NewGroup)); actionBar.setTitle(LocaleController.getString("NewGroup", R.string.NewGroup));
} }
actionBarLayer.setSubtitle(LocaleController.formatString("MembersCount", R.string.MembersCount, selectedContacts.size(), maxCount)); actionBar.setSubtitle(LocaleController.formatString("MembersCount", R.string.MembersCount, selectedContacts.size(), maxCount));
actionBarLayer.setActionBarMenuOnItemClick(new ActionBarLayer.ActionBarMenuOnItemClick() { actionBar.setActionBarMenuOnItemClick(new ActionBar.ActionBarMenuOnItemClick() {
@Override @Override
public void onItemClick(int id) { public void onItemClick(int id) {
if (id == -1) { if (id == -1) {
...@@ -166,7 +166,7 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen ...@@ -166,7 +166,7 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen
} }
}); });
ActionBarMenu menu = actionBarLayer.createMenu(); ActionBarMenu menu = actionBar.createMenu();
View doneItem = menu.addItemResource(done_button, R.layout.group_create_done_layout); View doneItem = menu.addItemResource(done_button, R.layout.group_create_done_layout);
TextView doneTextView = (TextView)doneItem.findViewById(R.id.done_button); TextView doneTextView = (TextView)doneItem.findViewById(R.id.done_button);
doneTextView.setText(LocaleController.getString("Next", R.string.Next)); doneTextView.setText(LocaleController.getString("Next", R.string.Next));
...@@ -227,7 +227,7 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen ...@@ -227,7 +227,7 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen
selectedContacts.remove(sp.uid); selectedContacts.remove(sp.uid);
} }
} }
actionBarLayer.setSubtitle(LocaleController.formatString("MembersCount", R.string.MembersCount, selectedContacts.size(), maxCount)); actionBar.setSubtitle(LocaleController.formatString("MembersCount", R.string.MembersCount, selectedContacts.size(), maxCount));
listView.invalidateViews(); listView.invalidateViews();
} else { } else {
search = true; search = true;
...@@ -293,7 +293,7 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen ...@@ -293,7 +293,7 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen
span.uid = user.id; span.uid = user.id;
ignoreChange = false; ignoreChange = false;
} }
actionBarLayer.setSubtitle(LocaleController.formatString("MembersCount", R.string.MembersCount, selectedContacts.size(), maxCount)); actionBar.setSubtitle(LocaleController.formatString("MembersCount", R.string.MembersCount, selectedContacts.size(), maxCount));
if (searching || searchWas) { if (searching || searchWas) {
searching = false; searching = false;
searchWas = false; searchWas = false;
......
TMessagesProj/src/main/java/org/telegram/ui/GroupCreateFinalActivity.java
View file @ ca46b69b
...@@ -31,7 +31,7 @@ import org.telegram.android.MessagesController; ...@@ -31,7 +31,7 @@ import org.telegram.android.MessagesController;
import org.telegram.android.NotificationCenter; import org.telegram.android.NotificationCenter;
import org.telegram.messenger.R; import org.telegram.messenger.R;
import org.telegram.ui.Cells.UserCell; import org.telegram.ui.Cells.UserCell;
import org.telegram.ui.Views.ActionBar.ActionBarLayer; import org.telegram.ui.Views.ActionBar.ActionBar;
import org.telegram.ui.Views.ActionBar.ActionBarMenu; import org.telegram.ui.Views.ActionBar.ActionBarMenu;
import org.telegram.ui.Views.AvatarDrawable; import org.telegram.ui.Views.AvatarDrawable;
import org.telegram.ui.Views.AvatarUpdater; import org.telegram.ui.Views.AvatarUpdater;
...@@ -123,15 +123,15 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati ...@@ -123,15 +123,15 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati
@Override @Override
public View createView(LayoutInflater inflater, ViewGroup container) { public View createView(LayoutInflater inflater, ViewGroup container) {
if (fragmentView == null) { if (fragmentView == null) {
actionBarLayer.setBackButtonImage(R.drawable.ic_ab_back); actionBar.setBackButtonImage(R.drawable.ic_ab_back);
actionBarLayer.setBackOverlay(R.layout.updating_state_layout); actionBar.setBackOverlay(R.layout.updating_state_layout);
if (isBroadcast) { if (isBroadcast) {
actionBarLayer.setTitle(LocaleController.getString("NewBroadcastList", R.string.NewBroadcastList)); actionBar.setTitle(LocaleController.getString("NewBroadcastList", R.string.NewBroadcastList));
} else { } else {
actionBarLayer.setTitle(LocaleController.getString("NewGroup", R.string.NewGroup)); actionBar.setTitle(LocaleController.getString("NewGroup", R.string.NewGroup));
} }
actionBarLayer.setActionBarMenuOnItemClick(new ActionBarLayer.ActionBarMenuOnItemClick() { actionBar.setActionBarMenuOnItemClick(new ActionBar.ActionBarMenuOnItemClick() {
@Override @Override
public void onItemClick(int id) { public void onItemClick(int id) {
if (id == -1) { if (id == -1) {
...@@ -177,7 +177,7 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati ...@@ -177,7 +177,7 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati
} }
}); });
ActionBarMenu menu = actionBarLayer.createMenu(); ActionBarMenu menu = actionBar.createMenu();
View doneItem = menu.addItemResource(done_button, R.layout.group_create_done_layout); View doneItem = menu.addItemResource(done_button, R.layout.group_create_done_layout);
TextView doneTextView = (TextView)doneItem.findViewById(R.id.done_button); TextView doneTextView = (TextView)doneItem.findViewById(R.id.done_button);
......
TMessagesProj/src/main/java/org/telegram/ui/IdenticonActivity.java
View file @ ca46b69b
...@@ -26,7 +26,7 @@ import org.telegram.android.LocaleController; ...@@ -26,7 +26,7 @@ import org.telegram.android.LocaleController;
import org.telegram.messenger.TLRPC; import org.telegram.messenger.TLRPC;
import org.telegram.android.MessagesController; import org.telegram.android.MessagesController;
import org.telegram.messenger.R; import org.telegram.messenger.R;
import org.telegram.ui.Views.ActionBar.ActionBarLayer; import org.telegram.ui.Views.ActionBar.ActionBar;
import org.telegram.ui.Views.ActionBar.BaseFragment; import org.telegram.ui.Views.ActionBar.BaseFragment;
import org.telegram.ui.Views.IdenticonDrawable; import org.telegram.ui.Views.IdenticonDrawable;
...@@ -46,12 +46,12 @@ public class IdenticonActivity extends BaseFragment { ...@@ -46,12 +46,12 @@ public class IdenticonActivity extends BaseFragment {
@Override @Override
public View createView(LayoutInflater inflater, ViewGroup container) { public View createView(LayoutInflater inflater, ViewGroup container) {
if (fragmentView == null) { if (fragmentView == null) {
actionBarLayer.setBackButtonImage(R.drawable.ic_ab_back); actionBar.setBackButtonImage(R.drawable.ic_ab_back);
actionBarLayer.setBackOverlay(R.layout.updating_state_layout); actionBar.setBackOverlay(R.layout.updating_state_layout);
actionBarLayer.setTitle(LocaleController.getString("EncryptionKey", R.string.EncryptionKey)); actionBar.setTitle(LocaleController.getString("EncryptionKey", R.string.EncryptionKey));
actionBarLayer.setTitleIcon(R.drawable.ic_lock_white, AndroidUtilities.dp(4)); actionBar.setTitleIcon(R.drawable.ic_lock_white, AndroidUtilities.dp(4));
actionBarLayer.setActionBarMenuOnItemClick(new ActionBarLayer.ActionBarMenuOnItemClick() { actionBar.setActionBarMenuOnItemClick(new ActionBar.ActionBarMenuOnItemClick() {
@Override @Override
public void onItemClick(int id) { public void onItemClick(int id) {
if (id == -1) { if (id == -1) {
......
TMessagesProj/src/main/java/org/telegram/ui/LanguageSelectActivity.java
View file @ ca46b69b
...@@ -27,7 +27,7 @@ import org.telegram.android.LocaleController; ...@@ -27,7 +27,7 @@ import org.telegram.android.LocaleController;
import org.telegram.messenger.R; import org.telegram.messenger.R;
import org.telegram.messenger.Utilities; import org.telegram.messenger.Utilities;
import org.telegram.ui.Adapters.BaseFragmentAdapter; import org.telegram.ui.Adapters.BaseFragmentAdapter;
import org.telegram.ui.Views.ActionBar.ActionBarLayer; import org.telegram.ui.Views.ActionBar.ActionBar;
import org.telegram.ui.Views.ActionBar.ActionBarMenu; import org.telegram.ui.Views.ActionBar.ActionBarMenu;
import org.telegram.ui.Views.ActionBar.ActionBarMenuItem; import org.telegram.ui.Views.ActionBar.ActionBarMenuItem;
import org.telegram.ui.Views.ActionBar.BaseFragment; import org.telegram.ui.Views.ActionBar.BaseFragment;
...@@ -50,11 +50,11 @@ public class LanguageSelectActivity extends BaseFragment { ...@@ -50,11 +50,11 @@ public class LanguageSelectActivity extends BaseFragment {
@Override @Override
public View createView(LayoutInflater inflater, ViewGroup container) { public View createView(LayoutInflater inflater, ViewGroup container) {
if (fragmentView == null) { if (fragmentView == null) {
actionBarLayer.setBackButtonImage(R.drawable.ic_ab_back); actionBar.setBackButtonImage(R.drawable.ic_ab_back);
actionBarLayer.setBackOverlay(R.layout.updating_state_layout); actionBar.setBackOverlay(R.layout.updating_state_layout);
actionBarLayer.setTitle(LocaleController.getString("Language", R.string.Language)); actionBar.setTitle(LocaleController.getString("Language", R.string.Language));
actionBarLayer.setActionBarMenuOnItemClick(new ActionBarLayer.ActionBarMenuOnItemClick() { actionBar.setActionBarMenuOnItemClick(new ActionBar.ActionBarMenuOnItemClick() {
@Override @Override
public void onItemClick(int id) { public void onItemClick(int id) {
if (id == -1) { if (id == -1) {
...@@ -63,7 +63,7 @@ public class LanguageSelectActivity extends BaseFragment { ...@@ -63,7 +63,7 @@ public class LanguageSelectActivity extends BaseFragment {
} }
}); });
ActionBarMenu menu = actionBarLayer.createMenu(); ActionBarMenu menu = actionBar.createMenu();
menu.addItem(0, R.drawable.ic_ab_search).setIsSearchField(true).setActionBarMenuItemSearchListener(new ActionBarMenuItem.ActionBarMenuItemSearchListener() { menu.addItem(0, R.drawable.ic_ab_search).setIsSearchField(true).setActionBarMenuItemSearchListener(new ActionBarMenuItem.ActionBarMenuItemSearchListener() {
@Override @Override
public void onSearchExpand() { public void onSearchExpand() {
......
TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java
View file @ ca46b69b
...@@ -240,7 +240,6 @@ public class LaunchActivity extends Activity implements ActionBarLayout.ActionBa ...@@ -240,7 +240,6 @@ public class LaunchActivity extends Activity implements ActionBarLayout.ActionBa
}); });
} else { } else {
drawerLayoutContainer = new DrawerLayoutContainer(this); drawerLayoutContainer = new DrawerLayoutContainer(this);
drawerLayoutContainer.setStatusBarColor(0xff54759e);
drawerLayoutContainer.addView(actionBarLayout, new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)); drawerLayoutContainer.addView(actionBarLayout, new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
ListView listView = new ListView(this); ListView listView = new ListView(this);
...@@ -933,7 +932,7 @@ public class LaunchActivity extends Activity implements ActionBarLayout.ActionBa ...@@ -933,7 +932,7 @@ public class LaunchActivity extends Activity implements ActionBarLayout.ActionBa
Utilities.checkForUpdates(this); Utilities.checkForUpdates(this);
ApplicationLoader.mainInterfacePaused = false; ApplicationLoader.mainInterfacePaused = false;
ConnectionsManager.getInstance().setAppPaused(false, false); ConnectionsManager.getInstance().setAppPaused(false, false);
actionBarLayout.getActionBar().setBackOverlayVisible(currentConnectionState != 0); //actionBarLayout.getActionBar().setBackOverlayVisible(currentConnectionState != 0);
} }
@Override @Override
...@@ -974,7 +973,7 @@ public class LaunchActivity extends Activity implements ActionBarLayout.ActionBa ...@@ -974,7 +973,7 @@ public class LaunchActivity extends Activity implements ActionBarLayout.ActionBa
if (currentConnectionState != state) { if (currentConnectionState != state) {
FileLog.e("tmessages", "switch to state " + state); FileLog.e("tmessages", "switch to state " + state);
currentConnectionState = state; currentConnectionState = state;
actionBarLayout.getActionBar().setBackOverlayVisible(currentConnectionState != 0); //actionBarLayout.getActionBar().setBackOverlayVisible(currentConnectionState != 0);
} }
} }
} }
......
TMessagesProj/src/main/java/org/telegram/ui/LocationActivity.java
View file @ ca46b69b
...@@ -35,7 +35,7 @@ import org.telegram.android.MessageObject; ...@@ -35,7 +35,7 @@ import org.telegram.android.MessageObject;
import org.telegram.android.MessagesController; import org.telegram.android.MessagesController;
import org.telegram.android.NotificationCenter; import org.telegram.android.NotificationCenter;
import org.telegram.messenger.R; import org.telegram.messenger.R;
import org.telegram.ui.Views.ActionBar.ActionBarLayer; import org.telegram.ui.Views.ActionBar.ActionBar;
import org.telegram.ui.Views.ActionBar.ActionBarMenu; import org.telegram.ui.Views.ActionBar.ActionBarMenu;
import org.telegram.ui.Views.ActionBar.ActionBarMenuItem; import org.telegram.ui.Views.ActionBar.ActionBarMenuItem;
import org.telegram.ui.Views.AvatarDrawable; import org.telegram.ui.Views.AvatarDrawable;
...@@ -91,15 +91,15 @@ public class LocationActivity extends BaseFragment implements NotificationCenter ...@@ -91,15 +91,15 @@ public class LocationActivity extends BaseFragment implements NotificationCenter
@Override @Override
public View createView(LayoutInflater inflater, ViewGroup container) { public View createView(LayoutInflater inflater, ViewGroup container) {
if (fragmentView == null) { if (fragmentView == null) {
actionBarLayer.setBackButtonImage(R.drawable.ic_ab_back); actionBar.setBackButtonImage(R.drawable.ic_ab_back);
actionBarLayer.setBackOverlay(R.layout.updating_state_layout); actionBar.setBackOverlay(R.layout.updating_state_layout);
if (messageObject != null) { if (messageObject != null) {
actionBarLayer.setTitle(LocaleController.getString("ChatLocation", R.string.ChatLocation)); actionBar.setTitle(LocaleController.getString("ChatLocation", R.string.ChatLocation));
} else { } else {
actionBarLayer.setTitle(LocaleController.getString("ShareLocation", R.string.ShareLocation)); actionBar.setTitle(LocaleController.getString("ShareLocation", R.string.ShareLocation));
} }
actionBarLayer.setActionBarMenuOnItemClick(new ActionBarLayer.ActionBarMenuOnItemClick() { actionBar.setActionBarMenuOnItemClick(new ActionBar.ActionBarMenuOnItemClick() {
@Override @Override
public void onItemClick(int id) { public void onItemClick(int id) {
if (id == -1) { if (id == -1) {
...@@ -128,7 +128,7 @@ public class LocationActivity extends BaseFragment implements NotificationCenter ...@@ -128,7 +128,7 @@ public class LocationActivity extends BaseFragment implements NotificationCenter
} }
}); });
ActionBarMenu menu = actionBarLayer.createMenu(); ActionBarMenu menu = actionBar.createMenu();
menu.addItem(map_to_my_location, R.drawable.ic_ab_location); menu.addItem(map_to_my_location, R.drawable.ic_ab_location);
ActionBarMenuItem item = menu.addItem(0, R.drawable.ic_ab_other); ActionBarMenuItem item = menu.addItem(0, R.drawable.ic_ab_other);
......
TMessagesProj/src/main/java/org/telegram/ui/LoginActivity.java
View file @ ca46b69b
...@@ -27,7 +27,7 @@ import org.telegram.android.AndroidUtilities; ...@@ -27,7 +27,7 @@ import org.telegram.android.AndroidUtilities;
import org.telegram.messenger.FileLog; import org.telegram.messenger.FileLog;
import org.telegram.android.LocaleController; import org.telegram.android.LocaleController;
import org.telegram.messenger.R; import org.telegram.messenger.R;
import org.telegram.ui.Views.ActionBar.ActionBarLayer; import org.telegram.ui.Views.ActionBar.ActionBar;
import org.telegram.ui.Views.ActionBar.ActionBarMenu; import org.telegram.ui.Views.ActionBar.ActionBarMenu;
import org.telegram.ui.Views.ActionBar.BaseFragment; import org.telegram.ui.Views.ActionBar.BaseFragment;
import org.telegram.ui.Views.SlideView; import org.telegram.ui.Views.SlideView;
...@@ -68,9 +68,9 @@ public class LoginActivity extends BaseFragment implements SlideView.SlideViewDe ...@@ -68,9 +68,9 @@ public class LoginActivity extends BaseFragment implements SlideView.SlideViewDe
@Override @Override
public View createView(LayoutInflater inflater, ViewGroup container) { public View createView(LayoutInflater inflater, ViewGroup container) {
if (fragmentView == null) { if (fragmentView == null) {
actionBarLayer.setTitle(LocaleController.getString("AppName", R.string.AppName)); actionBar.setTitle(LocaleController.getString("AppName", R.string.AppName));
actionBarLayer.setActionBarMenuOnItemClick(new ActionBarLayer.ActionBarMenuOnItemClick() { actionBar.setActionBarMenuOnItemClick(new ActionBar.ActionBarMenuOnItemClick() {
@Override @Override
public void onItemClick(int id) { public void onItemClick(int id) {
if (id == done_button) { if (id == done_button) {
...@@ -79,7 +79,7 @@ public class LoginActivity extends BaseFragment implements SlideView.SlideViewDe ...@@ -79,7 +79,7 @@ public class LoginActivity extends BaseFragment implements SlideView.SlideViewDe
} }
}); });
ActionBarMenu menu = actionBarLayer.createMenu(); ActionBarMenu menu = actionBar.createMenu();
View doneItem = menu.addItemResource(done_button, R.layout.group_create_done_layout); View doneItem = menu.addItemResource(done_button, R.layout.group_create_done_layout);
TextView doneTextView = (TextView)doneItem.findViewById(R.id.done_button); TextView doneTextView = (TextView)doneItem.findViewById(R.id.done_button);
doneTextView.setText(LocaleController.getString("Done", R.string.Done).toUpperCase()); doneTextView.setText(LocaleController.getString("Done", R.string.Done).toUpperCase());
...@@ -103,7 +103,7 @@ public class LoginActivity extends BaseFragment implements SlideView.SlideViewDe ...@@ -103,7 +103,7 @@ public class LoginActivity extends BaseFragment implements SlideView.SlideViewDe
FileLog.e("tmessages", e); FileLog.e("tmessages", e);
} }
actionBarLayer.setTitle(views[0].getHeaderName()); actionBar.setTitle(views[0].getHeaderName());
Bundle savedInstanceState = loadCurrentState(); Bundle savedInstanceState = loadCurrentState();
if (savedInstanceState != null) { if (savedInstanceState != null) {
...@@ -283,7 +283,7 @@ public class LoginActivity extends BaseFragment implements SlideView.SlideViewDe ...@@ -283,7 +283,7 @@ public class LoginActivity extends BaseFragment implements SlideView.SlideViewDe
currentViewNum = page; currentViewNum = page;
newView.setParams(params); newView.setParams(params);
actionBarLayer.setTitle(newView.getHeaderName()); actionBar.setTitle(newView.getHeaderName());
newView.onShow(); newView.onShow();
newView.setX(back ? -AndroidUtilities.displaySize.x : AndroidUtilities.displaySize.x); newView.setX(back ? -AndroidUtilities.displaySize.x : AndroidUtilities.displaySize.x);
outView.animate().setInterpolator(new AccelerateDecelerateInterpolator()).setListener(new Animator.AnimatorListener() { outView.animate().setInterpolator(new AccelerateDecelerateInterpolator()).setListener(new Animator.AnimatorListener() {
...@@ -328,7 +328,7 @@ public class LoginActivity extends BaseFragment implements SlideView.SlideViewDe ...@@ -328,7 +328,7 @@ public class LoginActivity extends BaseFragment implements SlideView.SlideViewDe
currentViewNum = page; currentViewNum = page;
views[page].setParams(params); views[page].setParams(params);
views[page].setVisibility(View.VISIBLE); views[page].setVisibility(View.VISIBLE);
actionBarLayer.setTitle(views[page].getHeaderName()); actionBar.setTitle(views[page].getHeaderName());
views[page].onShow(); views[page].onShow();
} }
} }
......
TMessagesProj/src/main/java/org/telegram/ui/MediaActivity.java
View file @ ca46b69b
...@@ -33,7 +33,7 @@ import org.telegram.android.MessagesController; ...@@ -33,7 +33,7 @@ import org.telegram.android.MessagesController;
import org.telegram.android.NotificationCenter; import org.telegram.android.NotificationCenter;
import org.telegram.messenger.R; import org.telegram.messenger.R;
import org.telegram.ui.Adapters.BaseFragmentAdapter; import org.telegram.ui.Adapters.BaseFragmentAdapter;
import org.telegram.ui.Views.ActionBar.ActionBarLayer; import org.telegram.ui.Views.ActionBar.ActionBar;
import org.telegram.ui.Views.BackupImageView; import org.telegram.ui.Views.BackupImageView;
import org.telegram.ui.Views.ActionBar.BaseFragment; import org.telegram.ui.Views.ActionBar.BaseFragment;
...@@ -87,10 +87,10 @@ public class MediaActivity extends BaseFragment implements NotificationCenter.No ...@@ -87,10 +87,10 @@ public class MediaActivity extends BaseFragment implements NotificationCenter.No
@Override @Override
public View createView(LayoutInflater inflater, ViewGroup container) { public View createView(LayoutInflater inflater, ViewGroup container) {
if (fragmentView == null) { if (fragmentView == null) {
actionBarLayer.setBackButtonImage(R.drawable.ic_ab_back); actionBar.setBackButtonImage(R.drawable.ic_ab_back);
actionBarLayer.setBackOverlay(R.layout.updating_state_layout); actionBar.setBackOverlay(R.layout.updating_state_layout);
actionBarLayer.setTitle(LocaleController.getString("SharedMedia", R.string.SharedMedia)); actionBar.setTitle(LocaleController.getString("SharedMedia", R.string.SharedMedia));
actionBarLayer.setActionBarMenuOnItemClick(new ActionBarLayer.ActionBarMenuOnItemClick() { actionBar.setActionBarMenuOnItemClick(new ActionBar.ActionBarMenuOnItemClick() {
@Override @Override
public void onItemClick(int id) { public void onItemClick(int id) {
if (id == -1) { if (id == -1) {
...@@ -259,9 +259,6 @@ public class MediaActivity extends BaseFragment implements NotificationCenter.No ...@@ -259,9 +259,6 @@ public class MediaActivity extends BaseFragment implements NotificationCenter.No
@Override @Override
public void onResume() { public void onResume() {
super.onResume(); super.onResume();
if (parentLayout != null) {
parentLayout.getDrawerLayoutContainer().setStatusBarColor(0xff54759e);
}
if (listAdapter != null) { if (listAdapter != null) {
listAdapter.notifyDataSetChanged(); listAdapter.notifyDataSetChanged();
} }
......
TMessagesProj/src/main/java/org/telegram/ui/MessagesActivity.java
View file @ ca46b69b
...@@ -46,7 +46,7 @@ import org.telegram.ui.AnimationCompat.ObjectAnimatorProxy; ...@@ -46,7 +46,7 @@ import org.telegram.ui.AnimationCompat.ObjectAnimatorProxy;
import org.telegram.ui.AnimationCompat.ViewProxy; import org.telegram.ui.AnimationCompat.ViewProxy;
import org.telegram.ui.Cells.UserCell; import org.telegram.ui.Cells.UserCell;
import org.telegram.ui.Cells.DialogCell; import org.telegram.ui.Cells.DialogCell;
import org.telegram.ui.Views.ActionBar.ActionBarLayer; import org.telegram.ui.Views.ActionBar.ActionBar;
import org.telegram.ui.Views.ActionBar.ActionBarMenu; import org.telegram.ui.Views.ActionBar.ActionBarMenu;
import org.telegram.ui.Views.ActionBar.ActionBarMenuItem; import org.telegram.ui.Views.ActionBar.ActionBarMenuItem;
import org.telegram.ui.Views.ActionBar.BaseFragment; import org.telegram.ui.Views.ActionBar.BaseFragment;
...@@ -129,7 +129,7 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter ...@@ -129,7 +129,7 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter
@Override @Override
public View createView(LayoutInflater inflater, ViewGroup container) { public View createView(LayoutInflater inflater, ViewGroup container) {
if (fragmentView == null) { if (fragmentView == null) {
ActionBarMenu menu = actionBarLayer.createMenu(); ActionBarMenu menu = actionBar.createMenu();
menu.addItem(0, R.drawable.ic_ab_search).setIsSearchField(true).setActionBarMenuItemSearchListener(new ActionBarMenuItem.ActionBarMenuItemSearchListener() { menu.addItem(0, R.drawable.ic_ab_search).setIsSearchField(true).setActionBarMenuItemSearchListener(new ActionBarMenuItem.ActionBarMenuItemSearchListener() {
@Override @Override
public void onSearchExpand() { public void onSearchExpand() {
...@@ -189,15 +189,15 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter ...@@ -189,15 +189,15 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter
} }
}); });
if (onlySelect) { if (onlySelect) {
actionBarLayer.setBackButtonImage(R.drawable.ic_ab_back); actionBar.setBackButtonImage(R.drawable.ic_ab_back);
actionBarLayer.setTitle(LocaleController.getString("SelectChat", R.string.SelectChat)); actionBar.setTitle(LocaleController.getString("SelectChat", R.string.SelectChat));
} else { } else {
actionBarLayer.setBackButtonDrawable(new MenuDrawable()); actionBar.setBackButtonDrawable(new MenuDrawable());
actionBarLayer.setTitle(LocaleController.getString("AppName", R.string.AppName)); actionBar.setTitle(LocaleController.getString("AppName", R.string.AppName));
} }
actionBarLayer.setBackOverlay(R.layout.updating_state_layout); actionBar.setBackOverlay(R.layout.updating_state_layout);
actionBarLayer.setActionBarMenuOnItemClick(new ActionBarLayer.ActionBarMenuOnItemClick() { actionBar.setActionBarMenuOnItemClick(new ActionBar.ActionBarMenuOnItemClick() {
@Override @Override
public void onItemClick(int id) { public void onItemClick(int id) {
if (id == -1) { if (id == -1) {
...@@ -357,9 +357,9 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter ...@@ -357,9 +357,9 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter
return; return;
} }
messagesActivityAdapter.setOpenedDialogId(openedDialogId = dialog_id); messagesActivityAdapter.setOpenedDialogId(openedDialogId = dialog_id);
updateVisibleRows(MessagesController.UPDATE_MASK_SELECT_DIALOG);
} }
presentFragment(new ChatActivity(args)); presentFragment(new ChatActivity(args));
updateVisibleRows(0);
} }
} }
}); });
...@@ -501,7 +501,6 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter ...@@ -501,7 +501,6 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter
@Override @Override
public void onResume() { public void onResume() {
super.onResume(); super.onResume();
showActionBar();
if (messagesActivityAdapter != null) { if (messagesActivityAdapter != null) {
messagesActivityAdapter.notifyDataSetChanged(); messagesActivityAdapter.notifyDataSetChanged();
} }
...@@ -579,7 +578,7 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter ...@@ -579,7 +578,7 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter
openedDialogId = dialog_id; openedDialogId = dialog_id;
} }
messagesActivityAdapter.setOpenedDialogId(openedDialogId); messagesActivityAdapter.setOpenedDialogId(openedDialogId);
updateVisibleRows(0); updateVisibleRows(MessagesController.UPDATE_MASK_SELECT_DIALOG);
} }
} }
} }
...@@ -603,14 +602,17 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter ...@@ -603,14 +602,17 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter
View child = messagesListView.getChildAt(a); View child = messagesListView.getChildAt(a);
if (child instanceof DialogCell) { if (child instanceof DialogCell) {
DialogCell cell = (DialogCell) child; DialogCell cell = (DialogCell) child;
if (!serverOnly && AndroidUtilities.isTablet()) { if ((mask & MessagesController.UPDATE_MASK_SELECT_DIALOG) != 0) {
if (cell.getDialogId() == openedDialogId) { if (!serverOnly && AndroidUtilities.isTablet()) {
child.setBackgroundColor(0x0f000000); if (cell.getDialogId() == openedDialogId) {
} else { child.setBackgroundColor(0x0f000000);
child.setBackgroundColor(0); } else {
child.setBackgroundColor(0);
}
} }
} else {
cell.update(mask);
} }
cell.update(mask);
} else if (child instanceof UserCell) { } else if (child instanceof UserCell) {
((UserCell) child).update(mask); ((UserCell) child).update(mask);
} }
......
TMessagesProj/src/main/java/org/telegram/ui/PhotoCropActivity.java
View file @ ca46b69b
...@@ -328,15 +328,15 @@ public class PhotoCropActivity extends BaseFragment { ...@@ -328,15 +328,15 @@ public class PhotoCropActivity extends BaseFragment {
@Override @Override
public View createView(LayoutInflater inflater, ViewGroup container) { public View createView(LayoutInflater inflater, ViewGroup container) {
if (fragmentView == null) { if (fragmentView == null) {
actionBarLayer.setCustomView(R.layout.settings_do_action_layout); actionBar.setCustomView(R.layout.settings_do_action_layout);
Button cancelButton = (Button)actionBarLayer.findViewById(R.id.cancel_button); Button cancelButton = (Button) actionBar.findViewById(R.id.cancel_button);
cancelButton.setOnClickListener(new View.OnClickListener() { cancelButton.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
finishFragment(); finishFragment();
} }
}); });
View doneButton = actionBarLayer.findViewById(R.id.done_button); View doneButton = actionBar.findViewById(R.id.done_button);
doneButton.setOnClickListener(new View.OnClickListener() { doneButton.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
......
TMessagesProj/src/main/java/org/telegram/ui/PhotoPickerActivity.java
View file @ ca46b69b
...@@ -32,7 +32,7 @@ import org.telegram.messenger.R; ...@@ -32,7 +32,7 @@ import org.telegram.messenger.R;
import org.telegram.messenger.TLRPC; import org.telegram.messenger.TLRPC;
import org.telegram.android.MessageObject; import org.telegram.android.MessageObject;
import org.telegram.ui.Adapters.BaseFragmentAdapter; import org.telegram.ui.Adapters.BaseFragmentAdapter;
import org.telegram.ui.Views.ActionBar.ActionBarLayer; import org.telegram.ui.Views.ActionBar.ActionBar;
import org.telegram.ui.Views.ActionBar.ActionBarMenu; import org.telegram.ui.Views.ActionBar.ActionBarMenu;
import org.telegram.ui.Views.ActionBar.BaseFragment; import org.telegram.ui.Views.ActionBar.BaseFragment;
import org.telegram.ui.Views.BackupImageView; import org.telegram.ui.Views.BackupImageView;
...@@ -84,17 +84,17 @@ public class PhotoPickerActivity extends BaseFragment implements NotificationCen ...@@ -84,17 +84,17 @@ public class PhotoPickerActivity extends BaseFragment implements NotificationCen
@Override @Override
public View createView(LayoutInflater inflater, ViewGroup container) { public View createView(LayoutInflater inflater, ViewGroup container) {
if (fragmentView == null) { if (fragmentView == null) {
actionBarLayer.setBackgroundColor(0xff333333); actionBar.setBackgroundColor(0xff333333);
actionBarLayer.setItemsBackground(R.drawable.bar_selector_picker); actionBar.setItemsBackground(R.drawable.bar_selector_picker);
actionBarLayer.setBackButtonImage(R.drawable.ic_ab_back); actionBar.setBackButtonImage(R.drawable.ic_ab_back);
actionBarLayer.setTitle(LocaleController.getString("Gallery", R.string.Gallery)); actionBar.setTitle(LocaleController.getString("Gallery", R.string.Gallery));
actionBarLayer.setActionBarMenuOnItemClick(new ActionBarLayer.ActionBarMenuOnItemClick() { actionBar.setActionBarMenuOnItemClick(new ActionBar.ActionBarMenuOnItemClick() {
@Override @Override
public void onItemClick(int id) { public void onItemClick(int id) {
if (id == -1) { if (id == -1) {
if (selectedAlbum != null) { if (selectedAlbum != null) {
selectedAlbum = null; selectedAlbum = null;
actionBarLayer.setTitle(LocaleController.getString("Gallery", R.string.Gallery)); actionBar.setTitle(LocaleController.getString("Gallery", R.string.Gallery));
fixLayoutInternal(); fixLayoutInternal();
} else { } else {
if (Build.VERSION.SDK_INT < 11) { if (Build.VERSION.SDK_INT < 11) {
...@@ -113,7 +113,7 @@ public class PhotoPickerActivity extends BaseFragment implements NotificationCen ...@@ -113,7 +113,7 @@ public class PhotoPickerActivity extends BaseFragment implements NotificationCen
} }
}); });
ActionBarMenu menu = actionBarLayer.createMenu(); ActionBarMenu menu = actionBar.createMenu();
menu.addItem(1, R.drawable.ic_ab_other); menu.addItem(1, R.drawable.ic_ab_other);
fragmentView = inflater.inflate(R.layout.photo_picker_layout, container, false); fragmentView = inflater.inflate(R.layout.photo_picker_layout, container, false);
...@@ -158,7 +158,7 @@ public class PhotoPickerActivity extends BaseFragment implements NotificationCen ...@@ -158,7 +158,7 @@ public class PhotoPickerActivity extends BaseFragment implements NotificationCen
return; return;
} }
selectedAlbum = albumsSorted.get(i); selectedAlbum = albumsSorted.get(i);
actionBarLayer.setTitle(selectedAlbum.bucketName); actionBar.setTitle(selectedAlbum.bucketName);
fixLayoutInternal(); fixLayoutInternal();
} else { } else {
if (i < 0 || i >= selectedAlbum.photos.size()) { if (i < 0 || i >= selectedAlbum.photos.size()) {
...@@ -231,7 +231,7 @@ public class PhotoPickerActivity extends BaseFragment implements NotificationCen ...@@ -231,7 +231,7 @@ public class PhotoPickerActivity extends BaseFragment implements NotificationCen
public boolean onBackPressed() { public boolean onBackPressed() {
if (selectedAlbum != null) { if (selectedAlbum != null) {
selectedAlbum = null; selectedAlbum = null;
actionBarLayer.setTitle(LocaleController.getString("Gallery", R.string.Gallery)); actionBar.setTitle(LocaleController.getString("Gallery", R.string.Gallery));
fixLayoutInternal(); fixLayoutInternal();
return false; return false;
} }
......
TMessagesProj/src/main/java/org/telegram/ui/PhotoViewer.java
View file @ ca46b69b
...@@ -64,7 +64,6 @@ import org.telegram.ui.AnimationCompat.AnimatorSetProxy; ...@@ -64,7 +64,6 @@ import org.telegram.ui.AnimationCompat.AnimatorSetProxy;
import org.telegram.ui.AnimationCompat.ObjectAnimatorProxy; import org.telegram.ui.AnimationCompat.ObjectAnimatorProxy;
import org.telegram.ui.AnimationCompat.ViewProxy; import org.telegram.ui.AnimationCompat.ViewProxy;
import org.telegram.ui.Views.ActionBar.ActionBar; import org.telegram.ui.Views.ActionBar.ActionBar;
import org.telegram.ui.Views.ActionBar.ActionBarLayer;
import org.telegram.ui.Views.ActionBar.ActionBarMenu; import org.telegram.ui.Views.ActionBar.ActionBarMenu;
import org.telegram.ui.Views.ActionBar.ActionBarMenuItem; import org.telegram.ui.Views.ActionBar.ActionBarMenuItem;
import org.telegram.ui.Views.ClippingImageView; import org.telegram.ui.Views.ClippingImageView;
...@@ -84,7 +83,6 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat ...@@ -84,7 +83,6 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat
private Activity parentActivity; private Activity parentActivity;
private ActionBar actionBar; private ActionBar actionBar;
private ActionBarLayer actionBarLayer;
private boolean isActionBarVisible = true; private boolean isActionBarVisible = true;
private static Drawable[] progressDrawables = null; private static Drawable[] progressDrawables = null;
...@@ -484,7 +482,7 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat ...@@ -484,7 +482,7 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat
loadingMoreImages = true; loadingMoreImages = true;
MessagesController.getInstance().loadMedia(currentDialogId, 0, 100, 0, true, classGuid); MessagesController.getInstance().loadMedia(currentDialogId, 0, 100, 0, true, classGuid);
} else if (!imagesArr.isEmpty()) { } else if (!imagesArr.isEmpty()) {
actionBarLayer.setTitle(LocaleController.formatString("Of", R.string.Of, (totalImagesCount - imagesArr.size()) + currentIndex + 1, totalImagesCount)); actionBar.setTitle(LocaleController.formatString("Of", R.string.Of, (totalImagesCount - imagesArr.size()) + currentIndex + 1, totalImagesCount));
} }
} }
} else if (id == NotificationCenter.mediaDidLoaded) { } else if (id == NotificationCenter.mediaDidLoaded) {
...@@ -603,18 +601,16 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat ...@@ -603,18 +601,16 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat
windowLayoutParams.flags = WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE; windowLayoutParams.flags = WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;
actionBar = new ActionBar(activity); actionBar = new ActionBar(activity);
containerView.addView(actionBar);
actionBar.setBackgroundColor(0x7F000000); actionBar.setBackgroundColor(0x7F000000);
layoutParams = (FrameLayout.LayoutParams)actionBar.getLayoutParams(); actionBar.setItemsBackground(R.drawable.bar_selector_white);
actionBar.setBackButtonImage(R.drawable.ic_ab_back);
actionBar.setTitle(LocaleController.formatString("Of", R.string.Of, 1, 1));
containerView.addView(actionBar);
layoutParams = (FrameLayout.LayoutParams) actionBar.getLayoutParams();
layoutParams.width = FrameLayout.LayoutParams.MATCH_PARENT; layoutParams.width = FrameLayout.LayoutParams.MATCH_PARENT;
actionBar.setLayoutParams(layoutParams); actionBar.setLayoutParams(layoutParams);
actionBarLayer = actionBar.createLayer();
actionBarLayer.setItemsBackground(R.drawable.bar_selector_white);
actionBarLayer.setBackButtonImage(R.drawable.ic_ab_back);
actionBarLayer.setTitle(LocaleController.formatString("Of", R.string.Of, 1, 1));
actionBar.setCurrentActionBarLayer(actionBarLayer);
actionBarLayer.setActionBarMenuOnItemClick(new ActionBarLayer.ActionBarMenuOnItemClick() { actionBar.setActionBarMenuOnItemClick(new ActionBar.ActionBarMenuOnItemClick() {
@Override @Override
public void onItemClick(int id) { public void onItemClick(int id) {
if (id == -1) { if (id == -1) {
...@@ -692,7 +688,7 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat ...@@ -692,7 +688,7 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat
} }
}); });
ActionBarMenu menu = actionBarLayer.createMenu(); ActionBarMenu menu = actionBar.createMenu();
menuItem = menu.addItem(0, R.drawable.ic_ab_other); menuItem = menu.addItem(0, R.drawable.ic_ab_other);
menuItem.addSubItem(gallery_menu_save, LocaleController.getString("SaveToGallery", R.string.SaveToGallery), 0); menuItem.addSubItem(gallery_menu_save, LocaleController.getString("SaveToGallery", R.string.SaveToGallery), 0);
menuItem.addSubItem(gallery_menu_showall, LocaleController.getString("ShowAllMedia", R.string.ShowAllMedia), 0); menuItem.addSubItem(gallery_menu_showall, LocaleController.getString("ShowAllMedia", R.string.ShowAllMedia), 0);
...@@ -953,7 +949,6 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat ...@@ -953,7 +949,6 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat
} }
isActionBarVisible = show; isActionBarVisible = show;
actionBar.setEnabled(show); actionBar.setEnabled(show);
actionBarLayer.setEnabled(show);
bottomLayout.setEnabled(show); bottomLayout.setEnabled(show);
if (animated) { if (animated) {
...@@ -1295,7 +1290,7 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat ...@@ -1295,7 +1290,7 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat
MessagesController.getInstance().loadMedia(currentDialogId, 0, 100, lastMessage.messageOwner.id, !cacheEndReached, classGuid); MessagesController.getInstance().loadMedia(currentDialogId, 0, 100, lastMessage.messageOwner.id, !cacheEndReached, classGuid);
loadingMoreImages = true; loadingMoreImages = true;
} }
actionBarLayer.setTitle(LocaleController.formatString("Of", R.string.Of, (totalImagesCount - imagesArr.size()) + currentIndex + 1, totalImagesCount)); actionBar.setTitle(LocaleController.formatString("Of", R.string.Of, (totalImagesCount - imagesArr.size()) + currentIndex + 1, totalImagesCount));
} }
if (currentMessageObject.messageOwner.ttl != 0) { if (currentMessageObject.messageOwner.ttl != 0) {
menuItem.hideSubItem(gallery_menu_save); menuItem.hideSubItem(gallery_menu_save);
...@@ -1317,12 +1312,12 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat ...@@ -1317,12 +1312,12 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat
if (old != null && currentFileLocation != null && old.local_id == currentFileLocation.local_id && old.volume_id == currentFileLocation.volume_id) { if (old != null && currentFileLocation != null && old.local_id == currentFileLocation.local_id && old.volume_id == currentFileLocation.volume_id) {
sameImage = true; sameImage = true;
} }
actionBarLayer.setTitle(LocaleController.formatString("Of", R.string.Of, currentIndex + 1, imagesArrLocations.size())); actionBar.setTitle(LocaleController.formatString("Of", R.string.Of, currentIndex + 1, imagesArrLocations.size()));
menuItem.showSubItem(gallery_menu_save); menuItem.showSubItem(gallery_menu_save);
shareButton.setVisibility(View.VISIBLE); shareButton.setVisibility(View.VISIBLE);
} else if (!imagesArrLocals.isEmpty()) { } else if (!imagesArrLocals.isEmpty()) {
currentPathObject = imagesArrLocals.get(index).path; currentPathObject = imagesArrLocals.get(index).path;
actionBarLayer.setTitle(LocaleController.formatString("Of", R.string.Of, currentIndex + 1, imagesArrLocals.size())); actionBar.setTitle(LocaleController.formatString("Of", R.string.Of, currentIndex + 1, imagesArrLocals.size()));
if (placeProvider.isPhotoChecked(currentIndex)) { if (placeProvider.isPhotoChecked(currentIndex)) {
checkImageView.setBackgroundColor(0xff42d1f6); checkImageView.setBackgroundColor(0xff42d1f6);
...@@ -1559,7 +1554,7 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat ...@@ -1559,7 +1554,7 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat
return; return;
} }
actionBarLayer.setTitle(LocaleController.formatString("Of", R.string.Of, 1, 1)); actionBar.setTitle(LocaleController.formatString("Of", R.string.Of, 1, 1));
NotificationCenter.getInstance().addObserver(this, NotificationCenter.FileDidFailedLoad); NotificationCenter.getInstance().addObserver(this, NotificationCenter.FileDidFailedLoad);
NotificationCenter.getInstance().addObserver(this, NotificationCenter.FileDidLoaded); NotificationCenter.getInstance().addObserver(this, NotificationCenter.FileDidLoaded);
NotificationCenter.getInstance().addObserver(this, NotificationCenter.FileLoadProgressChanged); NotificationCenter.getInstance().addObserver(this, NotificationCenter.FileLoadProgressChanged);
......
TMessagesProj/src/main/java/org/telegram/ui/PopupNotificationActivity.java
View file @ ca46b69b
...@@ -45,7 +45,6 @@ import org.telegram.messenger.TLRPC; ...@@ -45,7 +45,6 @@ import org.telegram.messenger.TLRPC;
import org.telegram.android.MessageObject; import org.telegram.android.MessageObject;
import org.telegram.android.PhotoObject; import org.telegram.android.PhotoObject;
import org.telegram.ui.Views.ActionBar.ActionBar; import org.telegram.ui.Views.ActionBar.ActionBar;
import org.telegram.ui.Views.ActionBar.ActionBarLayer;
import org.telegram.ui.Views.ActionBar.ActionBarMenu; import org.telegram.ui.Views.ActionBar.ActionBarMenu;
import org.telegram.ui.Views.AvatarDrawable; import org.telegram.ui.Views.AvatarDrawable;
import org.telegram.ui.Views.BackupImageView; import org.telegram.ui.Views.BackupImageView;
...@@ -59,7 +58,7 @@ import java.util.ArrayList; ...@@ -59,7 +58,7 @@ import java.util.ArrayList;
public class PopupNotificationActivity extends Activity implements NotificationCenter.NotificationCenterDelegate { public class PopupNotificationActivity extends Activity implements NotificationCenter.NotificationCenterDelegate {
private ActionBarLayer actionBarLayer; private ActionBar actionBar;
private ChatActivityEnterView chatActivityEnterView; private ChatActivityEnterView chatActivityEnterView;
private BackupImageView avatarImageView; private BackupImageView avatarImageView;
private TextView countText; private TextView countText;
...@@ -182,19 +181,16 @@ public class PopupNotificationActivity extends Activity implements NotificationC ...@@ -182,19 +181,16 @@ public class PopupNotificationActivity extends Activity implements NotificationC
messageContainer = new FrameLayoutTouch(this); messageContainer = new FrameLayoutTouch(this);
popupContainer.addView(messageContainer, 0); popupContainer.addView(messageContainer, 0);
ActionBar actionBar = new ActionBar(this); actionBar = new ActionBar(this);
actionBar.setBackButtonImage(R.drawable.ic_ab_back);
actionBar.setBackgroundResource(R.color.header);
actionBar.setItemsBackground(R.drawable.bar_selector);
popupContainer.addView(actionBar); popupContainer.addView(actionBar);
ViewGroup.LayoutParams layoutParams = actionBar.getLayoutParams(); ViewGroup.LayoutParams layoutParams = actionBar.getLayoutParams();
layoutParams.width = ViewGroup.LayoutParams.MATCH_PARENT; layoutParams.width = ViewGroup.LayoutParams.MATCH_PARENT;
actionBar.setLayoutParams(layoutParams); actionBar.setLayoutParams(layoutParams);
actionBarLayer = actionBar.createLayer(); ActionBarMenu menu = actionBar.createMenu();
actionBarLayer.setBackButtonImage(R.drawable.ic_ab_back);
actionBarLayer.setBackgroundResource(R.color.header);
actionBarLayer.setItemsBackground(R.drawable.bar_selector);
actionBar.setCurrentActionBarLayer(actionBarLayer);
ActionBarMenu menu = actionBarLayer.createMenu();
View view = menu.addItemResource(2, R.layout.popup_count_layout); View view = menu.addItemResource(2, R.layout.popup_count_layout);
countText = (TextView) view.findViewById(R.id.count_text); countText = (TextView) view.findViewById(R.id.count_text);
...@@ -202,7 +198,7 @@ public class PopupNotificationActivity extends Activity implements NotificationC ...@@ -202,7 +198,7 @@ public class PopupNotificationActivity extends Activity implements NotificationC
avatarImageView = (BackupImageView)view.findViewById(R.id.chat_avatar_image); avatarImageView = (BackupImageView)view.findViewById(R.id.chat_avatar_image);
avatarImageView.processDetach = false; avatarImageView.processDetach = false;
actionBarLayer.setActionBarMenuOnItemClick(new ActionBarLayer.ActionBarMenuOnItemClick() { actionBar.setActionBarMenuOnItemClick(new ActionBar.ActionBarMenuOnItemClick() {
@Override @Override
public void onItemClick(int id) { public void onItemClick(int id) {
if (id == -1) { if (id == -1) {
...@@ -715,7 +711,7 @@ public class PopupNotificationActivity extends Activity implements NotificationC ...@@ -715,7 +711,7 @@ public class PopupNotificationActivity extends Activity implements NotificationC
} }
private void updateInterfaceForCurrentMessage(int move) { private void updateInterfaceForCurrentMessage(int move) {
if (actionBarLayer == null) { if (actionBar == null) {
return; return;
} }
currentChat = null; currentChat = null;
...@@ -736,15 +732,15 @@ public class PopupNotificationActivity extends Activity implements NotificationC ...@@ -736,15 +732,15 @@ public class PopupNotificationActivity extends Activity implements NotificationC
} }
if (currentChat != null && currentUser != null) { if (currentChat != null && currentUser != null) {
actionBarLayer.setTitle(currentChat.title); actionBar.setTitle(currentChat.title);
actionBarLayer.setSubtitle(ContactsController.formatName(currentUser.first_name, currentUser.last_name)); actionBar.setSubtitle(ContactsController.formatName(currentUser.first_name, currentUser.last_name));
actionBarLayer.setTitleIcon(0, 0); actionBar.setTitleIcon(0, 0);
} else if (currentUser != null) { } else if (currentUser != null) {
actionBarLayer.setTitle(ContactsController.formatName(currentUser.first_name, currentUser.last_name)); actionBar.setTitle(ContactsController.formatName(currentUser.first_name, currentUser.last_name));
if ((int)dialog_id == 0) { if ((int)dialog_id == 0) {
actionBarLayer.setTitleIcon(R.drawable.ic_lock_white, AndroidUtilities.dp(4)); actionBar.setTitleIcon(R.drawable.ic_lock_white, AndroidUtilities.dp(4));
} else { } else {
actionBarLayer.setTitleIcon(0, 0); actionBar.setTitleIcon(0, 0);
} }
} }
...@@ -755,7 +751,7 @@ public class PopupNotificationActivity extends Activity implements NotificationC ...@@ -755,7 +751,7 @@ public class PopupNotificationActivity extends Activity implements NotificationC
} }
private void updateSubtitle() { private void updateSubtitle() {
if (actionBarLayer == null) { if (actionBar == null) {
return; return;
} }
if (currentChat != null || currentUser == null) { if (currentChat != null || currentUser == null) {
...@@ -763,12 +759,12 @@ public class PopupNotificationActivity extends Activity implements NotificationC ...@@ -763,12 +759,12 @@ public class PopupNotificationActivity extends Activity implements NotificationC
} }
if (currentUser.id / 1000 != 777 && currentUser.id / 1000 != 333 && ContactsController.getInstance().contactsDict.get(currentUser.id) == null && (ContactsController.getInstance().contactsDict.size() != 0 || !ContactsController.getInstance().isLoadingContacts())) { if (currentUser.id / 1000 != 777 && currentUser.id / 1000 != 333 && ContactsController.getInstance().contactsDict.get(currentUser.id) == null && (ContactsController.getInstance().contactsDict.size() != 0 || !ContactsController.getInstance().isLoadingContacts())) {
if (currentUser.phone != null && currentUser.phone.length() != 0) { if (currentUser.phone != null && currentUser.phone.length() != 0) {
actionBarLayer.setTitle(PhoneFormat.getInstance().format("+" + currentUser.phone)); actionBar.setTitle(PhoneFormat.getInstance().format("+" + currentUser.phone));
} else { } else {
actionBarLayer.setTitle(ContactsController.formatName(currentUser.first_name, currentUser.last_name)); actionBar.setTitle(ContactsController.formatName(currentUser.first_name, currentUser.last_name));
} }
} else { } else {
actionBarLayer.setTitle(ContactsController.formatName(currentUser.first_name, currentUser.last_name)); actionBar.setTitle(ContactsController.formatName(currentUser.first_name, currentUser.last_name));
} }
CharSequence printString = MessagesController.getInstance().printingStrings.get(currentMessageObject.getDialogId()); CharSequence printString = MessagesController.getInstance().printingStrings.get(currentMessageObject.getDialogId());
if (printString == null || printString.length() == 0) { if (printString == null || printString.length() == 0) {
...@@ -778,10 +774,10 @@ public class PopupNotificationActivity extends Activity implements NotificationC ...@@ -778,10 +774,10 @@ public class PopupNotificationActivity extends Activity implements NotificationC
if (user != null) { if (user != null) {
currentUser = user; currentUser = user;
} }
actionBarLayer.setSubtitle(LocaleController.formatUserStatus(currentUser)); actionBar.setSubtitle(LocaleController.formatUserStatus(currentUser));
} else { } else {
lastPrintString = printString; lastPrintString = printString;
actionBarLayer.setSubtitle(printString); actionBar.setSubtitle(printString);
setTypingAnimation(true); setTypingAnimation(true);
} }
} }
...@@ -816,18 +812,18 @@ public class PopupNotificationActivity extends Activity implements NotificationC ...@@ -816,18 +812,18 @@ public class PopupNotificationActivity extends Activity implements NotificationC
} }
private void setTypingAnimation(boolean start) { private void setTypingAnimation(boolean start) {
if (actionBarLayer == null) { if (actionBar == null) {
return; return;
} }
if (start) { if (start) {
try { try {
actionBarLayer.setSubTitleIcon(0, typingDotsDrawable, AndroidUtilities.dp(4)); actionBar.setSubTitleIcon(0, typingDotsDrawable, AndroidUtilities.dp(4));
typingDotsDrawable.start(); typingDotsDrawable.start();
} catch (Exception e) { } catch (Exception e) {
FileLog.e("tmessages", e); FileLog.e("tmessages", e);
} }
} else { } else {
actionBarLayer.setSubTitleIcon(0, null, 0); actionBar.setSubTitleIcon(0, null, 0);
typingDotsDrawable.stop(); typingDotsDrawable.stop();
} }
} }
......
TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java
View file @ ca46b69b
...@@ -12,6 +12,7 @@ import android.app.AlertDialog; ...@@ -12,6 +12,7 @@ import android.app.AlertDialog;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.content.res.Configuration;
import android.net.Uri; import android.net.Uri;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
...@@ -20,6 +21,7 @@ import android.view.Gravity; ...@@ -20,6 +21,7 @@ import android.view.Gravity;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.ViewTreeObserver;
import android.widget.AdapterView; import android.widget.AdapterView;
import android.widget.FrameLayout; import android.widget.FrameLayout;
import android.widget.ImageView; import android.widget.ImageView;
...@@ -42,7 +44,7 @@ import org.telegram.ui.Cells.DividerCell; ...@@ -42,7 +44,7 @@ import org.telegram.ui.Cells.DividerCell;
import org.telegram.ui.Cells.EmptyCell; import org.telegram.ui.Cells.EmptyCell;
import org.telegram.ui.Cells.TextCell; import org.telegram.ui.Cells.TextCell;
import org.telegram.ui.Cells.TextDetailCell; import org.telegram.ui.Cells.TextDetailCell;
import org.telegram.ui.Views.ActionBar.ActionBarLayer; import org.telegram.ui.Views.ActionBar.ActionBar;
import org.telegram.ui.Views.ActionBar.ActionBarMenu; import org.telegram.ui.Views.ActionBar.ActionBarMenu;
import org.telegram.ui.Views.ActionBar.ActionBarMenuItem; import org.telegram.ui.Views.ActionBar.ActionBarMenuItem;
import org.telegram.ui.Views.AvatarDrawable; import org.telegram.ui.Views.AvatarDrawable;
...@@ -58,7 +60,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter. ...@@ -58,7 +60,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
private BackupImageView avatarImage; private BackupImageView avatarImage;
private TextView nameTextView; private TextView nameTextView;
private TextView onlineTextView; private TextView onlineTextView;
FrameLayout nameContainer; private ImageView writeButton;
private int user_id; private int user_id;
private int totalMediaCount = -1; private int totalMediaCount = -1;
...@@ -128,10 +130,12 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter. ...@@ -128,10 +130,12 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
@Override @Override
public View createView(LayoutInflater inflater, ViewGroup container) { public View createView(LayoutInflater inflater, ViewGroup container) {
if (fragmentView == null) { if (fragmentView == null) {
actionBarLayer.setBackgroundColor(AvatarDrawable.getProfileBackColorForId(user_id)); actionBar.setBackgroundColor(AvatarDrawable.getProfileBackColorForId(user_id));
actionBarLayer.setBackButtonImage(R.drawable.ic_ab_back); actionBar.setItemsBackground(AvatarDrawable.getButtonColorForId(user_id));
actionBarLayer.setBackOverlay(R.layout.updating_state_layout); actionBar.setBackButtonImage(R.drawable.ic_ab_back);
actionBarLayer.setActionBarMenuOnItemClick(new ActionBarLayer.ActionBarMenuOnItemClick() { actionBar.setBackOverlay(R.layout.updating_state_layout);
actionBar.setExtraHeight(AndroidUtilities.dp(88));
actionBar.setActionBarMenuOnItemClick(new ActionBar.ActionBarMenuOnItemClick() {
@Override @Override
public void onItemClick(final int id) { public void onItemClick(final int id) {
if (id == -1) { if (id == -1) {
...@@ -200,27 +204,20 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter. ...@@ -200,27 +204,20 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
fragmentView = new FrameLayout(getParentActivity()); fragmentView = new FrameLayout(getParentActivity());
FrameLayout frameLayout = (FrameLayout) fragmentView; FrameLayout frameLayout = (FrameLayout) fragmentView;
frameLayout.addView(actionBar);
nameContainer = new FrameLayout(getParentActivity());
nameContainer.setBackgroundColor(AvatarDrawable.getProfileBackColorForId(user_id));
frameLayout.addView(nameContainer);
FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) nameContainer.getLayoutParams();
layoutParams.width = FrameLayout.LayoutParams.MATCH_PARENT;
layoutParams.height = AndroidUtilities.dp(88);
nameContainer.setLayoutParams(layoutParams);
avatarImage = new BackupImageView(getParentActivity()); avatarImage = new BackupImageView(getParentActivity());
avatarImage.imageReceiver.setRoundRadius(AndroidUtilities.dp(30)); avatarImage.imageReceiver.setRoundRadius(AndroidUtilities.dp(30));
avatarImage.processDetach = false; avatarImage.processDetach = false;
nameContainer.addView(avatarImage); actionBar.addView(avatarImage);
FrameLayout.LayoutParams layoutParams1 = (FrameLayout.LayoutParams) avatarImage.getLayoutParams(); FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) avatarImage.getLayoutParams();
layoutParams1.gravity = (LocaleController.isRTL ? Gravity.RIGHT : Gravity.LEFT) | Gravity.BOTTOM; layoutParams.gravity = (LocaleController.isRTL ? Gravity.RIGHT : Gravity.LEFT) | Gravity.BOTTOM;
layoutParams1.width = AndroidUtilities.dp(60); layoutParams.width = AndroidUtilities.dp(60);
layoutParams1.height = AndroidUtilities.dp(60); layoutParams.height = AndroidUtilities.dp(60);
layoutParams1.leftMargin = LocaleController.isRTL ? 0 : AndroidUtilities.dp(17); layoutParams.leftMargin = LocaleController.isRTL ? 0 : AndroidUtilities.dp(17);
layoutParams1.rightMargin = LocaleController.isRTL ? AndroidUtilities.dp(17) : 0; layoutParams.rightMargin = LocaleController.isRTL ? AndroidUtilities.dp(17) : 0;
layoutParams1.bottomMargin = AndroidUtilities.dp(22); layoutParams.bottomMargin = AndroidUtilities.dp(22);
avatarImage.setLayoutParams(layoutParams1); avatarImage.setLayoutParams(layoutParams);
avatarImage.setOnClickListener(new View.OnClickListener() { avatarImage.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
...@@ -240,42 +237,43 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter. ...@@ -240,42 +237,43 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
nameTextView.setSingleLine(true); nameTextView.setSingleLine(true);
nameTextView.setGravity((LocaleController.isRTL ? Gravity.RIGHT : Gravity.LEFT)); nameTextView.setGravity((LocaleController.isRTL ? Gravity.RIGHT : Gravity.LEFT));
nameTextView.setTypeface(AndroidUtilities.getTypeface("fonts/rmedium.ttf")); nameTextView.setTypeface(AndroidUtilities.getTypeface("fonts/rmedium.ttf"));
nameContainer.addView(nameTextView); actionBar.addView(nameTextView);
layoutParams1 = (FrameLayout.LayoutParams) nameTextView.getLayoutParams(); layoutParams = (FrameLayout.LayoutParams) nameTextView.getLayoutParams();
layoutParams1.width = FrameLayout.LayoutParams.WRAP_CONTENT; layoutParams.width = FrameLayout.LayoutParams.WRAP_CONTENT;
layoutParams1.height = FrameLayout.LayoutParams.WRAP_CONTENT; layoutParams.height = FrameLayout.LayoutParams.WRAP_CONTENT;
layoutParams1.leftMargin = AndroidUtilities.dp(LocaleController.isRTL ? 16 : 97); layoutParams.leftMargin = AndroidUtilities.dp(LocaleController.isRTL ? 16 : 97);
layoutParams1.rightMargin = AndroidUtilities.dp(LocaleController.isRTL ? 97 : 16); layoutParams.rightMargin = AndroidUtilities.dp(LocaleController.isRTL ? 97 : 16);
layoutParams1.bottomMargin = AndroidUtilities.dp(51); layoutParams.bottomMargin = AndroidUtilities.dp(51);
layoutParams1.gravity = (LocaleController.isRTL ? Gravity.RIGHT : Gravity.LEFT) | Gravity.BOTTOM; layoutParams.gravity = (LocaleController.isRTL ? Gravity.RIGHT : Gravity.LEFT) | Gravity.BOTTOM;
nameTextView.setLayoutParams(layoutParams1); nameTextView.setLayoutParams(layoutParams);
onlineTextView = new TextView(getParentActivity()); onlineTextView = new TextView(getParentActivity());
onlineTextView.setTextColor(0xffd0e4ea); onlineTextView.setTextColor(AvatarDrawable.getProfileTextColorForId(user_id));
onlineTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 14); onlineTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 14);
onlineTextView.setLines(1); onlineTextView.setLines(1);
onlineTextView.setMaxLines(1); onlineTextView.setMaxLines(1);
onlineTextView.setSingleLine(true); onlineTextView.setSingleLine(true);
onlineTextView.setGravity((LocaleController.isRTL ? Gravity.RIGHT : Gravity.LEFT)); onlineTextView.setGravity((LocaleController.isRTL ? Gravity.RIGHT : Gravity.LEFT));
nameContainer.addView(onlineTextView); actionBar.addView(onlineTextView);
layoutParams1 = (FrameLayout.LayoutParams) onlineTextView.getLayoutParams(); layoutParams = (FrameLayout.LayoutParams) onlineTextView.getLayoutParams();
layoutParams1.width = FrameLayout.LayoutParams.WRAP_CONTENT; layoutParams.width = FrameLayout.LayoutParams.WRAP_CONTENT;
layoutParams1.height = FrameLayout.LayoutParams.WRAP_CONTENT; layoutParams.height = FrameLayout.LayoutParams.WRAP_CONTENT;
layoutParams1.leftMargin = AndroidUtilities.dp(LocaleController.isRTL ? 16 : 97); layoutParams.leftMargin = AndroidUtilities.dp(LocaleController.isRTL ? 16 : 97);
layoutParams1.rightMargin = AndroidUtilities.dp(LocaleController.isRTL ? 97 : 16); layoutParams.rightMargin = AndroidUtilities.dp(LocaleController.isRTL ? 97 : 16);
layoutParams1.bottomMargin = AndroidUtilities.dp(30); layoutParams.bottomMargin = AndroidUtilities.dp(30);
layoutParams1.gravity = (LocaleController.isRTL ? Gravity.RIGHT : Gravity.LEFT) | Gravity.BOTTOM; layoutParams.gravity = (LocaleController.isRTL ? Gravity.RIGHT : Gravity.LEFT) | Gravity.BOTTOM;
onlineTextView.setLayoutParams(layoutParams1); onlineTextView.setLayoutParams(layoutParams);
listView = new ListView(getParentActivity()); listView = new ListView(getParentActivity());
listView.setDivider(null); listView.setDivider(null);
listView.setDividerHeight(0); listView.setDividerHeight(0);
listView.setVerticalScrollBarEnabled(false); listView.setVerticalScrollBarEnabled(false);
AndroidUtilities.setListViewEdgeEffectColor(listView, AvatarDrawable.getProfileBackColorForId(user_id));
frameLayout.addView(listView); frameLayout.addView(listView);
layoutParams = (FrameLayout.LayoutParams) listView.getLayoutParams(); layoutParams = (FrameLayout.LayoutParams) listView.getLayoutParams();
layoutParams.topMargin = AndroidUtilities.dp(88);
layoutParams.width = FrameLayout.LayoutParams.MATCH_PARENT; layoutParams.width = FrameLayout.LayoutParams.MATCH_PARENT;
layoutParams.height = FrameLayout.LayoutParams.MATCH_PARENT; layoutParams.height = FrameLayout.LayoutParams.MATCH_PARENT;
layoutParams.gravity = Gravity.TOP;
listView.setLayoutParams(layoutParams); listView.setLayoutParams(layoutParams);
listView.setAdapter(listAdapter); listView.setAdapter(listAdapter);
...@@ -359,17 +357,16 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter. ...@@ -359,17 +357,16 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
MessagesController.getInstance().getMediaCount(user_id, classGuid, true); MessagesController.getInstance().getMediaCount(user_id, classGuid, true);
} }
ImageView writeButton = new ImageView(getParentActivity()); writeButton = new ImageView(getParentActivity());
writeButton.setImageResource(R.drawable.floating_states); writeButton.setImageResource(R.drawable.floating_user_states);
frameLayout.addView(writeButton); frameLayout.addView(writeButton);
layoutParams1 = (FrameLayout.LayoutParams) writeButton.getLayoutParams(); layoutParams = (FrameLayout.LayoutParams) writeButton.getLayoutParams();
layoutParams1.width = FrameLayout.LayoutParams.WRAP_CONTENT; layoutParams.width = FrameLayout.LayoutParams.WRAP_CONTENT;
layoutParams1.height = FrameLayout.LayoutParams.WRAP_CONTENT; layoutParams.height = FrameLayout.LayoutParams.WRAP_CONTENT;
layoutParams1.leftMargin = AndroidUtilities.dp(LocaleController.isRTL ? 16 : 0); layoutParams.leftMargin = AndroidUtilities.dp(LocaleController.isRTL ? 16 : 0);
layoutParams1.rightMargin = AndroidUtilities.dp(LocaleController.isRTL ? 0 : 16); layoutParams.rightMargin = AndroidUtilities.dp(LocaleController.isRTL ? 0 : 16);
layoutParams1.topMargin = AndroidUtilities.dp(58); layoutParams.gravity = (LocaleController.isRTL ? Gravity.LEFT : Gravity.RIGHT);
layoutParams1.gravity = (LocaleController.isRTL ? Gravity.LEFT : Gravity.RIGHT); writeButton.setLayoutParams(layoutParams);
writeButton.setLayoutParams(layoutParams1);
writeButton.setOnClickListener(new View.OnClickListener() { writeButton.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
...@@ -394,6 +391,38 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter. ...@@ -394,6 +391,38 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
return fragmentView; return fragmentView;
} }
private void fixLayout() {
if (fragmentView == null) {
return;
}
fragmentView.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
@Override
public boolean onPreDraw() {
if (fragmentView != null) {
ViewGroup.MarginLayoutParams layoutParams = (ViewGroup.MarginLayoutParams) listView.getLayoutParams();
layoutParams.topMargin = actionBar.getHeight();
listView.setLayoutParams(layoutParams);
layoutParams = (ViewGroup.MarginLayoutParams) writeButton.getLayoutParams();
layoutParams.topMargin = actionBar.getHeight() - AndroidUtilities.dp(29.5f);
writeButton.setLayoutParams(layoutParams);
fragmentView.getViewTreeObserver().removeOnPreDrawListener(this);
}
return false;
}
});
}
@Override
public void onConfigurationChanged(Configuration newConfig) {
super.onConfigurationChanged(newConfig);
fixLayout();
}
@Override
public boolean needAddActionBar() {
return false;
}
public void didReceivedNotification(int id, final Object... args) { public void didReceivedNotification(int id, final Object... args) {
if (id == NotificationCenter.updateInterfaces) { if (id == NotificationCenter.updateInterfaces) {
int mask = (Integer)args[0]; int mask = (Integer)args[0];
...@@ -444,12 +473,10 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter. ...@@ -444,12 +473,10 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
@Override @Override
public void onResume() { public void onResume() {
super.onResume(); super.onResume();
if (parentLayout != null) {
parentLayout.getDrawerLayoutContainer().setStatusBarColor(AvatarDrawable.getProfileBackColorForId(user_id));
}
if (listAdapter != null) { if (listAdapter != null) {
listAdapter.notifyDataSetChanged(); listAdapter.notifyDataSetChanged();
} }
fixLayout();
} }
@Override @Override
...@@ -466,7 +493,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter. ...@@ -466,7 +493,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
PhotoViewer.PlaceProviderObject object = new PhotoViewer.PlaceProviderObject(); PhotoViewer.PlaceProviderObject object = new PhotoViewer.PlaceProviderObject();
object.viewX = coords[0]; object.viewX = coords[0];
object.viewY = coords[1] - AndroidUtilities.statusBarHeight; object.viewY = coords[1] - AndroidUtilities.statusBarHeight;
object.parentView = nameContainer; object.parentView = avatarImage;
object.imageReceiver = avatarImage.imageReceiver; object.imageReceiver = avatarImage.imageReceiver;
object.user_id = user_id; object.user_id = user_id;
object.thumb = object.imageReceiver.getBitmap(); object.thumb = object.imageReceiver.getBitmap();
...@@ -509,6 +536,8 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter. ...@@ -509,6 +536,8 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
usernameRow = -1; usernameRow = -1;
} }
sectionRow = rowCount++; sectionRow = rowCount++;
settingsNotificationsRow = rowCount++;
sharedMediaRow = rowCount++;
if (currentEncryptedChat instanceof TLRPC.TL_encryptedChat) { if (currentEncryptedChat instanceof TLRPC.TL_encryptedChat) {
settingsTimerRow = rowCount++; settingsTimerRow = rowCount++;
settingsKeyRow = rowCount++; settingsKeyRow = rowCount++;
...@@ -516,8 +545,6 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter. ...@@ -516,8 +545,6 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
settingsTimerRow = -1; settingsTimerRow = -1;
settingsKeyRow = -1; settingsKeyRow = -1;
} }
settingsNotificationsRow = rowCount++;
sharedMediaRow = rowCount++;
if (currentEncryptedChat == null) { if (currentEncryptedChat == null) {
startSecretChatRow = rowCount++; startSecretChatRow = rowCount++;
} else { } else {
...@@ -543,7 +570,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter. ...@@ -543,7 +570,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
} }
private void createActionBarMenu() { private void createActionBarMenu() {
ActionBarMenu menu = actionBarLayer.createMenu(); ActionBarMenu menu = actionBar.createMenu();
menu.clearItems(); menu.clearItems();
if (ContactsController.getInstance().contactsDict.get(user_id) == null) { if (ContactsController.getInstance().contactsDict.get(user_id) == null) {
...@@ -661,7 +688,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter. ...@@ -661,7 +688,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
} else { } else {
text = LocaleController.getString("NumberUnknown", R.string.NumberUnknown); text = LocaleController.getString("NumberUnknown", R.string.NumberUnknown);
} }
textDetailCell.setTextAndValue(text, LocaleController.getString("PhoneMobile", R.string.PhoneMobile)); textDetailCell.setTextAndValueAndIcon(text, LocaleController.getString("PhoneMobile", R.string.PhoneMobile), R.drawable.phone_grey);
} else if (i == usernameRow) { } else if (i == usernameRow) {
String text; String text;
if (user != null && user.username != null && user.username.length() != 0) { if (user != null && user.username != null && user.username.length() != 0) {
...@@ -696,7 +723,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter. ...@@ -696,7 +723,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
} }
textCell.setTextAndValue(LocaleController.getString("MessageLifetime", R.string.MessageLifetime), value); textCell.setTextAndValue(LocaleController.getString("MessageLifetime", R.string.MessageLifetime), value);
} else if (i == settingsNotificationsRow) { } else if (i == settingsNotificationsRow) {
textCell.setText(LocaleController.getString("NotificationsAndSounds", R.string.NotificationsAndSounds)); textCell.setTextAndIcon(LocaleController.getString("NotificationsAndSounds", R.string.NotificationsAndSounds), R.drawable.profile_list);
} else if (i == startSecretChatRow) { } else if (i == startSecretChatRow) {
textCell.setText(LocaleController.getString("StartEncryptedChat", R.string.StartEncryptedChat)); textCell.setText(LocaleController.getString("StartEncryptedChat", R.string.StartEncryptedChat));
textCell.setTextColor(0xff37a919); textCell.setTextColor(0xff37a919);
......
TMessagesProj/src/main/java/org/telegram/ui/ProfileNotificationsActivity.java
View file @ ca46b69b
...@@ -23,9 +23,11 @@ import android.view.LayoutInflater; ...@@ -23,9 +23,11 @@ import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.AdapterView; import android.widget.AdapterView;
import android.widget.FrameLayout;
import android.widget.ListView; import android.widget.ListView;
import android.widget.TextView; import android.widget.TextView;
import org.telegram.android.AndroidUtilities;
import org.telegram.android.MessagesController; import org.telegram.android.MessagesController;
import org.telegram.android.MessagesStorage; import org.telegram.android.MessagesStorage;
import org.telegram.messenger.ConnectionsManager; import org.telegram.messenger.ConnectionsManager;
...@@ -37,8 +39,9 @@ import org.telegram.messenger.RPCRequest; ...@@ -37,8 +39,9 @@ import org.telegram.messenger.RPCRequest;
import org.telegram.messenger.TLObject; import org.telegram.messenger.TLObject;
import org.telegram.messenger.TLRPC; import org.telegram.messenger.TLRPC;
import org.telegram.ui.Adapters.BaseFragmentAdapter; import org.telegram.ui.Adapters.BaseFragmentAdapter;
import org.telegram.ui.Views.ActionBar.ActionBarLayer; import org.telegram.ui.Views.ActionBar.ActionBar;
import org.telegram.ui.Views.ActionBar.BaseFragment; import org.telegram.ui.Views.ActionBar.BaseFragment;
import org.telegram.ui.Views.AvatarDrawable;
import org.telegram.ui.Views.ColorPickerView; import org.telegram.ui.Views.ColorPickerView;
public class ProfileNotificationsActivity extends BaseFragment implements NotificationCenter.NotificationCenterDelegate { public class ProfileNotificationsActivity extends BaseFragment implements NotificationCenter.NotificationCenterDelegate {
...@@ -76,12 +79,10 @@ public class ProfileNotificationsActivity extends BaseFragment implements Notifi ...@@ -76,12 +79,10 @@ public class ProfileNotificationsActivity extends BaseFragment implements Notifi
@Override @Override
public View createView(LayoutInflater inflater, ViewGroup container) { public View createView(LayoutInflater inflater, ViewGroup container) {
if (fragmentView == null) { if (fragmentView == null) {
actionBarLayer.setBackButtonImage(R.drawable.ic_ab_back); actionBar.setBackButtonImage(R.drawable.ic_ab_back);
actionBarLayer.setBackOverlay(R.layout.updating_state_layout); actionBar.setBackOverlay(R.layout.updating_state_layout);
actionBar.setTitle(LocaleController.getString("NotificationsAndSounds", R.string.NotificationsAndSounds));
actionBarLayer.setTitle(LocaleController.getString("NotificationsAndSounds", R.string.NotificationsAndSounds)); actionBar.setActionBarMenuOnItemClick(new ActionBar.ActionBarMenuOnItemClick() {
actionBarLayer.setActionBarMenuOnItemClick(new ActionBarLayer.ActionBarMenuOnItemClick() {
@Override @Override
public void onItemClick(int id) { public void onItemClick(int id) {
if (id == -1) { if (id == -1) {
...@@ -90,9 +91,19 @@ public class ProfileNotificationsActivity extends BaseFragment implements Notifi ...@@ -90,9 +91,19 @@ public class ProfileNotificationsActivity extends BaseFragment implements Notifi
} }
}); });
fragmentView = inflater.inflate(R.layout.settings_layout, container, false); fragmentView = new FrameLayout(getParentActivity());
FrameLayout frameLayout = (FrameLayout) fragmentView;
listView = (ListView)fragmentView.findViewById(R.id.listView);
listView = new ListView(getParentActivity());
listView.setDivider(null);
listView.setDividerHeight(0);
listView.setVerticalScrollBarEnabled(false);
AndroidUtilities.setListViewEdgeEffectColor(listView, AvatarDrawable.getProfileBackColorForId(5));
frameLayout.addView(listView);
FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) listView.getLayoutParams();
layoutParams.width = FrameLayout.LayoutParams.MATCH_PARENT;
layoutParams.height = FrameLayout.LayoutParams.MATCH_PARENT;
listView.setLayoutParams(layoutParams);
listView.setAdapter(new ListAdapter(getParentActivity())); listView.setAdapter(new ListAdapter(getParentActivity()));
listView.setOnItemClickListener(new AdapterView.OnItemClickListener() { listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override @Override
...@@ -253,14 +264,6 @@ public class ProfileNotificationsActivity extends BaseFragment implements Notifi ...@@ -253,14 +264,6 @@ public class ProfileNotificationsActivity extends BaseFragment implements Notifi
return fragmentView; return fragmentView;
} }
@Override
public void onResume() {
super.onResume();
if (parentLayout != null) {
parentLayout.getDrawerLayoutContainer().setStatusBarColor(0xff54759e);
}
}
public void updateServerNotificationsSettings() { public void updateServerNotificationsSettings() {
if ((int)dialog_id == 0) { if ((int)dialog_id == 0) {
return; return;
......
TMessagesProj/src/main/java/org/telegram/ui/SettingsActivity.java
View file @ ca46b69b
...@@ -16,19 +16,22 @@ import android.content.DialogInterface; ...@@ -16,19 +16,22 @@ import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.pm.PackageInfo; import android.content.pm.PackageInfo;
import android.graphics.Typeface; import android.content.res.Configuration;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.text.Html; import android.text.Html;
import android.text.Spannable; import android.text.Spannable;
import android.text.method.LinkMovementMethod; import android.text.method.LinkMovementMethod;
import android.util.Base64; import android.util.Base64;
import android.util.TypedValue;
import android.view.Gravity;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.ViewTreeObserver;
import android.widget.AdapterView; import android.widget.AdapterView;
import android.widget.ImageButton; import android.widget.FrameLayout;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.ListView; import android.widget.ListView;
import android.widget.TextView; import android.widget.TextView;
...@@ -55,55 +58,74 @@ import org.telegram.messenger.RPCRequest; ...@@ -55,55 +58,74 @@ import org.telegram.messenger.RPCRequest;
import org.telegram.messenger.UserConfig; import org.telegram.messenger.UserConfig;
import org.telegram.android.MessageObject; import org.telegram.android.MessageObject;
import org.telegram.ui.Adapters.BaseFragmentAdapter; import org.telegram.ui.Adapters.BaseFragmentAdapter;
import org.telegram.ui.Views.ActionBar.ActionBarLayer; import org.telegram.ui.Cells.DetailTextCell;
import org.telegram.ui.Cells.EmptyCell;
import org.telegram.ui.Cells.HeaderCell;
import org.telegram.ui.Cells.ShadowSectionCell;
import org.telegram.ui.Cells.TextCheckCell;
import org.telegram.ui.Cells.TextDetailSettingsCell;
import org.telegram.ui.Cells.TextSettingsCell;
import org.telegram.ui.Views.ActionBar.ActionBar;
import org.telegram.ui.Views.ActionBar.ActionBarMenu;
import org.telegram.ui.Views.ActionBar.ActionBarMenuItem;
import org.telegram.ui.Views.AvatarDrawable; import org.telegram.ui.Views.AvatarDrawable;
import org.telegram.ui.Views.AvatarUpdater; import org.telegram.ui.Views.AvatarUpdater;
import org.telegram.ui.Views.BackupImageView; import org.telegram.ui.Views.BackupImageView;
import org.telegram.ui.Views.ActionBar.BaseFragment; import org.telegram.ui.Views.ActionBar.BaseFragment;
import org.telegram.ui.Views.NumberPicker; import org.telegram.ui.Views.NumberPicker;
import org.telegram.ui.Views.SettingsSectionLayout;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Locale; import java.util.Locale;
public class SettingsActivity extends BaseFragment implements NotificationCenter.NotificationCenterDelegate, PhotoViewer.PhotoViewerProvider { public class SettingsActivity extends BaseFragment implements NotificationCenter.NotificationCenterDelegate, PhotoViewer.PhotoViewerProvider {
private ListView listView; private ListView listView;
private ListAdapter listAdapter; private ListAdapter listAdapter;
private BackupImageView avatarImage;
private TextView nameTextView;
private TextView onlineTextView;
private ImageView writeButton;
private AvatarUpdater avatarUpdater = new AvatarUpdater(); private AvatarUpdater avatarUpdater = new AvatarUpdater();
private int profileRow; private int emptyRow;
private int numberSectionRow; private int numberSectionRow;
private int numberRow; private int numberRow;
private int usernameRow; private int usernameRow;
private int settingsSectionRow; private int settingsSectionRow;
private int textSizeRow; private int settingsSectionRow2;
private int enableAnimationsRow; private int enableAnimationsRow;
private int notificationRow; private int notificationRow;
private int blockedRow; private int blockedRow;
private int backgroundRow; private int backgroundRow;
private int supportSectionRow; private int languageRow;
private int askQuestionRow;
private int logoutRow;
private int sendLogsRow;
private int clearLogsRow;
private int switchBackendButtonRow;
private int messagesSectionRow;
private int sendByEnterRow;
private int terminateSessionsRow; private int terminateSessionsRow;
private int mediaDownloadSection; private int mediaDownloadSection;
private int mediaDownloadSection2;
private int mobileDownloadRow; private int mobileDownloadRow;
private int wifiDownloadRow; private int wifiDownloadRow;
private int roamingDownloadRow; private int roamingDownloadRow;
private int saveToGalleryRow; private int saveToGalleryRow;
private int messagesSectionRow;
private int messagesSectionRow2;
private int textSizeRow;
private int sendByEnterRow;
private int supportSectionRow;
private int supportSectionRow2;
private int askQuestionRow;
private int telegramFaqRow; private int telegramFaqRow;
private int languageRow; private int sendLogsRow;
private int clearLogsRow;
private int switchBackendButtonRow;
private int versionRow; private int versionRow;
private int contactsSectionRow; private int contactsSectionRow;
private int contactsReimportRow; private int contactsReimportRow;
private int contactsSortRow; private int contactsSortRow;
private int rowCount; private int rowCount;
private final static int edit_name = 1;
private final static int logout = 2;
private static class LinkMovementMethodMy extends LinkMovementMethod { private static class LinkMovementMethodMy extends LinkMovementMethod {
@Override @Override
public boolean onTouchEvent(TextView widget, Spannable buffer, MotionEvent event) { public boolean onTouchEvent(TextView widget, Spannable buffer, MotionEvent event) {
...@@ -177,40 +199,42 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter ...@@ -177,40 +199,42 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
}; };
NotificationCenter.getInstance().addObserver(this, NotificationCenter.updateInterfaces); NotificationCenter.getInstance().addObserver(this, NotificationCenter.updateInterfaces);
rowCount = 0; rowCount = 0;
profileRow = rowCount++; emptyRow = rowCount++;
numberSectionRow = rowCount++; numberSectionRow = rowCount++;
numberRow = rowCount++; numberRow = rowCount++;
usernameRow = rowCount++; usernameRow = rowCount++;
settingsSectionRow = rowCount++; settingsSectionRow = rowCount++;
settingsSectionRow2 = rowCount++;
enableAnimationsRow = rowCount++; enableAnimationsRow = rowCount++;
languageRow = rowCount++;
notificationRow = rowCount++; notificationRow = rowCount++;
blockedRow = rowCount++; blockedRow = rowCount++;
backgroundRow = rowCount++; backgroundRow = rowCount++;
languageRow = rowCount++;
terminateSessionsRow = rowCount++; terminateSessionsRow = rowCount++;
mediaDownloadSection = rowCount++; mediaDownloadSection = rowCount++;
mediaDownloadSection2 = rowCount++;
mobileDownloadRow = rowCount++; mobileDownloadRow = rowCount++;
wifiDownloadRow = rowCount++; wifiDownloadRow = rowCount++;
roamingDownloadRow = rowCount++; roamingDownloadRow = rowCount++;
saveToGalleryRow = rowCount++; saveToGalleryRow = rowCount++;
messagesSectionRow = rowCount++; messagesSectionRow = rowCount++;
messagesSectionRow2 = rowCount++;
textSizeRow = rowCount++; textSizeRow = rowCount++;
sendByEnterRow = rowCount++; sendByEnterRow = rowCount++;
//contactsSectionRow = rowCount++;
//contactsSortRow = rowCount++;
//contactsReimportRow = rowCount++;
supportSectionRow = rowCount++; supportSectionRow = rowCount++;
supportSectionRow2 = rowCount++;
askQuestionRow = rowCount++;
telegramFaqRow = rowCount++;
if (BuildVars.DEBUG_VERSION) { if (BuildVars.DEBUG_VERSION) {
sendLogsRow = rowCount++; sendLogsRow = rowCount++;
clearLogsRow = rowCount++; clearLogsRow = rowCount++;
switchBackendButtonRow = rowCount++; switchBackendButtonRow = rowCount++;
} }
telegramFaqRow = rowCount++;
askQuestionRow = rowCount++;
logoutRow = rowCount++;
versionRow = rowCount++; versionRow = rowCount++;
//contactsSectionRow = rowCount++;
//contactsReimportRow = rowCount++;
//contactsSortRow = rowCount++;
MessagesController.getInstance().loadFullUser(UserConfig.getCurrentUser(), classGuid); MessagesController.getInstance().loadFullUser(UserConfig.getCurrentUser(), classGuid);
...@@ -225,24 +249,134 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter ...@@ -225,24 +249,134 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
avatarUpdater.clear(); avatarUpdater.clear();
} }
@Override
public boolean needAddActionBar() {
return false;
}
@Override @Override
public View createView(LayoutInflater inflater, ViewGroup container) { public View createView(LayoutInflater inflater, ViewGroup container) {
if (fragmentView == null) { if (fragmentView == null) {
actionBarLayer.setBackButtonImage(R.drawable.ic_ab_back); actionBar.setBackgroundColor(AvatarDrawable.getProfileBackColorForId(5));
actionBarLayer.setBackOverlay(R.layout.updating_state_layout); actionBar.setItemsBackground(AvatarDrawable.getButtonColorForId(5));
actionBarLayer.setTitle(LocaleController.getString("Settings", R.string.Settings)); actionBar.setBackButtonImage(R.drawable.ic_ab_back);
actionBarLayer.setActionBarMenuOnItemClick(new ActionBarLayer.ActionBarMenuOnItemClick() { actionBar.setBackOverlay(R.layout.updating_state_layout);
actionBar.setExtraHeight(AndroidUtilities.dp(88));
actionBar.setActionBarMenuOnItemClick(new ActionBar.ActionBarMenuOnItemClick() {
@Override @Override
public void onItemClick(int id) { public void onItemClick(int id) {
if (id == -1) { if (id == -1) {
finishFragment(); finishFragment();
} else if (id == edit_name) {
presentFragment(new SettingsChangeNameActivity());
} else if (id == logout) {
if (getParentActivity() == null) {
return;
}
AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity());
builder.setMessage(LocaleController.getString("AreYouSureLogout", R.string.AreYouSureLogout));
builder.setTitle(LocaleController.getString("AppName", R.string.AppName));
builder.setPositiveButton(LocaleController.getString("OK", R.string.OK), new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE);
SharedPreferences.Editor editor = preferences.edit();
editor.clear().commit();
NotificationCenter.getInstance().postNotificationName(NotificationCenter.appDidLogout);
MessagesController.getInstance().unregistedPush();
MessagesController.getInstance().logOut();
UserConfig.clearConfig();
MessagesStorage.getInstance().cleanUp(false);
MessagesController.getInstance().cleanUp();
ContactsController.getInstance().deleteAllAppAccounts();
}
});
builder.setNegativeButton(LocaleController.getString("Cancel", R.string.Cancel), null);
showAlertDialog(builder);
} }
} }
}); });
ActionBarMenu menu = actionBar.createMenu();
menu.clearItems();
ActionBarMenuItem item = menu.addItem(0, R.drawable.ic_ab_other);
item.addSubItem(edit_name, LocaleController.getString("EditName", R.string.EditName), 0);
item.addSubItem(logout, LocaleController.getString("LogOut", R.string.LogOut), 0);
fragmentView = inflater.inflate(R.layout.settings_layout, container, false);
listAdapter = new ListAdapter(getParentActivity()); listAdapter = new ListAdapter(getParentActivity());
listView = (ListView)fragmentView.findViewById(R.id.listView);
fragmentView = new FrameLayout(getParentActivity());
FrameLayout frameLayout = (FrameLayout) fragmentView;
frameLayout.addView(actionBar);
avatarImage = new BackupImageView(getParentActivity());
avatarImage.imageReceiver.setRoundRadius(AndroidUtilities.dp(30));
avatarImage.processDetach = false;
actionBar.addView(avatarImage);
FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) avatarImage.getLayoutParams();
layoutParams.gravity = (LocaleController.isRTL ? Gravity.RIGHT : Gravity.LEFT) | Gravity.BOTTOM;
layoutParams.width = AndroidUtilities.dp(60);
layoutParams.height = AndroidUtilities.dp(60);
layoutParams.leftMargin = LocaleController.isRTL ? 0 : AndroidUtilities.dp(17);
layoutParams.rightMargin = LocaleController.isRTL ? AndroidUtilities.dp(17) : 0;
layoutParams.bottomMargin = AndroidUtilities.dp(22);
avatarImage.setLayoutParams(layoutParams);
avatarImage.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
TLRPC.User user = MessagesController.getInstance().getUser(UserConfig.getClientUserId());
if (user.photo != null && user.photo.photo_big != null) {
PhotoViewer.getInstance().setParentActivity(getParentActivity());
PhotoViewer.getInstance().openPhoto(user.photo.photo_big, SettingsActivity.this);
}
}
});
nameTextView = new TextView(getParentActivity());
nameTextView.setTextColor(0xffffffff);
nameTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 20);
nameTextView.setLines(1);
nameTextView.setMaxLines(1);
nameTextView.setSingleLine(true);
nameTextView.setGravity((LocaleController.isRTL ? Gravity.RIGHT : Gravity.LEFT));
nameTextView.setTypeface(AndroidUtilities.getTypeface("fonts/rmedium.ttf"));
actionBar.addView(nameTextView);
layoutParams = (FrameLayout.LayoutParams) nameTextView.getLayoutParams();
layoutParams.width = FrameLayout.LayoutParams.WRAP_CONTENT;
layoutParams.height = FrameLayout.LayoutParams.WRAP_CONTENT;
layoutParams.leftMargin = AndroidUtilities.dp(LocaleController.isRTL ? 16 : 97);
layoutParams.rightMargin = AndroidUtilities.dp(LocaleController.isRTL ? 97 : 16);
layoutParams.bottomMargin = AndroidUtilities.dp(51);
layoutParams.gravity = (LocaleController.isRTL ? Gravity.RIGHT : Gravity.LEFT) | Gravity.BOTTOM;
nameTextView.setLayoutParams(layoutParams);
onlineTextView = new TextView(getParentActivity());
onlineTextView.setTextColor(AvatarDrawable.getProfileTextColorForId(5));
onlineTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 14);
onlineTextView.setLines(1);
onlineTextView.setMaxLines(1);
onlineTextView.setSingleLine(true);
onlineTextView.setGravity((LocaleController.isRTL ? Gravity.RIGHT : Gravity.LEFT));
actionBar.addView(onlineTextView);
layoutParams = (FrameLayout.LayoutParams) onlineTextView.getLayoutParams();
layoutParams.width = FrameLayout.LayoutParams.WRAP_CONTENT;
layoutParams.height = FrameLayout.LayoutParams.WRAP_CONTENT;
layoutParams.leftMargin = AndroidUtilities.dp(LocaleController.isRTL ? 16 : 97);
layoutParams.rightMargin = AndroidUtilities.dp(LocaleController.isRTL ? 97 : 16);
layoutParams.bottomMargin = AndroidUtilities.dp(30);
layoutParams.gravity = (LocaleController.isRTL ? Gravity.RIGHT : Gravity.LEFT) | Gravity.BOTTOM;
onlineTextView.setLayoutParams(layoutParams);
listView = new ListView(getParentActivity());
listView.setDivider(null);
listView.setDividerHeight(0);
listView.setVerticalScrollBarEnabled(false);
AndroidUtilities.setListViewEdgeEffectColor(listView, AvatarDrawable.getProfileBackColorForId(5));
frameLayout.addView(listView);
layoutParams = (FrameLayout.LayoutParams) listView.getLayoutParams();
layoutParams.width = FrameLayout.LayoutParams.MATCH_PARENT;
layoutParams.height = FrameLayout.LayoutParams.MATCH_PARENT;
layoutParams.gravity = Gravity.TOP;
listView.setLayoutParams(layoutParams);
listView.setAdapter(listAdapter); listView.setAdapter(listAdapter);
listView.setOnItemClickListener(new AdapterView.OnItemClickListener() { listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override @Override
...@@ -433,7 +567,7 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter ...@@ -433,7 +567,7 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
mask = MediaController.getInstance().roamingDownloadMask; mask = MediaController.getInstance().roamingDownloadMask;
} }
builder.setMultiChoiceItems( builder.setMultiChoiceItems(
new CharSequence[]{LocaleController.getString("AttachPhoto", R.string.AttachPhoto), LocaleController.getString("AttachAudio", R.string.AttachAudio), LocaleController.getString("AttachAudio", R.string.AttachVideo), LocaleController.getString("AttachAudio", R.string.AttachDocument)}, new CharSequence[]{LocaleController.getString("AttachPhoto", R.string.AttachPhoto), LocaleController.getString("AttachAudio", R.string.AttachAudio), LocaleController.getString("AttachVideo", R.string.AttachVideo), LocaleController.getString("AttachDocument", R.string.AttachDocument)},
new boolean[]{(mask & MediaController.AUTODOWNLOAD_MASK_PHOTO) != 0, (mask & MediaController.AUTODOWNLOAD_MASK_AUDIO) != 0, (mask & MediaController.AUTODOWNLOAD_MASK_VIDEO) != 0, (mask & MediaController.AUTODOWNLOAD_MASK_DOCUMENT) != 0}, new boolean[]{(mask & MediaController.AUTODOWNLOAD_MASK_PHOTO) != 0, (mask & MediaController.AUTODOWNLOAD_MASK_AUDIO) != 0, (mask & MediaController.AUTODOWNLOAD_MASK_VIDEO) != 0, (mask & MediaController.AUTODOWNLOAD_MASK_DOCUMENT) != 0},
new DialogInterface.OnMultiChoiceClickListener() { new DialogInterface.OnMultiChoiceClickListener() {
@Override @Override
...@@ -489,6 +623,60 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter ...@@ -489,6 +623,60 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
} }
} }
}); });
writeButton = new ImageView(getParentActivity());
writeButton.setImageResource(R.drawable.floating_group_states);
frameLayout.addView(writeButton);
layoutParams = (FrameLayout.LayoutParams) writeButton.getLayoutParams();
layoutParams.width = FrameLayout.LayoutParams.WRAP_CONTENT;
layoutParams.height = FrameLayout.LayoutParams.WRAP_CONTENT;
layoutParams.leftMargin = AndroidUtilities.dp(LocaleController.isRTL ? 16 : 0);
layoutParams.rightMargin = AndroidUtilities.dp(LocaleController.isRTL ? 0 : 16);
layoutParams.gravity = (LocaleController.isRTL ? Gravity.LEFT : Gravity.RIGHT);
writeButton.setLayoutParams(layoutParams);
writeButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (getParentActivity() == null) {
return;
}
AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity());
CharSequence[] items;
TLRPC.User user = MessagesController.getInstance().getUser(UserConfig.getClientUserId());
if (user == null) {
user = UserConfig.getCurrentUser();
}
if (user == null) {
return;
}
boolean fullMenu = false;
if (user.photo != null && user.photo.photo_big != null && !(user.photo instanceof TLRPC.TL_userProfilePhotoEmpty)) {
items = new CharSequence[] {LocaleController.getString("FromCamera", R.string.FromCamera), LocaleController.getString("FromGalley", R.string.FromGalley), LocaleController.getString("DeletePhoto", R.string.DeletePhoto)};
fullMenu = true;
} else {
items = new CharSequence[] {LocaleController.getString("FromCamera", R.string.FromCamera), LocaleController.getString("FromGalley", R.string.FromGalley)};
}
final boolean full = fullMenu;
builder.setItems(items, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
if (i == 0) {
avatarUpdater.openCamera();
} else if (i == 1) {
avatarUpdater.openGallery();
} else if (i == 3) {
MessagesController.getInstance().deleteUserPhoto(null);
}
}
});
showAlertDialog(builder);
}
});
updateUserData();
} else { } else {
ViewGroup parent = (ViewGroup)fragmentView.getParent(); ViewGroup parent = (ViewGroup)fragmentView.getParent();
if (parent != null) { if (parent != null) {
...@@ -512,24 +700,17 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter ...@@ -512,24 +700,17 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
if (user != null && user.photo != null && user.photo.photo_big != null) { if (user != null && user.photo != null && user.photo.photo_big != null) {
TLRPC.FileLocation photoBig = user.photo.photo_big; TLRPC.FileLocation photoBig = user.photo.photo_big;
if (photoBig.local_id == fileLocation.local_id && photoBig.volume_id == fileLocation.volume_id && photoBig.dc_id == fileLocation.dc_id) { if (photoBig.local_id == fileLocation.local_id && photoBig.volume_id == fileLocation.volume_id && photoBig.dc_id == fileLocation.dc_id) {
int count = listView.getChildCount(); int coords[] = new int[2];
for (int a = 0; a < count; a++) { avatarImage.getLocationInWindow(coords);
View view = listView.getChildAt(a); PhotoViewer.PlaceProviderObject object = new PhotoViewer.PlaceProviderObject();
BackupImageView avatarImage = (BackupImageView)view.findViewById(R.id.settings_avatar_image); object.viewX = coords[0];
if (avatarImage != null) { object.viewY = coords[1] - AndroidUtilities.statusBarHeight;
int coords[] = new int[2]; object.parentView = avatarImage;
avatarImage.getLocationInWindow(coords); object.imageReceiver = avatarImage.imageReceiver;
PhotoViewer.PlaceProviderObject object = new PhotoViewer.PlaceProviderObject(); object.user_id = UserConfig.getClientUserId();
object.viewX = coords[0]; object.thumb = object.imageReceiver.getBitmap();
object.viewY = coords[1] - AndroidUtilities.statusBarHeight; object.size = -1;
object.parentView = listView; return object;
object.imageReceiver = avatarImage.imageReceiver;
object.user_id = UserConfig.getClientUserId();
object.thumb = object.imageReceiver.getBitmap();
object.size = -1;
return object;
}
}
} }
} }
return null; return null;
...@@ -663,11 +844,62 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter ...@@ -663,11 +844,62 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
if (id == NotificationCenter.updateInterfaces) { if (id == NotificationCenter.updateInterfaces) {
int mask = (Integer)args[0]; int mask = (Integer)args[0];
if ((mask & MessagesController.UPDATE_MASK_AVATAR) != 0 || (mask & MessagesController.UPDATE_MASK_NAME) != 0) { if ((mask & MessagesController.UPDATE_MASK_AVATAR) != 0 || (mask & MessagesController.UPDATE_MASK_NAME) != 0) {
if (listView != null) { updateUserData();
listView.invalidateViews(); }
}
}
@Override
public void onResume() {
super.onResume();
if (listAdapter != null) {
listAdapter.notifyDataSetChanged();
}
fixLayout();
}
@Override
public void onConfigurationChanged(Configuration newConfig) {
super.onConfigurationChanged(newConfig);
fixLayout();
}
private void fixLayout() {
if (fragmentView == null) {
return;
}
fragmentView.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
@Override
public boolean onPreDraw() {
if (fragmentView != null) {
ViewGroup.MarginLayoutParams layoutParams = (ViewGroup.MarginLayoutParams) listView.getLayoutParams();
layoutParams.topMargin = actionBar.getHeight();
listView.setLayoutParams(layoutParams);
layoutParams = (ViewGroup.MarginLayoutParams) writeButton.getLayoutParams();
layoutParams.topMargin = actionBar.getHeight() - AndroidUtilities.dp(29.5f);
writeButton.setLayoutParams(layoutParams);
fragmentView.getViewTreeObserver().removeOnPreDrawListener(this);
} }
return false;
} }
});
}
private void updateUserData() {
TLRPC.User user = MessagesController.getInstance().getUser(UserConfig.getClientUserId());
TLRPC.FileLocation photo = null;
TLRPC.FileLocation photoBig = null;
if (user.photo != null) {
photo = user.photo.photo_small;
photoBig = user.photo.photo_big;
} }
avatarImage.setImage(photo, "50_50", new AvatarDrawable(user, true));
avatarImage.imageReceiver.setVisible(!PhotoViewer.getInstance().isShowingImage(photoBig), false);
nameTextView.setText(ContactsController.formatName(user.first_name, user.last_name));
onlineTextView.setText(LocaleController.formatUserStatus(user));
avatarImage.imageReceiver.setVisible(!PhotoViewer.getInstance().isShowingImage(photoBig), false);
} }
private void sendLogs() { private void sendLogs() {
...@@ -694,14 +926,6 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter ...@@ -694,14 +926,6 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
} }
} }
@Override
public void onResume() {
super.onResume();
if (listAdapter != null) {
listAdapter.notifyDataSetChanged();
}
}
private class ListAdapter extends BaseFragmentAdapter { private class ListAdapter extends BaseFragmentAdapter {
private Context mContext; private Context mContext;
...@@ -747,349 +971,180 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter ...@@ -747,349 +971,180 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
int type = getItemViewType(i); int type = getItemViewType(i);
if (type == 0) { if (type == 0) {
if (view == null) { if (view == null) {
LayoutInflater li = (LayoutInflater)mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE); view = new EmptyCell(mContext, 16);
view = li.inflate(R.layout.settings_name_layout, viewGroup, false);
ImageButton button = (ImageButton)view.findViewById(R.id.settings_edit_name);
button.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
presentFragment(new SettingsChangeNameActivity());
}
});
final ImageButton button2 = (ImageButton)view.findViewById(R.id.settings_change_avatar_button);
button2.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
if (getParentActivity() == null) {
return;
}
AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity());
CharSequence[] items;
TLRPC.User user = MessagesController.getInstance().getUser(UserConfig.getClientUserId());
if (user == null) {
user = UserConfig.getCurrentUser();
}
if (user == null) {
return;
}
boolean fullMenu = false;
if (user.photo != null && user.photo.photo_big != null && !(user.photo instanceof TLRPC.TL_userProfilePhotoEmpty)) {
items = new CharSequence[] {LocaleController.getString("OpenPhoto", R.string.OpenPhoto), LocaleController.getString("FromCamera", R.string.FromCamera), LocaleController.getString("FromGalley", R.string.FromGalley), LocaleController.getString("DeletePhoto", R.string.DeletePhoto)};
fullMenu = true;
} else {
items = new CharSequence[] {LocaleController.getString("FromCamera", R.string.FromCamera), LocaleController.getString("FromGalley", R.string.FromGalley)};
}
final boolean full = fullMenu;
builder.setItems(items, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
if (i == 0 && full) {
TLRPC.User user = MessagesController.getInstance().getUser(UserConfig.getClientUserId());
if (user != null && user.photo != null && user.photo.photo_big != null) {
PhotoViewer.getInstance().setParentActivity(getParentActivity());
PhotoViewer.getInstance().openPhoto(user.photo.photo_big, SettingsActivity.this);
}
} else if (i == 0 && !full || i == 1 && full) {
avatarUpdater.openCamera();
} else if (i == 1 && !full || i == 2 && full) {
avatarUpdater.openGallery();
} else if (i == 3) {
MessagesController.getInstance().deleteUserPhoto(null);
}
}
});
showAlertDialog(builder);
}
});
} }
TextView textView = (TextView)view.findViewById(R.id.settings_online);
textView.setText(LocaleController.getString("Online", R.string.Online));
textView = (TextView)view.findViewById(R.id.settings_name);
Typeface typeface = AndroidUtilities.getTypeface("fonts/rmedium.ttf");
textView.setTypeface(typeface);
TLRPC.User user = MessagesController.getInstance().getUser(UserConfig.getClientUserId());
if (user == null) {
user = UserConfig.getCurrentUser();
}
if (user != null) {
textView.setText(ContactsController.formatName(user.first_name, user.last_name));
BackupImageView avatarImage = (BackupImageView)view.findViewById(R.id.settings_avatar_image);
avatarImage.processDetach = false;
TLRPC.FileLocation photo = null;
TLRPC.FileLocation photoBig = null;
if (user.photo != null) {
photo = user.photo.photo_small;
photoBig = user.photo.photo_big;
}
avatarImage.setImage(photo, "50_50", new AvatarDrawable(user));
avatarImage.imageReceiver.setVisible(!PhotoViewer.getInstance().isShowingImage(photoBig), false);
}
return view;
} else if (type == 1) { } else if (type == 1) {
if (view == null) { if (view == null) {
view = new SettingsSectionLayout(mContext); view = new ShadowSectionCell(mContext);
}
if (i == numberSectionRow) {
((SettingsSectionLayout) view).setText(LocaleController.getString("Info", R.string.Info));
} else if (i == settingsSectionRow) {
((SettingsSectionLayout) view).setText(LocaleController.getString("SETTINGS", R.string.SETTINGS));
} else if (i == supportSectionRow) {
((SettingsSectionLayout) view).setText(LocaleController.getString("Support", R.string.Support));
} else if (i == messagesSectionRow) {
((SettingsSectionLayout) view).setText(LocaleController.getString("MessagesSettings", R.string.MessagesSettings));
} else if (i == mediaDownloadSection) {
((SettingsSectionLayout) view).setText(LocaleController.getString("AutomaticMediaDownload", R.string.AutomaticMediaDownload));
} else if (i == contactsSectionRow) {
((SettingsSectionLayout) view).setText(LocaleController.getString("Contacts", R.string.Contacts).toUpperCase());
} }
} else if (type == 2) { } else if (type == 2) {
if (view == null) { if (view == null) {
LayoutInflater li = (LayoutInflater)mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE); view = new TextSettingsCell(mContext);
view = li.inflate(R.layout.settings_row_button_layout, viewGroup, false);
} }
TextView textView = (TextView)view.findViewById(R.id.settings_row_text); TextSettingsCell textCell = (TextSettingsCell) view;
View divider = view.findViewById(R.id.settings_row_divider); if (i == textSizeRow) {
if (i == notificationRow) { SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("mainconfig", Activity.MODE_PRIVATE);
textView.setText(LocaleController.getString("NotificationsAndSounds", R.string.NotificationsAndSounds)); int size = preferences.getInt("fons_size", AndroidUtilities.isTablet() ? 18 : 16);
divider.setVisibility(View.VISIBLE); textCell.setTextAndValue(LocaleController.getString("TextSize", R.string.TextSize), String.format("%d", size), true);
} else if (i == languageRow) {
textCell.setTextAndValue(LocaleController.getString("Language", R.string.Language), LocaleController.getCurrentLanguageName(), true);
} else if (i == contactsSortRow) {
String value;
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("mainconfig", Activity.MODE_PRIVATE);
int sort = preferences.getInt("sortContactsBy", 0);
if (sort == 0) {
value = LocaleController.getString("Default", R.string.Default);
} else if (sort == 1) {
value = LocaleController.getString("FirstName", R.string.SortFirstName);
} else {
value = LocaleController.getString("LastName", R.string.SortLastName);
}
textCell.setTextAndValue(LocaleController.getString("SortBy", R.string.SortBy), value, true);
} else if (i == notificationRow) {
textCell.setText(LocaleController.getString("NotificationsAndSounds", R.string.NotificationsAndSounds), true);
} else if (i == blockedRow) { } else if (i == blockedRow) {
textView.setText(LocaleController.getString("BlockedUsers", R.string.BlockedUsers)); textCell.setText(LocaleController.getString("BlockedUsers", R.string.BlockedUsers), true);
divider.setVisibility(backgroundRow != 0 ? View.VISIBLE : View.INVISIBLE);
} else if (i == backgroundRow) { } else if (i == backgroundRow) {
textView.setText(LocaleController.getString("ChatBackground", R.string.ChatBackground)); textCell.setText(LocaleController.getString("ChatBackground", R.string.ChatBackground), true);
divider.setVisibility(View.VISIBLE);
} else if (i == sendLogsRow) { } else if (i == sendLogsRow) {
textView.setText("Send Logs"); textCell.setText("Send Logs", true);
divider.setVisibility(View.VISIBLE);
} else if (i == clearLogsRow) { } else if (i == clearLogsRow) {
textView.setText("Clear Logs"); textCell.setText("Clear Logs", true);
divider.setVisibility(View.VISIBLE);
} else if (i == askQuestionRow) { } else if (i == askQuestionRow) {
textView.setText(LocaleController.getString("AskAQuestion", R.string.AskAQuestion)); textCell.setText(LocaleController.getString("AskAQuestion", R.string.AskAQuestion), true);
divider.setVisibility(View.INVISIBLE);
} else if (i == terminateSessionsRow) { } else if (i == terminateSessionsRow) {
textView.setText(LocaleController.getString("TerminateAllSessions", R.string.TerminateAllSessions)); textCell.setText(LocaleController.getString("TerminateAllSessions", R.string.TerminateAllSessions), false);
divider.setVisibility(View.INVISIBLE);
} else if (i == switchBackendButtonRow) { } else if (i == switchBackendButtonRow) {
textView.setText("Switch Backend"); textCell.setText("Switch Backend", true);
divider.setVisibility(View.VISIBLE);
} else if (i == telegramFaqRow) { } else if (i == telegramFaqRow) {
textView.setText(LocaleController.getString("TelegramFAQ", R.string.TelegramFaq)); textCell.setText(LocaleController.getString("TelegramFAQ", R.string.TelegramFaq), true);
divider.setVisibility(View.VISIBLE);
} else if (i == contactsReimportRow) { } else if (i == contactsReimportRow) {
textView.setText(LocaleController.getString("ImportContacts", R.string.ImportContacts)); textCell.setText(LocaleController.getString("ImportContacts", R.string.ImportContacts), true);
divider.setVisibility(View.INVISIBLE);
} }
} else if (type == 3) { } else if (type == 3) {
if (view == null) { if (view == null) {
LayoutInflater li = (LayoutInflater)mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE); view = new TextCheckCell(mContext);
view = li.inflate(R.layout.settings_row_check_layout, viewGroup, false);
} }
TextView textView = (TextView)view.findViewById(R.id.settings_row_text); TextCheckCell textCell = (TextCheckCell) view;
View divider = view.findViewById(R.id.settings_row_divider);
ImageView checkButton = (ImageView)view.findViewById(R.id.settings_row_check_button);
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("mainconfig", Activity.MODE_PRIVATE); SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("mainconfig", Activity.MODE_PRIVATE);
if (i == enableAnimationsRow) { if (i == enableAnimationsRow) {
textView.setText(LocaleController.getString("EnableAnimations", R.string.EnableAnimations)); textCell.setTextAndCheck(LocaleController.getString("EnableAnimations", R.string.EnableAnimations), preferences.getBoolean("view_animations", true), true);
divider.setVisibility(View.VISIBLE);
boolean enabled = preferences.getBoolean("view_animations", true);
if (enabled) {
checkButton.setImageResource(R.drawable.btn_check_on);
} else {
checkButton.setImageResource(R.drawable.btn_check_off);
}
} else if (i == sendByEnterRow) { } else if (i == sendByEnterRow) {
textView.setText(LocaleController.getString("SendByEnter", R.string.SendByEnter)); textCell.setTextAndCheck(LocaleController.getString("SendByEnter", R.string.SendByEnter), preferences.getBoolean("send_by_enter", false), false);
divider.setVisibility(View.INVISIBLE);
boolean enabled = preferences.getBoolean("send_by_enter", false);
if (enabled) {
checkButton.setImageResource(R.drawable.btn_check_on);
} else {
checkButton.setImageResource(R.drawable.btn_check_off);
}
} else if (i == saveToGalleryRow) { } else if (i == saveToGalleryRow) {
textView.setText(LocaleController.getString("SaveToGallerySettings", R.string.SaveToGallerySettings)); textCell.setTextAndCheck(LocaleController.getString("SaveToGallerySettings", R.string.SaveToGallerySettings), MediaController.getInstance().canSaveToGallery(), false);
divider.setVisibility(View.INVISIBLE);
if (MediaController.getInstance().canSaveToGallery()) {
checkButton.setImageResource(R.drawable.btn_check_on);
} else {
checkButton.setImageResource(R.drawable.btn_check_off);
}
} }
} else if (type == 4) { } else if (type == 4) {
if (view == null) { if (view == null) {
LayoutInflater li = (LayoutInflater)mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE); view = new HeaderCell(mContext);
view = li.inflate(R.layout.settings_logout_button, viewGroup, false);
TextView textView = (TextView)view.findViewById(R.id.settings_row_text);
textView.setText(LocaleController.getString("LogOut", R.string.LogOut));
textView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
if (getParentActivity() == null) {
return;
}
AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity());
builder.setMessage(LocaleController.getString("AreYouSureLogout", R.string.AreYouSureLogout));
builder.setTitle(LocaleController.getString("AppName", R.string.AppName));
builder.setPositiveButton(LocaleController.getString("OK", R.string.OK), new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE);
SharedPreferences.Editor editor = preferences.edit();
editor.clear().commit();
NotificationCenter.getInstance().postNotificationName(NotificationCenter.appDidLogout);
MessagesController.getInstance().unregistedPush();
MessagesController.getInstance().logOut();
UserConfig.clearConfig();
MessagesStorage.getInstance().cleanUp(false);
MessagesController.getInstance().cleanUp();
ContactsController.getInstance().deleteAllAppAccounts();
}
});
builder.setNegativeButton(LocaleController.getString("Cancel", R.string.Cancel), null);
showAlertDialog(builder);
}
});
} }
} else if (type == 5) { if (i == settingsSectionRow2) {
if (view == null) { ((HeaderCell) view).setText(LocaleController.getString("SETTINGS", R.string.SETTINGS));
LayoutInflater li = (LayoutInflater)mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE); } else if (i == supportSectionRow2) {
view = li.inflate(R.layout.user_profile_leftright_row_layout, viewGroup, false); ((HeaderCell) view).setText(LocaleController.getString("Support", R.string.Support));
} else if (i == messagesSectionRow2) {
((HeaderCell) view).setText(LocaleController.getString("MessagesSettings", R.string.MessagesSettings));
} else if (i == mediaDownloadSection2) {
((HeaderCell) view).setText(LocaleController.getString("AutomaticMediaDownload", R.string.AutomaticMediaDownload));
} else if (i == numberSectionRow) {
((HeaderCell) view).setText(LocaleController.getString("Info", R.string.Info));
} }
TextView textView = (TextView)view.findViewById(R.id.settings_row_text); } else if (type == 5) {
TextView detailTextView = (TextView)view.findViewById(R.id.settings_row_text_detail);
View divider = view.findViewById(R.id.settings_row_divider);
if (i == numberRow) {
TLRPC.User user = UserConfig.getCurrentUser();
textView.setText(LocaleController.getString("Phone", R.string.Phone));
if (user != null && user.phone != null && user.phone.length() != 0) {
detailTextView.setText(PhoneFormat.getInstance().format("+" + user.phone));
} else {
detailTextView.setText(LocaleController.getString("NumberUnknown", R.string.NumberUnknown));
}
divider.setVisibility(View.VISIBLE);
} else if (i == textSizeRow) {
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("mainconfig", Activity.MODE_PRIVATE);
int size = preferences.getInt("fons_size", AndroidUtilities.isTablet() ? 18 : 16);
detailTextView.setText(String.format("%d", size));
textView.setText(LocaleController.getString("TextSize", R.string.TextSize));
divider.setVisibility(View.VISIBLE);
} else if (i == languageRow) {
detailTextView.setText(LocaleController.getCurrentLanguageName());
textView.setText(LocaleController.getString("Language", R.string.Language));
divider.setVisibility(View.VISIBLE);
} else if (i == contactsSortRow) {
textView.setText(LocaleController.getString("SortBy", R.string.SortBy));
divider.setVisibility(View.VISIBLE);
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("mainconfig", Activity.MODE_PRIVATE);
int sort = preferences.getInt("sortContactsBy", 0);
if (sort == 0) {
detailTextView.setText(LocaleController.getString("Default", R.string.Default));
} else if (sort == 1) {
detailTextView.setText(LocaleController.getString("FirstName", R.string.SortFirstName));
} else if (sort == 2) {
detailTextView.setText(LocaleController.getString("LastName", R.string.SortLastName));
}
} else if (i == usernameRow) {
TLRPC.User user = UserConfig.getCurrentUser();
textView.setText(LocaleController.getString("Username", R.string.Username));
if (user != null && user.username != null && user.username.length() != 0) {
detailTextView.setText("@" + user.username);
} else {
detailTextView.setText(LocaleController.getString("UsernameEmpty", R.string.UsernameEmpty));
}
divider.setVisibility(View.INVISIBLE);
}
} else if (type == 6) {
if (view == null) { if (view == null) {
LayoutInflater li = (LayoutInflater)mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE); view = new DetailTextCell(mContext);
view = li.inflate(R.layout.settings_row_version, viewGroup, false);
TextView textView = (TextView)view.findViewById(R.id.settings_row_text);
try { try {
PackageInfo pInfo = ApplicationLoader.applicationContext.getPackageManager().getPackageInfo(ApplicationLoader.applicationContext.getPackageName(), 0); PackageInfo pInfo = ApplicationLoader.applicationContext.getPackageManager().getPackageInfo(ApplicationLoader.applicationContext.getPackageName(), 0);
textView.setText(String.format(Locale.US, "Telegram for Android v%s (%d)", pInfo.versionName, pInfo.versionCode)); ((DetailTextCell) view).setText(String.format(Locale.US, "Telegram for Android v%s (%d)", pInfo.versionName, pInfo.versionCode));
} catch (Exception e) { } catch (Exception e) {
FileLog.e("tmessages", e); FileLog.e("tmessages", e);
} }
} }
} else if (type == 7) { } else if (type == 6) {
if (view == null) { if (view == null) {
LayoutInflater li = (LayoutInflater)mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE); view = new TextDetailSettingsCell(mContext);
view = li.inflate(R.layout.settings_row_detail_layout, viewGroup, false);
} }
TextView textView = (TextView)view.findViewById(R.id.settings_row_text); TextDetailSettingsCell textCell = (TextDetailSettingsCell) view;
TextView textViewDetail = (TextView)view.findViewById(R.id.settings_row_text_detail);
View divider = view.findViewById(R.id.settings_row_divider);
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("mainconfig", Activity.MODE_PRIVATE); if (i == mobileDownloadRow || i == wifiDownloadRow || i == roamingDownloadRow) {
int mask = 0; int mask = 0;
if (i == mobileDownloadRow) { String value;
textView.setText(LocaleController.getString("WhenUsingMobileData", R.string.WhenUsingMobileData)); SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("mainconfig", Activity.MODE_PRIVATE);
divider.setVisibility(View.VISIBLE); if (i == mobileDownloadRow) {
mask = MediaController.getInstance().mobileDataDownloadMask; value = LocaleController.getString("WhenUsingMobileData", R.string.WhenUsingMobileData);
} else if (i == wifiDownloadRow) { mask = MediaController.getInstance().mobileDataDownloadMask;
textView.setText(LocaleController.getString("WhenConnectedOnWiFi", R.string.WhenConnectedOnWiFi)); } else if (i == wifiDownloadRow) {
divider.setVisibility(View.VISIBLE); value = LocaleController.getString("WhenConnectedOnWiFi", R.string.WhenConnectedOnWiFi);
mask = MediaController.getInstance().wifiDownloadMask; mask = MediaController.getInstance().wifiDownloadMask;
} else if (i == roamingDownloadRow) { } else {
textView.setText(LocaleController.getString("WhenRoaming", R.string.WhenRoaming)); value = LocaleController.getString("WhenRoaming", R.string.WhenRoaming);
divider.setVisibility(View.VISIBLE); mask = MediaController.getInstance().roamingDownloadMask;
mask = MediaController.getInstance().roamingDownloadMask;
}
String text = "";
if ((mask & MediaController.AUTODOWNLOAD_MASK_PHOTO) != 0) {
text += LocaleController.getString("AttachPhoto", R.string.AttachPhoto);
}
if ((mask & MediaController.AUTODOWNLOAD_MASK_AUDIO) != 0) {
if (text.length() != 0) {
text += ", ";
} }
text += LocaleController.getString("AttachAudio", R.string.AttachAudio); String text = "";
} if ((mask & MediaController.AUTODOWNLOAD_MASK_PHOTO) != 0) {
if ((mask & MediaController.AUTODOWNLOAD_MASK_VIDEO) != 0) { text += LocaleController.getString("AttachPhoto", R.string.AttachPhoto);
if (text.length() != 0) {
text += ", ";
} }
text += LocaleController.getString("AttachVideo", R.string.AttachVideo); if ((mask & MediaController.AUTODOWNLOAD_MASK_AUDIO) != 0) {
} if (text.length() != 0) {
if ((mask & MediaController.AUTODOWNLOAD_MASK_DOCUMENT) != 0) { text += ", ";
if (text.length() != 0) { }
text += ", "; text += LocaleController.getString("AttachAudio", R.string.AttachAudio);
} }
text += LocaleController.getString("AttachDocument", R.string.AttachDocument); if ((mask & MediaController.AUTODOWNLOAD_MASK_VIDEO) != 0) {
} if (text.length() != 0) {
if (text.length() == 0) { text += ", ";
text = LocaleController.getString("NoMediaAutoDownload", R.string.NoMediaAutoDownload); }
text += LocaleController.getString("AttachVideo", R.string.AttachVideo);
}
if ((mask & MediaController.AUTODOWNLOAD_MASK_DOCUMENT) != 0) {
if (text.length() != 0) {
text += ", ";
}
text += LocaleController.getString("AttachDocument", R.string.AttachDocument);
}
if (text.length() == 0) {
text = LocaleController.getString("NoMediaAutoDownload", R.string.NoMediaAutoDownload);
}
textCell.setTextAndValue(value, text, true);
} else if (i == numberRow) {
TLRPC.User user = UserConfig.getCurrentUser();
String value;
if (user != null && user.phone != null && user.phone.length() != 0) {
value = PhoneFormat.getInstance().format("+" + user.phone);
} else {
value = LocaleController.getString("NumberUnknown", R.string.NumberUnknown);
}
textCell.setTextAndValue(value, LocaleController.getString("Phone", R.string.Phone), true);
} else if (i == usernameRow) {
TLRPC.User user = UserConfig.getCurrentUser();
String value;
if (user != null && user.username != null && user.username.length() != 0) {
value = "@" + user.username;
} else {
value = LocaleController.getString("UsernameEmpty", R.string.UsernameEmpty);
}
textCell.setTextAndValue(value, LocaleController.getString("Username", R.string.Username), false);
} }
textViewDetail.setText(text);
} }
return view; return view;
} }
@Override @Override
public int getItemViewType(int i) { public int getItemViewType(int i) {
if (i == profileRow) { if (i == emptyRow) {
return 0; return 0;
} else if (i == numberSectionRow || i == settingsSectionRow || i == supportSectionRow || i == messagesSectionRow || i == mediaDownloadSection || i == contactsSectionRow) { } if (i == settingsSectionRow || i == supportSectionRow || i == messagesSectionRow || i == mediaDownloadSection || i == contactsSectionRow) {
return 1; return 1;
} else if (i == textSizeRow || i == languageRow || i == contactsSortRow || i == numberRow || i == usernameRow) {
return 5;
} else if (i == enableAnimationsRow || i == sendByEnterRow || i == saveToGalleryRow) { } else if (i == enableAnimationsRow || i == sendByEnterRow || i == saveToGalleryRow) {
return 3; return 3;
} else if (i == notificationRow || i == blockedRow || i == backgroundRow || i == askQuestionRow || i == sendLogsRow || i == terminateSessionsRow || i == clearLogsRow || i == switchBackendButtonRow || i == telegramFaqRow || i == contactsReimportRow) { } else if (i == notificationRow || i == blockedRow || i == backgroundRow || i == askQuestionRow || i == sendLogsRow || i == terminateSessionsRow || i == clearLogsRow || i == switchBackendButtonRow || i == telegramFaqRow || i == contactsReimportRow || i == textSizeRow || i == languageRow || i == contactsSortRow) {
return 2; return 2;
} else if (i == logoutRow) {
return 4;
} else if (i == versionRow) { } else if (i == versionRow) {
return 5;
} else if (i == wifiDownloadRow || i == mobileDownloadRow || i == roamingDownloadRow || i == numberRow || i == usernameRow) {
return 6; return 6;
} else if (i == wifiDownloadRow || i == mobileDownloadRow || i == roamingDownloadRow) { } else if (i == settingsSectionRow2 || i == messagesSectionRow2 || i == supportSectionRow2 || i == numberSectionRow || i == mediaDownloadSection2) {
return 7; return 4;
} else { } else {
return 2; return 2;
} }
...@@ -1097,7 +1152,7 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter ...@@ -1097,7 +1152,7 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
@Override @Override
public int getViewTypeCount() { public int getViewTypeCount() {
return 8; return 7;
} }
@Override @Override
......
TMessagesProj/src/main/java/org/telegram/ui/SettingsBlockedUsersActivity.java
View file @ ca46b69b
...@@ -28,7 +28,7 @@ import org.telegram.android.NotificationCenter; ...@@ -28,7 +28,7 @@ import org.telegram.android.NotificationCenter;
import org.telegram.messenger.R; import org.telegram.messenger.R;
import org.telegram.ui.Adapters.BaseFragmentAdapter; import org.telegram.ui.Adapters.BaseFragmentAdapter;
import org.telegram.ui.Cells.UserCell; import org.telegram.ui.Cells.UserCell;
import org.telegram.ui.Views.ActionBar.ActionBarLayer; import org.telegram.ui.Views.ActionBar.ActionBar;
import org.telegram.ui.Views.ActionBar.ActionBarMenu; import org.telegram.ui.Views.ActionBar.ActionBarMenu;
import org.telegram.ui.Views.ActionBar.BaseFragment; import org.telegram.ui.Views.ActionBar.BaseFragment;
...@@ -60,10 +60,10 @@ public class SettingsBlockedUsersActivity extends BaseFragment implements Notifi ...@@ -60,10 +60,10 @@ public class SettingsBlockedUsersActivity extends BaseFragment implements Notifi
@Override @Override
public View createView(LayoutInflater inflater, ViewGroup container) { public View createView(LayoutInflater inflater, ViewGroup container) {
if (fragmentView == null) { if (fragmentView == null) {
actionBarLayer.setBackButtonImage(R.drawable.ic_ab_back); actionBar.setBackButtonImage(R.drawable.ic_ab_back);
actionBarLayer.setBackOverlay(R.layout.updating_state_layout); actionBar.setBackOverlay(R.layout.updating_state_layout);
actionBarLayer.setTitle(LocaleController.getString("BlockedUsers", R.string.BlockedUsers)); actionBar.setTitle(LocaleController.getString("BlockedUsers", R.string.BlockedUsers));
actionBarLayer.setActionBarMenuOnItemClick(new ActionBarLayer.ActionBarMenuOnItemClick() { actionBar.setActionBarMenuOnItemClick(new ActionBar.ActionBarMenuOnItemClick() {
@Override @Override
public void onItemClick(int id) { public void onItemClick(int id) {
if (id == -1) { if (id == -1) {
...@@ -80,7 +80,7 @@ public class SettingsBlockedUsersActivity extends BaseFragment implements Notifi ...@@ -80,7 +80,7 @@ public class SettingsBlockedUsersActivity extends BaseFragment implements Notifi
} }
}); });
ActionBarMenu menu = actionBarLayer.createMenu(); ActionBarMenu menu = actionBar.createMenu();
menu.addItem(block_user, R.drawable.plus); menu.addItem(block_user, R.drawable.plus);
fragmentView = inflater.inflate(R.layout.settings_blocked_users_layout, container, false); fragmentView = inflater.inflate(R.layout.settings_blocked_users_layout, container, false);
......
TMessagesProj/src/main/java/org/telegram/ui/SettingsChangeNameActivity.java
View file @ ca46b69b
...@@ -45,15 +45,15 @@ public class SettingsChangeNameActivity extends BaseFragment { ...@@ -45,15 +45,15 @@ public class SettingsChangeNameActivity extends BaseFragment {
@Override @Override
public View createView(LayoutInflater inflater, ViewGroup container) { public View createView(LayoutInflater inflater, ViewGroup container) {
if (fragmentView == null) { if (fragmentView == null) {
actionBarLayer.setCustomView(R.layout.settings_do_action_layout); actionBar.setCustomView(R.layout.settings_do_action_layout);
Button cancelButton = (Button)actionBarLayer.findViewById(R.id.cancel_button); Button cancelButton = (Button) actionBar.findViewById(R.id.cancel_button);
cancelButton.setOnClickListener(new View.OnClickListener() { cancelButton.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
finishFragment(); finishFragment();
} }
}); });
doneButton = actionBarLayer.findViewById(R.id.done_button); doneButton = actionBar.findViewById(R.id.done_button);
doneButton.setOnClickListener(new View.OnClickListener() { doneButton.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
......
TMessagesProj/src/main/java/org/telegram/ui/SettingsChangeUsernameActivity.java
View file @ ca46b69b
...@@ -59,15 +59,15 @@ public class SettingsChangeUsernameActivity extends BaseFragment { ...@@ -59,15 +59,15 @@ public class SettingsChangeUsernameActivity extends BaseFragment {
@Override @Override
public View createView(LayoutInflater inflater, ViewGroup container) { public View createView(LayoutInflater inflater, ViewGroup container) {
if (fragmentView == null) { if (fragmentView == null) {
actionBarLayer.setCustomView(R.layout.settings_do_action_layout); actionBar.setCustomView(R.layout.settings_do_action_layout);
Button cancelButton = (Button)actionBarLayer.findViewById(R.id.cancel_button); Button cancelButton = (Button) actionBar.findViewById(R.id.cancel_button);
cancelButton.setOnClickListener(new View.OnClickListener() { cancelButton.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
finishFragment(); finishFragment();
} }
}); });
doneButton = actionBarLayer.findViewById(R.id.done_button); doneButton = actionBar.findViewById(R.id.done_button);
doneButton.setOnClickListener(new View.OnClickListener() { doneButton.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
......
TMessagesProj/src/main/java/org/telegram/ui/SettingsNotificationsActivity.java
View file @ ca46b69b
...@@ -22,6 +22,7 @@ import android.view.LayoutInflater; ...@@ -22,6 +22,7 @@ import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.AdapterView; import android.widget.AdapterView;
import android.widget.FrameLayout;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.ListView; import android.widget.ListView;
import android.widget.TextView; import android.widget.TextView;
...@@ -39,8 +40,10 @@ import org.telegram.android.MessagesController; ...@@ -39,8 +40,10 @@ import org.telegram.android.MessagesController;
import org.telegram.messenger.R; import org.telegram.messenger.R;
import org.telegram.messenger.RPCRequest; import org.telegram.messenger.RPCRequest;
import org.telegram.ui.Adapters.BaseFragmentAdapter; import org.telegram.ui.Adapters.BaseFragmentAdapter;
import org.telegram.ui.Views.ActionBar.ActionBarLayer; import org.telegram.ui.Cells.TextCheckCell;
import org.telegram.ui.Views.ActionBar.ActionBar;
import org.telegram.ui.Views.ActionBar.BaseFragment; import org.telegram.ui.Views.ActionBar.BaseFragment;
import org.telegram.ui.Views.AvatarDrawable;
import org.telegram.ui.Views.ColorPickerView; import org.telegram.ui.Views.ColorPickerView;
import org.telegram.ui.Views.SettingsSectionLayout; import org.telegram.ui.Views.SettingsSectionLayout;
...@@ -119,10 +122,10 @@ public class SettingsNotificationsActivity extends BaseFragment implements Notif ...@@ -119,10 +122,10 @@ public class SettingsNotificationsActivity extends BaseFragment implements Notif
@Override @Override
public View createView(LayoutInflater inflater, ViewGroup container) { public View createView(LayoutInflater inflater, ViewGroup container) {
if (fragmentView == null) { if (fragmentView == null) {
actionBarLayer.setBackButtonImage(R.drawable.ic_ab_back); actionBar.setBackButtonImage(R.drawable.ic_ab_back);
actionBarLayer.setBackOverlay(R.layout.updating_state_layout); actionBar.setBackOverlay(R.layout.updating_state_layout);
actionBarLayer.setTitle(LocaleController.getString("NotificationsAndSounds", R.string.NotificationsAndSounds)); actionBar.setTitle(LocaleController.getString("NotificationsAndSounds", R.string.NotificationsAndSounds));
actionBarLayer.setActionBarMenuOnItemClick(new ActionBarLayer.ActionBarMenuOnItemClick() { actionBar.setActionBarMenuOnItemClick(new ActionBar.ActionBarMenuOnItemClick() {
@Override @Override
public void onItemClick(int id) { public void onItemClick(int id) {
if (id == -1) { if (id == -1) {
...@@ -131,10 +134,20 @@ public class SettingsNotificationsActivity extends BaseFragment implements Notif ...@@ -131,10 +134,20 @@ public class SettingsNotificationsActivity extends BaseFragment implements Notif
} }
}); });
fragmentView = inflater.inflate(R.layout.settings_layout, container, false); fragmentView = new FrameLayout(getParentActivity());
final ListAdapter listAdapter = new ListAdapter(getParentActivity()); FrameLayout frameLayout = (FrameLayout) fragmentView;
listView = (ListView)fragmentView.findViewById(R.id.listView);
listView.setAdapter(listAdapter); listView = new ListView(getParentActivity());
listView.setDivider(null);
listView.setDividerHeight(0);
listView.setVerticalScrollBarEnabled(false);
AndroidUtilities.setListViewEdgeEffectColor(listView, AvatarDrawable.getProfileBackColorForId(5));
frameLayout.addView(listView);
FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) listView.getLayoutParams();
layoutParams.width = FrameLayout.LayoutParams.MATCH_PARENT;
layoutParams.height = FrameLayout.LayoutParams.MATCH_PARENT;
listView.setLayoutParams(layoutParams);
listView.setAdapter(new ListAdapter(getParentActivity()));
listView.setOnItemClickListener(new AdapterView.OnItemClickListener() { listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override @Override
public void onItemClick(AdapterView<?> adapterView, View view, final int i, long l) { public void onItemClick(AdapterView<?> adapterView, View view, final int i, long l) {
...@@ -559,13 +572,10 @@ public class SettingsNotificationsActivity extends BaseFragment implements Notif ...@@ -559,13 +572,10 @@ public class SettingsNotificationsActivity extends BaseFragment implements Notif
} }
} if (type == 1) { } if (type == 1) {
if (view == null) { if (view == null) {
LayoutInflater li = (LayoutInflater)mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE); view = new TextCheckCell(mContext);
view = li.inflate(R.layout.settings_row_check_notify_layout, viewGroup, false);
} }
TextView textView = (TextView)view.findViewById(R.id.settings_row_text); TextCheckCell checkCell = (TextCheckCell) view;
View divider = view.findViewById(R.id.settings_row_divider);
ImageView checkButton = (ImageView)view.findViewById(R.id.settings_row_check_button);
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE);
boolean enabled = false; boolean enabled = false;
boolean enabledAll = preferences.getBoolean("EnableAll", true); boolean enabledAll = preferences.getBoolean("EnableAll", true);
...@@ -577,49 +587,28 @@ public class SettingsNotificationsActivity extends BaseFragment implements Notif ...@@ -577,49 +587,28 @@ public class SettingsNotificationsActivity extends BaseFragment implements Notif
} else if (i == groupAlertRow) { } else if (i == groupAlertRow) {
enabled = enabledGroup; enabled = enabledGroup;
} }
textView.setText(LocaleController.getString("Alert", R.string.Alert)); checkCell.setTextAndCheck(LocaleController.getString("Alert", R.string.Alert), enabled, true);
divider.setVisibility(View.VISIBLE);
} else if (i == messagePreviewRow || i == groupPreviewRow) { } else if (i == messagePreviewRow || i == groupPreviewRow) {
if (i == messagePreviewRow) { if (i == messagePreviewRow) {
enabled = preferences.getBoolean("EnablePreviewAll", true); enabled = preferences.getBoolean("EnablePreviewAll", true);
} else if (i == groupPreviewRow) { } else if (i == groupPreviewRow) {
enabled = preferences.getBoolean("EnablePreviewGroup", true); enabled = preferences.getBoolean("EnablePreviewGroup", true);
} }
textView.setText(LocaleController.getString("MessagePreview", R.string.MessagePreview)); checkCell.setTextAndCheck(LocaleController.getString("MessagePreview", R.string.MessagePreview), enabled, true);
divider.setVisibility(View.VISIBLE);
} else if (i == inappSoundRow) { } else if (i == inappSoundRow) {
enabled = preferences.getBoolean("EnableInAppSounds", true); checkCell.setTextAndCheck(LocaleController.getString("InAppSounds", R.string.InAppSounds), preferences.getBoolean("EnableInAppSounds", true), true);
textView.setText(LocaleController.getString("InAppSounds", R.string.InAppSounds));
divider.setVisibility(View.VISIBLE);
} else if (i == inappVibrateRow) { } else if (i == inappVibrateRow) {
enabled = preferences.getBoolean("EnableInAppVibrate", true); checkCell.setTextAndCheck(LocaleController.getString("InAppVibrate", R.string.InAppVibrate), preferences.getBoolean("EnableInAppVibrate", true), true);
textView.setText(LocaleController.getString("InAppVibrate", R.string.InAppVibrate));
divider.setVisibility(View.VISIBLE);
} else if (i == inappPreviewRow) { } else if (i == inappPreviewRow) {
enabled = preferences.getBoolean("EnableInAppPreview", true); checkCell.setTextAndCheck(LocaleController.getString("InAppPreview", R.string.InAppPreview), preferences.getBoolean("EnableInAppPreview", true), false);
textView.setText(LocaleController.getString("InAppPreview", R.string.InAppPreview));
divider.setVisibility(View.INVISIBLE);
} else if (i == contactJoinedRow) { } else if (i == contactJoinedRow) {
enabled = preferences.getBoolean("EnableContactJoined", true); checkCell.setTextAndCheck(LocaleController.getString("ContactJoined", R.string.ContactJoined), preferences.getBoolean("EnableContactJoined", true), false);
textView.setText(LocaleController.getString("ContactJoined", R.string.ContactJoined));
divider.setVisibility(View.INVISIBLE);
} else if (i == pebbleAlertRow) { } else if (i == pebbleAlertRow) {
enabled = preferences.getBoolean("EnablePebbleNotifications", false); checkCell.setTextAndCheck(LocaleController.getString("Pebble", R.string.Pebble), preferences.getBoolean("EnablePebbleNotifications", false), false);
textView.setText(LocaleController.getString("Pebble", R.string.Pebble));
divider.setVisibility(View.INVISIBLE);
} else if (i == notificationsServiceRow) { } else if (i == notificationsServiceRow) {
enabled = preferences.getBoolean("pushService", true); checkCell.setTextAndCheck(LocaleController.getString("NotificationsService", R.string.NotificationsService), preferences.getBoolean("pushService", true), false);
textView.setText(LocaleController.getString("NotificationsService", R.string.NotificationsService));
divider.setVisibility(View.INVISIBLE);
} else if (i == badgeNumberRow) { } else if (i == badgeNumberRow) {
enabled = preferences.getBoolean("badgeNumber", true); checkCell.setTextAndCheck(LocaleController.getString("BadgeNumber", R.string.BadgeNumber), preferences.getBoolean("badgeNumber", true), true);
textView.setText(LocaleController.getString("BadgeNumber", R.string.BadgeNumber));
divider.setVisibility(View.VISIBLE);
}
if (enabled) {
checkButton.setImageResource(R.drawable.btn_check_on);
} else {
checkButton.setImageResource(R.drawable.btn_check_off);
} }
} else if (type == 2) { } else if (type == 2) {
if (view == null) { if (view == null) {
......
TMessagesProj/src/main/java/org/telegram/ui/SettingsWallpapersActivity.java
View file @ ca46b69b
...@@ -99,15 +99,15 @@ public class SettingsWallpapersActivity extends BaseFragment implements Notifica ...@@ -99,15 +99,15 @@ public class SettingsWallpapersActivity extends BaseFragment implements Notifica
@Override @Override
public View createView(LayoutInflater inflater, ViewGroup container) { public View createView(LayoutInflater inflater, ViewGroup container) {
if (fragmentView == null) { if (fragmentView == null) {
actionBarLayer.setCustomView(R.layout.settings_do_action_layout); actionBar.setCustomView(R.layout.settings_do_action_layout);
Button cancelButton = (Button)actionBarLayer.findViewById(R.id.cancel_button); Button cancelButton = (Button) actionBar.findViewById(R.id.cancel_button);
cancelButton.setOnClickListener(new View.OnClickListener() { cancelButton.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
finishFragment(); finishFragment();
} }
}); });
doneButton = actionBarLayer.findViewById(R.id.done_button); doneButton = actionBar.findViewById(R.id.done_button);
doneButton.setOnClickListener(new View.OnClickListener() { doneButton.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
......
TMessagesProj/src/main/java/org/telegram/ui/VideoEditorActivity.java
View file @ ca46b69b
...@@ -46,7 +46,7 @@ import org.telegram.android.MediaController; ...@@ -46,7 +46,7 @@ import org.telegram.android.MediaController;
import org.telegram.messenger.FileLog; import org.telegram.messenger.FileLog;
import org.telegram.messenger.R; import org.telegram.messenger.R;
import org.telegram.messenger.Utilities; import org.telegram.messenger.Utilities;
import org.telegram.ui.Views.ActionBar.ActionBarLayer; import org.telegram.ui.Views.ActionBar.ActionBar;
import org.telegram.ui.Views.ActionBar.ActionBarMenu; import org.telegram.ui.Views.ActionBar.ActionBarMenu;
import org.telegram.ui.Views.ActionBar.BaseFragment; import org.telegram.ui.Views.ActionBar.BaseFragment;
import org.telegram.ui.Views.VideoSeekBarView; import org.telegram.ui.Views.VideoSeekBarView;
...@@ -220,11 +220,11 @@ public class VideoEditorActivity extends BaseFragment implements TextureView.Sur ...@@ -220,11 +220,11 @@ public class VideoEditorActivity extends BaseFragment implements TextureView.Sur
@Override @Override
public View createView(LayoutInflater inflater, ViewGroup container) { public View createView(LayoutInflater inflater, ViewGroup container) {
if (fragmentView == null) { if (fragmentView == null) {
actionBarLayer.setBackgroundColor(0xff333333); actionBar.setBackgroundColor(0xff333333);
actionBarLayer.setItemsBackground(R.drawable.bar_selector_white); actionBar.setItemsBackground(R.drawable.bar_selector_white);
actionBarLayer.setBackButtonImage(R.drawable.ic_ab_back); actionBar.setBackButtonImage(R.drawable.ic_ab_back);
actionBarLayer.setTitle(LocaleController.getString("EditVideo", R.string.EditVideo)); actionBar.setTitle(LocaleController.getString("EditVideo", R.string.EditVideo));
actionBarLayer.setActionBarMenuOnItemClick(new ActionBarLayer.ActionBarMenuOnItemClick() { actionBar.setActionBarMenuOnItemClick(new ActionBar.ActionBarMenuOnItemClick() {
@Override @Override
public void onItemClick(int id) { public void onItemClick(int id) {
if (id == -1) { if (id == -1) {
...@@ -253,7 +253,7 @@ public class VideoEditorActivity extends BaseFragment implements TextureView.Sur ...@@ -253,7 +253,7 @@ public class VideoEditorActivity extends BaseFragment implements TextureView.Sur
} }
}); });
ActionBarMenu menu = actionBarLayer.createMenu(); ActionBarMenu menu = actionBar.createMenu();
View doneItem = menu.addItemResource(1, R.layout.group_create_done_layout); View doneItem = menu.addItemResource(1, R.layout.group_create_done_layout);
TextView doneTextView = (TextView) doneItem.findViewById(R.id.done_button); TextView doneTextView = (TextView) doneItem.findViewById(R.id.done_button);
......
TMessagesProj/src/main/java/org/telegram/ui/Views/ActionBar/ActionBar.java
View file @ ca46b69b
...@@ -9,11 +9,18 @@ ...@@ -9,11 +9,18 @@
package org.telegram.ui.Views.ActionBar; package org.telegram.ui.Views.ActionBar;
import android.content.Context; import android.content.Context;
import android.util.AttributeSet; import android.content.res.Configuration;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.text.TextUtils;
import android.view.Gravity; import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.FrameLayout; import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.TextView;
import org.telegram.android.AndroidUtilities; import org.telegram.android.AndroidUtilities;
import org.telegram.messenger.R; import org.telegram.messenger.R;
...@@ -21,142 +28,462 @@ import org.telegram.ui.AnimationCompat.ViewProxy; ...@@ -21,142 +28,462 @@ import org.telegram.ui.AnimationCompat.ViewProxy;
public class ActionBar extends FrameLayout { public class ActionBar extends FrameLayout {
protected ActionBarLayer currentLayer = null; public static class ActionBarMenuOnItemClick {
protected ActionBarLayer previousLayer = null; public void onItemClick(int id) {
protected View shadowView = null;
}
public boolean canOpenMenu() {
return true;
}
}
private static boolean withStatusBar = Build.VERSION.SDK_INT >= 21;
private FrameLayout titleFrameLayout;
private ImageView backButtonImageView;
private TextView titleTextView;
private TextView subTitleTextView;
private ActionBarMenu menu;
private ActionBarMenu actionMode;
private View actionOverlay;
protected boolean isSearchFieldVisible;
protected int itemsBackgroundResourceId;
private boolean isBackOverlayVisible; private boolean isBackOverlayVisible;
protected BaseFragment parentFragment;
public ActionBarMenuOnItemClick actionBarMenuOnItemClick;
private float alphaEx = 1;
private int extraHeight;
public ActionBar(Context context) { public ActionBar(Context context) {
super(context); super(context);
createComponents(); titleFrameLayout = new FrameLayout(context);
addView(titleFrameLayout);
FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams)titleFrameLayout.getLayoutParams();
layoutParams.width = LayoutParams.WRAP_CONTENT;
layoutParams.height = LayoutParams.FILL_PARENT;
layoutParams.gravity = Gravity.TOP | Gravity.LEFT;
if (withStatusBar) {
layoutParams.topMargin = AndroidUtilities.statusBarHeight;
}
titleFrameLayout.setLayoutParams(layoutParams);
titleFrameLayout.setPadding(0, 0, AndroidUtilities.dp(4), 0);
titleFrameLayout.setEnabled(false);
backButtonImageView = new ImageView(getContext());
titleFrameLayout.addView(backButtonImageView);
backButtonImageView.setVisibility(VISIBLE);
backButtonImageView.setScaleType(ImageView.ScaleType.CENTER);
backButtonImageView.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
if (isSearchFieldVisible) {
closeSearchField();
return;
}
if (actionBarMenuOnItemClick != null) {
actionBarMenuOnItemClick.onItemClick(-1);
}
}
});
} }
public ActionBar(Context context, AttributeSet attrs) { private void positionBackImage(int height) {
super(context, attrs); if (backButtonImageView != null) {
createComponents(); LayoutParams layoutParams = (LayoutParams)backButtonImageView.getLayoutParams();
layoutParams.width = AndroidUtilities.dp(54);
layoutParams.height = height;
layoutParams.gravity = Gravity.TOP | Gravity.LEFT;
backButtonImageView.setLayoutParams(layoutParams);
}
} }
public ActionBar(Context context, AttributeSet attrs, int defStyleAttr) { private void positionTitle(int width, int height) {
super(context, attrs, defStyleAttr); int offset = AndroidUtilities.dp(2);
createComponents(); if (!AndroidUtilities.isTablet() && getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
offset = AndroidUtilities.dp(1);
}
int maxTextWidth = 0;
LayoutParams layoutParams = null;
if (titleTextView != null && titleTextView.getVisibility() == VISIBLE) {
if (!AndroidUtilities.isTablet() && getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
titleTextView.setTextSize(18);
} else {
titleTextView.setTextSize(20);
}
layoutParams = (LayoutParams) titleTextView.getLayoutParams();
layoutParams.width = LayoutParams.WRAP_CONTENT;
layoutParams.height = LayoutParams.WRAP_CONTENT;
layoutParams.gravity = Gravity.TOP | Gravity.LEFT;
titleTextView.setLayoutParams(layoutParams);
titleTextView.measure(width, height);
maxTextWidth = titleTextView.getMeasuredWidth();
}
if (subTitleTextView != null && subTitleTextView.getVisibility() == VISIBLE) {
if (!AndroidUtilities.isTablet() && getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
subTitleTextView.setTextSize(14);
} else {
subTitleTextView.setTextSize(16);
}
layoutParams = (LayoutParams) subTitleTextView.getLayoutParams();
layoutParams.width = LayoutParams.WRAP_CONTENT;
layoutParams.height = LayoutParams.WRAP_CONTENT;
layoutParams.gravity = Gravity.TOP | Gravity.LEFT;
subTitleTextView.setLayoutParams(layoutParams);
subTitleTextView.measure(width, height);
maxTextWidth = Math.max(maxTextWidth, subTitleTextView.getMeasuredWidth());
}
int x = 0;
if (AndroidUtilities.isTablet()) {
x = AndroidUtilities.dp(80);
} else {
x = AndroidUtilities.dp(72);
}
if (menu != null) {
maxTextWidth = Math.min(maxTextWidth, width - menu.getMeasuredWidth() - AndroidUtilities.dp(16));
}
if (titleTextView != null && titleTextView.getVisibility() == VISIBLE) {
layoutParams = (LayoutParams) titleTextView.getLayoutParams();
layoutParams.width = LayoutParams.MATCH_PARENT;
layoutParams.height = titleTextView.getMeasuredHeight();
int y;
if (subTitleTextView != null && subTitleTextView.getVisibility() == VISIBLE) {
y = (height / 2 - titleTextView.getMeasuredHeight()) / 2 + offset;
} else {
y = (height - titleTextView.getMeasuredHeight()) / 2 - AndroidUtilities.dp(1);
}
layoutParams.setMargins(x, y, 0, 0);
titleTextView.setLayoutParams(layoutParams);
}
if (subTitleTextView != null && subTitleTextView.getVisibility() == VISIBLE) {
layoutParams = (LayoutParams) subTitleTextView.getLayoutParams();
layoutParams.width = LayoutParams.MATCH_PARENT;
layoutParams.height = subTitleTextView.getMeasuredHeight();
layoutParams.setMargins(x, height / 2 + (height / 2 - subTitleTextView.getMeasuredHeight()) / 2 - offset, 0, 0);
subTitleTextView.setLayoutParams(layoutParams);
}
ViewGroup.LayoutParams layoutParams1 = titleFrameLayout.getLayoutParams();
layoutParams1.width = x + maxTextWidth + (isSearchFieldVisible ? 0 : AndroidUtilities.dp(6));
titleFrameLayout.setLayoutParams(layoutParams1);
}
public void positionMenu(int width, int height) {
if (menu == null) {
return;
}
FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams)menu.getLayoutParams();
layoutParams.width = isSearchFieldVisible ? LayoutParams.MATCH_PARENT : LayoutParams.WRAP_CONTENT;
layoutParams.height = height;
layoutParams.leftMargin = isSearchFieldVisible ? AndroidUtilities.dp(54) : 0;
if (withStatusBar) {
layoutParams.topMargin = AndroidUtilities.statusBarHeight;
}
menu.setLayoutParams(layoutParams);
menu.measure(width, height);
} }
public void createComponents() { public void setBackButtonDrawable(Drawable drawable) {
shadowView = new View(getContext()); backButtonImageView.setImageDrawable(drawable);
addView(shadowView);
shadowView.setVisibility(INVISIBLE);
ViewGroup.LayoutParams layoutParams = shadowView.getLayoutParams();
layoutParams.width = AndroidUtilities.dp(2);
layoutParams.height = LayoutParams.MATCH_PARENT;
shadowView.setLayoutParams(layoutParams);
shadowView.setBackgroundResource(R.drawable.shadow);
} }
public ActionBarLayer createLayer() { public void setBackButtonImage(int resource) {
return new ActionBarLayer(getContext(), this); backButtonImageView.setImageResource(resource);
} }
public void detachActionBarLayer(ActionBarLayer layer) { private void createSubtitleTextView() {
if (layer == null) { if (subTitleTextView != null) {
return; return;
} }
removeView(layer); subTitleTextView = new TextView(getContext());
if (currentLayer == layer) { titleFrameLayout.addView(subTitleTextView);
currentLayer = null; subTitleTextView.setGravity(Gravity.LEFT);
subTitleTextView.setTextColor(0xffd7e8f7);
subTitleTextView.setSingleLine(true);
subTitleTextView.setLines(1);
subTitleTextView.setMaxLines(1);
subTitleTextView.setEllipsize(TextUtils.TruncateAt.END);
}
public void setSubtitle(CharSequence value) {
if (value != null && subTitleTextView == null) {
createSubtitleTextView();
}
if (subTitleTextView != null) {
subTitleTextView.setVisibility(value != null ? VISIBLE : GONE);
subTitleTextView.setText(value);
positionTitle(getMeasuredWidth(), getMeasuredHeight());
}
}
public void setSubTitleIcon(int resourceId, Drawable drawable, int padding) {
if ((resourceId != 0 || drawable != null) && subTitleTextView == null) {
createSubtitleTextView();
positionTitle(getMeasuredWidth(), getMeasuredHeight());
}
if (subTitleTextView != null) {
if (drawable != null) {
subTitleTextView.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null);
} else {
subTitleTextView.setCompoundDrawablesWithIntrinsicBounds(resourceId, 0, 0, 0);
}
subTitleTextView.setCompoundDrawablePadding(padding);
} }
} }
public void setCurrentActionBarLayer(ActionBarLayer layer) { private void createTitleTextView() {
if (layer == null || layer.getParent() != null) { if (titleTextView != null) {
return; return;
} }
if (currentLayer != null) { titleTextView = new TextView(getContext());
removeView(currentLayer); titleTextView.setGravity(Gravity.LEFT);
titleTextView.setSingleLine(true);
titleTextView.setLines(1);
titleTextView.setMaxLines(1);
titleTextView.setEllipsize(TextUtils.TruncateAt.END);
titleFrameLayout.addView(titleTextView);
titleTextView.setTextColor(0xffffffff);
titleTextView.setTypeface(AndroidUtilities.getTypeface("fonts/rmedium.ttf"));
}
public void setTitle(CharSequence value) {
if (value != null && titleTextView == null) {
createTitleTextView();
}
if (titleTextView != null) {
titleTextView.setVisibility(value != null ? VISIBLE : GONE);
titleTextView.setText(value);
positionTitle(getMeasuredWidth(), getMeasuredHeight());
} }
currentLayer = layer;
addView(layer);
FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams)layer.getLayoutParams();
layoutParams.width = LayoutParams.MATCH_PARENT;
layoutParams.height = LayoutParams.MATCH_PARENT;
layoutParams.gravity = Gravity.TOP | Gravity.LEFT;
layer.setLayoutParams(layoutParams);
currentLayer.setBackOverlayVisible(isBackOverlayVisible);
layer.setAlphaEx(1);
} }
public void setBackOverlayVisible(boolean visible) { public void setTitleIcon(int resourceId, int padding) {
isBackOverlayVisible = visible; if (resourceId != 0 && titleTextView == null) {
if (currentLayer != null) { createTitleTextView();
currentLayer.setBackOverlayVisible(visible); positionTitle(getMeasuredWidth(), getMeasuredHeight());
} }
if (previousLayer != null) { titleTextView.setCompoundDrawablesWithIntrinsicBounds(resourceId, 0, 0, 0);
previousLayer.setBackOverlayVisible(visible); titleTextView.setCompoundDrawablePadding(padding);
}
public Drawable getSubTitleIcon() {
return subTitleTextView.getCompoundDrawables()[0];
}
public CharSequence getTitle() {
if (titleTextView == null) {
return null;
} }
return titleTextView.getText();
} }
public void prepareForMoving(ActionBarLayer layer) { public ActionBarMenu createMenu() {
if (currentLayer == null || layer == null) { if (menu != null) {
return menu;
}
menu = new ActionBarMenu(getContext(), this);
addView(menu);
FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams)menu.getLayoutParams();
layoutParams.height = LayoutParams.FILL_PARENT;
layoutParams.width = LayoutParams.WRAP_CONTENT;
layoutParams.gravity = Gravity.RIGHT;
menu.setLayoutParams(layoutParams);
return menu;
}
public void setActionBarMenuOnItemClick(ActionBarMenuOnItemClick listener) {
actionBarMenuOnItemClick = listener;
}
public void setCustomView(int resourceId) {
LayoutInflater li = (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
View view = li.inflate(resourceId, null);
addView(view);
FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams)view.getLayoutParams();
layoutParams.width = LayoutParams.FILL_PARENT;
layoutParams.height = LayoutParams.FILL_PARENT;
if (withStatusBar) {
layoutParams.topMargin = AndroidUtilities.statusBarHeight;
}
view.setLayoutParams(layoutParams);
}
public ActionBarMenu createActionMode() {
if (actionMode != null) {
return actionMode;
}
actionMode = new ActionBarMenu(getContext(), this);
actionMode.setBackgroundResource(R.drawable.editheader);
addView(actionMode);
FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams)actionMode.getLayoutParams();
layoutParams.height = LayoutParams.FILL_PARENT;
layoutParams.width = LayoutParams.FILL_PARENT;
layoutParams.gravity = Gravity.RIGHT;
if (withStatusBar) {
layoutParams.topMargin = AndroidUtilities.statusBarHeight;
}
actionMode.setLayoutParams(layoutParams);
actionMode.setVisibility(GONE);
return actionMode;
}
public void showActionMode() {
if (actionMode == null) {
return; return;
} }
previousLayer = layer; actionMode.setVisibility(VISIBLE);
ViewGroup parent = (ViewGroup) previousLayer.getParent(); if (titleFrameLayout != null) {
if (parent != null) { titleFrameLayout.setVisibility(INVISIBLE);
parent.removeView(previousLayer); }
if (menu != null) {
menu.setVisibility(INVISIBLE);
} }
this.addView(previousLayer, 0);
ViewGroup.LayoutParams layoutParams = layer.getLayoutParams();
layoutParams.width = LayoutParams.MATCH_PARENT;
layoutParams.height = LayoutParams.MATCH_PARENT;
layer.setLayoutParams(layoutParams);
ViewProxy.setX(shadowView, -AndroidUtilities.dp(2));
shadowView.setVisibility(VISIBLE);
previousLayer.setBackOverlayVisible(isBackOverlayVisible);
} }
public void stopMoving(boolean backAnimation) { public void hideActionMode() {
if (currentLayer == null) { if (actionMode == null) {
return; return;
} }
actionMode.setVisibility(GONE);
if (titleFrameLayout != null) {
titleFrameLayout.setVisibility(isSearchFieldVisible || actionOverlay == null || actionOverlay.getVisibility() == GONE ? VISIBLE : INVISIBLE);
}
if (menu != null) {
menu.setVisibility(VISIBLE);
}
}
if (!backAnimation) { public boolean isActionModeShowed() {
removeView(currentLayer); return actionMode != null && actionMode.getVisibility() == VISIBLE;
currentLayer = previousLayer; }
currentLayer.setAlphaEx(1);
previousLayer = null; protected void onSearchFieldVisibilityChanged(boolean visible) {
} else { isSearchFieldVisible = visible;
removeView(previousLayer); if (titleTextView != null) {
previousLayer = null; titleTextView.setVisibility(visible ? GONE : VISIBLE);
}
if (subTitleTextView != null) {
subTitleTextView.setVisibility(visible ? GONE : VISIBLE);
} }
shadowView.setVisibility(INVISIBLE); Drawable drawable = backButtonImageView.getDrawable();
ViewProxy.setX(currentLayer, 0); if (drawable != null && drawable instanceof MenuDrawable) {
((MenuDrawable)drawable).setRotation(visible ? 1 : 0, true);
}
positionBackOverlay(getMeasuredWidth(), getMeasuredHeight());
} }
public void moveActionBarByX(int dx) { public void closeSearchField() {
if (currentLayer == null) { if (!isSearchFieldVisible || menu == null) {
return; return;
} }
ViewProxy.setX(currentLayer, dx); menu.closeSearchField();
ViewProxy.setX(shadowView, dx - AndroidUtilities.dp(2));
if (dx != 0) {
if (previousLayer != null) {
previousLayer.setAlphaEx(Math.min(1, (float) dx / (float) currentLayer.getMeasuredWidth()));
}
} else {
if (previousLayer != null) {
previousLayer.setAlphaEx(0);
}
currentLayer.setAlphaEx(1);
}
} }
@Override @Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
super.onMeasure(widthMeasureSpec, MeasureSpec.makeMeasureSpec(AndroidUtilities.getCurrentActionBarHeight(), MeasureSpec.EXACTLY)); int actionBarHeight = AndroidUtilities.getCurrentActionBarHeight();
positionBackImage(actionBarHeight);
positionMenu(MeasureSpec.getSize(widthMeasureSpec), actionBarHeight);
positionTitle(MeasureSpec.getSize(widthMeasureSpec), actionBarHeight);
positionBackOverlay(MeasureSpec.getSize(widthMeasureSpec), actionBarHeight);
if (Build.VERSION.SDK_INT >= 21) {
actionBarHeight += AndroidUtilities.statusBarHeight;
}
super.onMeasure(widthMeasureSpec, MeasureSpec.makeMeasureSpec(actionBarHeight + extraHeight, MeasureSpec.EXACTLY));
}
public void setAlphaEx(float alpha) {
alphaEx = alpha;
if (menu != null) {
ViewProxy.setAlpha(menu, alphaEx);
}
if (titleFrameLayout != null) {
ViewProxy.setAlpha(titleFrameLayout, alphaEx);
}
}
public float getAlphaEx() {
return alphaEx;
} }
public void onMenuButtonPressed() { public void onMenuButtonPressed() {
if (currentLayer != null) { if (menu != null) {
currentLayer.onMenuButtonPressed(); menu.onMenuButtonPressed();
}
}
protected void onPause() {
if (menu != null) {
menu.hideAllPopupMenus();
}
}
public void setBackOverlay(int resourceId) {
LayoutInflater li = (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
actionOverlay = li.inflate(resourceId, null);
addView(actionOverlay);
actionOverlay.setVisibility(GONE);
actionOverlay.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
if (actionBarMenuOnItemClick != null) {
actionBarMenuOnItemClick.onItemClick(-1);
}
}
});
}
public void setBackOverlayVisible(boolean visible) {
if (actionOverlay == null || parentFragment == null || parentFragment.parentLayout == null) {
return;
}
isBackOverlayVisible = visible;
if (visible) {
parentFragment.parentLayout.onOverlayShow(actionOverlay, parentFragment);
}
positionBackOverlay(getMeasuredWidth(), getMeasuredHeight());
}
public void setExtraHeight(int value) {
extraHeight = value;
}
private void positionBackOverlay(int widthMeasureSpec, int heightMeasureSpec) {
if (actionOverlay == null) {
return;
} }
titleFrameLayout.setVisibility(isSearchFieldVisible || actionOverlay == null || actionOverlay.getVisibility() == GONE ? VISIBLE : INVISIBLE);
actionOverlay.setVisibility(!isSearchFieldVisible && isBackOverlayVisible ? VISIBLE : GONE);
if (actionOverlay.getVisibility() == VISIBLE) {
MarginLayoutParams layoutParams = (MarginLayoutParams) actionOverlay.getLayoutParams();
layoutParams.width = LayoutParams.WRAP_CONTENT;
layoutParams.height = LayoutParams.MATCH_PARENT;
actionOverlay.setLayoutParams(layoutParams);
actionOverlay.measure(widthMeasureSpec, heightMeasureSpec);
if (withStatusBar) {
layoutParams.topMargin = AndroidUtilities.statusBarHeight;
}
layoutParams.width = Math.min(actionOverlay.getMeasuredWidth() + AndroidUtilities.dp(4), widthMeasureSpec - (menu != null ? menu.getMeasuredWidth() : 0));
actionOverlay.setLayoutParams(layoutParams);
}
}
public void setItemsBackground(int resourceId) {
itemsBackgroundResourceId = resourceId;
backButtonImageView.setBackgroundResource(resourceId);
}
@Override
public boolean onTouchEvent(MotionEvent event) {
super.onTouchEvent(event);
return true;
} }
} }
\ No newline at end of file
TMessagesProj/src/main/java/org/telegram/ui/Views/ActionBar/ActionBarLayer.java deleted 100644 → 0
View file @ 41359b14
/*
* This is the source code of Telegram for Android v. 1.4.x.
* It is licensed under GNU GPL v. 2 or later.
* You should have received a copy of the license in this archive (see LICENSE).
*
* Copyright Nikolai Kudashov, 2013-2014.
*/
package org.telegram.ui.Views.ActionBar;
import android.content.Context;
import android.content.res.Configuration;
import android.graphics.drawable.Drawable;
import android.text.TextUtils;
import android.util.AttributeSet;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.TextView;
import org.telegram.android.AndroidUtilities;
import org.telegram.messenger.R;
import org.telegram.ui.AnimationCompat.ViewProxy;
public class ActionBarLayer extends FrameLayout {
public static class ActionBarMenuOnItemClick {
public void onItemClick(int id) {
}
public boolean canOpenMenu() {
return true;
}
}
private FrameLayout titleFrameLayout;
private ImageView backButtonImageView;
private TextView titleTextView;
private TextView subTitleTextView;
private ActionBarMenu menu;
private ActionBarMenu actionMode;
protected ActionBar parentActionBar;
private View actionOverlay;
protected boolean isSearchFieldVisible;
protected int itemsBackgroundResourceId;
private boolean isBackOverlayVisible;
protected BaseFragment parentFragment;
public ActionBarMenuOnItemClick actionBarMenuOnItemClick;
private float alphaEx = 1;
public ActionBarLayer(Context context, ActionBar actionBar) {
super(context);
parentActionBar = actionBar;
titleFrameLayout = new FrameLayout(context);
addView(titleFrameLayout);
FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams)titleFrameLayout.getLayoutParams();
layoutParams.width = LayoutParams.WRAP_CONTENT;
layoutParams.height = LayoutParams.FILL_PARENT;
layoutParams.gravity = Gravity.TOP | Gravity.LEFT;
titleFrameLayout.setLayoutParams(layoutParams);
titleFrameLayout.setPadding(0, 0, AndroidUtilities.dp(4), 0);
titleFrameLayout.setEnabled(false);
backButtonImageView = new ImageView(getContext());
titleFrameLayout.addView(backButtonImageView);
backButtonImageView.setVisibility(VISIBLE);
backButtonImageView.setScaleType(ImageView.ScaleType.CENTER);
backButtonImageView.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
if (isSearchFieldVisible) {
closeSearchField();
return;
}
if (actionBarMenuOnItemClick != null) {
actionBarMenuOnItemClick.onItemClick(-1);
}
}
});
}
public ActionBarLayer(Context context) {
super(context);
}
public ActionBarLayer(Context context, AttributeSet attrs) {
super(context, attrs);
}
public ActionBarLayer(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
}
private void positionBackImage(int height) {
if (backButtonImageView != null) {
LayoutParams layoutParams = (LayoutParams)backButtonImageView.getLayoutParams();
layoutParams.width = AndroidUtilities.dp(54);
layoutParams.height = height;
layoutParams.gravity = Gravity.TOP | Gravity.LEFT;
backButtonImageView.setLayoutParams(layoutParams);
}
}
private void positionTitle(int width, int height) {
int offset = AndroidUtilities.dp(2);
if (!AndroidUtilities.isTablet() && getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
offset = AndroidUtilities.dp(1);
}
int maxTextWidth = 0;
LayoutParams layoutParams = null;
if (titleTextView != null && titleTextView.getVisibility() == VISIBLE) {
if (!AndroidUtilities.isTablet() && getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
titleTextView.setTextSize(18);
} else {
titleTextView.setTextSize(20);
}
layoutParams = (LayoutParams) titleTextView.getLayoutParams();
layoutParams.width = LayoutParams.WRAP_CONTENT;
layoutParams.height = LayoutParams.WRAP_CONTENT;
layoutParams.gravity = Gravity.TOP | Gravity.LEFT;
titleTextView.setLayoutParams(layoutParams);
titleTextView.measure(width, height);
maxTextWidth = titleTextView.getMeasuredWidth();
}
if (subTitleTextView != null && subTitleTextView.getVisibility() == VISIBLE) {
if (!AndroidUtilities.isTablet() && getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
subTitleTextView.setTextSize(14);
} else {
subTitleTextView.setTextSize(16);
}
layoutParams = (LayoutParams) subTitleTextView.getLayoutParams();
layoutParams.width = LayoutParams.WRAP_CONTENT;
layoutParams.height = LayoutParams.WRAP_CONTENT;
layoutParams.gravity = Gravity.TOP | Gravity.LEFT;
subTitleTextView.setLayoutParams(layoutParams);
subTitleTextView.measure(width, height);
maxTextWidth = Math.max(maxTextWidth, subTitleTextView.getMeasuredWidth());
}
int x = 0;
if (AndroidUtilities.isTablet()) {
x = AndroidUtilities.dp(80);
} else {
x = AndroidUtilities.dp(72);
}
if (menu != null) {
maxTextWidth = Math.min(maxTextWidth, width - menu.getMeasuredWidth() - AndroidUtilities.dp(16));
}
if (titleTextView != null && titleTextView.getVisibility() == VISIBLE) {
layoutParams = (LayoutParams) titleTextView.getLayoutParams();
layoutParams.width = LayoutParams.MATCH_PARENT;
layoutParams.height = titleTextView.getMeasuredHeight();
int y;
if (subTitleTextView != null && subTitleTextView.getVisibility() == VISIBLE) {
y = (height / 2 - titleTextView.getMeasuredHeight()) / 2 + offset;
} else {
y = (height - titleTextView.getMeasuredHeight()) / 2 - AndroidUtilities.dp(1);
}
layoutParams.setMargins(x, y, 0, 0);
titleTextView.setLayoutParams(layoutParams);
}
if (subTitleTextView != null && subTitleTextView.getVisibility() == VISIBLE) {
layoutParams = (LayoutParams) subTitleTextView.getLayoutParams();
layoutParams.width = LayoutParams.MATCH_PARENT;
layoutParams.height = subTitleTextView.getMeasuredHeight();
layoutParams.setMargins(x, height / 2 + (height / 2 - subTitleTextView.getMeasuredHeight()) / 2 - offset, 0, 0);
subTitleTextView.setLayoutParams(layoutParams);
}
ViewGroup.LayoutParams layoutParams1 = titleFrameLayout.getLayoutParams();
layoutParams1.width = x + maxTextWidth + (isSearchFieldVisible ? 0 : AndroidUtilities.dp(6));
titleFrameLayout.setLayoutParams(layoutParams1);
}
public void positionMenu(int width, int height) {
if (menu == null) {
return;
}
FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams)menu.getLayoutParams();
layoutParams.width = isSearchFieldVisible ? LayoutParams.MATCH_PARENT : LayoutParams.WRAP_CONTENT;
layoutParams.leftMargin = isSearchFieldVisible ? AndroidUtilities.dp(54) : 0;
menu.setLayoutParams(layoutParams);
menu.measure(width, height);
}
public void setBackButtonDrawable(Drawable drawable) {
backButtonImageView.setImageDrawable(drawable);
}
public void setBackButtonImage(int resource) {
backButtonImageView.setImageResource(resource);
}
private void createSubtitleTextView() {
if (subTitleTextView != null) {
return;
}
subTitleTextView = new TextView(getContext());
titleFrameLayout.addView(subTitleTextView);
subTitleTextView.setGravity(Gravity.LEFT);
subTitleTextView.setTextColor(0xffd7e8f7);
subTitleTextView.setSingleLine(true);
subTitleTextView.setLines(1);
subTitleTextView.setMaxLines(1);
subTitleTextView.setEllipsize(TextUtils.TruncateAt.END);
}
public void setSubtitle(CharSequence value) {
if (value != null && subTitleTextView == null) {
createSubtitleTextView();
}
if (subTitleTextView != null) {
subTitleTextView.setVisibility(value != null ? VISIBLE : GONE);
subTitleTextView.setText(value);
positionTitle(getMeasuredWidth(), getMeasuredHeight());
}
}
public void setSubTitleIcon(int resourceId, Drawable drawable, int padding) {
if ((resourceId != 0 || drawable != null) && subTitleTextView == null) {
createSubtitleTextView();
positionTitle(getMeasuredWidth(), getMeasuredHeight());
}
if (subTitleTextView != null) {
if (drawable != null) {
subTitleTextView.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null);
} else {
subTitleTextView.setCompoundDrawablesWithIntrinsicBounds(resourceId, 0, 0, 0);
}
subTitleTextView.setCompoundDrawablePadding(padding);
}
}
private void createTitleTextView() {
if (titleTextView != null) {
return;
}
titleTextView = new TextView(getContext());
titleTextView.setGravity(Gravity.LEFT);
titleTextView.setSingleLine(true);
titleTextView.setLines(1);
titleTextView.setMaxLines(1);
titleTextView.setEllipsize(TextUtils.TruncateAt.END);
titleFrameLayout.addView(titleTextView);
titleTextView.setTextColor(0xffffffff);
titleTextView.setTypeface(AndroidUtilities.getTypeface("fonts/rmedium.ttf"));
}
public void setTitle(CharSequence value) {
if (value != null && titleTextView == null) {
createTitleTextView();
}
if (titleTextView != null) {
titleTextView.setVisibility(value != null ? VISIBLE : GONE);
titleTextView.setText(value);
positionTitle(getMeasuredWidth(), getMeasuredHeight());
}
}
public void setTitleIcon(int resourceId, int padding) {
if (resourceId != 0 && titleTextView == null) {
createTitleTextView();
positionTitle(getMeasuredWidth(), getMeasuredHeight());
}
titleTextView.setCompoundDrawablesWithIntrinsicBounds(resourceId, 0, 0, 0);
titleTextView.setCompoundDrawablePadding(padding);
}
public Drawable getSubTitleIcon() {
return subTitleTextView.getCompoundDrawables()[0];
}
public CharSequence getTitle() {
if (titleTextView == null) {
return null;
}
return titleTextView.getText();
}
public ActionBarMenu createMenu() {
if (menu != null) {
return menu;
}
menu = new ActionBarMenu(getContext(), parentActionBar, this);
addView(menu);
FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams)menu.getLayoutParams();
layoutParams.height = LayoutParams.FILL_PARENT;
layoutParams.width = LayoutParams.WRAP_CONTENT;
layoutParams.gravity = Gravity.RIGHT;
menu.setLayoutParams(layoutParams);
return menu;
}
public void onDestroy() {
parentActionBar.detachActionBarLayer(this);
}
public void setActionBarMenuOnItemClick(ActionBarMenuOnItemClick listener) {
actionBarMenuOnItemClick = listener;
}
public void setCustomView(int resourceId) {
LayoutInflater li = (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
View view = li.inflate(resourceId, null);
addView(view);
}
public ActionBarMenu createActionMode() {
if (actionMode != null) {
return actionMode;
}
actionMode = new ActionBarMenu(getContext(), parentActionBar, this);
actionMode.setBackgroundResource(R.drawable.editheader);
addView(actionMode);
FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams)actionMode.getLayoutParams();
layoutParams.height = LayoutParams.FILL_PARENT;
layoutParams.width = LayoutParams.FILL_PARENT;
layoutParams.gravity = Gravity.RIGHT;
actionMode.setLayoutParams(layoutParams);
actionMode.setVisibility(GONE);
return actionMode;
}
public void showActionMode() {
if (actionMode == null) {
return;
}
actionMode.setVisibility(VISIBLE);
if (titleFrameLayout != null) {
titleFrameLayout.setVisibility(INVISIBLE);
}
if (menu != null) {
menu.setVisibility(INVISIBLE);
}
}
public void hideActionMode() {
if (actionMode == null) {
return;
}
actionMode.setVisibility(GONE);
if (titleFrameLayout != null) {
titleFrameLayout.setVisibility(isSearchFieldVisible || actionOverlay == null || actionOverlay.getVisibility() == GONE ? VISIBLE : INVISIBLE);
}
if (menu != null) {
menu.setVisibility(VISIBLE);
}
}
public boolean isActionModeShowed() {
return actionMode != null && actionMode.getVisibility() == VISIBLE;
}
protected void onSearchFieldVisibilityChanged(boolean visible) {
isSearchFieldVisible = visible;
if (titleTextView != null) {
titleTextView.setVisibility(visible ? GONE : VISIBLE);
}
if (subTitleTextView != null) {
subTitleTextView.setVisibility(visible ? GONE : VISIBLE);
}
Drawable drawable = backButtonImageView.getDrawable();
if (drawable != null && drawable instanceof MenuDrawable) {
((MenuDrawable)drawable).setRotation(visible ? 1 : 0, true);
}
positionBackOverlay(getMeasuredWidth(), getMeasuredHeight());
}
public void closeSearchField() {
if (!isSearchFieldVisible || menu == null) {
return;
}
menu.closeSearchField();
}
@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
positionBackImage(MeasureSpec.getSize(heightMeasureSpec));
positionMenu(MeasureSpec.getSize(widthMeasureSpec), MeasureSpec.getSize(heightMeasureSpec));
positionTitle(MeasureSpec.getSize(widthMeasureSpec), MeasureSpec.getSize(heightMeasureSpec));
positionBackOverlay(MeasureSpec.getSize(widthMeasureSpec), MeasureSpec.getSize(heightMeasureSpec));
super.onMeasure(widthMeasureSpec, heightMeasureSpec);
}
public void setAlphaEx(float alpha) {
alphaEx = alpha;
if (menu != null) {
ViewProxy.setAlpha(menu, alphaEx);
}
if (titleFrameLayout != null) {
ViewProxy.setAlpha(titleFrameLayout, alphaEx);
}
}
public float getAlphaEx() {
return alphaEx;
}
public void onMenuButtonPressed() {
if (menu != null) {
menu.onMenuButtonPressed();
}
}
protected void onPause() {
if (menu != null) {
menu.hideAllPopupMenus();
}
}
public void setBackOverlay(int resourceId) {
LayoutInflater li = (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
actionOverlay = li.inflate(resourceId, null);
addView(actionOverlay);
actionOverlay.setVisibility(GONE);
actionOverlay.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
if (actionBarMenuOnItemClick != null) {
actionBarMenuOnItemClick.onItemClick(-1);
}
}
});
}
public void setBackOverlayVisible(boolean visible) {
if (actionOverlay == null || parentFragment == null || parentFragment.parentLayout == null) {
return;
}
isBackOverlayVisible = visible;
if (visible) {
parentFragment.parentLayout.onOverlayShow(actionOverlay, parentFragment);
}
positionBackOverlay(getMeasuredWidth(), getMeasuredHeight());
}
private void positionBackOverlay(int widthMeasureSpec, int heightMeasureSpec) {
if (actionOverlay == null) {
return;
}
titleFrameLayout.setVisibility(isSearchFieldVisible || actionOverlay == null || actionOverlay.getVisibility() == GONE ? VISIBLE : INVISIBLE);
actionOverlay.setVisibility(!isSearchFieldVisible && isBackOverlayVisible ? VISIBLE : GONE);
if (actionOverlay.getVisibility() == VISIBLE) {
ViewGroup.LayoutParams layoutParams = actionOverlay.getLayoutParams();
layoutParams.width = LayoutParams.WRAP_CONTENT;
layoutParams.height = LayoutParams.MATCH_PARENT;
actionOverlay.setLayoutParams(layoutParams);
actionOverlay.measure(widthMeasureSpec, heightMeasureSpec);
layoutParams.width = Math.min(actionOverlay.getMeasuredWidth() + AndroidUtilities.dp(4), widthMeasureSpec - (menu != null ? menu.getMeasuredWidth() : 0));
actionOverlay.setLayoutParams(layoutParams);
}
}
public void setItemsBackground(int resourceId) {
itemsBackgroundResourceId = resourceId;
backButtonImageView.setBackgroundResource(resourceId);
}
}
\ No newline at end of file
TMessagesProj/src/main/java/org/telegram/ui/Views/ActionBar/ActionBarLayout.java
View file @ ca46b69b
...@@ -11,6 +11,9 @@ package org.telegram.ui.Views.ActionBar; ...@@ -11,6 +11,9 @@ package org.telegram.ui.Views.ActionBar;
import android.app.Activity; import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.graphics.Canvas;
import android.graphics.Paint;
import android.graphics.drawable.Drawable;
import android.os.Build; import android.os.Build;
import android.os.Handler; import android.os.Handler;
import android.view.ActionMode; import android.view.ActionMode;
...@@ -20,15 +23,13 @@ import android.view.MotionEvent; ...@@ -20,15 +23,13 @@ import android.view.MotionEvent;
import android.view.VelocityTracker; import android.view.VelocityTracker;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.ViewTreeObserver; import android.view.animation.AccelerateDecelerateInterpolator;
import android.view.WindowManager; import android.view.animation.DecelerateInterpolator;
import android.view.animation.Animation;
import android.view.animation.AnimationUtils;
import android.widget.FrameLayout; import android.widget.FrameLayout;
import android.widget.LinearLayout;
import org.telegram.android.AndroidUtilities; import org.telegram.android.AndroidUtilities;
import org.telegram.android.NotificationCenter; import org.telegram.android.NotificationCenter;
import org.telegram.messenger.FileLog;
import org.telegram.messenger.R; import org.telegram.messenger.R;
import org.telegram.ui.AnimationCompat.AnimatorListenerAdapterProxy; import org.telegram.ui.AnimationCompat.AnimatorListenerAdapterProxy;
import org.telegram.ui.AnimationCompat.AnimatorSetProxy; import org.telegram.ui.AnimationCompat.AnimatorSetProxy;
...@@ -39,18 +40,6 @@ import java.util.ArrayList; ...@@ -39,18 +40,6 @@ import java.util.ArrayList;
public class ActionBarLayout extends FrameLayout { public class ActionBarLayout extends FrameLayout {
private class FrameLayoutAnimationListener extends FrameLayout {
public FrameLayoutAnimationListener(Context context) {
super(context);
}
@Override
protected void onAnimationEnd() {
super.onAnimationEnd();
ActionBarLayout.this.onAnimationEndCheck();
}
}
public static interface ActionBarLayoutDelegate { public static interface ActionBarLayoutDelegate {
public abstract boolean onPreIme(); public abstract boolean onPreIme();
public abstract void onOverlayShow(View view, BaseFragment fragment); public abstract void onOverlayShow(View view, BaseFragment fragment);
...@@ -60,18 +49,35 @@ public class ActionBarLayout extends FrameLayout { ...@@ -60,18 +49,35 @@ public class ActionBarLayout extends FrameLayout {
public abstract void onRebuildAllFragments(ActionBarLayout layout); public abstract void onRebuildAllFragments(ActionBarLayout layout);
} }
protected ActionBar actionBar; public class LinearLayoutContainer extends LinearLayout {
private FrameLayoutAnimationListener containerView;
private FrameLayoutAnimationListener containerViewBack; public LinearLayoutContainer(Context context) {
private View shadowView; super(context);
setOrientation(VERTICAL);
}
/*@Override
protected boolean drawChild(Canvas canvas, View child, long drawingTime) {
int saveCount = canvas.save();
canvas.clipRect(0, 0, getWidth(), getHeight());
boolean result = super.drawChild(canvas, child, drawingTime);
canvas.restoreToCount(saveCount);
return result;
}*/
}
private static Drawable headerShadowDrawable;
private static Drawable layerShadowDrawable;
private static Paint scrimPaint;
private LinearLayoutContainer containerView;
private LinearLayoutContainer containerViewBack;
private DrawerLayoutContainer drawerLayoutContainer; private DrawerLayoutContainer drawerLayoutContainer;
private ActionBar currentActionBar;
private AnimatorSetProxy currentAnimation;
private Animation openAnimation; public float innerTranslationX;
private Animation closeAnimation;
private Animation alphaOpenAnimation;
private Animation alphaOpenAnimation2;
private Animation alphaCloseAnimation;
private Animation alphaCloseAnimation2;
private boolean maybeStartTracking = false; private boolean maybeStartTracking = false;
protected boolean startedTracking = false; protected boolean startedTracking = false;
...@@ -96,71 +102,72 @@ public class ActionBarLayout extends FrameLayout { ...@@ -96,71 +102,72 @@ public class ActionBarLayout extends FrameLayout {
public ActionBarLayout(Context context) { public ActionBarLayout(Context context) {
super(context); super(context);
parentActivity = (Activity)context; parentActivity = (Activity) context;
try {
openAnimation = AnimationUtils.loadAnimation(context, R.anim.scale_in); if (layerShadowDrawable == null) {
closeAnimation = AnimationUtils.loadAnimation(context, R.anim.scale_out); layerShadowDrawable = getResources().getDrawable(R.drawable.layer_shadow);
} catch (Exception e) { scrimPaint = new Paint();
FileLog.e("tmessages", e);
} }
} }
public void init(ArrayList<BaseFragment> stack) { public void init(ArrayList<BaseFragment> stack) {
fragmentsStack = stack; fragmentsStack = stack;
containerViewBack = new FrameLayoutAnimationListener(parentActivity); containerViewBack = new LinearLayoutContainer(parentActivity);
//containerViewBack.setOrientation(LinearLayout.VERTICAL);
addView(containerViewBack); addView(containerViewBack);
FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) containerViewBack.getLayoutParams();
containerView = new FrameLayoutAnimationListener(parentActivity); layoutParams.width = LayoutParams.MATCH_PARENT;
layoutParams.height = LayoutParams.MATCH_PARENT;
layoutParams.gravity = Gravity.TOP | Gravity.LEFT;
containerViewBack.setLayoutParams(layoutParams);
containerView = new LinearLayoutContainer(parentActivity);
//containerView.setOrientation(LinearLayout.VERTICAL);
addView(containerView); addView(containerView);
layoutParams = (FrameLayout.LayoutParams) containerView.getLayoutParams();
shadowView = new FrameLayout(parentActivity); layoutParams.width = LayoutParams.MATCH_PARENT;
addView(shadowView); layoutParams.height = LayoutParams.MATCH_PARENT;
shadowView.setBackgroundResource(R.drawable.shadow); layoutParams.gravity = Gravity.TOP | Gravity.LEFT;
ViewGroup.LayoutParams layoutParams = shadowView.getLayoutParams(); containerView.setLayoutParams(layoutParams);
layoutParams.width = AndroidUtilities.dp(2);
layoutParams.height = FrameLayout.LayoutParams.MATCH_PARENT;
shadowView.setLayoutParams(layoutParams);
shadowView.setVisibility(View.INVISIBLE);
actionBar = new ActionBar(parentActivity);
addView(actionBar);
layoutParams = actionBar.getLayoutParams();
layoutParams.width = FrameLayout.LayoutParams.MATCH_PARENT;
actionBar.setLayoutParams(layoutParams);
for (BaseFragment fragment : fragmentsStack) { for (BaseFragment fragment : fragmentsStack) {
fragment.setParentLayout(this); fragment.setParentLayout(this);
} }
needLayout();
} }
@Override @Override
public void onConfigurationChanged(android.content.res.Configuration newConfig) { public void onConfigurationChanged(android.content.res.Configuration newConfig) {
super.onConfigurationChanged(newConfig); super.onConfigurationChanged(newConfig);
fixLayout();
if (!fragmentsStack.isEmpty()) { if (!fragmentsStack.isEmpty()) {
BaseFragment lastFragment = fragmentsStack.get(fragmentsStack.size() - 1); BaseFragment lastFragment = fragmentsStack.get(fragmentsStack.size() - 1);
lastFragment.onConfigurationChanged(newConfig); lastFragment.onConfigurationChanged(newConfig);
} }
} }
public void setInnerTranslationX(float value) {
innerTranslationX = value;
invalidate();
}
public float getInnerTranslationX() {
return innerTranslationX;
}
public void onResume() { public void onResume() {
fixLayout();
if (transitionAnimationInProgress) { if (transitionAnimationInProgress) {
if (currentAnimation != null) {
currentAnimation.cancel();
currentAnimation = null;
}
if (onCloseAnimationEndRunnable != null) { if (onCloseAnimationEndRunnable != null) {
closeAnimation.cancel();
onCloseAnimationEnd(false); onCloseAnimationEnd(false);
} else if (onOpenAnimationEndRunnable != null) { } else if (onOpenAnimationEndRunnable != null) {
openAnimation.cancel();
onOpenAnimationEnd(false); onOpenAnimationEnd(false);
} }
} }
if (!fragmentsStack.isEmpty()) { if (!fragmentsStack.isEmpty()) {
BaseFragment lastFragment = fragmentsStack.get(fragmentsStack.size() - 1); BaseFragment lastFragment = fragmentsStack.get(fragmentsStack.size() - 1);
lastFragment.onResume(); lastFragment.onResume();
actionBar.setCurrentActionBarLayer(lastFragment.actionBarLayer);
} }
} }
...@@ -191,9 +198,39 @@ public class ActionBarLayout extends FrameLayout { ...@@ -191,9 +198,39 @@ public class ActionBarLayout extends FrameLayout {
} }
@Override @Override
protected void onAnimationEnd() { protected boolean drawChild(Canvas canvas, View child, long drawingTime) {
super.onAnimationEnd(); int width = getWidth();
onAnimationEndCheck(); int translationX = (int) innerTranslationX;
int clipLeft = 0;
int clipRight = width;
if (child == containerViewBack) {
clipRight = translationX;
} else if (child == containerView) {
clipLeft = translationX;
}
final int restoreCount = canvas.save();
if (!transitionAnimationInProgress) {
canvas.clipRect(clipLeft, 0, clipRight, getHeight());
}
final boolean result = super.drawChild(canvas, child, drawingTime);
canvas.restoreToCount(restoreCount);
if (translationX != 0) {
if (child == containerView) {
final float alpha = Math.max(0, Math.min((width - translationX) / (float) AndroidUtilities.dp(20), 1.0f));
layerShadowDrawable.setBounds(translationX - layerShadowDrawable.getIntrinsicWidth(), child.getTop(), translationX, child.getBottom());
layerShadowDrawable.setAlpha((int) (0xff * alpha));
layerShadowDrawable.draw(canvas);
} else if (child == containerViewBack) {
final float opacity = Math.min(0.8f, (width - translationX) / (float)width);
scrimPaint.setColor((int) (((0x99000000 & 0xff000000) >>> 24) * opacity) << 24);
canvas.drawRect(clipLeft, 0, clipRight, getHeight(), scrimPaint);
}
}
return result;
} }
public void setDelegate(ActionBarLayoutDelegate delegate) { public void setDelegate(ActionBarLayoutDelegate delegate) {
...@@ -208,15 +245,11 @@ public class ActionBarLayout extends FrameLayout { ...@@ -208,15 +245,11 @@ public class ActionBarLayout extends FrameLayout {
lastFragment.setParentLayout(null); lastFragment.setParentLayout(null);
fragmentsStack.remove(fragmentsStack.size() - 1); fragmentsStack.remove(fragmentsStack.size() - 1);
FrameLayoutAnimationListener temp = containerView; LinearLayoutContainer temp = containerView;
containerView = containerViewBack; containerView = containerViewBack;
containerViewBack = temp; containerViewBack = temp;
ViewGroup parent = (ViewGroup)containerView.getParent(); bringChildToFront(containerView);
parent.bringChildToFront(containerView);
parent.bringChildToFront(shadowView);
parent.bringChildToFront(actionBar);
//parent.removeViewInLayout(containerView);
//parent.addView(containerView, 1);
lastFragment = fragmentsStack.get(fragmentsStack.size() - 1); lastFragment = fragmentsStack.get(fragmentsStack.size() - 1);
lastFragment.onResume(); lastFragment.onResume();
} else { } else {
...@@ -228,6 +261,12 @@ public class ActionBarLayout extends FrameLayout { ...@@ -228,6 +261,12 @@ public class ActionBarLayout extends FrameLayout {
parent.removeView(lastFragment.fragmentView); parent.removeView(lastFragment.fragmentView);
} }
} }
if (lastFragment.needAddActionBar() && lastFragment.actionBar != null) {
ViewGroup parent = (ViewGroup) lastFragment.actionBar.getParent();
if (parent != null) {
parent.removeView(lastFragment.actionBar);
}
}
} }
containerViewBack.setVisibility(View.GONE); containerViewBack.setVisibility(View.GONE);
AndroidUtilities.unlockOrientation(parentActivity); AndroidUtilities.unlockOrientation(parentActivity);
...@@ -236,26 +275,28 @@ public class ActionBarLayout extends FrameLayout { ...@@ -236,26 +275,28 @@ public class ActionBarLayout extends FrameLayout {
ViewProxy.setTranslationX(containerView, 0); ViewProxy.setTranslationX(containerView, 0);
ViewProxy.setTranslationX(containerViewBack, 0); ViewProxy.setTranslationX(containerViewBack, 0);
actionBar.stopMoving(backAnimation); setInnerTranslationX(0);
shadowView.setVisibility(View.INVISIBLE);
ViewProxy.setTranslationX(shadowView, -AndroidUtilities.dp(2));
} }
private void prepareForMoving(MotionEvent ev) { private void prepareForMoving(MotionEvent ev) {
maybeStartTracking = false; maybeStartTracking = false;
startedTracking = true; startedTracking = true;
startedTrackingX = (int) ev.getX(); startedTrackingX = (int) ev.getX();
shadowView.setVisibility(View.VISIBLE);
ViewProxy.setTranslationX(shadowView, -AndroidUtilities.dp(2));
containerViewBack.setVisibility(View.VISIBLE); containerViewBack.setVisibility(View.VISIBLE);
beginTrackingSent = false; beginTrackingSent = false;
BaseFragment lastFragment = fragmentsStack.get(fragmentsStack.size() - 2); BaseFragment lastFragment = fragmentsStack.get(fragmentsStack.size() - 2);
actionBar.prepareForMoving(lastFragment.actionBarLayer);
View fragmentView = lastFragment.createView(parentActivity.getLayoutInflater(), null); View fragmentView = lastFragment.createView(parentActivity.getLayoutInflater(), null);
ViewGroup parentView = (ViewGroup)fragmentView.getParent(); ViewGroup parent = (ViewGroup) fragmentView.getParent();
if (parentView != null) { if (parent != null) {
parentView.removeView(fragmentView); parent.removeView(fragmentView);
}
if (lastFragment.needAddActionBar() && lastFragment.actionBar != null) {
parent = (ViewGroup) lastFragment.actionBar.getParent();
if (parent != null) {
parent.removeView(lastFragment.actionBar);
}
containerViewBack.addView(lastFragment.actionBar);
} }
containerViewBack.addView(fragmentView); containerViewBack.addView(fragmentView);
ViewGroup.LayoutParams layoutParams = fragmentView.getLayoutParams(); ViewGroup.LayoutParams layoutParams = fragmentView.getLayoutParams();
...@@ -271,7 +312,7 @@ public class ActionBarLayout extends FrameLayout { ...@@ -271,7 +312,7 @@ public class ActionBarLayout extends FrameLayout {
} }
public boolean onTouchEvent(MotionEvent ev) { public boolean onTouchEvent(MotionEvent ev) {
if(!checkTransitionAnimation() && !inActionMode && !animationInProgress) { if (!checkTransitionAnimation() && !inActionMode && !animationInProgress) {
if (fragmentsStack.size() > 1) { if (fragmentsStack.size() > 1) {
if (ev != null && ev.getAction() == MotionEvent.ACTION_DOWN && !startedTracking && !maybeStartTracking) { if (ev != null && ev.getAction() == MotionEvent.ACTION_DOWN && !startedTracking && !maybeStartTracking) {
BaseFragment currentFragment = fragmentsStack.get(fragmentsStack.size() - 1); BaseFragment currentFragment = fragmentsStack.get(fragmentsStack.size() - 1);
...@@ -303,9 +344,8 @@ public class ActionBarLayout extends FrameLayout { ...@@ -303,9 +344,8 @@ public class ActionBarLayout extends FrameLayout {
currentFragment.onBeginSlide(); currentFragment.onBeginSlide();
beginTrackingSent = true; beginTrackingSent = true;
} }
actionBar.moveActionBarByX(dx);
ViewProxy.setTranslationX(containerView, dx); ViewProxy.setTranslationX(containerView, dx);
ViewProxy.setTranslationX(shadowView, dx - AndroidUtilities.dp(2)); setInnerTranslationX(dx);
} }
} else if (ev != null && ev.getPointerId(0) == startedTrackingPointerId && (ev.getAction() == MotionEvent.ACTION_CANCEL || ev.getAction() == MotionEvent.ACTION_UP || ev.getAction() == MotionEvent.ACTION_POINTER_UP)) { } else if (ev != null && ev.getPointerId(0) == startedTrackingPointerId && (ev.getAction() == MotionEvent.ACTION_CANCEL || ev.getAction() == MotionEvent.ACTION_UP || ev.getAction() == MotionEvent.ACTION_POINTER_UP)) {
if (velocityTracker == null) { if (velocityTracker == null) {
...@@ -318,8 +358,8 @@ public class ActionBarLayout extends FrameLayout { ...@@ -318,8 +358,8 @@ public class ActionBarLayout extends FrameLayout {
if (velX >= 3500 && velX > velY) { if (velX >= 3500 && velX > velY) {
prepareForMoving(ev); prepareForMoving(ev);
if (!beginTrackingSent) { if (!beginTrackingSent) {
if (((Activity)getContext()).getCurrentFocus() != null) { if (((Activity) getContext()).getCurrentFocus() != null) {
AndroidUtilities.hideKeyboard(((Activity)getContext()).getCurrentFocus()); AndroidUtilities.hideKeyboard(((Activity) getContext()).getCurrentFocus());
} }
beginTrackingSent = true; beginTrackingSent = true;
} }
...@@ -336,19 +376,13 @@ public class ActionBarLayout extends FrameLayout { ...@@ -336,19 +376,13 @@ public class ActionBarLayout extends FrameLayout {
distToMove = containerView.getMeasuredWidth() - x; distToMove = containerView.getMeasuredWidth() - x;
animatorSet.playTogether( animatorSet.playTogether(
ObjectAnimatorProxy.ofFloat(containerView, "x", containerView.getMeasuredWidth()), ObjectAnimatorProxy.ofFloat(containerView, "x", containerView.getMeasuredWidth()),
ObjectAnimatorProxy.ofFloat(shadowView, "x", containerView.getMeasuredWidth() - AndroidUtilities.dp(2)), ObjectAnimatorProxy.ofFloat(this, "innerTranslationX", (float)containerView.getMeasuredWidth())
ObjectAnimatorProxy.ofFloat(actionBar.currentLayer, "x", actionBar.getMeasuredWidth()),
ObjectAnimatorProxy.ofFloat(actionBar.shadowView, "x", actionBar.getMeasuredWidth() - AndroidUtilities.dp(2)),
ObjectAnimatorProxy.ofFloat(actionBar.previousLayer, "alphaEx", 1.0f)
); );
} else { } else {
distToMove = x; distToMove = x;
animatorSet.playTogether( animatorSet.playTogether(
ObjectAnimatorProxy.ofFloat(containerView, "x", 0), ObjectAnimatorProxy.ofFloat(containerView, "x", 0),
ObjectAnimatorProxy.ofFloat(shadowView, "x", -AndroidUtilities.dp(2)), ObjectAnimatorProxy.ofFloat(this, "innerTranslationX", 0.0f)
ObjectAnimatorProxy.ofFloat(actionBar.currentLayer, "x", 0),
ObjectAnimatorProxy.ofFloat(actionBar.shadowView, "x", -AndroidUtilities.dp(2)),
ObjectAnimatorProxy.ofFloat(actionBar.previousLayer, "alphaEx", 0)
); );
} }
...@@ -388,16 +422,12 @@ public class ActionBarLayout extends FrameLayout { ...@@ -388,16 +422,12 @@ public class ActionBarLayout extends FrameLayout {
return false; return false;
} }
public ActionBar getActionBar() {
return actionBar;
}
public void onBackPressed() { public void onBackPressed() {
if (startedTracking || checkTransitionAnimation() || fragmentsStack.isEmpty()) { if (startedTracking || checkTransitionAnimation() || fragmentsStack.isEmpty()) {
return; return;
} }
if (actionBar.currentLayer != null && actionBar.currentLayer.isSearchFieldVisible) { if (currentActionBar != null && currentActionBar.isSearchFieldVisible) {
actionBar.currentLayer.closeSearchField(); currentActionBar.closeSearchField();
return; return;
} }
BaseFragment lastFragment = fragmentsStack.get(fragmentsStack.size() - 1); BaseFragment lastFragment = fragmentsStack.get(fragmentsStack.size() - 1);
...@@ -414,65 +444,32 @@ public class ActionBarLayout extends FrameLayout { ...@@ -414,65 +444,32 @@ public class ActionBarLayout extends FrameLayout {
} }
} }
private void onAnimationEndCheck() { private void onAnimationEndCheck(boolean byCheck) {
onCloseAnimationEnd(false); onCloseAnimationEnd(false);
onOpenAnimationEnd(false); onOpenAnimationEnd(false);
if (currentAnimation != null) {
if (byCheck) {
currentAnimation.cancel();
}
currentAnimation = null;
}
ViewProxy.setAlpha(this, 1.0f);
ViewProxy.setAlpha(containerView, 1.0f);
ViewProxy.setScaleX(containerView, 1.0f);
ViewProxy.setScaleY(containerView, 1.0f);
ViewProxy.setAlpha(containerViewBack, 1.0f);
ViewProxy.setScaleX(containerViewBack, 1.0f);
ViewProxy.setScaleY(containerViewBack, 1.0f);
} }
public boolean checkTransitionAnimation() { public boolean checkTransitionAnimation() {
if (transitionAnimationInProgress && transitionAnimationStartTime < System.currentTimeMillis() - 400) { if (transitionAnimationInProgress && transitionAnimationStartTime < System.currentTimeMillis() - 400) {
transitionAnimationInProgress = false; transitionAnimationInProgress = false;
onAnimationEndCheck(); onAnimationEndCheck(true);
} }
return transitionAnimationInProgress; return transitionAnimationInProgress;
} }
private void fixLayout() {
getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
@Override
public void onGlobalLayout() {
needLayout();
if (Build.VERSION.SDK_INT < 16) {
getViewTreeObserver().removeGlobalOnLayoutListener(this);
} else {
getViewTreeObserver().removeOnGlobalLayoutListener(this);
}
}
});
}
public void needLayout() {
WindowManager manager = (WindowManager)parentActivity.getSystemService(Context.WINDOW_SERVICE);
int rotation = manager.getDefaultDisplay().getRotation();
int height = 0;
if (actionBar.getVisibility() == View.VISIBLE) {
height = AndroidUtilities.getCurrentActionBarHeight();
}
if (containerView != null) {
FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) containerView.getLayoutParams();
if (layoutParams.topMargin != height) {
layoutParams.setMargins(0, height, 0, 0);
layoutParams.gravity = Gravity.TOP | Gravity.LEFT;
containerView.setLayoutParams(layoutParams);
}
}
if (containerViewBack != null) {
FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) containerViewBack.getLayoutParams();
if (layoutParams.topMargin != height) {
layoutParams.setMargins(0, height, 0, 0);
layoutParams.gravity = Gravity.TOP | Gravity.LEFT;
containerViewBack.setLayoutParams(layoutParams);
}
}
}
public ActionBar getInternalActionBar() {
return actionBar;
}
private void presentFragmentInternalRemoveOld(boolean removeLast, final BaseFragment fragment) { private void presentFragmentInternalRemoveOld(boolean removeLast, final BaseFragment fragment) {
if (fragment == null) { if (fragment == null) {
return; return;
...@@ -489,6 +486,12 @@ public class ActionBarLayout extends FrameLayout { ...@@ -489,6 +486,12 @@ public class ActionBarLayout extends FrameLayout {
parent.removeView(fragment.fragmentView); parent.removeView(fragment.fragmentView);
} }
} }
if (fragment.needAddActionBar() && fragment.actionBar != null) {
ViewGroup parent = (ViewGroup) fragment.actionBar.getParent();
if (parent != null) {
parent.removeView(fragment.actionBar);
}
}
} }
containerViewBack.setVisibility(View.GONE); containerViewBack.setVisibility(View.GONE);
} }
...@@ -509,8 +512,8 @@ public class ActionBarLayout extends FrameLayout { ...@@ -509,8 +512,8 @@ public class ActionBarLayout extends FrameLayout {
AndroidUtilities.hideKeyboard(parentActivity.getCurrentFocus()); AndroidUtilities.hideKeyboard(parentActivity.getCurrentFocus());
NotificationCenter.getInstance().postNotificationName(NotificationCenter.hideEmojiKeyboard); NotificationCenter.getInstance().postNotificationName(NotificationCenter.hideEmojiKeyboard);
} }
boolean needAnimation = openAnimation != null && !forceWithoutAnimation && parentActivity.getSharedPreferences("mainconfig", Activity.MODE_PRIVATE).getBoolean("view_animations", true); boolean needAnimation = Build.VERSION.SDK_INT > 10 && !forceWithoutAnimation && parentActivity.getSharedPreferences("mainconfig", Activity.MODE_PRIVATE).getBoolean("view_animations", true);
if (useAlphaAnimations && fragmentsStack.size() == 0 && alphaOpenAnimation == null) { if (useAlphaAnimations && fragmentsStack.size() == 0) {
needAnimation = false; needAnimation = false;
} }
...@@ -518,6 +521,9 @@ public class ActionBarLayout extends FrameLayout { ...@@ -518,6 +521,9 @@ public class ActionBarLayout extends FrameLayout {
fragment.setParentLayout(this); fragment.setParentLayout(this);
View fragmentView = fragment.createView(parentActivity.getLayoutInflater(), null); View fragmentView = fragment.createView(parentActivity.getLayoutInflater(), null);
if (fragment.needAddActionBar() && fragment.actionBar != null) {
containerViewBack.addView(fragment.actionBar);
}
containerViewBack.addView(fragmentView); containerViewBack.addView(fragmentView);
ViewGroup.LayoutParams layoutParams = fragmentView.getLayoutParams(); ViewGroup.LayoutParams layoutParams = fragmentView.getLayoutParams();
layoutParams.width = FrameLayout.LayoutParams.MATCH_PARENT; layoutParams.width = FrameLayout.LayoutParams.MATCH_PARENT;
...@@ -525,21 +531,17 @@ public class ActionBarLayout extends FrameLayout { ...@@ -525,21 +531,17 @@ public class ActionBarLayout extends FrameLayout {
fragmentView.setLayoutParams(layoutParams); fragmentView.setLayoutParams(layoutParams);
fragmentsStack.add(fragment); fragmentsStack.add(fragment);
fragment.onResume(); fragment.onResume();
actionBar.setCurrentActionBarLayer(fragment.actionBarLayer); currentActionBar = fragment.actionBar;
if (fragmentView.getBackground() == null) { if (fragmentView.getBackground() == null) {
fragmentView.setBackgroundColor(0xffffffff); fragmentView.setBackgroundColor(0xffffffff);
} }
FrameLayoutAnimationListener temp = containerView; LinearLayoutContainer temp = containerView;
containerView = containerViewBack; containerView = containerViewBack;
containerViewBack = temp; containerViewBack = temp;
containerView.setVisibility(View.VISIBLE); containerView.setVisibility(View.VISIBLE);
ViewGroup parent = (ViewGroup)containerView.getParent();
//parent.removeView(containerView); bringChildToFront(containerView);
//parent.addView(containerView, 1);
parent.bringChildToFront(containerView);
parent.bringChildToFront(shadowView);
parent.bringChildToFront(actionBar);
if (!needAnimation) { if (!needAnimation) {
presentFragmentInternalRemoveOld(removeLast, currentFragment); presentFragmentInternalRemoveOld(removeLast, currentFragment);
...@@ -551,11 +553,27 @@ public class ActionBarLayout extends FrameLayout { ...@@ -551,11 +553,27 @@ public class ActionBarLayout extends FrameLayout {
if (needAnimation) { if (needAnimation) {
if (useAlphaAnimations && fragmentsStack.size() == 1) { if (useAlphaAnimations && fragmentsStack.size() == 1) {
presentFragmentInternalRemoveOld(removeLast, currentFragment); presentFragmentInternalRemoveOld(removeLast, currentFragment);
startAnimation(alphaOpenAnimation); AnimatorSetProxy animatorSet = new AnimatorSetProxy();
animatorSet.playTogether();
ArrayList<Object> animators = new ArrayList<Object>();
animators.add(ObjectAnimatorProxy.ofFloat(this, "alpha", 0.0f, 1.0f));
if (backgroundView != null) { if (backgroundView != null) {
backgroundView.setVisibility(VISIBLE); backgroundView.setVisibility(VISIBLE);
backgroundView.startAnimation(alphaOpenAnimation2); animators.add(ObjectAnimatorProxy.ofFloat(backgroundView, "alpha", 0.0f, 1.0f));
} }
currentAnimation = new AnimatorSetProxy();
currentAnimation.playTogether(animators);
currentAnimation.setInterpolator(new AccelerateDecelerateInterpolator());
currentAnimation.setDuration(200);
currentAnimation.addListener(new AnimatorListenerAdapterProxy() {
@Override
public void onAnimationEnd(Object animation) {
onAnimationEndCheck(false);
}
});
currentAnimation.start();
} else { } else {
transitionAnimationStartTime = System.currentTimeMillis(); transitionAnimationStartTime = System.currentTimeMillis();
transitionAnimationInProgress = true; transitionAnimationInProgress = true;
...@@ -566,8 +584,20 @@ public class ActionBarLayout extends FrameLayout { ...@@ -566,8 +584,20 @@ public class ActionBarLayout extends FrameLayout {
fragment.onOpenAnimationEnd(); fragment.onOpenAnimationEnd();
} }
}; };
openAnimation.reset(); currentAnimation = new AnimatorSetProxy();
containerView.startAnimation(openAnimation); currentAnimation.playTogether(
ObjectAnimatorProxy.ofFloat(containerView, "alpha", 0.0f, 1.0f),
ObjectAnimatorProxy.ofFloat(containerView, "scaleX", 0.8f, 1.0f),
ObjectAnimatorProxy.ofFloat(containerView, "scaleY", 0.8f, 1.0f));
currentAnimation.setInterpolator(new DecelerateInterpolator(1.5f));
currentAnimation.setDuration(200);
currentAnimation.addListener(new AnimatorListenerAdapterProxy() {
@Override
public void onAnimationEnd(Object animation) {
onAnimationEndCheck(false);
}
});
currentAnimation.start();
} }
} else { } else {
fragment.onOpenAnimationEnd(); fragment.onOpenAnimationEnd();
...@@ -598,9 +628,7 @@ public class ActionBarLayout extends FrameLayout { ...@@ -598,9 +628,7 @@ public class ActionBarLayout extends FrameLayout {
fragment.setParentLayout(null); fragment.setParentLayout(null);
fragmentsStack.remove(fragment); fragmentsStack.remove(fragment);
containerViewBack.setVisibility(View.GONE); containerViewBack.setVisibility(View.GONE);
ViewGroup parent = (ViewGroup)containerView.getParent(); bringChildToFront(containerView);
parent.removeView(containerViewBack);
parent.addView(containerViewBack, 0);
} }
public void closeLastFragment(boolean animated) { public void closeLastFragment(boolean animated) {
...@@ -610,8 +638,8 @@ public class ActionBarLayout extends FrameLayout { ...@@ -610,8 +638,8 @@ public class ActionBarLayout extends FrameLayout {
if (parentActivity.getCurrentFocus() != null) { if (parentActivity.getCurrentFocus() != null) {
AndroidUtilities.hideKeyboard(parentActivity.getCurrentFocus()); AndroidUtilities.hideKeyboard(parentActivity.getCurrentFocus());
} }
boolean needAnimation = animated && closeAnimation != null && parentActivity.getSharedPreferences("mainconfig", Activity.MODE_PRIVATE).getBoolean("view_animations", true); boolean needAnimation = Build.VERSION.SDK_INT > 10 && animated && parentActivity.getSharedPreferences("mainconfig", Activity.MODE_PRIVATE).getBoolean("view_animations", true);
if (useAlphaAnimations && fragmentsStack.size() == 1 && alphaCloseAnimation == null) { if (useAlphaAnimations && fragmentsStack.size() == 1) {
needAnimation = false; needAnimation = false;
} }
final BaseFragment currentFragment = fragmentsStack.get(fragmentsStack.size() - 1); final BaseFragment currentFragment = fragmentsStack.get(fragmentsStack.size() - 1);
...@@ -621,20 +649,23 @@ public class ActionBarLayout extends FrameLayout { ...@@ -621,20 +649,23 @@ public class ActionBarLayout extends FrameLayout {
} }
if (previousFragment != null) { if (previousFragment != null) {
FrameLayoutAnimationListener temp = containerView; LinearLayoutContainer temp = containerView;
containerView = containerViewBack; containerView = containerViewBack;
containerViewBack = temp; containerViewBack = temp;
containerView.setVisibility(View.VISIBLE); containerView.setVisibility(View.VISIBLE);
previousFragment.setParentLayout(this); previousFragment.setParentLayout(this);
View fragmentView = previousFragment.createView(parentActivity.getLayoutInflater(), null); View fragmentView = previousFragment.createView(parentActivity.getLayoutInflater(), null);
if (previousFragment.needAddActionBar() && previousFragment.actionBar != null) {
containerView.addView(previousFragment.actionBar);
}
containerView.addView(fragmentView); containerView.addView(fragmentView);
ViewGroup.LayoutParams layoutParams = fragmentView.getLayoutParams(); ViewGroup.LayoutParams layoutParams = fragmentView.getLayoutParams();
layoutParams.width = FrameLayout.LayoutParams.MATCH_PARENT; layoutParams.width = FrameLayout.LayoutParams.MATCH_PARENT;
layoutParams.height = FrameLayout.LayoutParams.MATCH_PARENT; layoutParams.height = FrameLayout.LayoutParams.MATCH_PARENT;
fragmentView.setLayoutParams(layoutParams); fragmentView.setLayoutParams(layoutParams);
previousFragment.onResume(); previousFragment.onResume();
actionBar.setCurrentActionBarLayer(previousFragment.actionBarLayer); currentActionBar = previousFragment.actionBar;
if (fragmentView.getBackground() == null) { if (fragmentView.getBackground() == null) {
fragmentView.setBackgroundColor(0xffffffff); fragmentView.setBackgroundColor(0xffffffff);
} }
...@@ -646,25 +677,33 @@ public class ActionBarLayout extends FrameLayout { ...@@ -646,25 +677,33 @@ public class ActionBarLayout extends FrameLayout {
if (needAnimation) { if (needAnimation) {
transitionAnimationStartTime = System.currentTimeMillis(); transitionAnimationStartTime = System.currentTimeMillis();
transitionAnimationInProgress = true; transitionAnimationInProgress = true;
closeAnimation.reset();
onCloseAnimationEndRunnable = new Runnable() { onCloseAnimationEndRunnable = new Runnable() {
@Override @Override
public void run() { public void run() {
closeLastFragmentInternalRemoveOld(currentFragment); closeLastFragmentInternalRemoveOld(currentFragment);
} }
}; };
containerViewBack.startAnimation(closeAnimation);
currentAnimation = new AnimatorSetProxy();
currentAnimation.playTogether(
ObjectAnimatorProxy.ofFloat(containerViewBack, "alpha", 1.0f, 0.0f),
ObjectAnimatorProxy.ofFloat(containerViewBack, "scaleX", 1.0f, 0.8f),
ObjectAnimatorProxy.ofFloat(containerViewBack, "scaleY", 1.0f, 0.8f));
currentAnimation.setInterpolator(new DecelerateInterpolator(1.5f));
currentAnimation.setDuration(200);
currentAnimation.addListener(new AnimatorListenerAdapterProxy() {
@Override
public void onAnimationEnd(Object animation) {
onAnimationEndCheck(false);
}
});
currentAnimation.start();
} }
} else { } else {
if (needAnimation && useAlphaAnimations) { if (needAnimation && useAlphaAnimations) {
transitionAnimationStartTime = System.currentTimeMillis(); transitionAnimationStartTime = System.currentTimeMillis();
transitionAnimationInProgress = true; transitionAnimationInProgress = true;
alphaCloseAnimation.reset();
alphaCloseAnimation2.reset();
startAnimation(alphaCloseAnimation);
if (backgroundView != null) {
backgroundView.startAnimation(alphaCloseAnimation2);
}
onCloseAnimationEndRunnable = new Runnable() { onCloseAnimationEndRunnable = new Runnable() {
@Override @Override
public void run() { public void run() {
...@@ -675,6 +714,24 @@ public class ActionBarLayout extends FrameLayout { ...@@ -675,6 +714,24 @@ public class ActionBarLayout extends FrameLayout {
} }
} }
}; };
ArrayList<Object> animators = new ArrayList<Object>();
animators.add(ObjectAnimatorProxy.ofFloat(this, "alpha", 1.0f, 0.0f));
if (backgroundView != null) {
animators.add(ObjectAnimatorProxy.ofFloat(backgroundView, "alpha", 1.0f, 0.0f));
}
currentAnimation = new AnimatorSetProxy();
currentAnimation.playTogether(animators);
currentAnimation.setInterpolator(new AccelerateDecelerateInterpolator());
currentAnimation.setDuration(200);
currentAnimation.addListener(new AnimatorListenerAdapterProxy() {
@Override
public void onAnimationEnd(Object animation) {
onAnimationEndCheck(false);
}
});
currentAnimation.start();
} else { } else {
removeFragmentFromStack(currentFragment); removeFragmentFromStack(currentFragment);
setVisibility(GONE); setVisibility(GONE);
...@@ -692,13 +749,16 @@ public class ActionBarLayout extends FrameLayout { ...@@ -692,13 +749,16 @@ public class ActionBarLayout extends FrameLayout {
BaseFragment previousFragment = fragmentsStack.get(fragmentsStack.size() - 1); BaseFragment previousFragment = fragmentsStack.get(fragmentsStack.size() - 1);
previousFragment.setParentLayout(this); previousFragment.setParentLayout(this);
View fragmentView = previousFragment.createView(parentActivity.getLayoutInflater(), null); View fragmentView = previousFragment.createView(parentActivity.getLayoutInflater(), null);
if (previousFragment.needAddActionBar() && previousFragment.actionBar != null) {
containerView.addView(previousFragment.actionBar);
}
containerView.addView(fragmentView); containerView.addView(fragmentView);
ViewGroup.LayoutParams layoutParams = fragmentView.getLayoutParams(); ViewGroup.LayoutParams layoutParams = fragmentView.getLayoutParams();
layoutParams.width = FrameLayout.LayoutParams.MATCH_PARENT; layoutParams.width = FrameLayout.LayoutParams.MATCH_PARENT;
layoutParams.height = FrameLayout.LayoutParams.MATCH_PARENT; layoutParams.height = FrameLayout.LayoutParams.MATCH_PARENT;
fragmentView.setLayoutParams(layoutParams); fragmentView.setLayoutParams(layoutParams);
previousFragment.onResume(); previousFragment.onResume();
actionBar.setCurrentActionBarLayer(previousFragment.actionBarLayer); currentActionBar = previousFragment.actionBar;
if (fragmentView.getBackground() == null) { if (fragmentView.getBackground() == null) {
fragmentView.setBackgroundColor(0xffffffff); fragmentView.setBackgroundColor(0xffffffff);
} }
...@@ -728,19 +788,9 @@ public class ActionBarLayout extends FrameLayout { ...@@ -728,19 +788,9 @@ public class ActionBarLayout extends FrameLayout {
} }
} }
public void showActionBar() {
actionBar.setVisibility(View.VISIBLE);
needLayout();
}
public void hideActionBar() {
actionBar.setVisibility(View.GONE);
needLayout();
}
public boolean onKeyUp(int keyCode, KeyEvent event) { public boolean onKeyUp(int keyCode, KeyEvent event) {
if (keyCode == KeyEvent.KEYCODE_MENU && !checkTransitionAnimation() && !startedTracking) { if (keyCode == KeyEvent.KEYCODE_MENU && !checkTransitionAnimation() && !startedTracking && currentActionBar != null) {
actionBar.onMenuButtonPressed(); currentActionBar.onMenuButtonPressed();
} }
return super.onKeyUp(keyCode, event); return super.onKeyUp(keyCode, event);
} }
...@@ -752,12 +802,16 @@ public class ActionBarLayout extends FrameLayout { ...@@ -752,12 +802,16 @@ public class ActionBarLayout extends FrameLayout {
} }
public void onActionModeStarted(ActionMode mode) { public void onActionModeStarted(ActionMode mode) {
hideActionBar(); if (currentActionBar != null) {
currentActionBar.setVisibility(GONE);
}
inActionMode = true; inActionMode = true;
} }
public void onActionModeFinished(ActionMode mode) { public void onActionModeFinished(ActionMode mode) {
showActionBar(); if (currentActionBar != null) {
currentActionBar.setVisibility(VISIBLE);
}
inActionMode = false; inActionMode = false;
} }
...@@ -802,11 +856,13 @@ public class ActionBarLayout extends FrameLayout { ...@@ -802,11 +856,13 @@ public class ActionBarLayout extends FrameLayout {
return; return;
} }
if (transitionAnimationInProgress) { if (transitionAnimationInProgress) {
if (currentAnimation != null) {
currentAnimation.cancel();
currentAnimation = null;
}
if (onCloseAnimationEndRunnable != null) { if (onCloseAnimationEndRunnable != null) {
closeAnimation.cancel();
onCloseAnimationEnd(false); onCloseAnimationEnd(false);
} else if (onOpenAnimationEndRunnable != null) { } else if (onOpenAnimationEndRunnable != null) {
openAnimation.cancel();
onOpenAnimationEnd(false); onOpenAnimationEnd(false);
} }
containerView.invalidate(); containerView.invalidate();
...@@ -822,12 +878,6 @@ public class ActionBarLayout extends FrameLayout { ...@@ -822,12 +878,6 @@ public class ActionBarLayout extends FrameLayout {
public void setUseAlphaAnimations(boolean value) { public void setUseAlphaAnimations(boolean value) {
useAlphaAnimations = value; useAlphaAnimations = value;
if (useAlphaAnimations) {
alphaOpenAnimation = AnimationUtils.loadAnimation(getContext(), R.anim.icon_anim_fade_in);
alphaOpenAnimation2 = AnimationUtils.loadAnimation(getContext(), R.anim.icon_anim_fade_in);
alphaCloseAnimation = AnimationUtils.loadAnimation(getContext(), R.anim.icon_anim_fade_out);
alphaCloseAnimation2 = AnimationUtils.loadAnimation(getContext(), R.anim.icon_anim_fade_out);
}
} }
public void setBackgroundView(View view) { public void setBackgroundView(View view) {
......
TMessagesProj/src/main/java/org/telegram/ui/Views/ActionBar/ActionBarMenu.java
View file @ ca46b69b
...@@ -20,14 +20,12 @@ import org.telegram.android.AndroidUtilities; ...@@ -20,14 +20,12 @@ import org.telegram.android.AndroidUtilities;
public class ActionBarMenu extends LinearLayout { public class ActionBarMenu extends LinearLayout {
private ActionBar parentActionBar; protected ActionBar parentActionBar;
private ActionBarLayer parentActionBarLayer;
public ActionBarMenu(Context context, ActionBar actionBar, ActionBarLayer layer) { public ActionBarMenu(Context context, ActionBar layer) {
super(context); super(context);
setOrientation(LinearLayout.HORIZONTAL); setOrientation(LinearLayout.HORIZONTAL);
parentActionBar = actionBar; parentActionBar = layer;
parentActionBarLayer = layer;
} }
public ActionBarMenu(Context context) { public ActionBarMenu(Context context) {
...@@ -49,7 +47,7 @@ public class ActionBarMenu extends LinearLayout { ...@@ -49,7 +47,7 @@ public class ActionBarMenu extends LinearLayout {
addView(view); addView(view);
LinearLayout.LayoutParams layoutParams = (LinearLayout.LayoutParams)view.getLayoutParams(); LinearLayout.LayoutParams layoutParams = (LinearLayout.LayoutParams)view.getLayoutParams();
layoutParams.height = FrameLayout.LayoutParams.FILL_PARENT; layoutParams.height = FrameLayout.LayoutParams.FILL_PARENT;
view.setBackgroundResource(parentActionBarLayer.itemsBackgroundResourceId); view.setBackgroundResource(parentActionBar.itemsBackgroundResourceId);
view.setLayoutParams(layoutParams); view.setLayoutParams(layoutParams);
view.setOnClickListener(new OnClickListener() { view.setOnClickListener(new OnClickListener() {
@Override @Override
...@@ -61,11 +59,11 @@ public class ActionBarMenu extends LinearLayout { ...@@ -61,11 +59,11 @@ public class ActionBarMenu extends LinearLayout {
} }
public ActionBarMenuItem addItem(int id, int icon) { public ActionBarMenuItem addItem(int id, int icon) {
return addItem(id, icon, parentActionBarLayer.itemsBackgroundResourceId); return addItem(id, icon, parentActionBar.itemsBackgroundResourceId);
} }
public ActionBarMenuItem addItem(int id, int icon, int backgroundResource) { public ActionBarMenuItem addItem(int id, int icon, int backgroundResource) {
ActionBarMenuItem menuItem = new ActionBarMenuItem(getContext(), this, parentActionBar, backgroundResource); ActionBarMenuItem menuItem = new ActionBarMenuItem(getContext(), this, backgroundResource);
menuItem.setTag(id); menuItem.setTag(id);
menuItem.setScaleType(ImageView.ScaleType.CENTER); menuItem.setScaleType(ImageView.ScaleType.CENTER);
menuItem.setImageResource(icon); menuItem.setImageResource(icon);
...@@ -79,11 +77,11 @@ public class ActionBarMenu extends LinearLayout { ...@@ -79,11 +77,11 @@ public class ActionBarMenu extends LinearLayout {
public void onClick(View view) { public void onClick(View view) {
ActionBarMenuItem item = (ActionBarMenuItem)view; ActionBarMenuItem item = (ActionBarMenuItem)view;
if (item.hasSubMenu()) { if (item.hasSubMenu()) {
if (parentActionBarLayer.actionBarMenuOnItemClick.canOpenMenu()) { if (parentActionBar.actionBarMenuOnItemClick.canOpenMenu()) {
item.toggleSubMenu(); item.toggleSubMenu();
} }
} else if (item.isSearchField()) { } else if (item.isSearchField()) {
parentActionBarLayer.onSearchFieldVisibilityChanged(item.toggleSearch()); parentActionBar.onSearchFieldVisibilityChanged(item.toggleSearch());
} else { } else {
onItemClick((Integer)view.getTag()); onItemClick((Integer)view.getTag());
} }
...@@ -102,8 +100,8 @@ public class ActionBarMenu extends LinearLayout { ...@@ -102,8 +100,8 @@ public class ActionBarMenu extends LinearLayout {
} }
public void onItemClick(int id) { public void onItemClick(int id) {
if (parentActionBarLayer.actionBarMenuOnItemClick != null) { if (parentActionBar.actionBarMenuOnItemClick != null) {
parentActionBarLayer.actionBarMenuOnItemClick.onItemClick(id); parentActionBar.actionBarMenuOnItemClick.onItemClick(id);
} }
} }
...@@ -132,7 +130,7 @@ public class ActionBarMenu extends LinearLayout { ...@@ -132,7 +130,7 @@ public class ActionBarMenu extends LinearLayout {
if (view instanceof ActionBarMenuItem) { if (view instanceof ActionBarMenuItem) {
ActionBarMenuItem item = (ActionBarMenuItem)view; ActionBarMenuItem item = (ActionBarMenuItem)view;
if (item.isSearchField()) { if (item.isSearchField()) {
parentActionBarLayer.onSearchFieldVisibilityChanged(item.toggleSearch()); parentActionBar.onSearchFieldVisibilityChanged(item.toggleSearch());
} }
} }
} }
......
TMessagesProj/src/main/java/org/telegram/ui/Views/ActionBar/ActionBarMenuItem.java
View file @ ca46b69b
...@@ -13,7 +13,6 @@ import android.graphics.Rect; ...@@ -13,7 +13,6 @@ import android.graphics.Rect;
import android.os.Build; import android.os.Build;
import android.text.Editable; import android.text.Editable;
import android.text.TextWatcher; import android.text.TextWatcher;
import android.util.AttributeSet;
import android.view.ActionMode; import android.view.ActionMode;
import android.view.ContextMenu; import android.view.ContextMenu;
import android.view.Gravity; import android.view.Gravity;
...@@ -48,7 +47,6 @@ public class ActionBarMenuItem extends ImageView { ...@@ -48,7 +47,6 @@ public class ActionBarMenuItem extends ImageView {
private ActionBarPopupWindow.ActionBarPopupWindowLayout popupLayout; private ActionBarPopupWindow.ActionBarPopupWindowLayout popupLayout;
private ActionBarMenu parentMenu; private ActionBarMenu parentMenu;
private ActionBarPopupWindow popupWindow; private ActionBarPopupWindow popupWindow;
private ActionBar parentActionBar;
private EditText searchField; private EditText searchField;
private boolean isSearchField = false; private boolean isSearchField = false;
private ActionBarMenuItemSearchListener listener; private ActionBarMenuItemSearchListener listener;
...@@ -57,23 +55,10 @@ public class ActionBarMenuItem extends ImageView { ...@@ -57,23 +55,10 @@ public class ActionBarMenuItem extends ImageView {
private View selectedMenuView; private View selectedMenuView;
private Runnable showMenuRunnable; private Runnable showMenuRunnable;
public ActionBarMenuItem(Context context, ActionBarMenu menu, ActionBar actionBar, int background) { public ActionBarMenuItem(Context context, ActionBarMenu menu, int background) {
super(context); super(context);
setBackgroundResource(background); setBackgroundResource(background);
parentMenu = menu; parentMenu = menu;
parentActionBar = actionBar;
}
public ActionBarMenuItem(Context context) {
super(context);
}
public ActionBarMenuItem(Context context, AttributeSet attrs) {
super(context, attrs);
}
public ActionBarMenuItem(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
} }
@Override @Override
...@@ -254,10 +239,10 @@ public class ActionBarMenuItem extends ImageView { ...@@ -254,10 +239,10 @@ public class ActionBarMenuItem extends ImageView {
} }
popupWindow.setFocusable(true); popupWindow.setFocusable(true);
if (popupLayout.getMeasuredWidth() == 0) { if (popupLayout.getMeasuredWidth() == 0) {
popupWindow.showAsDropDown(this, parentActionBar.getMeasuredWidth() - popupLayout.getMeasuredWidth() - getLeft() - parentMenu.getLeft(), -getMeasuredHeight()); popupWindow.showAsDropDown(this, parentMenu.parentActionBar.getMeasuredWidth() - popupLayout.getMeasuredWidth() - getLeft() - parentMenu.getLeft(), -getMeasuredHeight());
popupWindow.update(this, parentActionBar.getMeasuredWidth() - popupLayout.getMeasuredWidth() - getLeft() - parentMenu.getLeft(), -getMeasuredHeight(), -1, -1); popupWindow.update(this, parentMenu.parentActionBar.getMeasuredWidth() - popupLayout.getMeasuredWidth() - getLeft() - parentMenu.getLeft(), -getMeasuredHeight(), -1, -1);
} else { } else {
popupWindow.showAsDropDown(this, parentActionBar.getMeasuredWidth() - popupLayout.getMeasuredWidth() - getLeft() - parentMenu.getLeft(), -getMeasuredHeight()); popupWindow.showAsDropDown(this, parentMenu.parentActionBar.getMeasuredWidth() - popupLayout.getMeasuredWidth() - getLeft() - parentMenu.getLeft(), -getMeasuredHeight());
} }
} }
...@@ -402,10 +387,10 @@ public class ActionBarMenuItem extends ImageView { ...@@ -402,10 +387,10 @@ public class ActionBarMenuItem extends ImageView {
protected void onLayout(boolean changed, int left, int top, int right, int bottom) { protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
super.onLayout(changed, left, top, right, bottom); super.onLayout(changed, left, top, right, bottom);
if (popupWindow != null && popupWindow.isShowing()) { if (popupWindow != null && popupWindow.isShowing()) {
int x = parentActionBar.getMeasuredWidth() - popupLayout.getMeasuredWidth() - getLeft() - parentMenu.getLeft(); int x = parentMenu.parentActionBar.getMeasuredWidth() - popupLayout.getMeasuredWidth() - getLeft() - parentMenu.getLeft();
int y = -getMeasuredHeight(); int y = -getMeasuredHeight();
FileLog.e("tmessages", "x = " + x + " y = " + y); FileLog.e("tmessages", "x = " + x + " y = " + y);
popupWindow.update(this, parentActionBar.getMeasuredWidth() - popupLayout.getMeasuredWidth() - getLeft() - parentMenu.getLeft(), -getMeasuredHeight(), -1, -1); popupWindow.update(this, parentMenu.parentActionBar.getMeasuredWidth() - popupLayout.getMeasuredWidth() - getLeft() - parentMenu.getLeft(), -getMeasuredHeight(), -1, -1);
} }
} }
......
TMessagesProj/src/main/java/org/telegram/ui/Views/ActionBar/BaseFragment.java
View file @ ca46b69b
...@@ -23,12 +23,13 @@ import org.telegram.messenger.R; ...@@ -23,12 +23,13 @@ import org.telegram.messenger.R;
public class BaseFragment { public class BaseFragment {
private boolean isFinished = false; private boolean isFinished = false;
private AlertDialog visibleDialog = null;
protected View fragmentView; protected View fragmentView;
protected ActionBarLayout parentLayout; protected ActionBarLayout parentLayout;
protected ActionBarLayer actionBarLayer; protected ActionBar actionBar;
protected int classGuid = 0; protected int classGuid = 0;
protected Bundle arguments; protected Bundle arguments;
private AlertDialog visibleDialog = null;
protected boolean swipeBackEnabled = true; protected boolean swipeBackEnabled = true;
public BaseFragment() { public BaseFragment() {
...@@ -48,7 +49,7 @@ public class BaseFragment { ...@@ -48,7 +49,7 @@ public class BaseFragment {
return arguments; return arguments;
} }
public void setParentLayout(ActionBarLayout layout) { protected void setParentLayout(ActionBarLayout layout) {
if (parentLayout != layout) { if (parentLayout != layout) {
parentLayout = layout; parentLayout = layout;
if (fragmentView != null) { if (fragmentView != null) {
...@@ -62,14 +63,21 @@ public class BaseFragment { ...@@ -62,14 +63,21 @@ public class BaseFragment {
} }
fragmentView = null; fragmentView = null;
} }
if (parentLayout != null) { if (actionBar != null) {
if (actionBarLayer != null) { ViewGroup parent = (ViewGroup) actionBar.getParent();
actionBarLayer.onDestroy(); if (parent != null) {
try {
parent.removeView(actionBar);
} catch (Exception e) {
FileLog.e("tmessages", e);
}
} }
actionBarLayer = parentLayout.getInternalActionBar().createLayer(); }
actionBarLayer.parentFragment = this; if (parentLayout != null) {
actionBarLayer.setBackgroundResource(R.color.header); actionBar = new ActionBar(parentLayout.getContext());
actionBarLayer.setItemsBackground(R.drawable.bar_selector); actionBar.parentFragment = this;
actionBar.setBackgroundResource(R.color.header);
actionBar.setItemsBackground(R.drawable.bar_selector);
} }
} }
} }
...@@ -99,8 +107,8 @@ public class BaseFragment { ...@@ -99,8 +107,8 @@ public class BaseFragment {
public void onFragmentDestroy() { public void onFragmentDestroy() {
ConnectionsManager.getInstance().cancelRpcsForClassGuid(classGuid); ConnectionsManager.getInstance().cancelRpcsForClassGuid(classGuid);
isFinished = true; isFinished = true;
if (actionBarLayer != null) { if (actionBar != null) {
actionBarLayer.setEnabled(false); actionBar.setEnabled(false);
} }
} }
...@@ -109,9 +117,9 @@ public class BaseFragment { ...@@ -109,9 +117,9 @@ public class BaseFragment {
} }
public void onPause() { public void onPause() {
if (actionBarLayer != null) { if (actionBar != null) {
actionBarLayer.onPause(); actionBar.onPause();
actionBarLayer.closeSearchField(); actionBar.closeSearchField();
} }
try { try {
if (visibleDialog != null && visibleDialog.isShowing()) { if (visibleDialog != null && visibleDialog.isShowing()) {
...@@ -168,18 +176,6 @@ public class BaseFragment { ...@@ -168,18 +176,6 @@ public class BaseFragment {
} }
} }
public void showActionBar() {
if (parentLayout != null) {
parentLayout.showActionBar();
}
}
public void hideActionBar() {
if (parentLayout != null) {
parentLayout.hideActionBar();
}
}
public void onBeginSlide() { public void onBeginSlide() {
try { try {
if (visibleDialog != null && visibleDialog.isShowing()) { if (visibleDialog != null && visibleDialog.isShowing()) {
...@@ -189,8 +185,8 @@ public class BaseFragment { ...@@ -189,8 +185,8 @@ public class BaseFragment {
} catch (Exception e) { } catch (Exception e) {
FileLog.e("tmessages", e); FileLog.e("tmessages", e);
} }
if (actionBarLayer != null) { if (actionBar != null) {
actionBarLayer.onPause(); actionBar.onPause();
} }
} }
...@@ -202,6 +198,10 @@ public class BaseFragment { ...@@ -202,6 +198,10 @@ public class BaseFragment {
} }
public boolean needAddActionBar() {
return true;
}
protected void showAlertDialog(AlertDialog.Builder builder) { protected void showAlertDialog(AlertDialog.Builder builder) {
if (parentLayout == null || parentLayout.checkTransitionAnimation() || parentLayout.animationInProgress || parentLayout.startedTracking) { if (parentLayout == null || parentLayout.checkTransitionAnimation() || parentLayout.animationInProgress || parentLayout.startedTracking) {
return; return;
......
TMessagesProj/src/main/java/org/telegram/ui/Views/ActionBar/DrawerLayoutContainer.java
View file @ ca46b69b
...@@ -46,7 +46,6 @@ public class DrawerLayoutContainer extends FrameLayout { ...@@ -46,7 +46,6 @@ public class DrawerLayoutContainer extends FrameLayout {
private boolean beginTrackingSent; private boolean beginTrackingSent;
private AnimatorSetProxy currentAnimation = null; private AnimatorSetProxy currentAnimation = null;
private Paint statusBarPaint = new Paint();
private Paint scrimPaint = new Paint(); private Paint scrimPaint = new Paint();
private Object lastInsets; private Object lastInsets;
...@@ -100,7 +99,7 @@ public class DrawerLayoutContainer extends FrameLayout { ...@@ -100,7 +99,7 @@ public class DrawerLayoutContainer extends FrameLayout {
child.dispatchApplyWindowInsets(wi); child.dispatchApplyWindowInsets(wi);
} }
private void applyMarginInsets(MarginLayoutParams lp, Object insets, int drawerGravity) { private void applyMarginInsets(MarginLayoutParams lp, Object insets, int drawerGravity, boolean topOnly) {
WindowInsets wi = (WindowInsets) insets; WindowInsets wi = (WindowInsets) insets;
if (drawerGravity == Gravity.LEFT) { if (drawerGravity == Gravity.LEFT) {
wi = wi.replaceSystemWindowInsets(wi.getSystemWindowInsetLeft(), wi.getSystemWindowInsetTop(), 0, wi.getSystemWindowInsetBottom()); wi = wi.replaceSystemWindowInsets(wi.getSystemWindowInsetLeft(), wi.getSystemWindowInsetTop(), 0, wi.getSystemWindowInsetBottom());
...@@ -108,7 +107,7 @@ public class DrawerLayoutContainer extends FrameLayout { ...@@ -108,7 +107,7 @@ public class DrawerLayoutContainer extends FrameLayout {
wi = wi.replaceSystemWindowInsets(0, wi.getSystemWindowInsetTop(), wi.getSystemWindowInsetRight(), wi.getSystemWindowInsetBottom()); wi = wi.replaceSystemWindowInsets(0, wi.getSystemWindowInsetTop(), wi.getSystemWindowInsetRight(), wi.getSystemWindowInsetBottom());
} }
lp.leftMargin = wi.getSystemWindowInsetLeft(); lp.leftMargin = wi.getSystemWindowInsetLeft();
lp.topMargin = wi.getSystemWindowInsetTop(); lp.topMargin = topOnly ? 0 : wi.getSystemWindowInsetTop();
lp.rightMargin = wi.getSystemWindowInsetRight(); lp.rightMargin = wi.getSystemWindowInsetRight();
lp.bottomMargin = wi.getSystemWindowInsetBottom(); lp.bottomMargin = wi.getSystemWindowInsetBottom();
} }
...@@ -126,10 +125,6 @@ public class DrawerLayoutContainer extends FrameLayout { ...@@ -126,10 +125,6 @@ public class DrawerLayoutContainer extends FrameLayout {
requestLayout(); requestLayout();
} }
public void setStatusBarColor(int color) {
statusBarPaint.setColor(color);
}
public void setDrawerLayout(View layout) { public void setDrawerLayout(View layout) {
drawerLayout = layout; drawerLayout = layout;
addView(drawerLayout); addView(drawerLayout);
...@@ -361,14 +356,6 @@ public class DrawerLayoutContainer extends FrameLayout { ...@@ -361,14 +356,6 @@ public class DrawerLayoutContainer extends FrameLayout {
super.requestDisallowInterceptTouchEvent(disallowIntercept); super.requestDisallowInterceptTouchEvent(disallowIntercept);
} }
@Override
protected void onDraw(Canvas canvas) {
super.onDraw(canvas);
if (Build.VERSION.SDK_INT >= 21) {
canvas.drawRect(0, 0, getWidth(), AndroidUtilities.statusBarHeight, statusBarPaint);
}
}
@Override @Override
protected void onLayout(boolean changed, int l, int t, int r, int b) { protected void onLayout(boolean changed, int l, int t, int r, int b) {
inLayout = true; inLayout = true;
...@@ -410,7 +397,6 @@ public class DrawerLayoutContainer extends FrameLayout { ...@@ -410,7 +397,6 @@ public class DrawerLayoutContainer extends FrameLayout {
final boolean applyInsets = lastInsets != null && Build.VERSION.SDK_INT >= 21; final boolean applyInsets = lastInsets != null && Build.VERSION.SDK_INT >= 21;
int foundDrawers = 0;
final int childCount = getChildCount(); final int childCount = getChildCount();
for (int i = 0; i < childCount; i++) { for (int i = 0; i < childCount; i++) {
final View child = getChildAt(i); final View child = getChildAt(i);
...@@ -425,7 +411,7 @@ public class DrawerLayoutContainer extends FrameLayout { ...@@ -425,7 +411,7 @@ public class DrawerLayoutContainer extends FrameLayout {
if (child.getFitsSystemWindows()) { if (child.getFitsSystemWindows()) {
dispatchChildInsets(child, lastInsets, lp.gravity); dispatchChildInsets(child, lastInsets, lp.gravity);
} else { } else {
applyMarginInsets(lp, lastInsets, lp.gravity); applyMarginInsets(lp, lastInsets, lp.gravity, Build.VERSION.SDK_INT >= 21);
} }
} }
...@@ -471,7 +457,7 @@ public class DrawerLayoutContainer extends FrameLayout { ...@@ -471,7 +457,7 @@ public class DrawerLayoutContainer extends FrameLayout {
scrimPaint.setColor((int) (((0x99000000 & 0xff000000) >>> 24) * scrimOpacity) << 24); scrimPaint.setColor((int) (((0x99000000 & 0xff000000) >>> 24) * scrimOpacity) << 24);
canvas.drawRect(clipLeft, 0, clipRight, getHeight(), scrimPaint); canvas.drawRect(clipLeft, 0, clipRight, getHeight(), scrimPaint);
} else if (shadowLeft != null) { } else if (shadowLeft != null) {
final float alpha = Math.max(0, Math.min((float) drawerPosition / AndroidUtilities.dp(20), 1.f)); final float alpha = Math.max(0, Math.min((float) drawerPosition / AndroidUtilities.dp(20), 1.0f));
shadowLeft.setBounds(drawerPosition, child.getTop(), drawerPosition + shadowLeft.getIntrinsicWidth(), child.getBottom()); shadowLeft.setBounds(drawerPosition, child.getTop(), drawerPosition + shadowLeft.getIntrinsicWidth(), child.getBottom());
shadowLeft.setAlpha((int) (0xff * alpha)); shadowLeft.setAlpha((int) (0xff * alpha));
shadowLeft.draw(canvas); shadowLeft.draw(canvas);
......
TMessagesProj/src/main/java/org/telegram/ui/Views/AvatarDrawable.java
View file @ ca46b69b
...@@ -19,6 +19,7 @@ import android.text.TextPaint; ...@@ -19,6 +19,7 @@ import android.text.TextPaint;
import org.telegram.android.AndroidUtilities; import org.telegram.android.AndroidUtilities;
import org.telegram.messenger.FileLog; import org.telegram.messenger.FileLog;
import org.telegram.messenger.R;
import org.telegram.messenger.TLRPC; import org.telegram.messenger.TLRPC;
public class AvatarDrawable extends Drawable { public class AvatarDrawable extends Drawable {
...@@ -28,6 +29,9 @@ public class AvatarDrawable extends Drawable { ...@@ -28,6 +29,9 @@ public class AvatarDrawable extends Drawable {
private static int[] arrColors = {0xffe56555, 0xfff28c48, 0xffeec764, 0xff76c84d, 0xff5fbed5, 0xff549cdd, 0xff8e85ee, 0xfff2749a}; private static int[] arrColors = {0xffe56555, 0xfff28c48, 0xffeec764, 0xff76c84d, 0xff5fbed5, 0xff549cdd, 0xff8e85ee, 0xfff2749a};
private static int[] arrColorsProfiles = {0xffd86f65, 0xffdc9663, 0xffdebc68, 0xff67b35d, 0xff56a2bb, 0xff5c98cd, 0xff8c79d2, 0xffda738e}; private static int[] arrColorsProfiles = {0xffd86f65, 0xffdc9663, 0xffdebc68, 0xff67b35d, 0xff56a2bb, 0xff5c98cd, 0xff8c79d2, 0xffda738e};
private static int[] arrColorsProfilesBack = {0xffca6056, 0xffcf8550, 0xffcfa742, 0xff56a14c, 0xff4492ac, 0xff4c84b6, 0xff7d6ac4, 0xffc9637e}; private static int[] arrColorsProfilesBack = {0xffca6056, 0xffcf8550, 0xffcfa742, 0xff56a14c, 0xff4492ac, 0xff4c84b6, 0xff7d6ac4, 0xffc9637e};
private static int[] arrColorsProfilesText = {0xfff9cbc5, 0xfffadbc4, 0xfff7e7bf, 0xffc0edba, 0xffb8e2f0, 0xffb3d7f7, 0xffcdc4ed, 0xfff2cfd8};
private static int[] arrColorsButtons = {R.drawable.bar_selector_red, R.drawable.bar_selector_orange, R.drawable.bar_selector_yellow,
R.drawable.bar_selector_green, R.drawable.bar_selector_cyan, R.drawable.bar_selector_blue, R.drawable.bar_selector_violet, R.drawable.bar_selector_pink};
private int color; private int color;
private StaticLayout textLayout; private StaticLayout textLayout;
...@@ -73,10 +77,18 @@ public class AvatarDrawable extends Drawable { ...@@ -73,10 +77,18 @@ public class AvatarDrawable extends Drawable {
return arrColors[Math.abs(id) % arrColors.length]; return arrColors[Math.abs(id) % arrColors.length];
} }
public static int getButtonColorForId(int id) {
return arrColorsButtons[Math.abs(id) % arrColorsButtons.length];
}
public static int getProfileColorForId(int id) { public static int getProfileColorForId(int id) {
return arrColorsProfiles[Math.abs(id) % arrColorsProfiles.length]; return arrColorsProfiles[Math.abs(id) % arrColorsProfiles.length];
} }
public static int getProfileTextColorForId(int id) {
return arrColorsProfilesText[Math.abs(id) % arrColorsProfilesText.length];
}
public static int getProfileBackColorForId(int id) { public static int getProfileBackColorForId(int id) {
return arrColorsProfilesBack[Math.abs(id) % arrColorsProfilesBack.length]; return arrColorsProfilesBack[Math.abs(id) % arrColorsProfilesBack.length];
} }
...@@ -99,7 +111,7 @@ public class AvatarDrawable extends Drawable { ...@@ -99,7 +111,7 @@ public class AvatarDrawable extends Drawable {
public void setInfo(int id, String firstName, String lastName, boolean isBroadcast) { public void setInfo(int id, String firstName, String lastName, boolean isBroadcast) {
if (isProfile) { if (isProfile) {
color = arrColorsProfiles[Math.abs(id) % arrColors.length]; color = arrColorsProfiles[Math.abs(id) % arrColorsProfiles.length];
} else { } else {
color = arrColors[Math.abs(id) % arrColors.length]; color = arrColors[Math.abs(id) % arrColors.length];
} }
......
TMessagesProj/src/main/java/org/telegram/ui/Views/Switch.java 0 → 100644
View file @ ca46b69b
/*
* Copyright (C) 2010 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.telegram.ui.Views;
import android.content.Context;
import android.graphics.Canvas;
import android.graphics.PorterDuff;
import android.graphics.PorterDuffColorFilter;
import android.graphics.Rect;
import android.graphics.Region;
import android.graphics.drawable.Drawable;
import android.view.Gravity;
import android.view.MotionEvent;
import android.view.VelocityTracker;
import android.view.ViewConfiguration;
import android.widget.CompoundButton;
import org.telegram.android.AndroidUtilities;
import org.telegram.android.LocaleController;
import org.telegram.messenger.R;
import org.telegram.ui.AnimationCompat.ObjectAnimatorProxy;
public class Switch extends CompoundButton {
public static class Insets {
public static final Insets NONE = new Insets(AndroidUtilities.dp(4), 0, AndroidUtilities.dp(4), 0);
public final int left;
public final int top;
public final int right;
public final int bottom;
private Insets(int left, int top, int right, int bottom) {
this.left = left;
this.top = top;
this.right = right;
this.bottom = bottom;
}
}
public static float constrain(float amount, float low, float high) {
return amount < low ? low : (amount > high ? high : amount);
}
private static final int THUMB_ANIMATION_DURATION = 250;
private static final int TOUCH_MODE_IDLE = 0;
private static final int TOUCH_MODE_DOWN = 1;
private static final int TOUCH_MODE_DRAGGING = 2;
private Drawable mThumbDrawable;
private Drawable mTrackDrawable;
private int mThumbTextPadding;
private int mSwitchMinWidth;
private int mSwitchPadding;
private boolean mSplitTrack;
private boolean attachedToWindow;
private boolean wasLayout;
private int mTouchMode;
private int mTouchSlop;
private float mTouchX;
private float mTouchY;
private VelocityTracker mVelocityTracker = VelocityTracker.obtain();
private int mMinFlingVelocity;
private float thumbPosition;
private int mSwitchWidth;
private int mSwitchHeight;
private int mThumbWidth;
private int mSwitchLeft;
private int mSwitchTop;
private int mSwitchRight;
private int mSwitchBottom;
private ObjectAnimatorProxy mPositionAnimator;
@SuppressWarnings("hiding")
private final Rect mTempRect = new Rect();
public Switch(Context context) {
super(context);
mThumbDrawable = context.getResources().getDrawable(R.drawable.switch_thumb);
if (mThumbDrawable != null) {
mThumbDrawable.setCallback(this);
}
mTrackDrawable = context.getResources().getDrawable(R.drawable.switch_track);
if (mTrackDrawable != null) {
mTrackDrawable.setCallback(this);
}
if (AndroidUtilities.density < 1) {
mSwitchMinWidth = AndroidUtilities.dp(30);
} else {
mSwitchMinWidth = 0;
}
mSwitchPadding = 0;
mSplitTrack = false;
final ViewConfiguration config = ViewConfiguration.get(context);
mTouchSlop = config.getScaledTouchSlop();
mMinFlingVelocity = config.getScaledMinimumFlingVelocity();
refreshDrawableState();
setChecked(isChecked());
}
public void setSwitchPadding(int pixels) {
mSwitchPadding = pixels;
requestLayout();
}
public int getSwitchPadding() {
return mSwitchPadding;
}
public void setSwitchMinWidth(int pixels) {
mSwitchMinWidth = pixels;
requestLayout();
}
public int getSwitchMinWidth() {
return mSwitchMinWidth;
}
public void setThumbTextPadding(int pixels) {
mThumbTextPadding = pixels;
requestLayout();
}
public int getThumbTextPadding() {
return mThumbTextPadding;
}
public void setTrackDrawable(Drawable track) {
if (mTrackDrawable != null) {
mTrackDrawable.setCallback(null);
}
mTrackDrawable = track;
if (track != null) {
track.setCallback(this);
}
requestLayout();
}
public void setTrackResource(int resId) {
setTrackDrawable(getContext().getDrawable(resId));
}
public Drawable getTrackDrawable() {
return mTrackDrawable;
}
public void setThumbDrawable(Drawable thumb) {
if (mThumbDrawable != null) {
mThumbDrawable.setCallback(null);
}
mThumbDrawable = thumb;
if (thumb != null) {
thumb.setCallback(this);
}
requestLayout();
}
public void setThumbResource(int resId) {
setThumbDrawable(getContext().getDrawable(resId));
}
public Drawable getThumbDrawable() {
return mThumbDrawable;
}
public void setSplitTrack(boolean splitTrack) {
mSplitTrack = splitTrack;
invalidate();
}
public boolean getSplitTrack() {
return mSplitTrack;
}
@Override
public void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
final Rect padding = mTempRect;
int thumbWidth;
int thumbHeight;
if (mThumbDrawable != null) {
mThumbDrawable.getPadding(padding);
thumbWidth = mThumbDrawable.getIntrinsicWidth() - padding.left - padding.right;
thumbHeight = mThumbDrawable.getIntrinsicHeight();
} else {
thumbWidth = 0;
thumbHeight = 0;
}
mThumbWidth = thumbWidth;
int trackHeight;
if (mTrackDrawable != null) {
mTrackDrawable.getPadding(padding);
trackHeight = mTrackDrawable.getIntrinsicHeight();
} else {
padding.setEmpty();
trackHeight = 0;
}
int paddingLeft = padding.left;
int paddingRight = padding.right;
if (mThumbDrawable != null) {
final Insets inset = Insets.NONE;
paddingLeft = Math.max(paddingLeft, inset.left);
paddingRight = Math.max(paddingRight, inset.right);
}
final int switchWidth = Math.max(mSwitchMinWidth, 2 * mThumbWidth + paddingLeft + paddingRight);
final int switchHeight = Math.max(trackHeight, thumbHeight);
mSwitchWidth = switchWidth;
mSwitchHeight = switchHeight;
super.onMeasure(widthMeasureSpec, heightMeasureSpec);
final int measuredHeight = getMeasuredHeight();
if (measuredHeight < switchHeight) {
setMeasuredDimension(switchWidth, switchHeight);
}
}
private boolean hitThumb(float x, float y) {
final int thumbOffset = getThumbOffset();
mThumbDrawable.getPadding(mTempRect);
final int thumbTop = mSwitchTop - mTouchSlop;
final int thumbLeft = mSwitchLeft + thumbOffset - mTouchSlop;
final int thumbRight = thumbLeft + mThumbWidth + mTempRect.left + mTempRect.right + mTouchSlop;
final int thumbBottom = mSwitchBottom + mTouchSlop;
return x > thumbLeft && x < thumbRight && y > thumbTop && y < thumbBottom;
}
@Override
public boolean onTouchEvent(MotionEvent ev) {
mVelocityTracker.addMovement(ev);
final int action = ev.getActionMasked();
switch (action) {
case MotionEvent.ACTION_DOWN: {
final float x = ev.getX();
final float y = ev.getY();
if (isEnabled() && hitThumb(x, y)) {
mTouchMode = TOUCH_MODE_DOWN;
mTouchX = x;
mTouchY = y;
}
break;
}
case MotionEvent.ACTION_MOVE: {
switch (mTouchMode) {
case TOUCH_MODE_IDLE:
break;
case TOUCH_MODE_DOWN: {
final float x = ev.getX();
final float y = ev.getY();
if (Math.abs(x - mTouchX) > mTouchSlop || Math.abs(y - mTouchY) > mTouchSlop) {
mTouchMode = TOUCH_MODE_DRAGGING;
getParent().requestDisallowInterceptTouchEvent(true);
mTouchX = x;
mTouchY = y;
return true;
}
break;
}
case TOUCH_MODE_DRAGGING: {
final float x = ev.getX();
final int thumbScrollRange = getThumbScrollRange();
final float thumbScrollOffset = x - mTouchX;
float dPos;
if (thumbScrollRange != 0) {
dPos = thumbScrollOffset / thumbScrollRange;
} else {
dPos = thumbScrollOffset > 0 ? 1 : -1;
}
if (LocaleController.isRTL) {
dPos = -dPos;
}
final float newPos = constrain(thumbPosition + dPos, 0, 1);
if (newPos != thumbPosition) {
mTouchX = x;
setThumbPosition(newPos);
}
return true;
}
}
break;
}
case MotionEvent.ACTION_UP:
case MotionEvent.ACTION_CANCEL: {
if (mTouchMode == TOUCH_MODE_DRAGGING) {
stopDrag(ev);
super.onTouchEvent(ev);
return true;
}
mTouchMode = TOUCH_MODE_IDLE;
mVelocityTracker.clear();
break;
}
}
return super.onTouchEvent(ev);
}
private void cancelSuperTouch(MotionEvent ev) {
MotionEvent cancel = MotionEvent.obtain(ev);
cancel.setAction(MotionEvent.ACTION_CANCEL);
super.onTouchEvent(cancel);
cancel.recycle();
}
private void stopDrag(MotionEvent ev) {
mTouchMode = TOUCH_MODE_IDLE;
final boolean commitChange = ev.getAction() == MotionEvent.ACTION_UP && isEnabled();
final boolean newState;
if (commitChange) {
mVelocityTracker.computeCurrentVelocity(1000);
final float xvel = mVelocityTracker.getXVelocity();
if (Math.abs(xvel) > mMinFlingVelocity) {
newState = LocaleController.isRTL ? (xvel < 0) : (xvel > 0);
} else {
newState = getTargetCheckedState();
}
} else {
newState = isChecked();
}
setChecked(newState);
cancelSuperTouch(ev);
}
private void animateThumbToCheckedState(boolean newCheckedState) {
final float targetPosition = newCheckedState ? 1 : 0;
mPositionAnimator = ObjectAnimatorProxy.ofFloatProxy(this, "thumbPosition", targetPosition);
mPositionAnimator.setDuration(THUMB_ANIMATION_DURATION);
mPositionAnimator.setAutoCancel(true);
mPositionAnimator.start();
}
private void cancelPositionAnimator() {
if (mPositionAnimator != null) {
mPositionAnimator.cancel();
}
}
private boolean getTargetCheckedState() {
return thumbPosition > 0.5f;
}
private void setThumbPosition(float position) {
thumbPosition = position;
invalidate();
}
public float getThumbPosition() {
return thumbPosition;
}
@Override
public void toggle() {
setChecked(!isChecked());
}
@Override
protected void onAttachedToWindow() {
super.onAttachedToWindow();
attachedToWindow = true;
}
@Override
protected void onDetachedFromWindow() {
super.onDetachedFromWindow();
attachedToWindow = false;
wasLayout = false;
}
@Override
public void setChecked(boolean checked) {
super.setChecked(checked);
checked = isChecked();
if (attachedToWindow && wasLayout) {
animateThumbToCheckedState(checked);
} else {
cancelPositionAnimator();
setThumbPosition(checked ? 1 : 0);
}
if (mTrackDrawable != null) {
mTrackDrawable.setColorFilter(new PorterDuffColorFilter(checked ? 0xffa0d6fa : 0xffc7c7c7, PorterDuff.Mode.MULTIPLY));
}
if (mThumbDrawable != null) {
mThumbDrawable.setColorFilter(new PorterDuffColorFilter(checked ? 0xff45abef : 0xffededed, PorterDuff.Mode.MULTIPLY));
}
}
@Override
protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
super.onLayout(changed, left, top, right, bottom);
wasLayout = true;
int opticalInsetLeft = 0;
int opticalInsetRight = 0;
if (mThumbDrawable != null) {
final Rect trackPadding = mTempRect;
if (mTrackDrawable != null) {
mTrackDrawable.getPadding(trackPadding);
} else {
trackPadding.setEmpty();
}
final Insets insets = Insets.NONE;
opticalInsetLeft = Math.max(0, insets.left - trackPadding.left);
opticalInsetRight = Math.max(0, insets.right - trackPadding.right);
}
final int switchRight;
final int switchLeft;
if (LocaleController.isRTL) {
switchLeft = getPaddingLeft() + opticalInsetLeft;
switchRight = switchLeft + mSwitchWidth - opticalInsetLeft - opticalInsetRight;
} else {
switchRight = getWidth() - getPaddingRight() - opticalInsetRight;
switchLeft = switchRight - mSwitchWidth + opticalInsetLeft + opticalInsetRight;
}
final int switchTop;
final int switchBottom;
switch (getGravity() & Gravity.VERTICAL_GRAVITY_MASK) {
default:
case Gravity.TOP:
switchTop = getPaddingTop();
switchBottom = switchTop + mSwitchHeight;
break;
case Gravity.CENTER_VERTICAL:
switchTop = (getPaddingTop() + getHeight() - getPaddingBottom()) / 2 - mSwitchHeight / 2;
switchBottom = switchTop + mSwitchHeight;
break;
case Gravity.BOTTOM:
switchBottom = getHeight() - getPaddingBottom();
switchTop = switchBottom - mSwitchHeight;
break;
}
mSwitchLeft = switchLeft;
mSwitchTop = switchTop;
mSwitchBottom = switchBottom;
mSwitchRight = switchRight;
}
@Override
public void draw(Canvas c) {
final Rect padding = mTempRect;
final int switchLeft = mSwitchLeft;
final int switchTop = mSwitchTop;
final int switchRight = mSwitchRight;
final int switchBottom = mSwitchBottom;
int thumbInitialLeft = switchLeft + getThumbOffset();
final Insets thumbInsets;
if (mThumbDrawable != null) {
thumbInsets = Insets.NONE;
} else {
thumbInsets = Insets.NONE;
}
if (mTrackDrawable != null) {
mTrackDrawable.getPadding(padding);
thumbInitialLeft += padding.left;
int trackLeft = switchLeft;
int trackTop = switchTop;
int trackRight = switchRight;
int trackBottom = switchBottom;
if (thumbInsets != Insets.NONE) {
if (thumbInsets.left > padding.left) {
trackLeft += thumbInsets.left - padding.left;
}
if (thumbInsets.top > padding.top) {
trackTop += thumbInsets.top - padding.top;
}
if (thumbInsets.right > padding.right) {
trackRight -= thumbInsets.right - padding.right;
}
if (thumbInsets.bottom > padding.bottom) {
trackBottom -= thumbInsets.bottom - padding.bottom;
}
}
mTrackDrawable.setBounds(trackLeft, trackTop, trackRight, trackBottom);
}
if (mThumbDrawable != null) {
mThumbDrawable.getPadding(padding);
final int thumbLeft = thumbInitialLeft - padding.left;
final int thumbRight = thumbInitialLeft + mThumbWidth + padding.right;
mThumbDrawable.setBounds(thumbLeft, switchTop, thumbRight, switchBottom);
final Drawable background = getBackground();
if (background != null) {
background.setHotspotBounds(thumbLeft, switchTop, thumbRight, switchBottom);
}
}
super.draw(c);
}
@Override
protected void onDraw(Canvas canvas) {
super.onDraw(canvas);
final Rect padding = mTempRect;
final Drawable trackDrawable = mTrackDrawable;
if (trackDrawable != null) {
trackDrawable.getPadding(padding);
} else {
padding.setEmpty();
}
final int switchTop = mSwitchTop;
final int switchBottom = mSwitchBottom;
final int switchInnerTop = switchTop + padding.top;
final int switchInnerBottom = switchBottom - padding.bottom;
final Drawable thumbDrawable = mThumbDrawable;
if (trackDrawable != null) {
if (mSplitTrack && thumbDrawable != null) {
final Insets insets = Insets.NONE;
thumbDrawable.copyBounds(padding);
padding.left += insets.left;
padding.right -= insets.right;
final int saveCount = canvas.save();
canvas.clipRect(padding, Region.Op.DIFFERENCE);
trackDrawable.draw(canvas);
canvas.restoreToCount(saveCount);
} else {
trackDrawable.draw(canvas);
}
}
final int saveCount = canvas.save();
if (thumbDrawable != null) {
thumbDrawable.draw(canvas);
}
canvas.restoreToCount(saveCount);
}
@Override
public int getCompoundPaddingLeft() {
if (!LocaleController.isRTL) {
return super.getCompoundPaddingLeft();
}
return super.getCompoundPaddingLeft() + mSwitchWidth;
}
@Override
public int getCompoundPaddingRight() {
if (LocaleController.isRTL) {
return super.getCompoundPaddingRight();
}
return super.getCompoundPaddingRight() + mSwitchWidth;
}
private int getThumbOffset() {
final float position;
if (LocaleController.isRTL) {
position = 1 - thumbPosition;
} else {
position = thumbPosition;
}
return (int) (position * getThumbScrollRange() + 0.5f);
}
private int getThumbScrollRange() {
if (mTrackDrawable != null) {
final Rect padding = mTempRect;
mTrackDrawable.getPadding(padding);
final Insets insets;
if (mThumbDrawable != null) {
insets = Insets.NONE;
} else {
insets = Insets.NONE;
}
return mSwitchWidth - mThumbWidth - padding.left - padding.right - insets.left - insets.right;
} else {
return 0;
}
}
/*@Override
protected int[] onCreateDrawableState(int extraSpace) {
final int[] drawableState = super.onCreateDrawableState(extraSpace + 1);
if (isChecked()) {
mergeDrawableStates(drawableState, CHECKED_STATE_SET);
}
return drawableState;
}*/
@Override
protected void drawableStateChanged() {
super.drawableStateChanged();
final int[] myDrawableState = getDrawableState();
if (mThumbDrawable != null) {
mThumbDrawable.setState(myDrawableState);
}
if (mTrackDrawable != null) {
mTrackDrawable.setState(myDrawableState);
}
invalidate();
}
@Override
public void drawableHotspotChanged(float x, float y) {
super.drawableHotspotChanged(x, y);
if (mThumbDrawable != null) {
mThumbDrawable.setHotspot(x, y);
}
if (mTrackDrawable != null) {
mTrackDrawable.setHotspot(x, y);
}
}
@Override
protected boolean verifyDrawable(Drawable who) {
return super.verifyDrawable(who) || who == mThumbDrawable || who == mTrackDrawable;
}
@Override
public void jumpDrawablesToCurrentState() {
super.jumpDrawablesToCurrentState();
if (mThumbDrawable != null) {
mThumbDrawable.jumpToCurrentState();
}
if (mTrackDrawable != null) {
mTrackDrawable.jumpToCurrentState();
}
if (mPositionAnimator != null && mPositionAnimator.isRunning()) {
mPositionAnimator.end();
mPositionAnimator = null;
}
}
}
TMessagesProj/src/main/res/anim/decelerate_cubic.xml deleted 100644 → 0
View file @ 41359b14
<?xml version="1.0" encoding="utf-8"?>
<decelerateInterpolator xmlns:android="http://schemas.android.com/apk/res/android"
android:factor="1.5" />
TMessagesProj/src/main/res/anim/icon_anim_fade_in.xml
View file @ ca46b69b
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android"> <set xmlns:android="http://schemas.android.com/apk/res/android">
<!--<translate android:fromXDelta="100%"-->
<!--android:toXDelta="0"-->
<!--android:interpolator="@android:anim/accelerate_decelerate_interpolator"-->
<!--android:duration="150"/>-->
<alpha android:fromAlpha="0.0" <alpha android:fromAlpha="0.0"
android:toAlpha="1.0" android:toAlpha="1.0"
android:duration="200" android:duration="200"
android:interpolator="@android:anim/accelerate_decelerate_interpolator"/> android:interpolator="@android:anim/accelerate_decelerate_interpolator"/>
<!--<scale android:fromXScale="2.9"-->
<!--android:fromYScale="1.0"-->
<!--android:toXScale="1.0"-->
<!--android:toYScale="1.0"-->
<!--android:pivotX="50%"-->
<!--android:pivotY="50%"-->
<!--android:interpolator="@android:anim/accelerate_decelerate_interpolator"-->
<!--android:duration="150"/>-->
</set> </set>
\ No newline at end of file
TMessagesProj/src/main/res/anim/icon_anim_fade_out.xml
View file @ ca46b69b
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android"> <set xmlns:android="http://schemas.android.com/apk/res/android">
<!--<translate android:fromXDelta="0"-->
<!--android:toXDelta="-100%"-->
<!--android:interpolator="@android:anim/accelerate_decelerate_interpolator"-->
<!--android:duration="150"/>-->
<alpha android:fromAlpha="1.0" <alpha android:fromAlpha="1.0"
android:toAlpha="0.0" android:toAlpha="0.0"
android:duration="200" android:duration="200"
android:interpolator="@android:anim/accelerate_decelerate_interpolator"/> android:interpolator="@android:anim/accelerate_decelerate_interpolator"/>
<!--<scale android:fromXScale="1.0"-->
<!--android:fromYScale="1.0"-->
<!--android:toXScale="2.0"-->
<!--android:toYScale="1.0"-->
<!--android:pivotX="50%"-->
<!--android:pivotY="50%"-->
<!--android:interpolator="@android:anim/accelerate_decelerate_interpolator"-->
<!--android:duration="150"/>-->
</set> </set>
\ No newline at end of file
TMessagesProj/src/main/res/anim/scale_in.xml deleted 100644 → 0
View file @ 41359b14
<?xml version="1.0" encoding="utf-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android">
<!--<scale-->
<!--android:fromXScale="0.9"-->
<!--android:fromYScale="0.9"-->
<!--android:toXScale="1.0"-->
<!--android:toYScale="1.0"-->
<!--android:pivotX="50%"-->
<!--android:pivotY="50%"-->
<!--android:interpolator="@android:anim/decelerate_interpolator"-->
<!--android:duration="220"/>-->
<!--<alpha android:fromAlpha="0.0"-->
<!--android:toAlpha="1.0"-->
<!--android:interpolator="@android:anim/decelerate_interpolator"-->
<!--android:duration="@android:integer/config_mediumAnimTime" />-->
<alpha
android:fromAlpha="0.0"
android:toAlpha="1.0"
android:interpolator="@anim/decelerate_cubic"
android:duration="150"/>
<scale
android:fromXScale=".8" android:toXScale="1.0"
android:fromYScale=".8" android:toYScale="1.0"
android:pivotX="50%p" android:pivotY="50%p"
android:interpolator="@anim/decelerate_cubic"
android:duration="150"/>
</set>
\ No newline at end of file
TMessagesProj/src/main/res/anim/scale_out.xml deleted 100644 → 0
View file @ 41359b14
<?xml version="1.0" encoding="utf-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android">
<!--<scale-->
<!--android:fromXScale="1.0"-->
<!--android:fromYScale="1.0"-->
<!--android:toXScale="0.9"-->
<!--android:toYScale="0.9"-->
<!--android:pivotX="50%"-->
<!--android:pivotY="50%"-->
<!--android:interpolator="@android:anim/decelerate_interpolator"-->
<!--android:duration="220"/>-->
<!--<alpha-->
<!--android:fromAlpha="1.0"-->
<!--android:toAlpha="0.0"-->
<!--android:interpolator="@android:anim/decelerate_interpolator"-->
<!--android:duration="220" />-->
<alpha
android:fromAlpha="1.0"
android:toAlpha="0.0"
android:interpolator="@anim/decelerate_cubic"
android:duration="150"/>
<scale
android:fromXScale="1.0"
android:toXScale=".8"
android:fromYScale="1.0"
android:toYScale=".8"
android:pivotX="50%p"
android:pivotY="50%p"
android:interpolator="@anim/decelerate_cubic"
android:duration="150"/>
</set>
\ No newline at end of file
TMessagesProj/src/main/res/drawable-hdpi/ic_ab_attach.png 100644 → 100755
View replaced file @ 41359b14 View file @ ca46b69b
TMessagesProj/src/main/res/drawable-hdpi/ic_ab_attach.png

1.64 KB | W: | H:

TMessagesProj/src/main/res/drawable-hdpi/ic_ab_attach.png

1.64 KB | W: | H:

TMessagesProj/src/main/res/drawable-hdpi/ic_ab_attach.png
TMessagesProj/src/main/res/drawable-hdpi/ic_ab_attach.png
TMessagesProj/src/main/res/drawable-hdpi/ic_ab_attach.png
TMessagesProj/src/main/res/drawable-hdpi/ic_ab_attach.png
  • 2-up
  • Swipe
  • Onion skin
TMessagesProj/src/main/res/drawable-hdpi/ic_ab_doc.png 100644 → 100755
View replaced file @ 41359b14 View file @ ca46b69b
TMessagesProj/src/main/res/drawable-hdpi/ic_ab_doc.png

883 Bytes | W: | H:

TMessagesProj/src/main/res/drawable-hdpi/ic_ab_doc.png

1.08 KB | W: | H:

TMessagesProj/src/main/res/drawable-hdpi/ic_ab_doc.png
TMessagesProj/src/main/res/drawable-hdpi/ic_ab_doc.png
TMessagesProj/src/main/res/drawable-hdpi/ic_ab_doc.png
TMessagesProj/src/main/res/drawable-hdpi/ic_ab_doc.png
  • 2-up
  • Swipe
  • Onion skin
TMessagesProj/src/main/res/drawable-hdpi/ic_ab_done_gray.png 100644 → 100755
View replaced file @ 41359b14 View file @ ca46b69b
TMessagesProj/src/main/res/drawable-hdpi/ic_ab_done_gray.png

1.28 KB | W: | H:

TMessagesProj/src/main/res/drawable-hdpi/ic_ab_done_gray.png

1.15 KB | W: | H:

TMessagesProj/src/main/res/drawable-hdpi/ic_ab_done_gray.png
TMessagesProj/src/main/res/drawable-hdpi/ic_ab_done_gray.png
TMessagesProj/src/main/res/drawable-hdpi/ic_ab_done_gray.png
TMessagesProj/src/main/res/drawable-hdpi/ic_ab_done_gray.png
  • 2-up
  • Swipe
  • Onion skin
TMessagesProj/src/main/res/drawable-hdpi/ic_ab_fwd_copy.png 100644 → 100755
View replaced file @ 41359b14 View file @ ca46b69b
TMessagesProj/src/main/res/drawable-hdpi/ic_ab_fwd_copy.png

273 Bytes | W: | H:

TMessagesProj/src/main/res/drawable-hdpi/ic_ab_fwd_copy.png

1.13 KB | W: | H:

TMessagesProj/src/main/res/drawable-hdpi/ic_ab_fwd_copy.png
TMessagesProj/src/main/res/drawable-hdpi/ic_ab_fwd_copy.png
TMessagesProj/src/main/res/drawable-hdpi/ic_ab_fwd_copy.png
TMessagesProj/src/main/res/drawable-hdpi/ic_ab_fwd_copy.png
  • 2-up
  • Swipe
  • Onion skin
TMessagesProj/src/main/res/drawable-hdpi/ic_ab_fwd_delete.png 100644 → 100755
View replaced file @ 41359b14 View file @ ca46b69b
TMessagesProj/src/main/res/drawable-hdpi/ic_ab_fwd_delete.png

617 Bytes | W: | H:

TMessagesProj/src/main/res/drawable-hdpi/ic_ab_fwd_delete.png

1.07 KB | W: | H:

TMessagesProj/src/main/res/drawable-hdpi/ic_ab_fwd_delete.png
TMessagesProj/src/main/res/drawable-hdpi/ic_ab_fwd_delete.png
TMessagesProj/src/main/res/drawable-hdpi/ic_ab_fwd_delete.png
TMessagesProj/src/main/res/drawable-hdpi/ic_ab_fwd_delete.png
  • 2-up
  • Swipe
  • Onion skin
TMessagesProj/src/main/res/drawable-hdpi/ic_ab_fwd_forward.png 100644 → 100755
View replaced file @ 41359b14 View file @ ca46b69b
TMessagesProj/src/main/res/drawable-hdpi/ic_ab_fwd_forward.png

585 Bytes | W: | H:

TMessagesProj/src/main/res/drawable-hdpi/ic_ab_fwd_forward.png

1.37 KB | W: | H:

TMessagesProj/src/main/res/drawable-hdpi/ic_ab_fwd_forward.png
TMessagesProj/src/main/res/drawable-hdpi/ic_ab_fwd_forward.png
TMessagesProj/src/main/res/drawable-hdpi/ic_ab_fwd_forward.png
TMessagesProj/src/main/res/drawable-hdpi/ic_ab_fwd_forward.png
  • 2-up
  • Swipe
  • Onion skin
TMessagesProj/src/main/res/drawable-mdpi/ic_ab_attach.png 100644 → 100755
View replaced file @ 41359b14 View file @ ca46b69b
TMessagesProj/src/main/res/drawable-mdpi/ic_ab_attach.png

1.37 KB | W: | H:

TMessagesProj/src/main/res/drawable-mdpi/ic_ab_attach.png

1.36 KB | W: | H:

TMessagesProj/src/main/res/drawable-mdpi/ic_ab_attach.png
TMessagesProj/src/main/res/drawable-mdpi/ic_ab_attach.png
TMessagesProj/src/main/res/drawable-mdpi/ic_ab_attach.png
TMessagesProj/src/main/res/drawable-mdpi/ic_ab_attach.png
  • 2-up
  • Swipe
  • Onion skin
TMessagesProj/src/main/res/drawable-mdpi/ic_ab_doc.png 100644 → 100755
View replaced file @ 41359b14 View file @ ca46b69b
TMessagesProj/src/main/res/drawable-mdpi/ic_ab_doc.png

604 Bytes | W: | H:

TMessagesProj/src/main/res/drawable-mdpi/ic_ab_doc.png

1.01 KB | W: | H:

TMessagesProj/src/main/res/drawable-mdpi/ic_ab_doc.png
TMessagesProj/src/main/res/drawable-mdpi/ic_ab_doc.png
TMessagesProj/src/main/res/drawable-mdpi/ic_ab_doc.png
TMessagesProj/src/main/res/drawable-mdpi/ic_ab_doc.png
  • 2-up
  • Swipe
  • Onion skin
TMessagesProj/src/main/res/drawable-mdpi/ic_ab_done_gray.png 100644 → 100755
View replaced file @ 41359b14 View file @ ca46b69b
TMessagesProj/src/main/res/drawable-mdpi/ic_ab_done_gray.png

1.2 KB | W: | H:

TMessagesProj/src/main/res/drawable-mdpi/ic_ab_done_gray.png

1.05 KB | W: | H:

TMessagesProj/src/main/res/drawable-mdpi/ic_ab_done_gray.png
TMessagesProj/src/main/res/drawable-mdpi/ic_ab_done_gray.png
TMessagesProj/src/main/res/drawable-mdpi/ic_ab_done_gray.png
TMessagesProj/src/main/res/drawable-mdpi/ic_ab_done_gray.png
  • 2-up
  • Swipe
  • Onion skin
TMessagesProj/src/main/res/drawable-mdpi/ic_ab_fwd_copy.png 100644 → 100755
View replaced file @ 41359b14 View file @ ca46b69b
TMessagesProj/src/main/res/drawable-mdpi/ic_ab_fwd_copy.png

233 Bytes | W: | H:

TMessagesProj/src/main/res/drawable-mdpi/ic_ab_fwd_copy.png

1.02 KB | W: | H:

TMessagesProj/src/main/res/drawable-mdpi/ic_ab_fwd_copy.png
TMessagesProj/src/main/res/drawable-mdpi/ic_ab_fwd_copy.png
TMessagesProj/src/main/res/drawable-mdpi/ic_ab_fwd_copy.png
TMessagesProj/src/main/res/drawable-mdpi/ic_ab_fwd_copy.png
  • 2-up
  • Swipe
  • Onion skin
TMessagesProj/src/main/res/drawable-mdpi/ic_ab_fwd_delete.png 100644 → 100755
View replaced file @ 41359b14 View file @ ca46b69b
TMessagesProj/src/main/res/drawable-mdpi/ic_ab_fwd_delete.png

441 Bytes | W: | H:

TMessagesProj/src/main/res/drawable-mdpi/ic_ab_fwd_delete.png

1016 Bytes | W: | H:

TMessagesProj/src/main/res/drawable-mdpi/ic_ab_fwd_delete.png
TMessagesProj/src/main/res/drawable-mdpi/ic_ab_fwd_delete.png
TMessagesProj/src/main/res/drawable-mdpi/ic_ab_fwd_delete.png
TMessagesProj/src/main/res/drawable-mdpi/ic_ab_fwd_delete.png
  • 2-up
  • Swipe
  • Onion skin
TMessagesProj/src/main/res/drawable-mdpi/ic_ab_fwd_forward.png 100644 → 100755
View replaced file @ 41359b14 View file @ ca46b69b
TMessagesProj/src/main/res/drawable-mdpi/ic_ab_fwd_forward.png

416 Bytes | W: | H:

TMessagesProj/src/main/res/drawable-mdpi/ic_ab_fwd_forward.png

1.23 KB | W: | H:

TMessagesProj/src/main/res/drawable-mdpi/ic_ab_fwd_forward.png
TMessagesProj/src/main/res/drawable-mdpi/ic_ab_fwd_forward.png
TMessagesProj/src/main/res/drawable-mdpi/ic_ab_fwd_forward.png
TMessagesProj/src/main/res/drawable-mdpi/ic_ab_fwd_forward.png
  • 2-up
  • Swipe
  • Onion skin
TMessagesProj/src/main/res/drawable-v21/bar_selector_blue.xml 0 → 100644
View file @ ca46b69b
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="#ff3f76a8">
</ripple>
\ No newline at end of file
TMessagesProj/src/main/res/drawable-v21/bar_selector_cyan.xml 0 → 100644
View file @ ca46b69b
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="#ff39849d">
</ripple>
\ No newline at end of file
TMessagesProj/src/main/res/drawable-v21/bar_selector_green.xml 0 → 100644
View file @ ca46b69b
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="#ff48953d">
</ripple>
\ No newline at end of file
TMessagesProj/src/main/res/drawable-v21/bar_selector_orange.xml 0 → 100644
View file @ ca46b69b
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="#ffc6763d">
</ripple>
\ No newline at end of file
TMessagesProj/src/main/res/drawable-v21/bar_selector_pink.xml 0 → 100644
View file @ ca46b69b
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="#ffbb536e">
</ripple>
\ No newline at end of file
TMessagesProj/src/main/res/drawable-v21/bar_selector_red.xml 0 → 100644
View file @ ca46b69b
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="#ffbc4b41">
</ripple>
\ No newline at end of file
TMessagesProj/src/main/res/drawable-v21/bar_selector_violet.xml 0 → 100644
View file @ ca46b69b
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="#ff735fbe">
</ripple>
\ No newline at end of file
TMessagesProj/src/main/res/drawable-v21/bar_selector_yellow.xml 0 → 100644
View file @ ca46b69b
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="#ffc9982e">
</ripple>
\ No newline at end of file
TMessagesProj/src/main/res/drawable-xhdpi/ic_ab_attach.png 100644 → 100755
View replaced file @ 41359b14 View file @ ca46b69b
TMessagesProj/src/main/res/drawable-xhdpi/ic_ab_attach.png

2.53 KB | W: | H:

TMessagesProj/src/main/res/drawable-xhdpi/ic_ab_attach.png

2.51 KB | W: | H:

TMessagesProj/src/main/res/drawable-xhdpi/ic_ab_attach.png
TMessagesProj/src/main/res/drawable-xhdpi/ic_ab_attach.png
TMessagesProj/src/main/res/drawable-xhdpi/ic_ab_attach.png
TMessagesProj/src/main/res/drawable-xhdpi/ic_ab_attach.png
  • 2-up
  • Swipe
  • Onion skin
TMessagesProj/src/main/res/drawable-xhdpi/ic_ab_doc.png 100644 → 100755
View replaced file @ 41359b14 View file @ ca46b69b
TMessagesProj/src/main/res/drawable-xhdpi/ic_ab_doc.png

1.65 KB | W: | H:

TMessagesProj/src/main/res/drawable-xhdpi/ic_ab_doc.png

1.14 KB | W: | H:

TMessagesProj/src/main/res/drawable-xhdpi/ic_ab_doc.png
TMessagesProj/src/main/res/drawable-xhdpi/ic_ab_doc.png
TMessagesProj/src/main/res/drawable-xhdpi/ic_ab_doc.png
TMessagesProj/src/main/res/drawable-xhdpi/ic_ab_doc.png
  • 2-up
  • Swipe
  • Onion skin
TMessagesProj/src/main/res/drawable-xhdpi/ic_ab_done_gray.png 100644 → 100755
View replaced file @ 41359b14 View file @ ca46b69b
TMessagesProj/src/main/res/drawable-xhdpi/ic_ab_done_gray.png

1.25 KB | W: | H:

TMessagesProj/src/main/res/drawable-xhdpi/ic_ab_done_gray.png

1.2 KB | W: | H:

TMessagesProj/src/main/res/drawable-xhdpi/ic_ab_done_gray.png
TMessagesProj/src/main/res/drawable-xhdpi/ic_ab_done_gray.png
TMessagesProj/src/main/res/drawable-xhdpi/ic_ab_done_gray.png
TMessagesProj/src/main/res/drawable-xhdpi/ic_ab_done_gray.png
  • 2-up
  • Swipe
  • Onion skin
TMessagesProj/src/main/res/drawable-xhdpi/ic_ab_fwd_copy.png 100644 → 100755
View replaced file @ 41359b14 View file @ ca46b69b
TMessagesProj/src/main/res/drawable-xhdpi/ic_ab_fwd_copy.png

299 Bytes | W: | H:

TMessagesProj/src/main/res/drawable-xhdpi/ic_ab_fwd_copy.png

1.15 KB | W: | H:

TMessagesProj/src/main/res/drawable-xhdpi/ic_ab_fwd_copy.png
TMessagesProj/src/main/res/drawable-xhdpi/ic_ab_fwd_copy.png
TMessagesProj/src/main/res/drawable-xhdpi/ic_ab_fwd_copy.png
TMessagesProj/src/main/res/drawable-xhdpi/ic_ab_fwd_copy.png
  • 2-up
  • Swipe
  • Onion skin
TMessagesProj/src/main/res/drawable-xhdpi/ic_ab_fwd_delete.png 100644 → 100755
View replaced file @ 41359b14 View file @ ca46b69b
TMessagesProj/src/main/res/drawable-xhdpi/ic_ab_fwd_delete.png

734 Bytes | W: | H:

TMessagesProj/src/main/res/drawable-xhdpi/ic_ab_fwd_delete.png

1.08 KB | W: | H:

TMessagesProj/src/main/res/drawable-xhdpi/ic_ab_fwd_delete.png
TMessagesProj/src/main/res/drawable-xhdpi/ic_ab_fwd_delete.png
TMessagesProj/src/main/res/drawable-xhdpi/ic_ab_fwd_delete.png
TMessagesProj/src/main/res/drawable-xhdpi/ic_ab_fwd_delete.png
  • 2-up
  • Swipe
  • Onion skin
TMessagesProj/src/main/res/drawable-xhdpi/ic_ab_fwd_forward.png 100644 → 100755
View replaced file @ 41359b14 View file @ ca46b69b
TMessagesProj/src/main/res/drawable-xhdpi/ic_ab_fwd_forward.png

692 Bytes | W: | H:

TMessagesProj/src/main/res/drawable-xhdpi/ic_ab_fwd_forward.png

1.5 KB | W: | H:

TMessagesProj/src/main/res/drawable-xhdpi/ic_ab_fwd_forward.png
TMessagesProj/src/main/res/drawable-xhdpi/ic_ab_fwd_forward.png
TMessagesProj/src/main/res/drawable-xhdpi/ic_ab_fwd_forward.png
TMessagesProj/src/main/res/drawable-xhdpi/ic_ab_fwd_forward.png
  • 2-up
  • Swipe
  • Onion skin
TMessagesProj/src/main/res/drawable-xxhdpi/ic_ab_attach.png 100644 → 100755
View replaced file @ 41359b14 View file @ ca46b69b
TMessagesProj/src/main/res/drawable-xxhdpi/ic_ab_attach.png

2.37 KB | W: | H:

TMessagesProj/src/main/res/drawable-xxhdpi/ic_ab_attach.png

2.36 KB | W: | H:

TMessagesProj/src/main/res/drawable-xxhdpi/ic_ab_attach.png
TMessagesProj/src/main/res/drawable-xxhdpi/ic_ab_attach.png
TMessagesProj/src/main/res/drawable-xxhdpi/ic_ab_attach.png
TMessagesProj/src/main/res/drawable-xxhdpi/ic_ab_attach.png
  • 2-up
  • Swipe
  • Onion skin
TMessagesProj/src/main/res/drawable-xxhdpi/ic_ab_doc.png 100644 → 100755
View replaced file @ 41359b14 View file @ ca46b69b
TMessagesProj/src/main/res/drawable-xxhdpi/ic_ab_doc.png

1.58 KB | W: | H:

TMessagesProj/src/main/res/drawable-xxhdpi/ic_ab_doc.png

1.27 KB | W: | H:

TMessagesProj/src/main/res/drawable-xxhdpi/ic_ab_doc.png
TMessagesProj/src/main/res/drawable-xxhdpi/ic_ab_doc.png
TMessagesProj/src/main/res/drawable-xxhdpi/ic_ab_doc.png
TMessagesProj/src/main/res/drawable-xxhdpi/ic_ab_doc.png
  • 2-up
  • Swipe
  • Onion skin
TMessagesProj/src/main/res/drawable-xxhdpi/ic_ab_done_gray.png 100644 → 100755
View replaced file @ 41359b14 View file @ ca46b69b
TMessagesProj/src/main/res/drawable-xxhdpi/ic_ab_done_gray.png

1.47 KB | W: | H:

TMessagesProj/src/main/res/drawable-xxhdpi/ic_ab_done_gray.png

1.36 KB | W: | H:

TMessagesProj/src/main/res/drawable-xxhdpi/ic_ab_done_gray.png
TMessagesProj/src/main/res/drawable-xxhdpi/ic_ab_done_gray.png
TMessagesProj/src/main/res/drawable-xxhdpi/ic_ab_done_gray.png
TMessagesProj/src/main/res/drawable-xxhdpi/ic_ab_done_gray.png
  • 2-up
  • Swipe
  • Onion skin
TMessagesProj/src/main/res/drawable-xxhdpi/ic_ab_fwd_copy.png 100644 → 100755
View replaced file @ 41359b14 View file @ ca46b69b
TMessagesProj/src/main/res/drawable-xxhdpi/ic_ab_fwd_copy.png

388 Bytes | W: | H:

TMessagesProj/src/main/res/drawable-xxhdpi/ic_ab_fwd_copy.png

1.29 KB | W: | H:

TMessagesProj/src/main/res/drawable-xxhdpi/ic_ab_fwd_copy.png
TMessagesProj/src/main/res/drawable-xxhdpi/ic_ab_fwd_copy.png
TMessagesProj/src/main/res/drawable-xxhdpi/ic_ab_fwd_copy.png
TMessagesProj/src/main/res/drawable-xxhdpi/ic_ab_fwd_copy.png
  • 2-up
  • Swipe
  • Onion skin
TMessagesProj/src/main/res/drawable-xxhdpi/ic_ab_fwd_delete.png 100644 → 100755
View replaced file @ 41359b14 View file @ ca46b69b
TMessagesProj/src/main/res/drawable-xxhdpi/ic_ab_fwd_delete.png

1.03 KB | W: | H:

TMessagesProj/src/main/res/drawable-xxhdpi/ic_ab_fwd_delete.png

1.18 KB | W: | H:

TMessagesProj/src/main/res/drawable-xxhdpi/ic_ab_fwd_delete.png
TMessagesProj/src/main/res/drawable-xxhdpi/ic_ab_fwd_delete.png
TMessagesProj/src/main/res/drawable-xxhdpi/ic_ab_fwd_delete.png
TMessagesProj/src/main/res/drawable-xxhdpi/ic_ab_fwd_delete.png
  • 2-up
  • Swipe
  • Onion skin
TMessagesProj/src/main/res/drawable-xxhdpi/ic_ab_fwd_forward.png 100644 → 100755
View replaced file @ 41359b14 View file @ ca46b69b
TMessagesProj/src/main/res/drawable-xxhdpi/ic_ab_fwd_forward.png

1022 Bytes | W: | H:

TMessagesProj/src/main/res/drawable-xxhdpi/ic_ab_fwd_forward.png

1.86 KB | W: | H:

TMessagesProj/src/main/res/drawable-xxhdpi/ic_ab_fwd_forward.png
TMessagesProj/src/main/res/drawable-xxhdpi/ic_ab_fwd_forward.png
TMessagesProj/src/main/res/drawable-xxhdpi/ic_ab_fwd_forward.png
TMessagesProj/src/main/res/drawable-xxhdpi/ic_ab_fwd_forward.png
  • 2-up
  • Swipe
  • Onion skin
TMessagesProj/src/main/res/drawable/bar_selector_blue.xml 0 → 100644
View file @ ca46b69b
<selector
xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true">
<shape android:shape="rectangle">
<solid android:color="#ff3f76a8" />
</shape>
</item>
<item android:state_focused="true">
<shape android:shape="rectangle">
<solid android:color="#ff3f76a8" />
</shape>
</item>
<item android:state_selected="true">
<shape android:shape="rectangle">
<solid android:color="#ff3f76a8" />
</shape>
</item>
<item android:drawable="@drawable/transparent" />
</selector>
\ No newline at end of file
TMessagesProj/src/main/res/drawable/bar_selector_cyan.xml 0 → 100644
View file @ ca46b69b
<selector
xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true">
<shape android:shape="rectangle">
<solid android:color="#ff39849d" />
</shape>
</item>
<item android:state_focused="true">
<shape android:shape="rectangle">
<solid android:color="#ff39849d" />
</shape>
</item>
<item android:state_selected="true">
<shape android:shape="rectangle">
<solid android:color="#ff39849d" />
</shape>
</item>
<item android:drawable="@drawable/transparent" />
</selector>
\ No newline at end of file
TMessagesProj/src/main/res/drawable/bar_selector_green.xml 0 → 100644
View file @ ca46b69b
<selector
xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true">
<shape android:shape="rectangle">
<solid android:color="#ff48953d" />
</shape>
</item>
<item android:state_focused="true">
<shape android:shape="rectangle">
<solid android:color="#ff48953d" />
</shape>
</item>
<item android:state_selected="true">
<shape android:shape="rectangle">
<solid android:color="#ff48953d" />
</shape>
</item>
<item android:drawable="@drawable/transparent" />
</selector>
\ No newline at end of file
TMessagesProj/src/main/res/drawable/bar_selector_orange.xml 0 → 100644
View file @ ca46b69b
<selector
xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true">
<shape android:shape="rectangle">
<solid android:color="#ffc6763d" />
</shape>
</item>
<item android:state_focused="true">
<shape android:shape="rectangle">
<solid android:color="#ffc6763d" />
</shape>
</item>
<item android:state_selected="true">
<shape android:shape="rectangle">
<solid android:color="#ffc6763d" />
</shape>
</item>
<item android:drawable="@drawable/transparent" />
</selector>
\ No newline at end of file
TMessagesProj/src/main/res/drawable/bar_selector_pink.xml 0 → 100644
View file @ ca46b69b
<selector
xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true">
<shape android:shape="rectangle">
<solid android:color="#ffbb536e" />
</shape>
</item>
<item android:state_focused="true">
<shape android:shape="rectangle">
<solid android:color="#ffbb536e" />
</shape>
</item>
<item android:state_selected="true">
<shape android:shape="rectangle">
<solid android:color="#ffbb536e" />
</shape>
</item>
<item android:drawable="@drawable/transparent" />
</selector>
\ No newline at end of file
TMessagesProj/src/main/res/drawable/bar_selector_red.xml 0 → 100644
View file @ ca46b69b
<selector
xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true">
<shape android:shape="rectangle">
<solid android:color="#ffbc4b41" />
</shape>
</item>
<item android:state_focused="true">
<shape android:shape="rectangle">
<solid android:color="#ffbc4b41" />
</shape>
</item>
<item android:state_selected="true">
<shape android:shape="rectangle">
<solid android:color="#ffbc4b41" />
</shape>
</item>
<item android:drawable="@drawable/transparent" />
</selector>
\ No newline at end of file
TMessagesProj/src/main/res/drawable/bar_selector_violet.xml 0 → 100644
View file @ ca46b69b
<selector
xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true">
<shape android:shape="rectangle">
<solid android:color="#ff735fbe" />
</shape>
</item>
<item android:state_focused="true">
<shape android:shape="rectangle">
<solid android:color="#ff735fbe" />
</shape>
</item>
<item android:state_selected="true">
<shape android:shape="rectangle">
<solid android:color="#ff735fbe" />
</shape>
</item>
<item android:drawable="@drawable/transparent" />
</selector>
\ No newline at end of file
TMessagesProj/src/main/res/drawable/bar_selector_yellow.xml 0 → 100644
View file @ ca46b69b
<selector
xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true">
<shape android:shape="rectangle">
<solid android:color="#ffc9982e" />
</shape>
</item>
<item android:state_focused="true">
<shape android:shape="rectangle">
<solid android:color="#ffc9982e" />
</shape>
</item>
<item android:state_selected="true">
<shape android:shape="rectangle">
<solid android:color="#ffc9982e" />
</shape>
</item>
<item android:drawable="@drawable/transparent" />
</selector>
\ No newline at end of file
TMessagesProj/src/main/res/drawable/floating_group_states.xml 0 → 100644
View file @ ca46b69b
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ This is the source code of Telegram for Android v. 1.7.x.
~ It is licensed under GNU GPL v. 2 or later.
~ You should have received a copy of the license in this archive (see LICENSE).
~
~ Copyright Nikolai Kudashov, 2013-2014.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/floating4_profile_pressed" android:state_pressed="true" />
<item android:drawable="@drawable/floating4_profile_pressed" android:state_selected="true" />
<item android:drawable="@drawable/floating4_profile" />
</selector>
\ No newline at end of file
TMessagesProj/src/main/res/drawable/floating_user_states.xml 0 → 100644
View file @ ca46b69b
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ This is the source code of Telegram for Android v. 1.7.x.
~ It is licensed under GNU GPL v. 2 or later.
~ You should have received a copy of the license in this archive (see LICENSE).
~
~ Copyright Nikolai Kudashov, 2013-2014.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/floating3_profile_pressed" android:state_pressed="true" />
<item android:drawable="@drawable/floating3_profile_pressed" android:state_selected="true" />
<item android:drawable="@drawable/floating3_profile" />
</selector>
\ No newline at end of file
TMessagesProj/src/main/res/drawable/switch_thumb.xml 0 → 100644
View file @ ca46b69b
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_checked="true" android:drawable="@drawable/switch_to_on2" />
<item android:drawable="@drawable/switch_to_on1" />
</selector>
\ No newline at end of file
TMessagesProj/src/main/res/layout/settings_layout.xml deleted 100644 → 0
View file @ 41359b14
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<ListView
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:id="@+id/listView"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_alignParentBottom="true"
android:clipToPadding="false"
android:fadingEdge="none"
android:fadingEdgeLength="0dp"
android:paddingLeft="13dp"
android:paddingRight="13dp"
android:dividerHeight="0dp"
android:divider="@null"
android:scrollbars="none"
android:paddingBottom="16dp"/>
</RelativeLayout>
TMessagesProj/src/main/res/values-ar/strings.xml
View file @ ca46b69b
...@@ -175,7 +175,6 @@ ...@@ -175,7 +175,6 @@
<string name="EnterGroupNameTitle">أدخل سم للمجموعة</string> <string name="EnterGroupNameTitle">أدخل سم للمجموعة</string>
<string name="SharedMedia">عدد الوسائط المشتركة</string> <string name="SharedMedia">عدد الوسائط المشتركة</string>
<string name="GroupInfo">معلومات المجموعة</string> <string name="GroupInfo">معلومات المجموعة</string>
<string name="SHAREDMEDIA">عرض الوسائط المشتركة</string>
<string name="SETTINGS">الإعدادات</string> <string name="SETTINGS">الإعدادات</string>
<string name="AddMember">إضافة مشترك</string> <string name="AddMember">إضافة مشترك</string>
<string name="DeleteAndExit">مغادرة المجموعة وحذفها</string> <string name="DeleteAndExit">مغادرة المجموعة وحذفها</string>
......
TMessagesProj/src/main/res/values-de/strings.xml
View file @ ca46b69b
...@@ -175,7 +175,6 @@ ...@@ -175,7 +175,6 @@
<string name="EnterGroupNameTitle">GRUPPENNAMEN EINGEBEN</string> <string name="EnterGroupNameTitle">GRUPPENNAMEN EINGEBEN</string>
<string name="SharedMedia">Geteilte Medien</string> <string name="SharedMedia">Geteilte Medien</string>
<string name="GroupInfo">Gruppeninfo</string> <string name="GroupInfo">Gruppeninfo</string>
<string name="SHAREDMEDIA">GETEILTE MEDIEN</string>
<string name="SETTINGS">EINSTELLUNGEN</string> <string name="SETTINGS">EINSTELLUNGEN</string>
<string name="AddMember">Mitglied hinzufügen</string> <string name="AddMember">Mitglied hinzufügen</string>
<string name="DeleteAndExit">Gruppe löschen und verlassen</string> <string name="DeleteAndExit">Gruppe löschen und verlassen</string>
......
TMessagesProj/src/main/res/values-es/strings.xml
View file @ ca46b69b
...@@ -175,7 +175,6 @@ ...@@ -175,7 +175,6 @@
<string name="EnterGroupNameTitle">PON EL NOMBRE DEL GRUPO</string> <string name="EnterGroupNameTitle">PON EL NOMBRE DEL GRUPO</string>
<string name="SharedMedia">Fotos y vídeos</string> <string name="SharedMedia">Fotos y vídeos</string>
<string name="GroupInfo">Información </string> <string name="GroupInfo">Información </string>
<string name="SHAREDMEDIA">FOTOS Y VÍDEOS</string>
<string name="SETTINGS">AJUSTES</string> <string name="SETTINGS">AJUSTES</string>
<string name="AddMember">Añadir miembro</string> <string name="AddMember">Añadir miembro</string>
<string name="DeleteAndExit">Eliminar y dejar el grupo</string> <string name="DeleteAndExit">Eliminar y dejar el grupo</string>
......
TMessagesProj/src/main/res/values-it/strings.xml
View file @ ca46b69b
...@@ -175,7 +175,6 @@ ...@@ -175,7 +175,6 @@
<string name="EnterGroupNameTitle">INSERISCI IL NOME DEL GRUPPO</string> <string name="EnterGroupNameTitle">INSERISCI IL NOME DEL GRUPPO</string>
<string name="SharedMedia">Media condivisi</string> <string name="SharedMedia">Media condivisi</string>
<string name="GroupInfo">Info gruppo</string> <string name="GroupInfo">Info gruppo</string>
<string name="SHAREDMEDIA">MEDIA CONDIVISI</string>
<string name="SETTINGS">IMPOSTAZIONI</string> <string name="SETTINGS">IMPOSTAZIONI</string>
<string name="AddMember">Aggiungi membro</string> <string name="AddMember">Aggiungi membro</string>
<string name="DeleteAndExit">Elimina e lascia il gruppo</string> <string name="DeleteAndExit">Elimina e lascia il gruppo</string>
......
TMessagesProj/src/main/res/values-ko/strings.xml
View file @ ca46b69b
...@@ -175,7 +175,6 @@ ...@@ -175,7 +175,6 @@
<string name="EnterGroupNameTitle">그룹 이름을 입력하세요</string> <string name="EnterGroupNameTitle">그룹 이름을 입력하세요</string>
<string name="SharedMedia">공유한 미디어</string> <string name="SharedMedia">공유한 미디어</string>
<string name="GroupInfo">그룹 정보</string> <string name="GroupInfo">그룹 정보</string>
<string name="SHAREDMEDIA">공유한 미디어</string>
<string name="SETTINGS">설정</string> <string name="SETTINGS">설정</string>
<string name="AddMember">대화상대 추가</string> <string name="AddMember">대화상대 추가</string>
<string name="DeleteAndExit">그룹에서 나가기</string> <string name="DeleteAndExit">그룹에서 나가기</string>
......
TMessagesProj/src/main/res/values-nl/strings.xml
View file @ ca46b69b
...@@ -175,7 +175,6 @@ ...@@ -175,7 +175,6 @@
<string name="EnterGroupNameTitle">GROEPSNAAM INSTELLEN</string> <string name="EnterGroupNameTitle">GROEPSNAAM INSTELLEN</string>
<string name="SharedMedia">Gedeelde media</string> <string name="SharedMedia">Gedeelde media</string>
<string name="GroupInfo">Groepsinformatie</string> <string name="GroupInfo">Groepsinformatie</string>
<string name="SHAREDMEDIA">GEDEELDE MEDIA</string>
<string name="SETTINGS">INSTELLINGEN</string> <string name="SETTINGS">INSTELLINGEN</string>
<string name="AddMember">Deelnemer toevoegen</string> <string name="AddMember">Deelnemer toevoegen</string>
<string name="DeleteAndExit">Groep verwijderen en verlaten</string> <string name="DeleteAndExit">Groep verwijderen en verlaten</string>
......
TMessagesProj/src/main/res/values-pt-rBR/strings.xml
View file @ ca46b69b
...@@ -175,7 +175,6 @@ ...@@ -175,7 +175,6 @@
<string name="EnterGroupNameTitle">DIGITE O NOME DO GRUPO</string> <string name="EnterGroupNameTitle">DIGITE O NOME DO GRUPO</string>
<string name="SharedMedia">Mídia compartilhada</string> <string name="SharedMedia">Mídia compartilhada</string>
<string name="GroupInfo">Informações do Grupo</string> <string name="GroupInfo">Informações do Grupo</string>
<string name="SHAREDMEDIA">MÍDIA COMPARTILHADA</string>
<string name="SETTINGS">CONFIGURAÇÕES</string> <string name="SETTINGS">CONFIGURAÇÕES</string>
<string name="AddMember">Adicionar membro</string> <string name="AddMember">Adicionar membro</string>
<string name="DeleteAndExit">Apagar e sair do grupo</string> <string name="DeleteAndExit">Apagar e sair do grupo</string>
......
TMessagesProj/src/main/res/values-pt-rPT/strings.xml
View file @ ca46b69b
...@@ -175,7 +175,6 @@ ...@@ -175,7 +175,6 @@
<string name="EnterGroupNameTitle">DIGITE O NOME DO GRUPO</string> <string name="EnterGroupNameTitle">DIGITE O NOME DO GRUPO</string>
<string name="SharedMedia">Mídia compartilhada</string> <string name="SharedMedia">Mídia compartilhada</string>
<string name="GroupInfo">Informações do Grupo</string> <string name="GroupInfo">Informações do Grupo</string>
<string name="SHAREDMEDIA">MÍDIA COMPARTILHADA</string>
<string name="SETTINGS">CONFIGURAÇÕES</string> <string name="SETTINGS">CONFIGURAÇÕES</string>
<string name="AddMember">Adicionar membro</string> <string name="AddMember">Adicionar membro</string>
<string name="DeleteAndExit">Apagar e sair do grupo</string> <string name="DeleteAndExit">Apagar e sair do grupo</string>
......
TMessagesProj/src/main/res/values-v21/styles.xml
View file @ ca46b69b
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
<item name="android:actionBarItemBackground">@drawable/bar_selector_style</item> <item name="android:actionBarItemBackground">@drawable/bar_selector_style</item>
<item name="android:colorPrimaryDark">#33000000</item> <item name="android:colorPrimaryDark">#33000000</item>
<item name="android:colorPrimary">#54759e</item> <item name="android:colorPrimary">#54759e</item>
<item name="android:alertDialogTheme">@style/Theme.TMessages.Dialog.Alert</item>
</style> </style>
<style name="Theme.TMessages.PopupNotification" parent="Theme.TMessages"> <style name="Theme.TMessages.PopupNotification" parent="Theme.TMessages">
...@@ -44,6 +45,10 @@ ...@@ -44,6 +45,10 @@
<item name="android:windowNoTitle">true</item> <item name="android:windowNoTitle">true</item>
</style> </style>
<style name="Theme.TMessages.Dialog.Alert" parent="android:style/Theme.Material.Light.Dialog.Alert">
<item name="android:colorAccent">#54759e</item>
</style>
<!--ACTION BAR--> <!--ACTION BAR-->
<style name="ActionBar.Transparent.TMessages.Start" parent="android:style/Widget.Material.Light.ActionBar"> <style name="ActionBar.Transparent.TMessages.Start" parent="android:style/Widget.Material.Light.ActionBar">
...@@ -59,6 +64,12 @@ ...@@ -59,6 +64,12 @@
<item name="android:textSize">18sp</item> <item name="android:textSize">18sp</item>
</style> </style>
<!--BORDERLESS BUTTON-->
<style name="Theme.TMessages.BorderLessButton" parent="android:Widget.Material.Light.ButtonBar.AlertDialog">
<item name="android:textColor">#54759e</item>
</style>
<!--LIST VIEW--> <!--LIST VIEW-->
<style name="Theme.TMessages.ListView" parent="@android:style/Widget.Material.Light.ListView"> <style name="Theme.TMessages.ListView" parent="@android:style/Widget.Material.Light.ListView">
......
TMessagesProj/src/main/res/values/strings.xml
View file @ ca46b69b
...@@ -175,8 +175,7 @@ ...@@ -175,8 +175,7 @@
<string name="EnterGroupNameTitle">ENTER GROUP NAME</string> <string name="EnterGroupNameTitle">ENTER GROUP NAME</string>
<string name="SharedMedia">Shared Media</string> <string name="SharedMedia">Shared Media</string>
<string name="GroupInfo">Group Info</string> <string name="GroupInfo">Group Info</string>
<string name="SHAREDMEDIA">SHARED MEDIA</string> <string name="SETTINGS">Settings</string>
<string name="SETTINGS">SETTINGS</string>
<string name="AddMember">Add member</string> <string name="AddMember">Add member</string>
<string name="DeleteAndExit">Delete and leave group</string> <string name="DeleteAndExit">Delete and leave group</string>
<string name="Notifications">Notifications</string> <string name="Notifications">Notifications</string>
...@@ -202,7 +201,7 @@ ...@@ -202,7 +201,7 @@
<string name="ShortMessageLifetimeForever">Off</string> <string name="ShortMessageLifetimeForever">Off</string>
<string name="EncryptionKeyDescription">This image is a visualization of the encryption key for this secret chat with <![CDATA[<b>]]>%1$s<![CDATA[</b>]]>.<![CDATA[<br><br>]]>If this image looks the same on <![CDATA[<b>]]>%2$s\'s<![CDATA[</b>]]> phone, your chat is 200%% secure.<![CDATA[<br><br>]]>Learn more at telegram.org</string> <string name="EncryptionKeyDescription">This image is a visualization of the encryption key for this secret chat with <![CDATA[<b>]]>%1$s<![CDATA[</b>]]>.<![CDATA[<br><br>]]>If this image looks the same on <![CDATA[<b>]]>%2$s\'s<![CDATA[</b>]]> phone, your chat is 200%% secure.<![CDATA[<br><br>]]>Learn more at telegram.org</string>
<string name="NumberUnknown">Unknown</string> <string name="NumberUnknown">Unknown</string>
<string name="Info">INFO</string> <string name="Info">Info</string>
<string name="Phone">Phone</string> <string name="Phone">Phone</string>
<!--usernames--> <!--usernames-->
<string name="Username">Username</string> <string name="Username">Username</string>
...@@ -245,9 +244,9 @@ ...@@ -245,9 +244,9 @@
<string name="YourFirstNameAndLastName">YOUR FIRST AND LAST NAME</string> <string name="YourFirstNameAndLastName">YOUR FIRST AND LAST NAME</string>
<string name="NoSound">No sound</string> <string name="NoSound">No sound</string>
<string name="Default">Default</string> <string name="Default">Default</string>
<string name="Support">SUPPORT</string> <string name="Support">Support</string>
<string name="ChatBackground">Chat Background</string> <string name="ChatBackground">Chat Background</string>
<string name="MessagesSettings">MESSAGES</string> <string name="MessagesSettings">Messages</string>
<string name="SendByEnter">Send by Enter</string> <string name="SendByEnter">Send by Enter</string>
<string name="TerminateAllSessions">Terminate All Other Sessions</string> <string name="TerminateAllSessions">Terminate All Other Sessions</string>
<string name="Events">EVENTS</string> <string name="Events">EVENTS</string>
...@@ -280,12 +279,13 @@ ...@@ -280,12 +279,13 @@
<string name="Long">Long</string> <string name="Long">Long</string>
<string name="SystemDefault">System default</string> <string name="SystemDefault">System default</string>
<string name="SettingsDefault">Settings default</string> <string name="SettingsDefault">Settings default</string>
<string name="AutomaticMediaDownload">AUTOMATIC MEDIA DOWNLOAD</string> <string name="AutomaticMediaDownload">Automatic media download</string>
<string name="WhenUsingMobileData">When using mobile data</string> <string name="WhenUsingMobileData">When using mobile data</string>
<string name="WhenConnectedOnWiFi">When connected on Wi-Fi</string> <string name="WhenConnectedOnWiFi">When connected on Wi-Fi</string>
<string name="WhenRoaming">When roaming</string> <string name="WhenRoaming">When roaming</string>
<string name="NoMediaAutoDownload">No media</string> <string name="NoMediaAutoDownload">No media</string>
<string name="SaveToGallerySettings">Save to gallery</string> <string name="SaveToGallerySettings">Save to gallery</string>
<string name="EditName">Edit Name</string>
<!--media view--> <!--media view-->
<string name="NoMedia">No shared media yet</string> <string name="NoMedia">No shared media yet</string>
<string name="CancelDownload">Cancel Download</string> <string name="CancelDownload">Cancel Download</string>
......
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