Skip to content

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

Merge branch 'dev'

parents d4703e32 8351b066
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1351 additions and 658 deletions
TMessagesProj/build.gradle
View file @ d4854101
......@@ -82,7 +82,7 @@ android {
defaultConfig {
minSdkVersion 8
targetSdkVersion 19
versionCode 208
versionName "1.4.7"
versionCode 211
versionName "1.4.8"
}
}
TMessagesProj/src/main/java/org/telegram/messenger/ConnectionsManager.java
View file @ d4854101
......@@ -479,7 +479,6 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection.
processedMessageIdsSet.remove(sessionId);
nextSeqNoInSession.remove(sessionId);
processedSessionChanges.remove(sessionId);
pingIdToDate.remove(sessionId);
if (sessionId == datacenter.authSessionId) {
clearRequestsForRequestClass(RPCRequest.RPCRequestClassGeneric, datacenter);
......@@ -858,7 +857,7 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection.
}
} catch(Exception e) {
FileLog.e("tmessages", e);
return false;
return true;
}
return status;
}
......
TMessagesProj/src/main/java/org/telegram/messenger/ContactsController.java
View file @ d4854101
......@@ -592,9 +592,9 @@ public class ContactsController {
if (!toImport.isEmpty()) {
if (BuildVars.DEBUG_VERSION) {
FileLog.e("tmessages", "start import contacts");
for (TLRPC.TL_inputPhoneContact contact : toImport) {
FileLog.e("tmessages", "add contact " + contact.first_name + " " + contact.last_name + " " + contact.phone);
}
// for (TLRPC.TL_inputPhoneContact contact : toImport) {
// FileLog.e("tmessages", "add contact " + contact.first_name + " " + contact.last_name + " " + contact.phone);
// }
}
final int count = (int)Math.ceil(toImport.size() / 500.0f);
for (int a = 0; a < count; a++) {
......@@ -614,9 +614,9 @@ public class ContactsController {
}
TLRPC.TL_contacts_importedContacts res = (TLRPC.TL_contacts_importedContacts)response;
if (BuildVars.DEBUG_VERSION) {
for (TLRPC.User user : res.users) {
FileLog.e("tmessages", "received user " + user.first_name + " " + user.last_name + " " + user.phone);
}
// for (TLRPC.User user : res.users) {
// FileLog.e("tmessages", "received user " + user.first_name + " " + user.last_name + " " + user.phone);
// }
}
MessagesStorage.getInstance().putUsersAndChats(res.users, null, true, true);
ArrayList<TLRPC.TL_contact> cArr = new ArrayList<TLRPC.TL_contact>();
......@@ -776,9 +776,9 @@ public class ContactsController {
if (user != null) {
usersDict.put(user.id, user);
if (BuildVars.DEBUG_VERSION) {
FileLog.e("tmessages", "loaded user contact " + user.first_name + " " + user.last_name + " " + user.phone);
}
// if (BuildVars.DEBUG_VERSION) {
// FileLog.e("tmessages", "loaded user contact " + user.first_name + " " + user.last_name + " " + user.phone);
// }
}
}
......@@ -1398,9 +1398,9 @@ public class ContactsController {
contactsParams.add(c);
req.contacts = contactsParams;
req.replace = false;
if (BuildVars.DEBUG_VERSION) {
FileLog.e("tmessages", "add contact " + user.first_name + " " + user.last_name + " " + user.phone);
}
// if (BuildVars.DEBUG_VERSION) {
// FileLog.e("tmessages", "add contact " + user.first_name + " " + user.last_name + " " + user.phone);
// }
ConnectionsManager.getInstance().performRpc(req, new RPCRequest.RPCRequestDelegate() {
@Override
public void run(TLObject response, TLRPC.TL_error error) {
......@@ -1410,11 +1410,11 @@ public class ContactsController {
final TLRPC.TL_contacts_importedContacts res = (TLRPC.TL_contacts_importedContacts)response;
MessagesStorage.getInstance().putUsersAndChats(res.users, null, true, true);
if (BuildVars.DEBUG_VERSION) {
for (TLRPC.User user : res.users) {
FileLog.e("tmessages", "received user " + user.first_name + " " + user.last_name + " " + user.phone);
}
}
// if (BuildVars.DEBUG_VERSION) {
// for (TLRPC.User user : res.users) {
// FileLog.e("tmessages", "received user " + user.first_name + " " + user.last_name + " " + user.phone);
// }
// }
for (final TLRPC.User u : res.users) {
Utilities.globalQueue.postRunnable(new Runnable() {
......
TMessagesProj/src/main/java/org/telegram/messenger/MessagesController.java
View file @ d4854101
......@@ -4344,7 +4344,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter
} else if (messageObject.messageOwner.action instanceof TLRPC.TL_messageActionUserUpdatedPhoto) {
msg = LocaleController.formatString("NotificationContactNewPhoto", R.string.NotificationContactNewPhoto, Utilities.formatName(u.first_name, u.last_name));
} else if (messageObject.messageOwner.action instanceof TLRPC.TL_messageActionLoginUnknownLocation) {
String date = String.format("%s %s %s", Utilities.formatterYear.format(((long)messageObject.messageOwner.date) * 1000), LocaleController.getString("OtherAt", R.string.OtherAt), Utilities.formatterDay.format(((long)messageObject.messageOwner.date) * 1000));
String date = String.format("%s %s %s", LocaleController.formatterYear.format(((long)messageObject.messageOwner.date) * 1000), LocaleController.getString("OtherAt", R.string.OtherAt), LocaleController.formatterDay.format(((long)messageObject.messageOwner.date) * 1000));
msg = LocaleController.formatString("NotificationUnrecognizedDevice", R.string.NotificationUnrecognizedDevice, UserConfig.currentUser.first_name, date, messageObject.messageOwner.action.title, messageObject.messageOwner.action.address);
}
} else {
......
TMessagesProj/src/main/java/org/telegram/messenger/MessagesStorage.java
View file @ d4854101
......@@ -62,6 +62,8 @@ public class MessagesStorage {
}
public void openDatabase() {
NativeLoader.initNativeLibs(ApplicationLoader.applicationContext);
cacheFile = new File(ApplicationLoader.applicationContext.getFilesDir(), "cache4.db");
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("dbconfig", Context.MODE_PRIVATE);
......
TMessagesProj/src/main/java/org/telegram/messenger/NativeLoader.java
View file @ d4854101
......@@ -28,7 +28,13 @@ public class NativeLoader {
0, //mips
};
public static void initNativeLibs(Context context) {
private static volatile boolean nativeLoaded = false;
public static synchronized void initNativeLibs(Context context) {
if (nativeLoaded) {
return;
}
if (Build.VERSION.SDK_INT >= 9) {
try {
String folder = null;
......@@ -50,6 +56,7 @@ public class NativeLoader {
libSize = sizes[3];
} else {
System.loadLibrary("tmessages");
nativeLoaded = true;
Log.e("tmessages", "Unsupported arch: " + Build.CPU_ABI);
return;
}
......@@ -59,6 +66,7 @@ public class NativeLoader {
Log.d("tmessages", "Load normal lib");
try {
System.loadLibrary("tmessages");
nativeLoaded = true;
return;
} catch (Exception e) {
e.printStackTrace();
......@@ -68,9 +76,14 @@ public class NativeLoader {
File destLocalFile = new File(context.getFilesDir().getAbsolutePath() + "/libtmessages.so");
if (destLocalFile.exists()) {
if (destLocalFile.length() == libSize) {
Log.d("tmessages", "Load local lib");
System.load(destLocalFile.getAbsolutePath());
return;
try {
Log.d("tmessages", "Load local lib");
System.load(destLocalFile.getAbsolutePath());
nativeLoaded = true;
return;
} catch (Exception e) {
e.printStackTrace();
}
} else {
destLocalFile.delete();
}
......@@ -98,6 +111,7 @@ public class NativeLoader {
out.close();
System.load(destLocalFile.getAbsolutePath());
nativeLoaded = true;
return;
} catch (Exception e) {
e.printStackTrace();
......@@ -123,5 +137,6 @@ public class NativeLoader {
}
System.loadLibrary("tmessages");
nativeLoaded = true;
}
}
TMessagesProj/src/main/java/org/telegram/messenger/TcpConnection.java
View file @ d4854101
......@@ -60,6 +60,7 @@ public class TcpConnection extends PyroClientAdapter {
private boolean firstPacket;
private Timer reconnectTimer;
private boolean tryWithNoNetworkAnyway = false;
public TcpConnection(int did) {
if (selector == null) {
......@@ -90,9 +91,13 @@ public class TcpConnection extends PyroClientAdapter {
connectionState = TcpConnectionState.TcpConnectionStageConnecting;
try {
if (!ConnectionsManager.isNetworkOnline()) {
handleConnectionError(null);
return;
if(android.os.Build.VERSION.SDK_INT < 11) {
if (!ConnectionsManager.isNetworkOnline() && !tryWithNoNetworkAnyway) {
handleConnectionError(null);
tryWithNoNetworkAnyway = true;
return;
}
tryWithNoNetworkAnyway = false;
}
try {
synchronized (timerSync) {
......
TMessagesProj/src/main/java/org/telegram/messenger/Utilities.java
View file @ d4854101
......@@ -24,7 +24,6 @@ import android.provider.DocumentsContract;
import android.provider.MediaStore;
import android.text.Html;
import android.text.SpannableStringBuilder;
import android.text.format.DateFormat;
import android.util.Base64;
import android.view.Display;
import android.view.View;
......@@ -49,7 +48,6 @@ import java.security.PublicKey;
import java.security.spec.RSAPublicKeySpec;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.Hashtable;
import java.util.Locale;
......@@ -64,7 +62,6 @@ public class Utilities {
public static int statusBarHeight = 0;
public static float density = 1;
public static Point displaySize = new Point();
public static boolean isRTL = false;
public static Pattern pattern = Pattern.compile("[0-9]+");
private final static Integer lock = 1;
......@@ -83,14 +80,6 @@ public class Utilities {
public static volatile DispatchQueue imageLoadQueue = new DispatchQueue("imageLoadQueue");
public static volatile DispatchQueue fileUploadQueue = new DispatchQueue("fileUploadQueue");
public static FastDateFormat formatterDay;
public static FastDateFormat formatterWeek;
public static FastDateFormat formatterMonth;
public static FastDateFormat formatterYear;
public static FastDateFormat formatterYearMax;
public static FastDateFormat chatDate;
public static FastDateFormat chatFullDate;
public static int[] arrColors = {0xffee4928, 0xff41a903, 0xffe09602, 0xff0f94ed, 0xff8f3bf7, 0xfffc4380, 0xff00a1c4, 0xffeb7002};
public static int[] arrUsersAvatars = {
R.drawable.user_red,
......@@ -139,7 +128,6 @@ public class Utilities {
}
}
recreateFormatters();
checkDisplaySize();
}
......@@ -537,49 +525,6 @@ public class Utilities {
});
}
public static void recreateFormatters() {
Locale locale = Locale.getDefault();
String lang = locale.getLanguage();
if (lang == null) {
lang = "en";
}
isRTL = lang.toLowerCase().equals("ar");
if (lang.equals("en")) {
formatterMonth = FastDateFormat.getInstance("MMM dd", locale);
formatterYear = FastDateFormat.getInstance("dd.MM.yy", locale);
formatterYearMax = FastDateFormat.getInstance("dd.MM.yyyy", locale);
chatDate = FastDateFormat.getInstance("MMMM d", locale);
chatFullDate = FastDateFormat.getInstance("MMMM d, yyyy", locale);
} else if (lang.startsWith("es")) {
formatterMonth = FastDateFormat.getInstance("dd 'de' MMM", locale);
formatterYear = FastDateFormat.getInstance("dd.MM.yy", locale);
formatterYearMax = FastDateFormat.getInstance("dd.MM.yyyy", locale);
chatDate = FastDateFormat.getInstance("d 'de' MMMM", locale);
chatFullDate = FastDateFormat.getInstance("d 'de' MMMM 'de' yyyy", locale);
} else {
formatterMonth = FastDateFormat.getInstance("dd MMM", locale);
formatterYear = FastDateFormat.getInstance("dd.MM.yy", locale);
formatterYearMax = FastDateFormat.getInstance("dd.MM.yyyy", locale);
chatDate = FastDateFormat.getInstance("d MMMM", locale);
chatFullDate = FastDateFormat.getInstance("d MMMM yyyy", locale);
}
formatterWeek = FastDateFormat.getInstance("EEE", locale);
if (lang != null) {
if (DateFormat.is24HourFormat(ApplicationLoader.applicationContext)) {
formatterDay = FastDateFormat.getInstance("HH:mm", locale);
} else {
if (lang.toLowerCase().equals("ar")) {
formatterDay = FastDateFormat.getInstance("h:mm a", locale);
} else {
formatterDay = FastDateFormat.getInstance("h:mm a", Locale.US);
}
}
} else {
formatterDay = FastDateFormat.getInstance("h:mm a", Locale.US);
}
}
public static void checkDisplaySize() {
try {
WindowManager manager = (WindowManager)ApplicationLoader.applicationContext.getSystemService(Context.WINDOW_SERVICE);
......@@ -599,57 +544,6 @@ public class Utilities {
}
}
public static String formatDateChat(long date) {
Calendar rightNow = Calendar.getInstance();
int year = rightNow.get(Calendar.YEAR);
rightNow.setTimeInMillis(date * 1000);
int dateYear = rightNow.get(Calendar.YEAR);
if (year == dateYear) {
return chatDate.format(date * 1000);
}
return chatFullDate.format(date * 1000);
}
public static String formatDate(long date) {
Calendar rightNow = Calendar.getInstance();
int day = rightNow.get(Calendar.DAY_OF_YEAR);
int year = rightNow.get(Calendar.YEAR);
rightNow.setTimeInMillis(date * 1000);
int dateDay = rightNow.get(Calendar.DAY_OF_YEAR);
int dateYear = rightNow.get(Calendar.YEAR);
if (dateDay == day && year == dateYear) {
return formatterDay.format(new Date(date * 1000));
} else if (dateDay + 1 == day && year == dateYear) {
return ApplicationLoader.applicationContext.getResources().getString(R.string.Yesterday);
} else if (year == dateYear) {
return formatterMonth.format(new Date(date * 1000));
} else {
return formatterYear.format(new Date(date * 1000));
}
}
public static String formatDateOnline(long date) {
Calendar rightNow = Calendar.getInstance();
int day = rightNow.get(Calendar.DAY_OF_YEAR);
int year = rightNow.get(Calendar.YEAR);
rightNow.setTimeInMillis(date * 1000);
int dateDay = rightNow.get(Calendar.DAY_OF_YEAR);
int dateYear = rightNow.get(Calendar.YEAR);
if (dateDay == day && year == dateYear) {
return String.format("%s %s %s", LocaleController.getString("LastSeen", R.string.LastSeen), LocaleController.getString("TodayAt", R.string.TodayAt), formatterDay.format(new Date(date * 1000)));
} else if (dateDay + 1 == day && year == dateYear) {
return String.format("%s %s %s", LocaleController.getString("LastSeen", R.string.LastSeen), LocaleController.getString("YesterdayAt", R.string.YesterdayAt), formatterDay.format(new Date(date * 1000)));
} else if (year == dateYear) {
return String.format("%s %s %s %s", LocaleController.getString("LastSeenDate", R.string.LastSeenDate), formatterMonth.format(new Date(date * 1000)), LocaleController.getString("OtherAt", R.string.OtherAt), formatterDay.format(new Date(date * 1000)));
} else {
return String.format("%s %s %s %s", LocaleController.getString("LastSeenDate", R.string.LastSeenDate), formatterYear.format(new Date(date * 1000)), LocaleController.getString("OtherAt", R.string.OtherAt), formatterDay.format(new Date(date * 1000)));
}
}
public static void HideProgressDialog(Activity activity) {
activity.runOnUiThread(new Runnable() {
@Override
......@@ -941,7 +835,7 @@ public class Utilities {
} else if (result.length() != 0 && lastName.length() != 0) {
result += " " + lastName;
}
return result;
return result.trim();
}
public static String formatFileSize(long size) {
......@@ -956,28 +850,6 @@ public class Utilities {
}
}
public static String stringForMessageListDate(long date) {
Calendar rightNow = Calendar.getInstance();
int day = rightNow.get(Calendar.DAY_OF_YEAR);
int year = rightNow.get(Calendar.YEAR);
rightNow.setTimeInMillis(date * 1000);
int dateDay = rightNow.get(Calendar.DAY_OF_YEAR);
int dateYear = rightNow.get(Calendar.YEAR);
if (year != dateYear) {
return formatterYear.format(new Date(date * 1000));
} else {
int dayDiff = dateDay - day;
if(dayDiff == 0 || dayDiff == -1 && (int)(System.currentTimeMillis() / 1000) - date < 60 * 60 * 8) {
return formatterDay.format(new Date(date * 1000));
} else if(dayDiff > -7 && dayDiff <= -1) {
return formatterWeek.format(new Date(date * 1000));
} else {
return formatterMonth.format(new Date(date * 1000));
}
}
}
public static byte[] decodeQuotedPrintable(final byte[] bytes) {
if (bytes == null) {
return null;
......
TMessagesProj/src/main/java/org/telegram/objects/MessageObject.java
View file @ d4854101
......@@ -202,7 +202,7 @@ public class MessageObject {
}
}
} else if (message.action instanceof TLRPC.TL_messageActionLoginUnknownLocation) {
String date = String.format("%s %s %s", Utilities.formatterYear.format(((long)message.date) * 1000), LocaleController.getString("OtherAt", R.string.OtherAt), Utilities.formatterDay.format(((long)message.date) * 1000));
String date = String.format("%s %s %s", LocaleController.formatterYear.format(((long)message.date) * 1000), LocaleController.getString("OtherAt", R.string.OtherAt), LocaleController.formatterDay.format(((long)message.date) * 1000));
messageText = LocaleController.formatString("NotificationUnrecognizedDevice", R.string.NotificationUnrecognizedDevice, UserConfig.currentUser.first_name, date, message.action.title, message.action.address);
} else if (message.action instanceof TLRPC.TL_messageActionUserJoined) {
if (fromUser != null) {
......
TMessagesProj/src/main/java/org/telegram/ui/Adapters/ContactsActivityAdapter.java
View file @ d4854101
......@@ -9,7 +9,6 @@
package org.telegram.ui.Adapters;
import android.content.Context;
import android.text.Html;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
......@@ -114,7 +113,6 @@ public class ContactsActivityAdapter extends SectionedBaseAdapter {
if (user != null) {
if (convertView == null) {
convertView = new ChatOrUserCell(mContext);
((ChatOrUserCell)convertView).useBoldFont = true;
((ChatOrUserCell)convertView).usePadding = false;
}
......@@ -153,11 +151,11 @@ public class ContactsActivityAdapter extends SectionedBaseAdapter {
}
}
if (contact.first_name != null && contact.last_name != null) {
textView.setText(Html.fromHtml(contact.first_name + " <b>" + contact.last_name + "</b>"));
textView.setText(contact.first_name + " " + contact.last_name);
} else if (contact.first_name != null && contact.last_name == null) {
textView.setText(Html.fromHtml("<b>" + contact.first_name + "</b>"));
textView.setText(contact.first_name);
} else {
textView.setText(Html.fromHtml("<b>" + contact.last_name + "</b>"));
textView.setText(contact.last_name);
}
return convertView;
}
......
TMessagesProj/src/main/java/org/telegram/ui/Adapters/ContactsActivitySearchAdapter.java
View file @ d4854101
......@@ -30,7 +30,7 @@ public class ContactsActivitySearchAdapter extends BaseFragmentAdapter {
private HashMap<Integer, TLRPC.User> ignoreUsers;
private ArrayList<TLRPC.User> searchResult;
private ArrayList<CharSequence> searchResultNames;
private Timer searchDialogsTimer;
private Timer searchTimer;
public ContactsActivitySearchAdapter(Context context, HashMap<Integer, TLRPC.User> arg1) {
mContext = context;
......@@ -44,19 +44,19 @@ public class ContactsActivitySearchAdapter extends BaseFragmentAdapter {
notifyDataSetChanged();
} else {
try {
if (searchDialogsTimer != null) {
searchDialogsTimer.cancel();
if (searchTimer != null) {
searchTimer.cancel();
}
} catch (Exception e) {
FileLog.e("tmessages", e);
}
searchDialogsTimer = new Timer();
searchDialogsTimer.schedule(new TimerTask() {
searchTimer = new Timer();
searchTimer.schedule(new TimerTask() {
@Override
public void run() {
try {
searchDialogsTimer.cancel();
searchDialogsTimer = null;
searchTimer.cancel();
searchTimer = null;
} catch (Exception e) {
FileLog.e("tmessages", e);
}
......
TMessagesProj/src/main/java/org/telegram/ui/ApplicationLoader.java
View file @ d4854101
......@@ -30,6 +30,7 @@ import com.google.android.gms.gcm.GoogleCloudMessaging;
import org.telegram.messenger.BuildVars;
import org.telegram.messenger.ConnectionsManager;
import org.telegram.messenger.FileLog;
import org.telegram.messenger.LocaleController;
import org.telegram.messenger.MessagesController;
import org.telegram.messenger.NativeLoader;
import org.telegram.messenger.ScreenReceiver;
......@@ -39,7 +40,6 @@ import org.telegram.ui.Views.BaseFragment;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Locale;
import java.util.concurrent.atomic.AtomicInteger;
public class ApplicationLoader extends Application {
......@@ -52,7 +52,6 @@ public class ApplicationLoader extends Application {
private static final int PLAY_SERVICES_RESOLUTION_REQUEST = 9000;
public static long lastPauseTime;
public static Bitmap cachedWallpaper = null;
private Locale currentLocale;
public static volatile Context applicationContext = null;
public static volatile Handler applicationHandler = null;
......@@ -120,8 +119,14 @@ public class ApplicationLoader extends Application {
super.onCreate();
lastPauseTime = System.currentTimeMillis();
applicationContext = getApplicationContext();
NativeLoader.initNativeLibs(this);
try {
LocaleController.getInstance();
} catch (Exception e) {
e.printStackTrace();
}
applicationHandler = new Handler(applicationContext.getMainLooper());
currentLocale = Locale.getDefault();
java.lang.System.setProperty("java.net.preferIPv4Stack", "true");
java.lang.System.setProperty("java.net.preferIPv6Addresses", "false");
......@@ -136,23 +141,17 @@ public class ApplicationLoader extends Application {
} catch (Exception e) {
e.printStackTrace();
}
FileLog.e("tmessages", "start application with time " + lastPauseTime);
}
@Override
public void onConfigurationChanged(Configuration newConfig) {
super.onConfigurationChanged(newConfig);
Locale newLocale = newConfig.locale;
if (newLocale != null) {
String d1 = newLocale.getDisplayName();
String d2 = currentLocale.getDisplayName();
if (d1 != null && d2 != null && !d1.equals(d2)) {
Utilities.recreateFormatters();
}
currentLocale = newLocale;
try {
LocaleController.getInstance().onDeviceConfigurationChange(newConfig);
Utilities.checkDisplaySize();
} catch (Exception e) {
e.printStackTrace();
}
Utilities.checkDisplaySize();
}
public static void resetLastPauseTime() {
......
TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatBaseCell.java
View file @ d4854101
......@@ -206,7 +206,7 @@ public class ChatBaseCell extends BaseCell {
currentTimePaint = timePaintIn;
}
currentTimeString = Utilities.formatterDay.format((long) (currentMessageObject.messageOwner.date) * 1000);
currentTimeString = LocaleController.formatterDay.format((long) (currentMessageObject.messageOwner.date) * 1000);
timeWidth = (int)Math.ceil(currentTimePaint.measureText(currentTimeString));
namesOffset = 0;
......
TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatOrUserCell.java
View file @ d4854101
......@@ -12,7 +12,6 @@ import android.content.Context;
import android.graphics.Canvas;
import android.graphics.Paint;
import android.graphics.drawable.Drawable;
import android.text.Html;
import android.text.Layout;
import android.text.StaticLayout;
import android.text.TextPaint;
......@@ -55,7 +54,6 @@ public class ChatOrUserCell extends BaseCell {
private TLRPC.FileLocation lastAvatar = null;
public boolean usePadding = true;
public boolean useBoldFont = false;
public boolean useSeparator = false;
public float drawAlpha = 1;
......@@ -275,7 +273,7 @@ public class ChatOrUserCell extends BaseCell {
if (encryptedChat != null) {
drawNameLock = true;
if (!Utilities.isRTL) {
if (!LocaleController.isRTL) {
nameLockLeft = Utilities.dp(61 + (usePadding ? 11 : 0));
nameLeft = Utilities.dp(65 + (usePadding ? 11 : 0)) + lockDrawable.getIntrinsicWidth();
} else {
......@@ -284,7 +282,7 @@ public class ChatOrUserCell extends BaseCell {
}
} else {
drawNameLock = false;
if (!Utilities.isRTL) {
if (!LocaleController.isRTL) {
nameLeft = Utilities.dp(61 + (usePadding ? 11 : 0));
} else {
nameLeft = usePadding ? Utilities.dp(11) : 0;
......@@ -294,39 +292,30 @@ public class ChatOrUserCell extends BaseCell {
if (currentName != null) {
nameString = currentName;
} else {
if (useBoldFont) {
if (user != null) {
if (user.first_name.length() != 0 && user.last_name.length() != 0) {
nameString = Html.fromHtml(user.first_name + " <b>" + user.last_name + "</b>");
} else if (user.first_name.length() != 0) {
nameString = Html.fromHtml("<b>" + user.first_name + "</b>");
String nameString2 = "";
if (chat != null) {
nameString2 = chat.title;
} else if (user != null) {
if (user.id / 1000 != 333 && ContactsController.getInstance().contactsDict.get(user.id) == null) {
if (ContactsController.getInstance().contactsDict.size() == 0 && ContactsController.getInstance().loadingContacts) {
nameString2 = Utilities.formatName(user.first_name, user.last_name);
} else {
nameString = Html.fromHtml("<b>" + user.last_name + "</b>");
}
}
} else {
String nameString2 = "";
if (chat != null) {
nameString2 = chat.title;
} else if (user != null) {
if (user.id / 1000 != 333 && ContactsController.getInstance().contactsDict.get(user.id) == null) {
if (ContactsController.getInstance().contactsDict.size() == 0 && ContactsController.getInstance().loadingContacts) {
nameString2 = Utilities.formatName(user.first_name, user.last_name);
if (user.phone != null && user.phone.length() != 0) {
nameString2 = PhoneFormat.getInstance().format("+" + user.phone);
} else {
if (user.phone != null && user.phone.length() != 0) {
nameString2 = PhoneFormat.getInstance().format("+" + user.phone);
} else {
nameString2 = Utilities.formatName(user.first_name, user.last_name);
}
nameString2 = Utilities.formatName(user.first_name, user.last_name);
}
} else {
nameString2 = Utilities.formatName(user.first_name, user.last_name);
}
} else {
nameString2 = Utilities.formatName(user.first_name, user.last_name);
}
nameString = nameString2.replace("\n", " ");
}
nameString = nameString2.replace("\n", " ");
}
if (nameString.length() == 0) {
if (user.phone != null && user.phone.length() != 0) {
nameString = PhoneFormat.getInstance().format("+" + user.phone);
}
nameString = LocaleController.getString("HiddenName", R.string.HiddenName);
}
if (encryptedChat != null) {
......@@ -335,7 +324,7 @@ public class ChatOrUserCell extends BaseCell {
currentNamePaint = namePaint;
}
if (!Utilities.isRTL) {
if (!LocaleController.isRTL) {
onlineWidth = nameWidth = width - nameLeft - Utilities.dp(3 + (usePadding ? 11 : 0));
} else {
onlineWidth = nameWidth = width - nameLeft - Utilities.dp(61 + (usePadding ? 11 : 0));
......@@ -348,7 +337,7 @@ public class ChatOrUserCell extends BaseCell {
nameLayout = new StaticLayout(nameStringFinal, currentNamePaint, nameWidth, Layout.Alignment.ALIGN_NORMAL, 1.0f, 0.0f, false);
if (chat == null) {
if (!Utilities.isRTL) {
if (!LocaleController.isRTL) {
onlineLeft = Utilities.dp(61 + (usePadding ? 11 : 0));
} else {
onlineLeft = usePadding ? Utilities.dp(11) : 0;
......@@ -372,7 +361,7 @@ public class ChatOrUserCell extends BaseCell {
if (user.status.expires <= 10000) {
onlineString = getResources().getString(R.string.Invisible);
} else {
onlineString = Utilities.formatDateOnline(user.status.expires);
onlineString = LocaleController.formatDateOnline(user.status.expires);
}
}
}
......@@ -387,7 +376,7 @@ public class ChatOrUserCell extends BaseCell {
nameTop = Utilities.dp(22);
}
if (!Utilities.isRTL) {
if (!LocaleController.isRTL) {
avatarLeft = usePadding ? Utilities.dp(11) : 0;
} else {
avatarLeft = width - Utilities.dp(50 + (usePadding ? 11 : 0));
......@@ -399,7 +388,7 @@ public class ChatOrUserCell extends BaseCell {
double widthpx = 0;
float left = 0;
if (Utilities.isRTL) {
if (LocaleController.isRTL) {
if (nameLayout.getLineCount() > 0) {
left = nameLayout.getLineLeft(0);
if (left == 0) {
......
TMessagesProj/src/main/java/org/telegram/ui/Cells/DialogCell.java
View file @ d4854101
......@@ -359,7 +359,7 @@ public class DialogCell extends BaseCell {
if (encryptedChat != null) {
drawNameLock = true;
if (!Utilities.isRTL) {
if (!LocaleController.isRTL) {
nameLockLeft = Utilities.dp(77);
nameLeft = Utilities.dp(81) + lockDrawable.getIntrinsicWidth();
} else {
......@@ -368,7 +368,7 @@ public class DialogCell extends BaseCell {
}
} else {
drawNameLock = false;
if (!Utilities.isRTL) {
if (!LocaleController.isRTL) {
nameLeft = Utilities.dp(77);
} else {
nameLeft = Utilities.dp(14);
......@@ -407,7 +407,7 @@ public class DialogCell extends BaseCell {
}
}
if (currentDialog.last_message_date != 0) {
timeString = Utilities.stringForMessageListDate(currentDialog.last_message_date);
timeString = LocaleController.stringForMessageListDate(currentDialog.last_message_date);
}
drawCheck1 = false;
drawCheck2 = false;
......@@ -418,9 +418,9 @@ public class DialogCell extends BaseCell {
TLRPC.User fromUser = MessagesController.getInstance().users.get(message.messageOwner.from_id);
if (currentDialog.last_message_date != 0) {
timeString = Utilities.stringForMessageListDate(currentDialog.last_message_date);
timeString = LocaleController.stringForMessageListDate(currentDialog.last_message_date);
} else {
timeString = Utilities.stringForMessageListDate(message.messageOwner.date);
timeString = LocaleController.stringForMessageListDate(message.messageOwner.date);
}
if (printingString != null) {
lastPrintString = messageString = printingString;
......@@ -508,7 +508,7 @@ public class DialogCell extends BaseCell {
timeWidth = (int)Math.ceil(timePaint.measureText(timeString));
timeLayout = new StaticLayout(timeString, timePaint, timeWidth, Layout.Alignment.ALIGN_NORMAL, 1.0f, 0.0f, false);
if (!Utilities.isRTL) {
if (!LocaleController.isRTL) {
timeLeft = width - Utilities.dp(11) - timeWidth;
} else {
timeLeft = Utilities.dp(11);
......@@ -539,7 +539,7 @@ public class DialogCell extends BaseCell {
nameString = LocaleController.getString("HiddenName", R.string.HiddenName);
}
if (!Utilities.isRTL) {
if (!LocaleController.isRTL) {
nameWidth = width - nameLeft - Utilities.dp(14) - timeWidth;
} else {
nameWidth = width - nameLeft - Utilities.dp(77) - timeWidth;
......@@ -551,7 +551,7 @@ public class DialogCell extends BaseCell {
if (drawClock) {
int w = clockDrawable.getIntrinsicWidth() + Utilities.dp(2);
nameWidth -= w;
if (!Utilities.isRTL) {
if (!LocaleController.isRTL) {
checkDrawLeft = timeLeft - w;
} else {
checkDrawLeft = timeLeft + timeWidth + Utilities.dp(2);
......@@ -562,7 +562,7 @@ public class DialogCell extends BaseCell {
nameWidth -= w;
if (drawCheck1) {
nameWidth -= halfCheckDrawable.getIntrinsicWidth() - Utilities.dp(5);
if (!Utilities.isRTL) {
if (!LocaleController.isRTL) {
halfCheckDrawLeft = timeLeft - w;
checkDrawLeft = halfCheckDrawLeft - Utilities.dp(5);
} else {
......@@ -571,7 +571,7 @@ public class DialogCell extends BaseCell {
nameLeft += w + halfCheckDrawable.getIntrinsicWidth() - Utilities.dp(5);
}
} else {
if (!Utilities.isRTL) {
if (!LocaleController.isRTL) {
checkDrawLeft = timeLeft - w;
} else {
checkDrawLeft = timeLeft + timeWidth + Utilities.dp(2);
......@@ -584,7 +584,7 @@ public class DialogCell extends BaseCell {
nameLayout = new StaticLayout(nameStringFinal, currentNamePaint, nameWidth, Layout.Alignment.ALIGN_NORMAL, 1.0f, 0.0f, false);
messageWidth = width - Utilities.dp(88);
if (!Utilities.isRTL) {
if (!LocaleController.isRTL) {
messageLeft = Utilities.dp(77);
avatarLeft = Utilities.dp(11);
} else {
......@@ -598,7 +598,7 @@ public class DialogCell extends BaseCell {
if (drawError) {
int w = errorDrawable.getIntrinsicWidth() + Utilities.dp(8);
messageWidth -= w;
if (!Utilities.isRTL) {
if (!LocaleController.isRTL) {
errorLeft = width - errorDrawable.getIntrinsicWidth() - Utilities.dp(11);
} else {
errorLeft = Utilities.dp(11);
......@@ -609,7 +609,7 @@ public class DialogCell extends BaseCell {
countLayout = new StaticLayout(countString, countPaint, countWidth, Layout.Alignment.ALIGN_CENTER, 1.0f, 0.0f, false);
int w = countWidth + Utilities.dp(18);
messageWidth -= w;
if (!Utilities.isRTL) {
if (!LocaleController.isRTL) {
countLeft = width - countWidth - Utilities.dp(16);
} else {
countLeft = Utilities.dp(16);
......@@ -636,7 +636,7 @@ public class DialogCell extends BaseCell {
double widthpx = 0;
float left = 0;
if (Utilities.isRTL) {
if (LocaleController.isRTL) {
if (nameLayout.getLineCount() > 0) {
left = nameLayout.getLineLeft(0);
if (left == 0) {
......
TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
View file @ d4854101
......@@ -1315,7 +1315,7 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa
if (currentUser.status.expires <= 10000) {
actionBar.setSubtitle(LocaleController.getString("Invisible", R.string.Invisible));
} else {
actionBar.setSubtitle(Utilities.formatDateOnline(currentUser.status.expires));
actionBar.setSubtitle(LocaleController.formatDateOnline(currentUser.status.expires));
}
}
}
......@@ -1624,7 +1624,7 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa
messagesByDays.put(obj.dateKey, dayArray);
TLRPC.Message dateMsg = new TLRPC.Message();
dateMsg.message = Utilities.formatDateChat(obj.messageOwner.date);
dateMsg.message = LocaleController.formatDateChat(obj.messageOwner.date);
dateMsg.id = 0;
MessageObject dateObj = new MessageObject(dateMsg, null);
dateObj.type = 10;
......@@ -1902,7 +1902,7 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa
messagesByDays.put(obj.dateKey, dayArray);
TLRPC.Message dateMsg = new TLRPC.Message();
dateMsg.message = Utilities.formatDateChat(obj.messageOwner.date);
dateMsg.message = LocaleController.formatDateChat(obj.messageOwner.date);
dateMsg.id = 0;
MessageObject dateObj = new MessageObject(dateMsg, null);
dateObj.type = 10;
......@@ -3557,7 +3557,7 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa
int type = message.type;
if (timeTextView != null) {
timeTextView.setText(Utilities.formatterDay.format((long) (message.messageOwner.date) * 1000));
timeTextView.setText(LocaleController.formatterDay.format((long) (message.messageOwner.date) * 1000));
}
if (avatarImageView != null && fromUser != null) {
......
TMessagesProj/src/main/java/org/telegram/ui/ChatProfileActivity.java
View file @ d4854101
......@@ -684,7 +684,6 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen
if (view == null) {
view = new ChatOrUserCell(mContext);
((ChatOrUserCell)view).useBoldFont = true;
((ChatOrUserCell)view).usePadding = false;
((ChatOrUserCell)view).useSeparator = true;
}
......
TMessagesProj/src/main/java/org/telegram/ui/ContactAddActivity.java
View file @ d4854101
......@@ -141,7 +141,7 @@ public class ContactAddActivity extends BaseFragment implements NotificationCent
if (user.status.expires <= 10000) {
onlineText.setText(LocaleController.getString("Invisible", R.string.Invisible));
} else {
onlineText.setText(Utilities.formatDateOnline(user.status.expires));
onlineText.setText(LocaleController.formatDateOnline(user.status.expires));
}
}
}
......
TMessagesProj/src/main/java/org/telegram/ui/ContactsActivity.java
View file @ d4854101
......@@ -70,7 +70,7 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
public int selectAlertString = 0;
public String selectAlertStringDesc = null;
private SearchView searchView;
private TextView epmtyTextView;
private TextView emptyTextView;
private HashMap<Integer, TLRPC.User> ignoreUsers;
private SupportMenuItem searchItem;
......@@ -145,12 +145,12 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
fragmentView = inflater.inflate(R.layout.contacts_layout, container, false);
epmtyTextView = (TextView)fragmentView.findViewById(R.id.searchEmptyView);
epmtyTextView.setText(LocaleController.getString("NoContacts", R.string.NoContacts));
emptyTextView = (TextView)fragmentView.findViewById(R.id.searchEmptyView);
emptyTextView.setText(LocaleController.getString("NoContacts", R.string.NoContacts));
searchListViewAdapter = new ContactsActivitySearchAdapter(parentActivity, ignoreUsers);
listView = (PinnedHeaderListView)fragmentView.findViewById(R.id.listView);
listView.setEmptyView(epmtyTextView);
listView.setEmptyView(emptyTextView);
listView.setVerticalScrollBarEnabled(false);
listViewAdapter = new ContactsActivityAdapter(parentActivity, onlyUsers, usersAsSections, ignoreUsers);
......@@ -284,7 +284,7 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
}
}
});
epmtyTextView.setOnTouchListener(new OnSwipeTouchListener() {
emptyTextView.setOnTouchListener(new OnSwipeTouchListener() {
public void onSwipeRight() {
finishFragment(true);
if (searchItem != null) {
......@@ -444,8 +444,8 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
listView.setFastScrollEnabled(false);
listView.setVerticalScrollBarEnabled(true);
}
if (epmtyTextView != null) {
epmtyTextView.setText(LocaleController.getString("NoResult", R.string.NoResult));
if (emptyTextView != null) {
emptyTextView.setText(LocaleController.getString("NoResult", R.string.NoResult));
}
}
return true;
......@@ -474,7 +474,7 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
searchWas = false;
ViewGroup group = (ViewGroup) listView.getParent();
listView.setAdapter(listViewAdapter);
if (!Utilities.isRTL) {
if (!LocaleController.isRTL) {
listView.setPadding(Utilities.dp(16), listView.getPaddingTop(), Utilities.dp(30), listView.getPaddingBottom());
} else {
listView.setPadding(Utilities.dp(30), listView.getPaddingTop(), Utilities.dp(16), listView.getPaddingBottom());
......@@ -486,7 +486,7 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
listView.setVerticalScrollBarEnabled(false);
((LaunchActivity)parentActivity).updateActionBar();
epmtyTextView.setText(LocaleController.getString("NoContacts", R.string.NoContacts));
emptyTextView.setText(LocaleController.getString("NoContacts", R.string.NoContacts));
return true;
}
});
......
TMessagesProj/src/main/java/org/telegram/ui/CountrySelectActivity.java
View file @ d4854101
......@@ -29,6 +29,7 @@ import android.widget.ImageView;
import android.widget.TextView;
import org.telegram.messenger.FileLog;
import org.telegram.messenger.LocaleController;
import org.telegram.messenger.R;
import org.telegram.messenger.Utilities;
import org.telegram.ui.Views.PinnedHeaderListView;
......@@ -52,11 +53,11 @@ public class CountrySelectActivity extends ActionBarActivity {
private boolean searchWas;
private boolean searching;
private BaseAdapter searchListViewAdapter;
private TextView epmtyTextView;
private TextView emptyTextView;
private HashMap<String, ArrayList<Country>> countries = new HashMap<String, ArrayList<Country>>();
private ArrayList<String> sortedCountries = new ArrayList<String>();
private Timer searchDialogsTimer;
private Timer searchTimer;
public ArrayList<Country> searchResult;
public static class Country {
......@@ -112,11 +113,11 @@ public class CountrySelectActivity extends ActionBarActivity {
setContentView(R.layout.country_select_layout);
epmtyTextView = (TextView)findViewById(R.id.searchEmptyView);
emptyTextView = (TextView)findViewById(R.id.searchEmptyView);
searchListViewAdapter = new SearchAdapter(this);
listView = (PinnedHeaderListView)findViewById(R.id.listView);
listView.setEmptyView(epmtyTextView);
listView.setEmptyView(emptyTextView);
listView.setVerticalScrollBarEnabled(false);
listView.setAdapter(listViewAdapter = new ListAdapter(this));
......@@ -221,7 +222,7 @@ public class CountrySelectActivity extends ActionBarActivity {
@Override
public boolean onQueryTextChange(String s) {
searchDialogs(s);
search(s);
if (s.length() != 0) {
searchWas = true;
if (listView != null) {
......@@ -233,8 +234,8 @@ public class CountrySelectActivity extends ActionBarActivity {
listView.setFastScrollEnabled(false);
listView.setVerticalScrollBarEnabled(true);
}
if (epmtyTextView != null) {
epmtyTextView.setText(getString(R.string.NoResult));
if (emptyTextView != null) {
emptyTextView.setText(getString(R.string.NoResult));
}
}
return true;
......@@ -252,12 +253,12 @@ public class CountrySelectActivity extends ActionBarActivity {
@Override
public boolean onMenuItemActionCollapse(MenuItem menuItem) {
searchView.setQuery("", false);
searchDialogs(null);
search(null);
searching = false;
searchWas = false;
ViewGroup group = (ViewGroup) listView.getParent();
listView.setAdapter(listViewAdapter);
if (!Utilities.isRTL) {
if (!LocaleController.isRTL) {
listView.setPadding(Utilities.dp(16), listView.getPaddingTop(), Utilities.dp(30), listView.getPaddingBottom());
} else {
listView.setPadding(Utilities.dp(30), listView.getPaddingTop(), Utilities.dp(16), listView.getPaddingBottom());
......@@ -269,7 +270,7 @@ public class CountrySelectActivity extends ActionBarActivity {
listView.setVerticalScrollBarEnabled(false);
applySelfActionBar();
epmtyTextView.setText(getString(R.string.ChooseCountry));
emptyTextView.setText(getString(R.string.ChooseCountry));
return true;
}
});
......@@ -305,24 +306,24 @@ public class CountrySelectActivity extends ActionBarActivity {
}
}
public void searchDialogs(final String query) {
public void search(final String query) {
if (query == null) {
searchResult = null;
} else {
try {
if (searchDialogsTimer != null) {
searchDialogsTimer.cancel();
if (searchTimer != null) {
searchTimer.cancel();
}
} catch (Exception e) {
FileLog.e("tmessages", e);
}
searchDialogsTimer = new Timer();
searchDialogsTimer.schedule(new TimerTask() {
searchTimer = new Timer();
searchTimer.schedule(new TimerTask() {
@Override
public void run() {
try {
searchDialogsTimer.cancel();
searchDialogsTimer = null;
searchTimer.cancel();
searchTimer = null;
} catch (Exception e) {
FileLog.e("tmessages", e);
}
......
TMessagesProj/src/main/java/org/telegram/ui/GalleryImageViewer.java
View file @ d4854101
......@@ -374,9 +374,9 @@ public class GalleryImageViewer extends AbstractGalleryActivity implements Notif
Utilities.RunOnUIThread(new Runnable() {
@Override
public void run() {
getSupportActionBar().setTitle(String.format("%d %s %d", pos, LocaleController.getString("Of", R.string.Of), totalCount));
getSupportActionBar().setTitle(LocaleController.formatString("Of", R.string.Of, pos, totalCount));
if (title != null) {
fakeTitleView.setText(String.format("%d %s %d", pos, LocaleController.getString("Of", R.string.Of), totalCount));
fakeTitleView.setText(LocaleController.formatString("Of", R.string.Of, pos, totalCount));
fakeTitleView.measure(View.MeasureSpec.makeMeasureSpec(400, View.MeasureSpec.AT_MOST), View.MeasureSpec.makeMeasureSpec(100, View.MeasureSpec.AT_MOST));
title.setWidth(fakeTitleView.getMeasuredWidth() + Utilities.dp(8));
title.setMaxWidth(fakeTitleView.getMeasuredWidth() + Utilities.dp(8));
......@@ -565,7 +565,7 @@ public class GalleryImageViewer extends AbstractGalleryActivity implements Notif
TLRPC.User user = MessagesController.getInstance().users.get(obj.messageOwner.from_id);
if (user != null) {
nameTextView.setText(Utilities.formatName(user.first_name, user.last_name));
timeTextView.setText(Utilities.formatterYearMax.format(((long)obj.messageOwner.date) * 1000));
timeTextView.setText(LocaleController.formatterYearMax.format(((long)obj.messageOwner.date) * 1000));
} else {
nameTextView.setText("");
}
......@@ -866,9 +866,9 @@ public class GalleryImageViewer extends AbstractGalleryActivity implements Notif
Utilities.RunOnUIThread(new Runnable() {
@Override
public void run() {
getSupportActionBar().setTitle(String.format("%d %s %d", (totalCount - imagesArr.size()) + position + 1, LocaleController.getString("Of", R.string.Of), totalCount));
getSupportActionBar().setTitle(LocaleController.formatString("Of", R.string.Of, (totalCount - imagesArr.size()) + position + 1, totalCount));
if (title != null) {
fakeTitleView.setText(String.format("%d %s %d", (totalCount - imagesArr.size()) + position + 1, LocaleController.getString("Of", R.string.Of), totalCount));
fakeTitleView.setText(LocaleController.formatString("Of", R.string.Of, (totalCount - imagesArr.size()) + position + 1, totalCount));
fakeTitleView.measure(View.MeasureSpec.makeMeasureSpec(400, View.MeasureSpec.AT_MOST), View.MeasureSpec.makeMeasureSpec(100, View.MeasureSpec.AT_MOST));
title.setWidth(fakeTitleView.getMeasuredWidth() + Utilities.dp(8));
title.setMaxWidth(fakeTitleView.getMeasuredWidth() + Utilities.dp(8));
......@@ -885,9 +885,9 @@ public class GalleryImageViewer extends AbstractGalleryActivity implements Notif
Utilities.RunOnUIThread(new Runnable() {
@Override
public void run() {
getSupportActionBar().setTitle(String.format("%d %s %d", position + 1, LocaleController.getString("Of", R.string.Of), imagesArrLocations.size()));
getSupportActionBar().setTitle(LocaleController.formatString("Of", R.string.Of, position + 1, imagesArrLocations.size()));
if (title != null) {
fakeTitleView.setText(String.format("%d %s %d", position + 1, LocaleController.getString("Of", R.string.Of), imagesArrLocations.size()));
fakeTitleView.setText(LocaleController.formatString("Of", R.string.Of, position + 1, imagesArrLocations.size()));
fakeTitleView.measure(View.MeasureSpec.makeMeasureSpec(400, View.MeasureSpec.AT_MOST), View.MeasureSpec.makeMeasureSpec(100, View.MeasureSpec.AT_MOST));
title.setWidth(fakeTitleView.getMeasuredWidth() + Utilities.dp(8));
title.setMaxWidth(fakeTitleView.getMeasuredWidth() + Utilities.dp(8));
......
TMessagesProj/src/main/java/org/telegram/ui/GroupCreateFinalActivity.java
View file @ d4854101
......@@ -148,6 +148,7 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati
actionBar.setDisplayUseLogoEnabled(false);
actionBar.setDisplayShowCustomEnabled(false);
actionBar.setCustomView(null);
actionBar.setSubtitle(null);
actionBar.setTitle(LocaleController.getString("NewGroup", R.string.NewGroup));
TextView title = (TextView)parentActivity.findViewById(R.id.action_bar_title);
......@@ -346,7 +347,6 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati
if (convertView == null) {
convertView = new ChatOrUserCell(mContext);
((ChatOrUserCell)convertView).useBoldFont = true;
((ChatOrUserCell)convertView).usePadding = false;
}
......
TMessagesProj/src/main/java/org/telegram/ui/IntroActivity.java
View file @ d4854101
......@@ -44,7 +44,7 @@ public class IntroActivity extends ActionBarActivity {
setContentView(R.layout.intro_layout);
if (Utilities.isRTL) {
if (LocaleController.isRTL) {
icons = new int[] {
R.drawable.intro7,
R.drawable.intro6,
......@@ -209,7 +209,7 @@ public class IntroActivity extends ActionBarActivity {
protected void onResume() {
super.onResume();
if (justCreated) {
if (Utilities.isRTL) {
if (LocaleController.isRTL) {
viewPager.setCurrentItem(6);
lastPage = 6;
} else {
......
TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java
View file @ d4854101
......@@ -86,7 +86,7 @@ public class LaunchActivity extends ActionBarActivity implements NotificationCen
if (!UserConfig.clientActivated) {
Intent intent = getIntent();
if (intent != null && intent.getAction() != null && Intent.ACTION_SEND.equals(intent.getAction()) || intent.getAction().equals(Intent.ACTION_SEND_MULTIPLE)) {
if (intent != null && intent.getAction() != null && (Intent.ACTION_SEND.equals(intent.getAction()) || intent.getAction().equals(Intent.ACTION_SEND_MULTIPLE))) {
finish();
return;
}
......
TMessagesProj/src/main/java/org/telegram/ui/MessagesActivity.java
View file @ d4854101
......@@ -69,7 +69,7 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter
private int activityToken = (int)(MessagesController.random.nextDouble() * Integer.MAX_VALUE);
private long selectedDialog;
private Timer searchDialogsTimer;
private Timer searchTimer;
public ArrayList<TLObject> searchResult;
public ArrayList<CharSequence> searchResultNames;
......@@ -511,19 +511,19 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter
searchResultNames = null;
} else {
try {
if (searchDialogsTimer != null) {
searchDialogsTimer.cancel();
if (searchTimer != null) {
searchTimer.cancel();
}
} catch (Exception e) {
FileLog.e("tmessages", e);
}
searchDialogsTimer = new Timer();
searchDialogsTimer.schedule(new TimerTask() {
searchTimer = new Timer();
searchTimer.schedule(new TimerTask() {
@Override
public void run() {
try {
searchDialogsTimer.cancel();
searchDialogsTimer = null;
searchTimer.cancel();
searchTimer = null;
} catch (Exception e) {
FileLog.e("tmessages", e);
}
......
TMessagesProj/src/main/java/org/telegram/ui/SettingsActivity.java
View file @ d4854101
......@@ -87,6 +87,7 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
private int audioDownloadSection;
private int audioDownloadChatRow;
private int audioDownloadPrivateRow;
private int languageRow;
@Override
public boolean onFragmentCreate() {
......@@ -156,6 +157,7 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
numberRow = rowCount++;
settingsSectionRow = rowCount++;
enableAnimationsRow = rowCount++;
languageRow = rowCount++;
notificationRow = rowCount++;
blockedRow = rowCount++;
backgroundRow = rowCount++;
......@@ -206,7 +208,7 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
if (i == textSizeRow) {
AlertDialog.Builder builder = new AlertDialog.Builder(parentActivity);
builder.setTitle(LocaleController.getString("TextSize", R.string.TextSize));
builder.setItems(new CharSequence[]{String.format("%d", 12), String.format("%d", 13), String.format("%d", 14), String.format("%d", 15), String.format("%d", 16), String.format("%d", 17), String.format("%d", 18), String.format("%d", 19), String.format("%d", 20)}, new DialogInterface.OnClickListener() {
builder.setItems(new CharSequence[]{String.format("%d", 12), String.format("%d", 13), String.format("%d", 14), String.format("%d", 15), String.format("%d", 16), String.format("%d", 17), String.format("%d", 18), String.format("%d", 19), String.format("%d", 20), String.format("%d", 21), String.format("%d", 22), String.format("%d", 23), String.format("%d", 24)}, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("mainconfig", Activity.MODE_PRIVATE);
......@@ -404,6 +406,8 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
if (listView != null) {
listView.invalidateViews();
}
} else if (i == languageRow) {
((LaunchActivity)parentActivity).presentFragment(new LanguageSelectActivity(), "settings_wallpapers", false);
}
// else if (i == 6) {
// UserConfig.saveIncomingPhotos = !UserConfig.saveIncomingPhotos;
......@@ -538,7 +542,7 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
public boolean isEnabled(int i) {
return i == textSizeRow || i == enableAnimationsRow || i == blockedRow || i == notificationRow || i == backgroundRow ||
i == askQuestionRow || i == sendLogsRow || i == sendByEnterRow || i == terminateSessionsRow || i == photoDownloadPrivateRow ||
i == photoDownloadChatRow || i == clearLogsRow || i == audioDownloadChatRow || i == audioDownloadPrivateRow;
i == photoDownloadChatRow || i == clearLogsRow || i == audioDownloadChatRow || i == audioDownloadPrivateRow || i == languageRow;
}
@Override
......@@ -569,9 +573,6 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
LayoutInflater li = (LayoutInflater)mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
view = li.inflate(R.layout.settings_name_layout, viewGroup, false);
TextView textView = (TextView)view.findViewById(R.id.settings_online);
textView.setText(LocaleController.getString("Online", R.string.Online));
ImageButton button = (ImageButton)view.findViewById(R.id.settings_edit_name);
button.setOnClickListener(new View.OnClickListener() {
@Override
......@@ -672,7 +673,10 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
}
});
}
TextView textView = (TextView)view.findViewById(R.id.settings_name);
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 = Utilities.getTypeface("fonts/rmedium.ttf");
textView.setTypeface(typeface);
TLRPC.User user = MessagesController.getInstance().users.get(UserConfig.clientUserId);
......@@ -860,9 +864,12 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
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);
}
}
return view;
}
......@@ -872,7 +879,7 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
return 0;
} else if (i == numberSectionRow || i == settingsSectionRow || i == supportSectionRow || i == messagesSectionRow || i == photoDownloadSection || i == audioDownloadSection) {
return 1;
} else if (i == textSizeRow) {
} else if (i == textSizeRow || i == languageRow) {
return 5;
} else if (i == enableAnimationsRow || i == sendByEnterRow || i == photoDownloadChatRow || i == photoDownloadPrivateRow || i == audioDownloadChatRow || i == audioDownloadPrivateRow) {
return 3;
......
TMessagesProj/src/main/java/org/telegram/ui/SettingsBlockedUsers.java
View file @ d4854101
......@@ -386,7 +386,6 @@ public class SettingsBlockedUsers extends BaseFragment implements NotificationCe
if (type == 0) {
if (view == null) {
view = new ChatOrUserCell(mContext);
((ChatOrUserCell)view).useBoldFont = true;
((ChatOrUserCell)view).usePadding = false;
((ChatOrUserCell)view).useSeparator = true;
}
......
TMessagesProj/src/main/java/org/telegram/ui/UserProfileActivity.java
View file @ d4854101
......@@ -647,7 +647,7 @@ public class UserProfileActivity extends BaseFragment implements NotificationCen
if (user.status.expires <= 10000) {
onlineText.setText(LocaleController.getString("Invisible", R.string.Invisible));
} else {
onlineText.setText(Utilities.formatDateOnline(user.status.expires));
onlineText.setText(LocaleController.formatDateOnline(user.status.expires));
}
}
}
......
TMessagesProj/src/main/java/org/telegram/ui/Views/NotificationView.java
View file @ d4854101
......@@ -23,6 +23,7 @@ import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import org.telegram.messenger.LocaleController;
import org.telegram.messenger.TLRPC;
import org.telegram.messenger.FileLog;
import org.telegram.messenger.MessagesController;
......@@ -305,7 +306,7 @@ public class NotificationView extends LinearLayout {
messageTextView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14);
nameTextView.setPadding(0, Utilities.dp(2), 0, 0);
messageTextView.setPadding(0, Utilities.dp(18), 0, 0);
if (Utilities.isRTL) {
if (LocaleController.isRTL) {
params1.setMargins(Utilities.dp(40), 0, height + Utilities.dp(6), 0);
} else {
params1.setMargins(height + Utilities.dp(6), 0, Utilities.dp(40), 0);
......@@ -315,7 +316,7 @@ public class NotificationView extends LinearLayout {
messageTextView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 15);
nameTextView.setPadding(0, Utilities.dp(4), 0, 0);
messageTextView.setPadding(0, Utilities.dp(24), 0, 0);
if (Utilities.isRTL) {
if (LocaleController.isRTL) {
params1.setMargins(Utilities.dp(40), 0, height + Utilities.dp(8), 0);
} else {
params1.setMargins(height + Utilities.dp(8), 0, Utilities.dp(40), 0);
......
TMessagesProj/src/main/res/color/chat_create_bubble_text_states.xml deleted 100644 → 0
View file @ d4703e32
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true" android:color="#ffffff" />
<item android:state_focused="true" android:color="#ffffff" />
<item android:state_selected="true" android:color="#ffffff" />
<item android:color="#035ea8" />
</selector>
\ No newline at end of file
TMessagesProj/src/main/res/drawable/btn_check_off_old.xml deleted 100644 → 0
View file @ d4703e32
<?xml version="1.0" encoding="utf-8"?>
<selector
xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true" android:drawable="@drawable/btn_check_off_pressed_holo_light" />
<item android:state_focused="true" android:drawable="@drawable/btn_check_off_pressed_holo_light" />
<item android:state_checked="true" android:drawable="@drawable/btn_check_off_pressed_holo_light" />
<item android:drawable="@drawable/btn_check_off_holo_light" />
</selector>
\ No newline at end of file
TMessagesProj/src/main/res/drawable/btn_check_on_old.xml deleted 100644 → 0
View file @ d4703e32
<?xml version="1.0" encoding="utf-8"?>
<selector
xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true" android:drawable="@drawable/btn_check_on_pressed_holo_light" />
<item android:state_focused="true" android:drawable="@drawable/btn_check_on_pressed_holo_light" />
<item android:state_checked="true" android:drawable="@drawable/btn_check_on_pressed_holo_light" />
<item android:drawable="@drawable/btn_check_on_holo_light" />
</selector>
\ No newline at end of file
TMessagesProj/src/main/res/drawable/chat_create_bubble_states.xml deleted 100644 → 0
View file @ d4703e32
<?xml version="1.0" encoding="UTF-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/compose_bubble_down" android:state_pressed="true" />
<item android:drawable="@drawable/compose_bubble_up" />
</selector>
\ No newline at end of file
TMessagesProj/src/main/res/layout-ar/group_create_final_layout.xml
View file @ d4854101
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical">
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical">
<FrameLayout android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:id="@+id/top_layout"
android:layout_gravity="top">
<FrameLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:id="@+id/top_layout"
android:layout_gravity="top">
<FrameLayout android:layout_width="64dp"
android:layout_height="64dp"
android:layout_marginTop="12dp"
android:layout_marginBottom="12dp"
android:layout_marginRight="16dp"
android:layout_gravity="top|right">
<FrameLayout
android:layout_width="64dp"
android:layout_height="64dp"
android:layout_marginTop="12dp"
android:layout_marginBottom="12dp"
android:layout_marginRight="16dp"
android:layout_gravity="top|right">
<org.telegram.ui.Views.BackupImageView
android:id="@+id/settings_avatar_image"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:src="@drawable/group_blue"/>
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:src="@drawable/group_blue"/>
<ImageButton
android:id="@+id/settings_change_avatar_button"
android:background="@drawable/photo_spinner"
android:layout_width="fill_parent"
android:layout_height="fill_parent"/>
<ImageButton android:id="@+id/settings_change_avatar_button"
android:background="@drawable/photo_spinner"
android:layout_width="fill_parent"
android:layout_height="fill_parent"/>
</FrameLayout>
<EditText
......@@ -47,22 +52,24 @@
</FrameLayout>
<FrameLayout android:layout_width="match_parent"
android:layout_height="match_parent">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<org.telegram.ui.Views.PinnedHeaderListView
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:id="@+id/listView"
android:clipToPadding="false"
android:fadingEdge="none"
android:fadingEdgeLength="0dp"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:dividerHeight="0dp"
android:divider="@null"
android:paddingBottom="16dp"
android:scrollbars="none"/>
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:id="@+id/listView"
android:clipToPadding="false"
android:fadingEdge="none"
android:fadingEdgeLength="0dp"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:dividerHeight="0dp"
android:divider="@null"
android:paddingBottom="16dp"
android:scrollbars="none"/>
</FrameLayout>
</LinearLayout>
TMessagesProj/src/main/res/layout-ar/group_create_layout.xml
View file @ d4854101
......@@ -21,7 +21,7 @@
android:layout_marginRight="5dp"
android:minHeight="52dp"
android:gravity="right|center_vertical"
android:maxLines="3"
android:maxLines="2"
android:paddingTop="3dp"
android:layout_marginTop="0dp"
android:inputType="textFilter|textNoSuggestions|textMultiLine"
......@@ -29,18 +29,6 @@
android:textCursorDrawable="@null"
android:textColor="#000000"/>
<TextView
android:textSize="16dp"
android:textColor="#a6a6a6"
android:gravity="center_vertical"
android:layout_gravity="top|left|center"
android:id="@+id/bubble_counter_text"
android:layout_width="wrap_content"
android:layout_height="52dp"
android:layout_marginLeft="16dp"
android:paddingBottom="4dp"
android:text="0/200"/>
</FrameLayout>
......
TMessagesProj/src/main/res/layout-ar/group_create_row_layout.xml
View file @ d4854101
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="66dp"
android:layout_gravity="top">
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="66dp"
android:layout_gravity="top">
<org.telegram.ui.Views.BackupImageView
android:layout_width="50dp"
android:layout_height="50dp"
android:id="@+id/messages_list_row_avatar"
android:contentDescription=""
android:layout_marginTop="8dp"
android:layout_gravity="top|right"/>
android:layout_width="50dp"
android:layout_height="50dp"
android:id="@+id/messages_list_row_avatar"
android:contentDescription=""
android:layout_marginTop="8dp"
android:layout_gravity="top|right"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/messages_list_row_name"
android:textSize="18dp"
android:layout_marginRight="61dp"
android:ellipsize="end"
android:layout_marginTop="10dp"
android:textColor="#000000"
android:maxLines="1"
android:layout_marginLeft="60dp"
android:layout_gravity="top|right"
android:gravity="right"/>
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/messages_list_row_name"
android:textSize="18dp"
android:layout_marginRight="61dp"
android:ellipsize="end"
android:layout_marginTop="10dp"
android:textColor="#000000"
android:maxLines="1"
android:layout_marginLeft="60dp"
android:layout_gravity="top|right"
android:gravity="right"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/messages_list_row_message"
android:textSize="15dp"
android:maxLines="1"
android:ellipsize="end"
android:textColor="#808080"
android:layout_marginLeft="60dp"
android:layout_marginTop="34dp"
android:layout_marginRight="61dp"
android:layout_gravity="top|right"
android:gravity="right"/>
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/messages_list_row_message"
android:textSize="15dp"
android:maxLines="1"
android:ellipsize="end"
android:textColor="#808080"
android:layout_marginLeft="60dp"
android:layout_marginTop="34dp"
android:layout_marginRight="61dp"
android:layout_gravity="top|right"
android:gravity="right"/>
<ImageView android:layout_gravity="center_vertical|left"
android:id="@+id/settings_row_check_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="14dp"
android:src="@drawable/btn_check_off_old"/>
<ImageView
android:layout_gravity="center_vertical|left"
android:id="@+id/settings_row_check_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="14dp"
android:src="@drawable/btn_check_off_holo_light"/>
<View
android:background="@color/divider"
android:layout_width="fill_parent"
android:layout_height="1px"
android:layout_gravity="bottom"
android:id="@+id/settings_row_divider"
android:visibility="gone"/>
<View android:background="@color/divider"
android:layout_width="fill_parent"
android:layout_height="1px"
android:layout_gravity="bottom"
android:id="@+id/settings_row_divider"
android:visibility="gone"/>
</FrameLayout>
\ No newline at end of file
TMessagesProj/src/main/res/layout/chat_profile_change_name_layout.xml
View file @ d4854101
......@@ -5,14 +5,16 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout android:orientation="vertical"
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:paddingTop="8dp">
<include layout="@layout/settings_section_layout"/>
<include
layout="@layout/settings_section_layout"/>
<EditText
android:textSize="19dp"
......
TMessagesProj/src/main/res/layout/country_select_layout.xml
View file @ d4854101
......@@ -22,7 +22,8 @@
android:layout_gravity="top"/>
<TextView android:layout_width="match_parent"
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:textColor="#808080"
android:gravity="center"
......
TMessagesProj/src/main/res/layout/group_create_bubble.xml
View file @ d4854101
......@@ -3,18 +3,16 @@
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="41dp"
android:paddingRight="9dp"
android:paddingTop="9dp"
xmlns:android="http://schemas.android.com/apk/res/android">
<TextView android:layout_width="wrap_content"
android:layout_height="31dp"
android:background="@drawable/chat_create_bubble_states"
android:textSize="16dp"
android:paddingRight="8dp"
android:paddingLeft="8dp"
android:gravity="center"
android:textColor="@color/chat_create_bubble_text_states"
android:id="@+id/bubble_text_view"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="26dp"
android:textSize="16dp"
android:gravity="center"
android:textColor="#ff000000"
android:id="@+id/bubble_text_view"/>
</FrameLayout>
TMessagesProj/src/main/res/layout/group_create_done_layout.xml
View file @ d4854101
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_gravity="right|center_vertical"
android:minHeight="60dp">
......@@ -19,6 +19,7 @@
android:paddingRight="16dp"
android:paddingLeft="16dp"
android:background="@drawable/bar_selector"
android:minHeight="60dp"/>
android:minHeight="60dp"
android:textAllCaps="true"/>
</FrameLayout>
\ No newline at end of file
TMessagesProj/src/main/res/layout/group_create_final_layout.xml
View file @ d4854101
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical">
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical">
<FrameLayout android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:id="@+id/top_layout"
android:layout_gravity="top">
<FrameLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:id="@+id/top_layout"
android:layout_gravity="top">
<FrameLayout android:layout_width="64dp"
android:layout_height="64dp"
android:layout_marginTop="12dp"
android:layout_marginBottom="12dp"
android:layout_marginLeft="16dp"
android:layout_gravity="top">
<FrameLayout
android:layout_width="64dp"
android:layout_height="64dp"
android:layout_marginTop="12dp"
android:layout_marginBottom="12dp"
android:layout_marginLeft="16dp"
android:layout_gravity="top">
<org.telegram.ui.Views.BackupImageView
android:id="@+id/settings_avatar_image"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:src="@drawable/group_blue"/>
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:src="@drawable/group_blue"/>
<ImageButton
android:id="@+id/settings_change_avatar_button"
android:background="@drawable/photo_spinner"
android:layout_width="fill_parent"
android:layout_height="fill_parent"/>
<ImageButton android:id="@+id/settings_change_avatar_button"
android:background="@drawable/photo_spinner"
android:layout_width="fill_parent"
android:layout_height="fill_parent"/>
</FrameLayout>
<EditText
......@@ -48,22 +53,24 @@
</FrameLayout>
<FrameLayout android:layout_width="match_parent"
android:layout_height="match_parent">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<org.telegram.ui.Views.PinnedHeaderListView
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:id="@+id/listView"
android:clipToPadding="false"
android:fadingEdge="none"
android:fadingEdgeLength="0dp"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:dividerHeight="0dp"
android:divider="@null"
android:paddingBottom="16dp"
android:scrollbars="none"/>
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:id="@+id/listView"
android:clipToPadding="false"
android:fadingEdge="none"
android:fadingEdgeLength="0dp"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:dividerHeight="0dp"
android:divider="@null"
android:paddingBottom="16dp"
android:scrollbars="none"/>
</FrameLayout>
</LinearLayout>
TMessagesProj/src/main/res/layout/group_create_layout.xml
View file @ d4854101
......@@ -14,14 +14,13 @@
android:textSize="16dp"
android:textColorHint="#a6a6a6"
android:id="@+id/bubble_input_text"
android:paddingRight="60dp"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:minHeight="52dp"
android:gravity="left|center_vertical"
android:maxLines="3"
android:maxLines="2"
android:paddingTop="3dp"
android:layout_marginTop="0dp"
android:inputType="textFilter|textNoSuggestions|textMultiLine"
......@@ -29,18 +28,6 @@
android:textCursorDrawable="@null"
android:textColor="#000000"/>
<TextView
android:textSize="16dp"
android:textColor="#a6a6a6"
android:gravity="center_vertical"
android:layout_gravity="top|right|center"
android:id="@+id/bubble_counter_text"
android:layout_width="wrap_content"
android:layout_height="52dp"
android:layout_marginRight="16dp"
android:paddingBottom="4dp"
android:text="0/200"/>
</FrameLayout>
<FrameLayout
......
TMessagesProj/src/main/res/layout/group_create_row_layout.xml
View file @ d4854101
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="66dp"
android:layout_gravity="top">
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="66dp"
android:layout_gravity="top">
<org.telegram.ui.Views.BackupImageView
android:layout_width="50dp"
android:layout_height="50dp"
android:id="@+id/messages_list_row_avatar"
android:contentDescription=""
android:layout_marginTop="8dp"
android:layout_gravity="top"/>
android:layout_width="50dp"
android:layout_height="50dp"
android:id="@+id/messages_list_row_avatar"
android:contentDescription=""
android:layout_marginTop="8dp"
android:layout_gravity="top"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/messages_list_row_name"
android:textSize="18dp"
android:layout_marginLeft="61dp"
android:ellipsize="end"
android:layout_marginTop="10dp"
android:maxLines="1"
android:textColor="#000000"
android:layout_marginRight="60dp"
android:layout_gravity="top"/>
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/messages_list_row_name"
android:textSize="18dp"
android:layout_marginLeft="61dp"
android:ellipsize="end"
android:layout_marginTop="10dp"
android:maxLines="1"
android:textColor="#000000"
android:layout_marginRight="60dp"
android:layout_gravity="top"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/messages_list_row_message"
android:textSize="15dp"
android:maxLines="1"
android:ellipsize="end"
android:textColor="#808080"
android:layout_marginLeft="61dp"
android:layout_marginTop="34dp"
android:layout_marginRight="60dp"
android:layout_gravity="top"/>
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/messages_list_row_message"
android:textSize="15dp"
android:maxLines="1"
android:ellipsize="end"
android:textColor="#808080"
android:layout_marginLeft="61dp"
android:layout_marginTop="34dp"
android:layout_marginRight="60dp"
android:layout_gravity="top"/>
<ImageView android:layout_gravity="center_vertical|right"
android:id="@+id/settings_row_check_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="14dp"
android:src="@drawable/btn_check_off_old"/>
<ImageView
android:layout_gravity="center_vertical|right"
android:id="@+id/settings_row_check_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="14dp"
android:src="@drawable/btn_check_off_holo_light"/>
<View
android:background="@color/divider"
android:layout_width="fill_parent"
android:layout_height="1px"
android:layout_gravity="bottom"
android:id="@+id/settings_row_divider"
android:visibility="gone"/>
<View android:background="@color/divider"
android:layout_width="fill_parent"
android:layout_height="1px"
android:layout_gravity="bottom"
android:id="@+id/settings_row_divider"
android:visibility="gone"/>
</FrameLayout>
\ No newline at end of file
TMessagesProj/src/main/res/layout/language_select_layout.xml 0 → 100644
View file @ d4854101
<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"/>
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:textColor="#808080"
android:gravity="center"
android:textSize="24dp"
android:id="@+id/searchEmptyView"
android:visibility="invisible"
android:layout_gravity="top"/>
</RelativeLayout>
\ No newline at end of file
TMessagesProj/src/main/res/values-ar/strings.xml
View file @ d4854101
......@@ -5,6 +5,9 @@
<resources>
<string name="AppName">Telegram</string>
<string name="LanguangeName">العربية</string>
<string name="LanguangeNameInEnglish">Arabic</string>
<!--signin view-->
<string name="YourPhone">رقم هاتفك المحمول</string>
<string name="StartText">يرجى التحقق من صحة رمز بلدك وإدخال رقم هاتفك المحمول</string>
......@@ -107,6 +110,7 @@
<string name="DeleteThisGroup">حذف المجموعة</string>
<string name="SlideToCancel">قم بالسحب للإلغاء</string>
<string name="SaveToDownloads">حفظ في الجهاز</string>
<string name="ApplyLocalizationFile">Apply localization file</string>
<!--notification-->
<string name="EncryptedChatRequested">تم طلب محادثة سرية</string>
......@@ -250,6 +254,7 @@
<string name="Events">الأحداث</string>
<string name="ContactJoined">اشترك صديق في تيليجرام</string>
<string name="Pebble">PEBBLE</string>
<string name="Language">اللغة</string>
<!--media view-->
<string name="NoMedia">لا توجد وسائط بعد</string>
......@@ -268,7 +273,7 @@
<!--photo gallery view-->
<string name="ShowAllMedia">عرض كافة الوسائط</string>
<string name="SaveToGallery">حفظ في الجهاز</string>
<string name="Of">من</string>
<string name="Of">%1$d من %2$d</string>
<string name="Gallery">الألبوم</string>
<!--button titles-->
......
TMessagesProj/src/main/res/values-de/strings.xml
View file @ d4854101
......@@ -5,6 +5,9 @@
<resources>
<string name="AppName">Telegram</string>
<string name="LanguangeName">Deutsch</string>
<string name="LanguangeNameInEnglish">German</string>
<!--signin view-->
<string name="YourPhone">Dein Telefon</string>
<string name="StartText">Bitte bestätige deine Landesvorwahl und deine Telefonnummer.</string>
......@@ -107,6 +110,7 @@
<string name="DeleteThisGroup">Diese Gruppe löschen</string>
<string name="SlideToCancel">WISCHEN UM ABZUBRECHEN</string>
<string name="SaveToDownloads">In Ordner Downloads speichern</string>
<string name="ApplyLocalizationFile">Apply localization file</string>
<!--notification-->
<string name="EncryptedChatRequested">Geheimen Chat angefordert</string>
......@@ -250,6 +254,7 @@
<string name="Events">EREIGNISSE</string>
<string name="ContactJoined">Kontakt ist Telegram beigetreten</string>
<string name="Pebble">PEBBLE</string>
<string name="Language">Sprache</string>
<!--media view-->
<string name="NoMedia">Noch keine geteilten Medien vorhanden</string>
......@@ -268,7 +273,7 @@
<!--photo gallery view-->
<string name="ShowAllMedia">Zeige alle Medien</string>
<string name="SaveToGallery">In der Galerie speichern</string>
<string name="Of">von</string>
<string name="Of">%1$d von %2$d</string>
<string name="Gallery">Galerie</string>
<!--button titles-->
......
TMessagesProj/src/main/res/values-es/strings.xml
View file @ d4854101
......@@ -5,6 +5,9 @@
<resources>
<string name="AppName">Telegram</string>
<string name="LanguangeName">Español</string>
<string name="LanguangeNameInEnglish">Spanish</string>
<!--signin view-->
<string name="YourPhone">Tu teléfono</string>
<string name="StartText">Por favor, confirma tu código de país\ne introduce tu número.</string>
......@@ -107,6 +110,7 @@
<string name="DeleteThisGroup">Eliminar este grupo</string>
<string name="SlideToCancel">DESLIZA PARA CANCELAR</string>
<string name="SaveToDownloads">Guardar en descargas</string>
<string name="ApplyLocalizationFile">Apply localization file</string>
<!--notification-->
<string name="EncryptedChatRequested">Chat secreto solicitado</string>
......@@ -250,6 +254,7 @@
<string name="Events">EVENTOS</string>
<string name="ContactJoined">Un contacto se unió a Telegram</string>
<string name="Pebble">PEBBLE</string>
<string name="Language">Idioma</string>
<!--media view-->
<string name="NoMedia">No hay fotos ni vídeos compartidos aún</string>
......@@ -268,7 +273,7 @@
<!--photo gallery view-->
<string name="ShowAllMedia">Mostrar todas las fotos y vídeos</string>
<string name="SaveToGallery">Guardar en galería</string>
<string name="Of">de</string>
<string name="Of">%1$d de %2$d</string>
<string name="Gallery">Galería</string>
<!--button titles-->
......
TMessagesProj/src/main/res/values-nl/strings.xml
View file @ d4854101
......@@ -5,6 +5,9 @@
<resources>
<string name="AppName">Telegram</string>
<string name="LanguangeName">Nederlands</string>
<string name="LanguangeNameInEnglish">Dutch</string>
<!--signin view-->
<string name="YourPhone">Uw telefoon</string>
<string name="StartText">Bevestig uw landcode\nen voer uw telefoonnummer in.</string>
......@@ -107,6 +110,7 @@
<string name="DeleteThisGroup">Deze groep verwijderen</string>
<string name="SlideToCancel">SLEEP OM TE ANNULEREN</string>
<string name="SaveToDownloads">Opslaan in downloads</string>
<string name="ApplyLocalizationFile">Apply localization file</string>
<!--notification-->
<string name="EncryptedChatRequested">Privégesprek aangevraagd</string>
......@@ -250,6 +254,7 @@
<string name="Events">GEBEURTENISSEN</string>
<string name="ContactJoined">Contact lid geworden van Telegram</string>
<string name="Pebble">PEBBLE</string>
<string name="Language">Taal</string>
<!--media view-->
<string name="NoMedia">Nog geen media gedeeld</string>
......@@ -268,7 +273,7 @@
<!--photo gallery view-->
<string name="ShowAllMedia">Alle media weergeven</string>
<string name="SaveToGallery">Opslaan in galerij</string>
<string name="Of">van</string>
<string name="Of">%1$d van %1$d</string>
<string name="Gallery">Galerij</string>
<!--button titles-->
......
TMessagesProj/src/main/res/values/strings.xml
View file @ d4854101
......@@ -5,6 +5,9 @@
<resources>
<string name="AppName">Telegram</string>
<string name="LanguangeName">English</string>
<string name="LanguangeNameInEnglish">English</string>
<!--signin view-->
<string name="YourPhone">Your phone</string>
<string name="StartText">Please confirm your country code\nand enter your phone number.</string>
......@@ -107,6 +110,7 @@
<string name="DeleteThisGroup">Delete this group</string>
<string name="SlideToCancel">SLIDE TO CANCEL</string>
<string name="SaveToDownloads">Save to downloads</string>
<string name="ApplyLocalizationFile">Apply localization file</string>
<!--notification-->
<string name="EncryptedChatRequested">Secret chat requested</string>
......@@ -250,6 +254,7 @@
<string name="Events">EVENTS</string>
<string name="ContactJoined">Contact joined Telegram</string>
<string name="Pebble">PEBBLE</string>
<string name="Language">Language</string>
<!--media view-->
<string name="NoMedia">No shared media yet</string>
......@@ -268,7 +273,7 @@
<!--photo gallery view-->
<string name="ShowAllMedia">Show all media</string>
<string name="SaveToGallery">Save to gallery</string>
<string name="Of">of</string>
<string name="Of">%1$d of %2$d</string>
<string name="Gallery">Gallery</string>
<!--button titles-->
......
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