mirror of https://github.com/NekoX-Dev/NekoX.git
fix merge 8.8.3
This commit is contained in:
parent
531f4f9ba9
commit
4f85d02518
|
@ -67,9 +67,6 @@ public class HeaderCell extends LinearLayout {
|
||||||
super(context);
|
super(context);
|
||||||
this.resourcesProvider = resourcesProvider;
|
this.resourcesProvider = resourcesProvider;
|
||||||
|
|
||||||
setOrientation(LinearLayout.VERTICAL);
|
|
||||||
setPadding(AndroidUtilities.dp(padding), AndroidUtilities.dp(topMargin), AndroidUtilities.dp(padding), 0);
|
|
||||||
|
|
||||||
textView = new TextView(getContext());
|
textView = new TextView(getContext());
|
||||||
textView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 15);
|
textView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 15);
|
||||||
textView.setTypeface(AndroidUtilities.getTypeface("fonts/rmedium.ttf"));
|
textView.setTypeface(AndroidUtilities.getTypeface("fonts/rmedium.ttf"));
|
||||||
|
@ -107,7 +104,7 @@ public class HeaderCell extends LinearLayout {
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setHeight(int value) {
|
public void setHeight(int value) {
|
||||||
textView.setMinHeight(AndroidUtilities.dp(value) - ((LayoutParams) textView.getLayoutParams()).topMargin);
|
textView.setMinHeight(AndroidUtilities.dp(height = value) - ((LayoutParams) textView.getLayoutParams()).topMargin);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setEnabled(boolean value, ArrayList<Animator> animators) {
|
public void setEnabled(boolean value, ArrayList<Animator> animators) {
|
||||||
|
|
|
@ -2949,7 +2949,7 @@ ChatActivity extends BaseFragment implements NotificationCenter.NotificationCent
|
||||||
TLRPC.UserFull userFull = null;
|
TLRPC.UserFull userFull = null;
|
||||||
if (currentUser != null) {
|
if (currentUser != null) {
|
||||||
// audioCallIconItem = menu.addItem(call, R.drawable.ic_call, themeDelegate);
|
// audioCallIconItem = menu.addItem(call, R.drawable.ic_call, themeDelegate);
|
||||||
audioCallIconItem.setContentDescription(LocaleController.getString("Call", R.string.Call));
|
// audioCallIconItem.setContentDescription(LocaleController.getString("Call", R.string.Call));
|
||||||
userFull = getMessagesController().getUserFull(currentUser.id);
|
userFull = getMessagesController().getUserFull(currentUser.id);
|
||||||
// if (userFull != null && userFull.phone_calls_available) {
|
// if (userFull != null && userFull.phone_calls_available) {
|
||||||
// showAudioCallAsIcon = !inPreviewMode;
|
// showAudioCallAsIcon = !inPreviewMode;
|
||||||
|
|
|
@ -434,8 +434,8 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
|
||||||
private int privacyRow;
|
private int privacyRow;
|
||||||
private int dataRow;
|
private int dataRow;
|
||||||
private int chatRow;
|
private int chatRow;
|
||||||
private int stickersRow;
|
|
||||||
private int filtersRow;
|
private int filtersRow;
|
||||||
|
private int stickersRow;
|
||||||
private int devicesRow;
|
private int devicesRow;
|
||||||
private int devicesSectionRow;
|
private int devicesSectionRow;
|
||||||
private int helpHeaderRow;
|
private int helpHeaderRow;
|
||||||
|
@ -3136,6 +3136,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
|
||||||
});
|
});
|
||||||
showDialog(builder.create());
|
showDialog(builder.create());
|
||||||
} else if (position == setAvatarRow) {
|
} else if (position == setAvatarRow) {
|
||||||
|
onWriteButtonClick();
|
||||||
} else if (position == versionRow) {
|
} else if (position == versionRow) {
|
||||||
TextInfoPrivacyCell cell = (TextInfoPrivacyCell) view;
|
TextInfoPrivacyCell cell = (TextInfoPrivacyCell) view;
|
||||||
|
|
||||||
|
@ -4515,9 +4516,8 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
|
||||||
showDialog(builder.create());
|
showDialog(builder.create());
|
||||||
return true;
|
return true;
|
||||||
} else if (position == channelInfoRow || position == userInfoRow || position == locationRow || position == bioRow) {
|
} else if (position == channelInfoRow || position == userInfoRow || position == locationRow || position == bioRow) {
|
||||||
if (position == bioRow) {
|
if (position == bioRow && (userInfo == null || TextUtils.isEmpty(userInfo.about))) {
|
||||||
presentFragment(new ChangeBioActivity());
|
return false;
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
if (view instanceof AboutLinkCell && ((AboutLinkCell) view).onClick()) {
|
if (view instanceof AboutLinkCell && ((AboutLinkCell) view).onClick()) {
|
||||||
return false;
|
return false;
|
||||||
|
@ -6315,7 +6315,6 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
|
||||||
privacyRow = -1;
|
privacyRow = -1;
|
||||||
dataRow = -1;
|
dataRow = -1;
|
||||||
chatRow = -1;
|
chatRow = -1;
|
||||||
stickersRow = -1;
|
|
||||||
filtersRow = -1;
|
filtersRow = -1;
|
||||||
stickersRow = -1;
|
stickersRow = -1;
|
||||||
devicesRow = -1;
|
devicesRow = -1;
|
||||||
|
@ -8030,6 +8029,16 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
|
||||||
aboutLinkCell.setTextAndValue(LocaleController.getString("UserBioDetail", R.string.UserBioDetail), LocaleController.getString("UserBio", R.string.UserBio), false);
|
aboutLinkCell.setTextAndValue(LocaleController.getString("UserBioDetail", R.string.UserBioDetail), LocaleController.getString("UserBio", R.string.UserBio), false);
|
||||||
currentBio = null;
|
currentBio = null;
|
||||||
}
|
}
|
||||||
|
// aboutLinkCell.setMoreButtonDisabled(true);
|
||||||
|
}
|
||||||
|
if (position == bioRow) {
|
||||||
|
aboutLinkCell.setOnClickListener(e -> {
|
||||||
|
if (userInfo != null) {
|
||||||
|
presentFragment(new ChangeBioActivity());
|
||||||
|
}
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
aboutLinkCell.setOnClickListener(e -> processOnClickOrPress(position, aboutLinkCell));
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case VIEW_TYPE_PREMIUM_TEXT_CELL:
|
case VIEW_TYPE_PREMIUM_TEXT_CELL:
|
||||||
|
@ -8129,6 +8138,8 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
|
||||||
textCell.setTextAndIcon(LocaleController.getString("DebugClearLogs", R.string.DebugClearLogs), R.drawable.baseline_delete_sweep_24, switchBackendRow != -1);
|
textCell.setTextAndIcon(LocaleController.getString("DebugClearLogs", R.string.DebugClearLogs), R.drawable.baseline_delete_sweep_24, switchBackendRow != -1);
|
||||||
} else if (position == switchBackendRow) {
|
} else if (position == switchBackendRow) {
|
||||||
textCell.setText("Switch Backend", false);
|
textCell.setText("Switch Backend", false);
|
||||||
|
} else if (position == devicesRow) {
|
||||||
|
textCell.setTextAndIcon(LocaleController.getString("Devices", R.string.Devices), R.drawable.menu_devices, true);
|
||||||
} else if (position == setAvatarRow) {
|
} else if (position == setAvatarRow) {
|
||||||
textCell.setTextAndIcon(LocaleController.getString("SetProfilePhoto", R.string.SetProfilePhoto), R.drawable.baseline_image_24, false);
|
textCell.setTextAndIcon(LocaleController.getString("SetProfilePhoto", R.string.SetProfilePhoto), R.drawable.baseline_image_24, false);
|
||||||
textCell.setColors(Theme.key_windowBackgroundWhiteBlueIcon, Theme.key_windowBackgroundWhiteBlueButton);
|
textCell.setColors(Theme.key_windowBackgroundWhiteBlueIcon, Theme.key_windowBackgroundWhiteBlueButton);
|
||||||
|
|
Loading…
Reference in New Issue