ui fixes

optimized resources to make app small

twidere/src/main/java/org/mariotaku/twidere/Constants.java

@@ -28,7 +28,7 @@ package org.mariotaku.twidere;
 public interface Constants extends TwidereConstants {
 
     public static final String DATABASES_NAME = "twidere.sqlite";
-    public static final int DATABASES_VERSION = 86;
+    public static final int DATABASES_VERSION = 87;
 
     public static final int MENU_GROUP_STATUS_EXTENSION = 10;
     public static final int MENU_GROUP_COMPOSE_EXTENSION = 11;

twidere/src/main/java/org/mariotaku/twidere/activity/support/AccountsManagerActivity.java

@@ -11,6 +11,7 @@ import android.view.MenuItem;
 import org.mariotaku.twidere.R;
 import org.mariotaku.twidere.fragment.iface.IBaseFragment;
 import org.mariotaku.twidere.fragment.support.AccountsManagerFragment;
+import org.mariotaku.twidere.view.TintedStatusFrameLayout;
 
 /**
  * Accounts manager
@@ -18,6 +19,8 @@ import org.mariotaku.twidere.fragment.support.AccountsManagerFragment;
  */
 public class AccountsManagerActivity extends BaseActionBarActivity {
 
+    private TintedStatusFrameLayout mMainContent;
+
     @Override
     public boolean onOptionsItemSelected(final MenuItem item) {
         switch (item.getItemId()) {
@@ -29,6 +32,12 @@ public class AccountsManagerActivity extends BaseActionBarActivity {
         return super.onOptionsItemSelected(item);
     }
 
+    @Override
+    public void onSupportContentChanged() {
+        super.onSupportContentChanged();
+        mMainContent = (TintedStatusFrameLayout) findViewById(R.id.main_content);
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -37,6 +46,7 @@ public class AccountsManagerActivity extends BaseActionBarActivity {
             actionBar.setDisplayHomeAsUpEnabled(true);
         }
         setContentView(R.layout.activity_content_fragment);
+        mMainContent.setOnFitSystemWindowsListener(this);
         final FragmentManager fm = getSupportFragmentManager();
         final FragmentTransaction ft = fm.beginTransaction();
         ft.replace(R.id.main_content, new AccountsManagerFragment());
@@ -44,8 +54,8 @@ public class AccountsManagerActivity extends BaseActionBarActivity {
     }
 
     @Override
-    public void fitSystemWindows(Rect insets) {
-        super.fitSystemWindows(insets);
+    public void onFitSystemWindows(Rect insets) {
+        super.onFitSystemWindows(insets);
         final FragmentManager fm = getSupportFragmentManager();
         final Fragment f = fm.findFragmentById(R.id.main_content);
         if (f instanceof IBaseFragment) {

twidere/src/main/java/org/mariotaku/twidere/activity/support/BaseActionBarActivity.java

@@ -34,13 +34,13 @@ import org.mariotaku.twidere.fragment.iface.IBasePullToRefreshFragment;
 import org.mariotaku.twidere.util.AsyncTwitterWrapper;
 import org.mariotaku.twidere.util.MessagesManager;
 import org.mariotaku.twidere.util.ThemeUtils;
-import org.mariotaku.twidere.view.MainFrameLayout.FitSystemWindowsCallback;
+import org.mariotaku.twidere.view.iface.IExtendedView.OnFitSystemWindowsListener;
 
 import java.util.ArrayList;
 
 @SuppressLint("Registered")
 public class BaseActionBarActivity extends ThemedActionBarActivity implements Constants,
-        FitSystemWindowsCallback, SystemWindowsInsetsCallback, IControlBarActivity {
+        OnFitSystemWindowsListener, SystemWindowsInsetsCallback, IControlBarActivity {
 
     private boolean mInstanceStateSaved, mIsVisible, mIsOnTop;
 
@@ -159,7 +159,7 @@ public class BaseActionBarActivity extends ThemedActionBarActivity implements Co
     }
 
     @Override
-    public void fitSystemWindows(Rect insets) {
+    public void onFitSystemWindows(Rect insets) {
         mSystemWindowsInsets = new Rect(insets);
     }
 

twidere/src/main/java/org/mariotaku/twidere/activity/support/HomeActivity.java

@@ -344,6 +344,7 @@ public class HomeActivity extends BaseActionBarActivity implements OnClickListen
         mTabDisplayOption = getTabDisplayOptionInt(this);
         final int initialTabPosition = handleIntent(intent, savedInstanceState == null);
 
+        mColorStatusFrameLayout.setOnFitSystemWindowsListener(this);
         ThemeUtils.applyBackground(mTabIndicator);
         mPagerAdapter = new SupportTabsAdapter(this, getSupportFragmentManager(), mTabIndicator, 1);
         mViewPager.setAdapter(mPagerAdapter);

twidere/src/main/java/org/mariotaku/twidere/activity/support/LinkHandlerActivity.java

@@ -28,6 +28,7 @@ import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
 import android.support.v4.app.ListFragment;
+import android.support.v4.view.WindowCompat;
 import android.support.v7.app.ActionBar;
 import android.view.MenuItem;
 import android.view.View;
@@ -136,6 +137,7 @@ public class LinkHandlerActivity extends BaseActionBarActivity implements OnClic
             setActionBarBackground(actionBar, linkId, data);
         }
         setContentView(R.layout.activity_content_fragment);
+        mMainContent.setOnFitSystemWindowsListener(this);
         setStatusBarColor(linkId, data);
         setTaskInfo(linkId, data);
         setSupportProgressBarIndeterminateVisibility(false);
@@ -157,17 +159,8 @@ public class LinkHandlerActivity extends BaseActionBarActivity implements OnClic
     }
 
     @Override
-    public boolean getSystemWindowsInsets(Rect insets) {
-        final boolean result = super.getSystemWindowsInsets(insets);
-//        if (result) {
-//            insets.bottom = 0;
-//        }
-        return result;
-    }
-
-    @Override
-    public void fitSystemWindows(Rect insets) {
-        super.fitSystemWindows(insets);
+    public void onFitSystemWindows(Rect insets) {
+        super.onFitSystemWindows(insets);
         final Fragment fragment = getSupportFragmentManager().findFragmentById(R.id.main_content);
         if (fragment instanceof IBaseFragment) {
             ((IBaseFragment) fragment).requestFitSystemWindows();
@@ -190,8 +183,8 @@ public class LinkHandlerActivity extends BaseActionBarActivity implements OnClic
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
             window.addFlags(LayoutParams.FLAG_TRANSLUCENT_STATUS);
         }
-        window.requestFeature(Window.FEATURE_ACTION_BAR_OVERLAY);
-        window.requestFeature(Window.FEATURE_ACTION_MODE_OVERLAY);
+        supportRequestWindowFeature(WindowCompat.FEATURE_ACTION_BAR_OVERLAY);
+        supportRequestWindowFeature(WindowCompat.FEATURE_ACTION_MODE_OVERLAY);
         final int transitionRes;
         switch (linkId) {
             case LINK_ID_USER: {

twidere/src/main/java/org/mariotaku/twidere/util/Utils.java

@@ -25,6 +25,7 @@ import android.app.Activity;
 import android.content.ContentResolver;
 import android.content.ContentValues;
 import android.content.Context;
+import android.content.ContextWrapper;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
@@ -2248,6 +2249,15 @@ public final class Utils implements Constants, TwitterConstants {
         }
     }
 
+    public static Activity findActivity(Context context) {
+        if (context instanceof Activity) {
+            return (Activity) context;
+        } else if (context instanceof ContextWrapper) {
+            return findActivity(((ContextWrapper) context).getBaseContext());
+        }
+        return null;
+    }
+
     public static String getTabDisplayOption(final Context context) {
         if (context == null) return null;
         final String defaultOption = context.getString(R.string.default_tab_display_option);
@@ -3970,7 +3980,7 @@ public final class Utils implements Constants, TwitterConstants {
         return appInfo.metaData != null && appInfo.metaData.getBoolean(METADATA_KEY_EXTENSION_USE_JSON, false);
     }
 
-    public static int getActionBarHeight(ActionBar actionBar) {
+    public static int getActionBarHeight(@Nullable ActionBar actionBar) {
         if (actionBar == null) return 0;
         final Context context = actionBar.getThemedContext();
         final TypedValue tv = new TypedValue();
@@ -3982,7 +3992,7 @@ public final class Utils implements Constants, TwitterConstants {
         return 0;
     }
 
-    public static int getActionBarHeight(android.support.v7.app.ActionBar actionBar) {
+    public static int getActionBarHeight(@Nullable android.support.v7.app.ActionBar actionBar) {
         if (actionBar == null) return 0;
         final Context context = actionBar.getThemedContext();
         final TypedValue tv = new TypedValue();

twidere/src/main/java/org/mariotaku/twidere/util/content/TwidereSQLiteOpenHelper.java

@@ -102,6 +102,8 @@ public final class TwidereSQLiteOpenHelper extends SQLiteOpenHelper implements C
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) return;
         db.execSQL(createIndex("statuses_index", Statuses.TABLE_NAME, new String[]{Statuses.ACCOUNT_ID}, true));
         db.execSQL(createIndex("mentions_index", Mentions.TABLE_NAME, new String[]{Statuses.ACCOUNT_ID}, true));
+        db.execSQL(createIndex("messages_inbox_index", DirectMessages.Inbox.TABLE_NAME, new String[]{DirectMessages.ACCOUNT_ID}, true));
+        db.execSQL(createIndex("messages_outbox_index", DirectMessages.Outbox.TABLE_NAME, new String[]{DirectMessages.ACCOUNT_ID}, true));
     }
 
     private void createViews(SQLiteDatabase db) {

twidere/src/main/java/org/mariotaku/twidere/view/ExtendedFrameLayout.java

@@ -19,13 +19,18 @@
 
 package org.mariotaku.twidere.view;
 
+import android.app.Activity;
 import android.content.Context;
 import android.graphics.Rect;
+import android.os.Build;
 import android.support.annotation.NonNull;
+import android.support.v7.app.ActionBarActivity;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
+import android.view.Window;
 import android.widget.FrameLayout;
 
+import org.mariotaku.twidere.util.Utils;
 import org.mariotaku.twidere.view.iface.IExtendedView;
 
 public class ExtendedFrameLayout extends FrameLayout implements IExtendedView {
@@ -81,12 +86,36 @@ public class ExtendedFrameLayout extends FrameLayout implements IExtendedView {
 
     @Override
     protected boolean fitSystemWindows(@NonNull Rect insets) {
+//        if (mOnFitSystemWindowsListener != null && Build.VERSION.SDK_INT > Build.VERSION_CODES.KITKAT) {
+//            mOnFitSystemWindowsListener.onFitSystemWindows(insets);
+//        }
         if (mOnFitSystemWindowsListener != null) {
             mOnFitSystemWindowsListener.onFitSystemWindows(insets);
         }
         return super.fitSystemWindows(insets);
     }
 
+    Rect insets = new Rect();
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+//        if (mOnFitSystemWindowsListener != null && Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {
+//            final OnFitSystemWindowsListener l = mOnFitSystemWindowsListener;
+//            final Activity activity = Utils.findActivity(getContext());
+//            if (activity instanceof ActionBarActivity) {
+//                final ActionBarActivity actionBarActivity = (ActionBarActivity) activity;
+//                insets.top = Utils.getActionBarHeight(actionBarActivity.getSupportActionBar());
+//                l.onFitSystemWindows(insets);
+//            } else if (activity != null && activity.getWindow().hasFeature(Window.FEATURE_ACTION_BAR
+//                    | Window.FEATURE_ACTION_BAR_OVERLAY)) {
+//                insets.top = Utils.getActionBarHeight(activity.getActionBar());
+//                l.onFitSystemWindows(insets);
+//            }
+//        }
+
+    }
+
     @Override
     public final boolean onTouchEvent(final MotionEvent event) {
         if (mTouchInterceptor != null) {

twidere/src/main/java/org/mariotaku/twidere/view/HeaderDrawerLayout.java

@@ -281,6 +281,7 @@ public class HeaderDrawerLayout extends ViewGroup {
     }
 
     private boolean shouldLayoutHeaderBottomCallback() {
+        if (mDragCallback == null) return false;
         return mDrawerCallback.shouldLayoutHeaderBottom();
     }
 

twidere/src/main/java/org/mariotaku/twidere/view/MainFrameLayout.java

@@ -1,7 +1,6 @@
 package org.mariotaku.twidere.view;
 
 import android.content.Context;
-import android.graphics.Rect;
 import android.util.AttributeSet;
 
 /**
@@ -31,7 +30,4 @@ public class MainFrameLayout extends TintedStatusFrameLayout {
         super.setStatusBarHeight(height);
     }
 
-    public static interface FitSystemWindowsCallback {
-        void fitSystemWindows(Rect insets);
-    }
 }

twidere/src/main/java/org/mariotaku/twidere/view/TintedStatusFrameLayout.java

@@ -26,16 +26,14 @@ import android.graphics.Paint;
 import android.graphics.Rect;
 import android.support.annotation.NonNull;
 import android.util.AttributeSet;
-import android.widget.FrameLayout;
 
 import org.mariotaku.twidere.util.MathUtils;
 import org.mariotaku.twidere.util.Utils;
-import org.mariotaku.twidere.view.MainFrameLayout.FitSystemWindowsCallback;
 
 /**
  * Created by mariotaku on 14/11/26.
  */
-public class TintedStatusFrameLayout extends FrameLayout {
+public class TintedStatusFrameLayout extends ExtendedFrameLayout {
 
     private final Paint mBlackPaint, mShadowPaint, mColorPaint;
 
@@ -112,10 +110,6 @@ public class TintedStatusFrameLayout extends FrameLayout {
     @Override
     protected boolean fitSystemWindows(@NonNull Rect insets) {
         setStatusBarHeight(Utils.getInsetsTopWithoutActionBarHeight(getContext(), insets.top));
-        final Context context = getContext();
-        if (context instanceof FitSystemWindowsCallback) {
-            ((FitSystemWindowsCallback) context).fitSystemWindows(insets);
-        }
         return super.fitSystemWindows(insets);
     }