diff --git a/settings.gradle b/settings.gradle index 1bf2a591e..9873796cc 100644 --- a/settings.gradle +++ b/settings.gradle @@ -11,11 +11,10 @@ include ':twidere.donate.nyanwp.wear' include ':twidere.component.nyan' include ':twidere.component.viewer.media' include ':twidere.extension.streaming' -include ':SlidingMenu', ':DragSortListView', ':MenuComponent', ':RefreshNow', ':PullToRefresh', ':MessageBubbleView' +include ':SlidingMenu', ':DragSortListView', ':RefreshNow', ':PullToRefresh', ':MessageBubbleView' project(':SlidingMenu').projectDir = file('libraries/SlidingMenu/library') project(':DragSortListView').projectDir = file('libraries/DragSortListView/library') -project(':MenuComponent').projectDir = file('libraries/MenuComponent/library') project(':RefreshNow').projectDir = file('libraries/RefreshNow/library') project(':PullToRefresh').projectDir = file('libraries/PullToRefresh/library') project(':MessageBubbleView').projectDir = file('libraries/MessageBubbleView/library') \ No newline at end of file diff --git a/twidere.donate.nyanwp.wear/build.gradle b/twidere.donate.nyanwp.wear/build.gradle index c117c9e0f..7434a7e4a 100644 --- a/twidere.donate.nyanwp.wear/build.gradle +++ b/twidere.donate.nyanwp.wear/build.gradle @@ -31,6 +31,10 @@ android { versionCode 1 versionName "1.0" } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_7 + targetCompatibility JavaVersion.VERSION_1_7 + } } dependencies { diff --git a/twidere.donate.nyanwp/build.gradle b/twidere.donate.nyanwp/build.gradle index 9f8961c58..8eaa12578 100644 --- a/twidere.donate.nyanwp/build.gradle +++ b/twidere.donate.nyanwp/build.gradle @@ -31,6 +31,10 @@ android { versionCode 3 versionName "1.2" } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_7 + targetCompatibility JavaVersion.VERSION_1_7 + } } dependencies { diff --git a/twidere.extension.streaming/build.gradle b/twidere.extension.streaming/build.gradle index d7111b198..7506f1a33 100644 --- a/twidere.extension.streaming/build.gradle +++ b/twidere.extension.streaming/build.gradle @@ -37,6 +37,10 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_7 + targetCompatibility JavaVersion.VERSION_1_7 + } } dependencies { diff --git a/twidere/src/main/java/org/mariotaku/twidere/activity/support/ComposeActivity.java b/twidere/src/main/java/org/mariotaku/twidere/activity/support/ComposeActivity.java index 2ffd3ecfa..0dd2bd8df 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/activity/support/ComposeActivity.java +++ b/twidere/src/main/java/org/mariotaku/twidere/activity/support/ComposeActivity.java @@ -429,9 +429,17 @@ public class ComposeActivity extends BaseSupportDialogActivity implements TextWa } break; } + case R.id.account_selector_container: { + setAccountSelectorVisible(false); + break; + } } } + private void setAccountSelectorVisible(boolean visible) { + mAccountSelectorContainer.setVisibility(visible ? View.VISIBLE : View.GONE); + } + @Override public boolean onEditorAction(final TextView view, final int actionId, final KeyEvent event) { if (event == null) return false; @@ -554,6 +562,7 @@ public class ComposeActivity extends BaseSupportDialogActivity implements TextWa mMenuBar.setOnMenuItemClickListener(this); mEditText.setOnEditorActionListener(mPreferences.getBoolean(KEY_QUICK_SEND, false) ? this : null); mEditText.addTextChangedListener(this); + mAccountSelectorContainer.setOnClickListener(this); final LinearLayoutManager linearLayoutManager = new LinearLayoutManager(this); linearLayoutManager.setOrientation(LinearLayoutManager.VERTICAL); diff --git a/twidere/src/main/java/org/mariotaku/twidere/fragment/support/AbsStatusesFragment.java b/twidere/src/main/java/org/mariotaku/twidere/fragment/support/AbsStatusesFragment.java index 97441712d..1a7ef6e4e 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/fragment/support/AbsStatusesFragment.java +++ b/twidere/src/main/java/org/mariotaku/twidere/fragment/support/AbsStatusesFragment.java @@ -182,6 +182,9 @@ public abstract class AbsStatusesFragment extends BaseSupportFragment impl mLayoutManager.scrollToPositionWithOffset(pos, lastVisibleTop - mLayoutManager.getPaddingTop()); } } + if (data instanceof IExtendedLoader) { + ((IExtendedLoader) data).setFromUser(false); + } setListShown(true); } diff --git a/twidere/src/main/java/org/mariotaku/twidere/menu/ComposeAccountActionProvider.java b/twidere/src/main/java/org/mariotaku/twidere/menu/ComposeAccountActionProvider.java index 9814563fe..d397176eb 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/menu/ComposeAccountActionProvider.java +++ b/twidere/src/main/java/org/mariotaku/twidere/menu/ComposeAccountActionProvider.java @@ -21,8 +21,6 @@ package org.mariotaku.twidere.menu; import android.annotation.SuppressLint; import android.content.Context; -import android.graphics.Color; -import android.graphics.drawable.ColorDrawable; import android.support.v4.view.ActionProvider; import android.view.LayoutInflater; import android.view.View; @@ -99,7 +97,7 @@ public class ComposeAccountActionProvider extends ActionProvider implements OnCl } else { mCountView.setText(String.valueOf(accounts.length)); mImageLoader.cancelDisplayTask(mProfileImageView); - mProfileImageView.setImageDrawable(new ColorDrawable(Color.WHITE)); + mProfileImageView.setImageDrawable(null); mProfileImageView.setBorderColors(Utils.getAccountColors(accounts)); } } diff --git a/twidere/src/main/java/org/mariotaku/twidere/view/ShapedImageView.java b/twidere/src/main/java/org/mariotaku/twidere/view/ShapedImageView.java index 509f325e0..cf663621b 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/view/ShapedImageView.java +++ b/twidere/src/main/java/org/mariotaku/twidere/view/ShapedImageView.java @@ -295,6 +295,8 @@ public class ShapedImageView extends ImageView { bitmapDrawable = (BitmapDrawable) drawable; } else if (drawable instanceof ColorDrawable) { mSolidColorPaint.setColor(((ColorDrawable) drawable).getColor()); + } else { + mSolidColorPaint.setColor(0); } Bitmap bitmap = null; @@ -325,7 +327,7 @@ public class ShapedImageView extends ImageView { @Override protected void onLayout(boolean changed, int left, int top, int right, int bottom) { super.onLayout(changed, left, top, right, bottom); - updateShadowBitmap(); + updateBounds(); } @Override @@ -357,14 +359,14 @@ public class ShapedImageView extends ImageView { @Override public void setPadding(int left, int top, int right, int bottom) { super.setPadding(left, top, right, bottom); - updateShadowBitmap(); + updateBounds(); } @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1) @Override public void setPaddingRelative(int start, int top, int end, int bottom) { super.setPaddingRelative(start, top, end, bottom); - updateShadowBitmap(); + updateBounds(); } private void drawBorder(@NonNull final Canvas canvas) { @@ -413,8 +415,12 @@ public class ShapedImageView extends ImageView { } } - private void updateShadowBitmap() { + private void updateBounds() { updateBorderShader(); + updateShadowBitmap(); + } + + private void updateShadowBitmap() { if (USE_OUTLINE) return; final int width = getWidth(), height = getHeight(); if (width <= 0 || height <= 0) return; diff --git a/twidere/src/main/res/layout/action_item_account_selector.xml b/twidere/src/main/res/layout/action_item_account_selector.xml index a9e8a0545..5c1c10ec1 100644 --- a/twidere/src/main/res/layout/action_item_account_selector.xml +++ b/twidere/src/main/res/layout/action_item_account_selector.xml @@ -39,6 +39,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_gravity="center" + app:sivBackgroundColor="?android:colorBackground" app:sivBorder="true" app:sivBorderWidth="1.5dp" tools:src="@drawable/ic_profile_image_default"/> @@ -48,6 +49,6 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_gravity="center" - android:textColor="?android:textColorPrimary"/> + android:textColor="?android:colorForeground"/> \ No newline at end of file diff --git a/twidere/src/main/res/layout/activity_image_viewer_bottombar.xml b/twidere/src/main/res/layout/activity_image_viewer_bottombar.xml index 15f27f8ec..f842e4ab0 100644 --- a/twidere/src/main/res/layout/activity_image_viewer_bottombar.xml +++ b/twidere/src/main/res/layout/activity_image_viewer_bottombar.xml @@ -15,7 +15,7 @@ limitations under the License. --> - + android:layout_height="match_parent">