Mastodon
/
Twidere-App-Android-Twitter-Mastodon
mirror of https://github.com/TwidereProject/Twidere-Android
1
0
Fork 0
Code Issues Releases Wiki Activity

bug fixes

This commit is contained in:
Mariotaku Lee 2015-01-18 04:19:11 +08:00
parent 6534f16ef1
commit 2200678565
11 changed files with 40 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
settings.gradle
View File

@ -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')

4
twidere.donate.nyanwp.wear/build.gradle
View File

@ -31,6 +31,10 @@ android {
versionCode 1
versionName "1.0"
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_7
}
}
dependencies {

4
twidere.donate.nyanwp/build.gradle
View File

@ -31,6 +31,10 @@ android {
versionCode 3
versionName "1.2"
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_7
}
}
dependencies {

4
twidere.extension.streaming/build.gradle
View File

@ -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 {

9
twidere/src/main/java/org/mariotaku/twidere/activity/support/ComposeActivity.java
View File

@ -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);

3
twidere/src/main/java/org/mariotaku/twidere/fragment/support/AbsStatusesFragment.java
View File

@ -182,6 +182,9 @@ public abstract class AbsStatusesFragment<Data> extends BaseSupportFragment impl
mLayoutManager.scrollToPositionWithOffset(pos, lastVisibleTop - mLayoutManager.getPaddingTop());
}
}
if (data instanceof IExtendedLoader) {
((IExtendedLoader) data).setFromUser(false);
}
setListShown(true);
}

4
twidere/src/main/java/org/mariotaku/twidere/menu/ComposeAccountActionProvider.java
View File

@ -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));
}
}

14
twidere/src/main/java/org/mariotaku/twidere/view/ShapedImageView.java
View File

@ -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;

3
twidere/src/main/res/layout/action_item_account_selector.xml
View File

@ -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"/>
</org.mariotaku.twidere.view.SquareFrameLayout>

2
twidere/src/main/res/layout/activity_image_viewer_bottombar.xml
View File

@ -15,7 +15,7 @@
limitations under the License.
-->
<org.mariotaku.twidere.view.TwidereMenuBar
<android.support.v7.widget.ActionMenuView
android:id="@+id/menu_bar"
style="?android:actionBarSplitStyle"
xmlns:android="http://schemas.android.com/apk/res/android"

2
twidere/src/main/res/layout/fragment_content_pages.xml
View File

@ -21,7 +21,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="match_parent">
<RelativeLayout
android:id="@+id/pages_content"