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

disabled retweet if status is protected

This commit is contained in:
Mariotaku Lee 2015-06-02 11:07:56 +08:00
parent 2db066f467
commit 4424f4cd85
4 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
twidere/src/main/java/org/mariotaku/twidere/fragment/support/UserFragment.java
View File

@ -88,6 +88,7 @@ import com.squareup.otto.Subscribe;
import org.mariotaku.querybuilder.Expression; import org.mariotaku.querybuilder.Expression;
import org.mariotaku.twidere.R; import org.mariotaku.twidere.R;
import org.mariotaku.twidere.activity.iface.IControlBarActivity;
import org.mariotaku.twidere.activity.iface.IThemedActivity; import org.mariotaku.twidere.activity.iface.IThemedActivity;
import org.mariotaku.twidere.activity.support.AccountSelectorActivity; import org.mariotaku.twidere.activity.support.AccountSelectorActivity;
import org.mariotaku.twidere.activity.support.ColorPickerDialogActivity; import org.mariotaku.twidere.activity.support.ColorPickerDialogActivity;
@ -1180,7 +1181,8 @@ public class UserFragment extends BaseSupportFragment implements OnClickListener
@Override @Override
protected void fitSystemWindows(Rect insets) { protected void fitSystemWindows(Rect insets) {
final ThemedAppCompatActivity activity = (ThemedAppCompatActivity) getActivity(); final ThemedAppCompatActivity activity = (ThemedAppCompatActivity) getActivity();
mHeaderDrawerLayout.setPadding(insets.left, insets.top, insets.right, insets.bottom); mHeaderDrawerLayout.setPadding(insets.left, Utils.getInsetsTopWithoutActionBarHeight(activity, insets.top),
insets.right, insets.bottom);
final String backgroundOption = activity.getCurrentThemeBackgroundOption(); final String backgroundOption = activity.getCurrentThemeBackgroundOption();
final boolean isTransparentBackground = ThemeUtils.isTransparentBackground(backgroundOption); final boolean isTransparentBackground = ThemeUtils.isTransparentBackground(backgroundOption);
mHeaderDrawerLayout.setClipToPadding(isTransparentBackground); mHeaderDrawerLayout.setClipToPadding(isTransparentBackground);
@ -1495,6 +1497,8 @@ public class UserFragment extends BaseSupportFragment implements OnClickListener
profileBannerContainer.setTranslationY(-offset); profileBannerContainer.setTranslationY(-offset);
profileBannerView.setTranslationY(offset / 2); profileBannerView.setTranslationY(offset / 2);
final ThemedAppCompatActivity activity = (ThemedAppCompatActivity) getActivity();
if (mActionBarBackground != null && mTintedStatusContent != null) { if (mActionBarBackground != null && mTintedStatusContent != null) {
mActionBarBackground.setFactor(factor); mActionBarBackground.setFactor(factor);
mTintedStatusContent.setFactor(factor); mTintedStatusContent.setFactor(factor);
@ -1508,8 +1512,6 @@ public class UserFragment extends BaseSupportFragment implements OnClickListener
} }
mActionBarBackground.setOutlineAlphaFactor(tabOutlineAlphaFactor); mActionBarBackground.setOutlineAlphaFactor(tabOutlineAlphaFactor);
final ThemedAppCompatActivity activity = (ThemedAppCompatActivity) getActivity();
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) { if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
setCompatToolbarOverlayAlpha(activity, factor * tabOutlineAlphaFactor); setCompatToolbarOverlayAlpha(activity, factor * tabOutlineAlphaFactor);
} }

4
twidere/src/main/res/layout/activity_compose_bottombar.xml
View File

@ -35,6 +35,10 @@
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:clickable="true" android:clickable="true"
android:paddingBottom="@dimen/element_spacing_msmall" android:paddingBottom="@dimen/element_spacing_msmall"
android:paddingEnd="@dimen/element_spacing_msmall"
android:paddingLeft="@dimen/element_spacing_msmall"
android:paddingRight="@dimen/element_spacing_msmall"
android:paddingStart="@dimen/element_spacing_msmall"
android:paddingTop="@dimen/element_spacing_msmall"> android:paddingTop="@dimen/element_spacing_msmall">
<org.mariotaku.twidere.view.SquareShapedImageView <org.mariotaku.twidere.view.SquareShapedImageView

1
twidere/src/main/res/layout/dialog_status_quote_retweet.xml
View File

@ -33,6 +33,7 @@
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <LinearLayout
android:id="@+id/comment_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"> android:orientation="horizontal">

16
twidere/src/main/res/xml/preferences_account_refresh.xml
View File

@ -30,15 +30,15 @@
android:title="@string/trends"/> android:title="@string/trends"/>
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory <!--<PreferenceCategory-->
android:enabled="false" <!--android:enabled="false"-->
android:key="cat_streaming" <!--android:key="cat_streaming"-->
android:title="@string/streaming"> <!--android:title="@string/streaming">-->
<org.mariotaku.twidere.preference.AutoFixSwitchPreference <!--<org.mariotaku.twidere.preference.AutoFixSwitchPreference-->
android:key="enable_streaming" <!--android:key="enable_streaming"-->
android:title="@string/enable_streaming"/> <!--android:title="@string/enable_streaming"/>-->
</PreferenceCategory> <!--</PreferenceCategory>-->
</PreferenceScreen> </PreferenceScreen>