More Android L design

qwinner · Nov 13, 2014 · bfd8d13 · bfd8d13
1 parent ea0b86d
commit bfd8d13
Show file tree

Hide file tree

Showing 197 changed files with 1,216 additions and 1,820 deletions.
diff --git a/...elegram/ui/Views/ActionBar/ActionBar.java → .../org/telegram/ui/ActionBar/ActionBar.java b/...elegram/ui/Views/ActionBar/ActionBar.java → .../org/telegram/ui/ActionBar/ActionBar.java
@@ -6,7 +6,7 @@
  * Copyright Nikolai Kudashov, 2013-2014.
  */
 
-package org.telegram.ui.Views.ActionBar;
+package org.telegram.ui.ActionBar;
 
 import android.content.Context;
 import android.content.res.Configuration;
@@ -47,6 +47,7 @@ public boolean canOpenMenu() {
     private ActionBarMenu menu;
     private ActionBarMenu actionMode;
     private View actionOverlay;
+
     protected boolean isSearchFieldVisible;
     protected int itemsBackgroundResourceId;
     private boolean isBackOverlayVisible;
@@ -69,23 +70,6 @@ public ActionBar(Context context) {
         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);
-                }
-            }
-        });
     }
 
     private void positionBackImage(int height) {
@@ -139,13 +123,20 @@ private void positionTitle(int width, int height) {
         }
 
         int x = 0;
-        if (AndroidUtilities.isTablet()) {
-            x = AndroidUtilities.dp(80);
+        if (backButtonImageView != null) {
+            if (AndroidUtilities.isTablet()) {
+                x = AndroidUtilities.dp(80);
+            } else {
+                x = AndroidUtilities.dp(72);
+            }
         } else {
-            x = AndroidUtilities.dp(72);
+            if (AndroidUtilities.isTablet()) {
+                x = AndroidUtilities.dp(26);
+            } else {
+                x = AndroidUtilities.dp(18);
+            }
         }
 
-
         if (menu != null) {
             maxTextWidth = Math.min(maxTextWidth, width - menu.getMeasuredWidth() - AndroidUtilities.dp(16));
         }
@@ -191,11 +182,39 @@ public void positionMenu(int width, int height) {
         menu.measure(width, height);
     }
 
+    private void createBackButtonImage() {
+        if (backButtonImageView != null) {
+            return;
+        }
+        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 void setBackButtonDrawable(Drawable drawable) {
+        if (backButtonImageView == null) {
+            createBackButtonImage();
+        }
         backButtonImageView.setImageDrawable(drawable);
     }
 
     public void setBackButtonImage(int resource) {
+        if (backButtonImageView == null) {
+            createBackButtonImage();
+        }
         backButtonImageView.setImageResource(resource);
     }
 
@@ -485,7 +504,9 @@ private void positionBackOverlay(int widthMeasureSpec, int heightMeasureSpec) {
 
     public void setItemsBackground(int resourceId) {
         itemsBackgroundResourceId = resourceId;
-        backButtonImageView.setBackgroundResource(resourceId);
+        if (backButtonImageView != null) {
+            backButtonImageView.setBackgroundResource(resourceId);
+        }
     }
 
     @Override

diff --git a/...m/ui/Views/ActionBar/ActionBarLayout.java → ...elegram/ui/ActionBar/ActionBarLayout.java b/...m/ui/Views/ActionBar/ActionBarLayout.java → ...elegram/ui/ActionBar/ActionBarLayout.java
@@ -6,7 +6,7 @@
  * Copyright Nikolai Kudashov, 2013-2014.
  */
 
-package org.telegram.ui.Views.ActionBar;
+package org.telegram.ui.ActionBar;
 
 import android.app.Activity;
 import android.content.Context;

diff --git a/...ram/ui/Views/ActionBar/ActionBarMenu.java → .../telegram/ui/ActionBar/ActionBarMenu.java b/...ram/ui/Views/ActionBar/ActionBarMenu.java → .../telegram/ui/ActionBar/ActionBarMenu.java
@@ -6,7 +6,7 @@
  * Copyright Nikolai Kudashov, 2013-2014.
  */
 
-package org.telegram.ui.Views.ActionBar;
+package org.telegram.ui.ActionBar;
 
 import android.content.Context;
 import android.util.AttributeSet;

diff --git a/...ui/Views/ActionBar/ActionBarMenuItem.java → ...egram/ui/ActionBar/ActionBarMenuItem.java b/...ui/Views/ActionBar/ActionBarMenuItem.java → ...egram/ui/ActionBar/ActionBarMenuItem.java
@@ -6,7 +6,7 @@
  * Copyright Nikolai Kudashov, 2013-2014.
  */
 
-package org.telegram.ui.Views.ActionBar;
+package org.telegram.ui.ActionBar;
 
 import android.content.Context;
 import android.graphics.Rect;

diff --git a/...Views/ActionBar/ActionBarPopupWindow.java → ...am/ui/ActionBar/ActionBarPopupWindow.java b/...Views/ActionBar/ActionBarPopupWindow.java → ...am/ui/ActionBar/ActionBarPopupWindow.java
@@ -8,7 +8,7 @@
 
 //Thanks to https://github.com/JakeWharton/ActionBarSherlock/
 
-package org.telegram.ui.Views.ActionBar;
+package org.telegram.ui.ActionBar;
 
 import android.content.Context;
 import android.util.AttributeSet;

diff --git a/...gram/ui/Views/ActionBar/BaseFragment.java → ...g/telegram/ui/ActionBar/BaseFragment.java b/...gram/ui/Views/ActionBar/BaseFragment.java → ...g/telegram/ui/ActionBar/BaseFragment.java
@@ -6,7 +6,7 @@
  * Copyright Nikolai Kudashov, 2013.
  */
 
-package org.telegram.ui.Views.ActionBar;
+package org.telegram.ui.ActionBar;
 
 import android.app.Activity;
 import android.app.AlertDialog;

diff --git a/...iews/ActionBar/DrawerLayoutContainer.java → ...m/ui/ActionBar/DrawerLayoutContainer.java b/...iews/ActionBar/DrawerLayoutContainer.java → ...m/ui/ActionBar/DrawerLayoutContainer.java
@@ -6,7 +6,7 @@
  * Copyright Nikolai Kudashov, 2013-2014.
  */
 
-package org.telegram.ui.Views.ActionBar;
+package org.telegram.ui.ActionBar;
 
 import android.app.Activity;
 import android.content.Context;

diff --git a/...gram/ui/Views/ActionBar/MenuDrawable.java → ...g/telegram/ui/ActionBar/MenuDrawable.java b/...gram/ui/Views/ActionBar/MenuDrawable.java → ...g/telegram/ui/ActionBar/MenuDrawable.java
@@ -6,7 +6,7 @@
  * Copyright Nikolai Kudashov, 2013-2014.
  */
 
-package org.telegram.ui.Views.ActionBar;
+package org.telegram.ui.ActionBar;
 
 import android.graphics.Canvas;
 import android.graphics.ColorFilter;

diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Adapters/BaseFragmentAdapter.java b/TMessagesProj/src/main/java/org/telegram/ui/Adapters/BaseFragmentAdapter.java
@@ -15,12 +15,6 @@
 
 public class BaseFragmentAdapter extends BaseAdapter {
 
-    public void onFragmentCreate() {
-    }
-
-    public void onFragmentDestroy() {
-    }
-
     @Override
     public int getCount() {
         return 0;

diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Adapters/BaseSectionsAdapter.java b/TMessagesProj/src/main/java/org/telegram/ui/Adapters/BaseSectionsAdapter.java
@@ -120,7 +120,7 @@ public final int getSectionForPosition(int position) {
             }
             sectionStart = sectionEnd;
         }
-        return 0;
+        return -1;
     }
 
     public int getPositionInSectionForPosition(int position) {
@@ -139,7 +139,7 @@ public int getPositionInSectionForPosition(int position) {
             }
             sectionStart = sectionEnd;
         }
-        return 0;
+        return -1;
     }
 
     public abstract int getSectionCount();

diff --git a/.../ui/Adapters/ContactsActivityAdapter.java → ...telegram/ui/Adapters/ContactsAdapter.java b/.../ui/Adapters/ContactsActivityAdapter.java → ...telegram/ui/Adapters/ContactsAdapter.java
@@ -28,14 +28,14 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 
-public class ContactsActivityAdapter extends BaseSectionsAdapter {
+public class ContactsAdapter extends BaseSectionsAdapter {
 
     private Context mContext;
     private boolean onlyUsers;
     private boolean needPhonebook;
     private HashMap<Integer, TLRPC.User> ignoreUsers;
 
-    public ContactsActivityAdapter(Context context, boolean arg1, boolean arg2, HashMap<Integer, TLRPC.User> arg3) {
+    public ContactsAdapter(Context context, boolean arg1, boolean arg2, HashMap<Integer, TLRPC.User> arg3) {
         mContext = context;
         onlyUsers = arg1;
         needPhonebook = arg2;

diff --git a/...apters/ContactsActivitySearchAdapter.java → ...am/ui/Adapters/ContactsSearchAdapter.java b/...apters/ContactsActivitySearchAdapter.java → ...am/ui/Adapters/ContactsSearchAdapter.java
@@ -24,26 +24,32 @@
 import org.telegram.messenger.Utilities;
 import org.telegram.ui.Cells.GreySectionCell;
 import org.telegram.ui.Cells.ProfileSearchCell;
+import org.telegram.ui.Cells.UserCell;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Timer;
 import java.util.TimerTask;
 
-public class ContactsActivitySearchAdapter extends BaseContactsSearchAdapter {
+public class ContactsSearchAdapter extends BaseContactsSearchAdapter {
     private Context mContext;
     private HashMap<Integer, TLRPC.User> ignoreUsers;
     private ArrayList<TLRPC.User> searchResult = new ArrayList<TLRPC.User>();
     private ArrayList<CharSequence> searchResultNames = new ArrayList<CharSequence>();
     private Timer searchTimer;
     private boolean allowUsernameSearch;
+    private boolean useUserCell;
 
-    public ContactsActivitySearchAdapter(Context context, HashMap<Integer, TLRPC.User> arg1, boolean usernameSearch) {
+    public ContactsSearchAdapter(Context context, HashMap<Integer, TLRPC.User> arg1, boolean usernameSearch) {
         mContext = context;
         ignoreUsers = arg1;
         allowUsernameSearch = usernameSearch;
     }
 
+    public void setUseUserCell(boolean value) {
+        useUserCell = value;
+    }
+
     public void searchDialogs(final String query) {
         try {
             if (searchTimer != null) {
@@ -202,10 +208,13 @@ public View getView(int i, View view, ViewGroup viewGroup) {
             }
         } else {
             if (view == null) {
-                view = new ProfileSearchCell(mContext);
+                if (useUserCell) {
+                    view = new UserCell(mContext, 1);
+                } else {
+                    view = new ProfileSearchCell(mContext);
+                }
             }
 
-            ((ProfileSearchCell) view).useSeparator = (i != getCount() - 1 && i != searchResult.size() - 1);
             TLRPC.User user = getItem(i);
             if (user != null) {
                 CharSequence username = null;
@@ -227,13 +236,16 @@ public View getView(int i, View view, ViewGroup viewGroup) {
                     }
                 }
 
-                ((ProfileSearchCell) view).setData(user, null, null, name, username);
-
-                if (ignoreUsers != null) {
-                    if (ignoreUsers.containsKey(user.id)) {
-                        ((ProfileSearchCell) view).drawAlpha = 0.5f;
-                    } else {
-                        ((ProfileSearchCell) view).drawAlpha = 1.0f;
+                if (useUserCell) {
+                    ((UserCell) view).setData(user, name, username, 0);
+                } else {
+                    ((ProfileSearchCell) view).useSeparator = (i != getCount() - 1 && i != searchResult.size() - 1);
+                    if (ignoreUsers != null) {
+                        if (ignoreUsers.containsKey(user.id)) {
+                            ((ProfileSearchCell) view).drawAlpha = 0.5f;
+                        } else {
+                            ((ProfileSearchCell) view).drawAlpha = 1.0f;
+                        }
                     }
                 }
             }