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

hides retweet if tweet user is protected 

improved quick search bar
This commit is contained in:
Mariotaku Lee 2015-06-06 10:43:37 +08:00
parent 4424f4cd85
commit 5e3e49f8f0
26 changed files with 596 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
settings.gradle
View File

@ -1,4 +1,4 @@
include ':twidere'
include ':twidere', ':twidere.extension.shortener.gist'
include ':twidere.component.common'
include ':twidere.library.extension'
include ':twidere.component.querybuilder'

1
twidere.extension.shortener.gist/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
/build

47
twidere.extension.shortener.gist/build.gradle Normal file
View File

@ -0,0 +1,47 @@
/*
* Twidere - Twitter client for Android
*
* Copyright (C) 2012-2015 Mariotaku Lee <mariotaku.lee@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
apply plugin: 'com.android.application'
apply plugin: 'com.neenbedankt.android-apt'
android {
compileSdkVersion 22
buildToolsVersion "22.0.1"
defaultConfig {
applicationId "org.mariotaku.twidere.extension.shortener.gist"
minSdkVersion 14
targetSdkVersion 22
versionCode 1
versionName "1.0"
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
}
dependencies {
apt 'com.bluelinelabs:logansquare-compiler:1.1.0'
compile 'com.bluelinelabs:logansquare:1.1.0'
compile project(':twidere.library.extension')
compile fileTree(dir: 'libs', include: ['*.jar'])
}

17
twidere.extension.shortener.gist/proguard-rules.pro vendored Normal file
View File

@ -0,0 +1,17 @@
# Add project specific ProGuard rules here.
# By default, the flags in this file are appended to flags specified
# in /Users/mariotaku/Library/Android/sdk/tools/proguard/proguard-android.txt
# You can edit the include path and order by changing the proguardFiles
# directive in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html
# Add any project specific keep options here:
# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}

32
twidere.extension.shortener.gist/src/androidTest/java/org/mariotaku/twidere/extension/shortener/gist/ApplicationTest.java Normal file
View File

@ -0,0 +1,32 @@
/*
* Twidere - Twitter client for Android
*
* Copyright (C) 2012-2015 Mariotaku Lee <mariotaku.lee@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.extension.shortener.gist;
import android.app.Application;
import android.test.ApplicationTestCase;
/**
* <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
*/
public class ApplicationTest extends ApplicationTestCase<Application> {
public ApplicationTest() {
super(Application.class);
}
}

40
twidere.extension.shortener.gist/src/main/AndroidManifest.xml Normal file
View File

@ -0,0 +1,40 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Twidere - Twitter client for Android
~
~ Copyright (C) 2012-2015 Mariotaku Lee <mariotaku.lee@gmail.com>
~
~ This program is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 3 of the License, or
~ (at your option) any later version.
~
~ This program is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<manifest package="org.mariotaku.twidere.extension.shortener.gist"
xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:theme="@android:style/Theme.DeviceDefault">
<activity
android:name=".SettingsActivity"
android:label="@string/app_name">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
</manifest>

37
twidere.extension.shortener.gist/src/main/java/org/mariotaku/twidere/extension/shortener/gist/Gist.java Normal file
View File

@ -0,0 +1,37 @@
/*
* Twidere - Twitter client for Android
*
* Copyright (C) 2012-2015 Mariotaku Lee <mariotaku.lee@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.extension.shortener.gist;
import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject;
/**
* Created by mariotaku on 15/6/4.
*/
@JsonObject
public class Gist {
@JsonField(name = "html_url")
String htmlUrl;
public String getHtmlUrl() {
return htmlUrl;
}
}

92
twidere.extension.shortener.gist/src/main/java/org/mariotaku/twidere/extension/shortener/gist/GistStatusShortenerService.java Normal file
View File

@ -0,0 +1,92 @@
/*
* Twidere - Twitter client for Android
*
* Copyright (C) 2012-2015 Mariotaku Lee <mariotaku.lee@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.extension.shortener.gist;
import android.app.Service;
import android.content.Intent;
import android.os.IBinder;
import android.os.RemoteException;
import org.mariotaku.restfu.RestAPIFactory;
import org.mariotaku.twidere.IStatusShortener;
import org.mariotaku.twidere.model.ParcelableAccount;
import org.mariotaku.twidere.model.ParcelableStatusUpdate;
import org.mariotaku.twidere.model.StatusShortenResult;
import java.lang.ref.WeakReference;
/**
* Created by mariotaku on 15/6/4.
*/
public class GistStatusShortenerService extends Service {
private final StatusShortenerStub mBinder = new StatusShortenerStub(this);
@Override
public IBinder onBind(final Intent intent) {
return mBinder;
}
/**
* @return Shortened tweet.
*/
public StatusShortenResult shorten(final ParcelableStatusUpdate status, final String overrideStatusText) {
final Github github = getGithubInstance();
try {
final String text = overrideStatusText != null ? overrideStatusText : status.text;
final ParcelableAccount account = status.accounts[0];
final NewGist newGist = new NewGist();
final Gist response = github.createGist(newGist);
if (response != null) return StatusShortenResult.getInstance(response.getHtmlUrl());
} catch (final GithubException e) {
final int errorCode = e.getErrorCode() != 0 ? e.getErrorCode() : -1;
return StatusShortenResult.getInstance(errorCode, e.getMessage());
}
return StatusShortenResult.getInstance(-1, "Unknown error");
}
private Github getGithubInstance() {
RestAPIFactory factory = new RestAPIFactory();
return factory.build(Github.class);
}
/*
* By making this a static class with a WeakReference to the Service, we
* ensure that the Service can be GCd even when the system process still has
* a remote reference to the stub.
*/
private static final class StatusShortenerStub extends IStatusShortener.Stub {
final WeakReference<GistStatusShortenerService> mService;
public StatusShortenerStub(final GistStatusShortenerService service) {
mService = new WeakReference<>(service);
}
@Override
public StatusShortenResult shorten(final ParcelableStatusUpdate status, final String overrideStatusText)
throws RemoteException {
return mService.get().shorten(status, overrideStatusText);
}
}
}

35
twidere.extension.shortener.gist/src/main/java/org/mariotaku/twidere/extension/shortener/gist/Github.java Normal file
View File

@ -0,0 +1,35 @@
/*
* Twidere - Twitter client for Android
*
* Copyright (C) 2012-2015 Mariotaku Lee <mariotaku.lee@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.extension.shortener.gist;
import org.mariotaku.restfu.annotation.method.POST;
import org.mariotaku.restfu.annotation.param.File;
/**
* Created by mariotaku on 15/6/4.
*/
public interface Github {
@POST("/gists")
Gist createGist(@File NewGist newGist) throws GithubException;
}

31
twidere.extension.shortener.gist/src/main/java/org/mariotaku/twidere/extension/shortener/gist/GithubException.java Normal file
View File

@ -0,0 +1,31 @@
/*
* Twidere - Twitter client for Android
*
* Copyright (C) 2012-2015 Mariotaku Lee <mariotaku.lee@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.extension.shortener.gist;
/**
* Created by mariotaku on 15/6/4.
*/
public class GithubException extends Exception {
private int errorCode;
public int getErrorCode() {
return errorCode;
}
}

26
twidere.extension.shortener.gist/src/main/java/org/mariotaku/twidere/extension/shortener/gist/NewGist.java Normal file
View File

@ -0,0 +1,26 @@
/*
* Twidere - Twitter client for Android
*
* Copyright (C) 2012-2015 Mariotaku Lee <mariotaku.lee@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.extension.shortener.gist;
/**
* Created by mariotaku on 15/6/4.
*/
public class NewGist {
}

57
twidere.extension.shortener.gist/src/main/java/org/mariotaku/twidere/extension/shortener/gist/SettingsActivity.java Normal file
View File

@ -0,0 +1,57 @@
/*
* Twidere - Twitter client for Android
*
* Copyright (C) 2012-2015 Mariotaku Lee <mariotaku.lee@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.extension.shortener.gist;
import android.os.Bundle;
import android.support.v4.app.FragmentActivity;
import android.view.Menu;
import android.view.MenuItem;
public class SettingsActivity extends FragmentActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_settings);
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
// Inflate the menu; this adds items to the action bar if it is present.
getMenuInflater().inflate(R.menu.menu_settings, menu);
return true;
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
// Handle action bar item clicks here. The action bar will
// automatically handle clicks on the Home/Up button, so long
// as you specify a parent activity in AndroidManifest.xml.
int id = item.getItemId();
//noinspection SimplifiableIfStatement
if (id == R.id.action_settings) {
return true;
}
return super.onOptionsItemSelected(item);
}
}

35
twidere.extension.shortener.gist/src/main/res/layout/activity_settings.xml Normal file
View File

@ -0,0 +1,35 @@
<!--
~ Twidere - Twitter client for Android
~
~ Copyright (C) 2012-2015 Mariotaku Lee <mariotaku.lee@gmail.com>
~
~ This program is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 3 of the License, or
~ (at your option) any later version.
~
~ This program is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:paddingBottom="@dimen/activity_vertical_margin"
tools:context=".SettingsActivity">
<TextView
android:text="@string/hello_world"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</RelativeLayout>

28
twidere.extension.shortener.gist/src/main/res/menu/menu_settings.xml Normal file
View File

@ -0,0 +1,28 @@
<!--
~ Twidere - Twitter client for Android
~
~ Copyright (C) 2012-2015 Mariotaku Lee <mariotaku.lee@gmail.com>
~
~ This program is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 3 of the License, or
~ (at your option) any later version.
~
~ This program is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
tools:context=".SettingsActivity">
<item
android:id="@+id/action_settings"
android:orderInCategory="100"
android:showAsAction="never"
android:title="@string/action_settings"/>
</menu>

BIN
twidere.extension.shortener.gist/src/main/res/mipmap-hdpi/ic_launcher.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
twidere.extension.shortener.gist/src/main/res/mipmap-mdpi/ic_launcher.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
twidere.extension.shortener.gist/src/main/res/mipmap-xhdpi/ic_launcher.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.7 KiB

BIN
twidere.extension.shortener.gist/src/main/res/mipmap-xxhdpi/ic_launcher.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.5 KiB

25
twidere.extension.shortener.gist/src/main/res/values-w820dp/dimens.xml Normal file
View File

@ -0,0 +1,25 @@
<!--
~ Twidere - Twitter client for Android
~
~ Copyright (C) 2012-2015 Mariotaku Lee <mariotaku.lee@gmail.com>
~
~ This program is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 3 of the License, or
~ (at your option) any later version.
~
~ This program is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<resources>
<!-- Example customization of dimensions originally defined in res/values/dimens.xml
(such as screen margins) for screens with more than 820dp of available width. This
would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
<dimen name="activity_horizontal_margin">64dp</dimen>
</resources>

24
twidere.extension.shortener.gist/src/main/res/values/dimens.xml Normal file
View File

@ -0,0 +1,24 @@
<!--
~ Twidere - Twitter client for Android
~
~ Copyright (C) 2012-2015 Mariotaku Lee <mariotaku.lee@gmail.com>
~
~ This program is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 3 of the License, or
~ (at your option) any later version.
~
~ This program is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<resources>
<!-- Default screen margins, per the Android Design guidelines. -->
<dimen name="activity_horizontal_margin">16dp</dimen>
<dimen name="activity_vertical_margin">16dp</dimen>
</resources>

25
twidere.extension.shortener.gist/src/main/res/values/strings.xml Normal file
View File

@ -0,0 +1,25 @@
<!--
~ Twidere - Twitter client for Android
~
~ Copyright (C) 2012-2015 Mariotaku Lee <mariotaku.lee@gmail.com>
~
~ This program is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 3 of the License, or
~ (at your option) any later version.
~
~ This program is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<resources>
<string name="app_name">Twidere Gist Shortener Extension</string>
<string name="hello_world">Hello world!</string>
<string name="action_settings">Settings</string>
</resources>

23
twidere.extension.shortener.gist/src/main/res/values/styles.xml Normal file
View File

@ -0,0 +1,23 @@
<!--
~ Twidere - Twitter client for Android
~
~ Copyright (C) 2012-2015 Mariotaku Lee <mariotaku.lee@gmail.com>
~
~ This program is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 3 of the License, or
~ (at your option) any later version.
~
~ This program is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<resources>
</resources>

2
twidere.extension.twitlonger/src/main/java/org/mariotaku/twidere/extension/twitlonger/TwitLongerService.java
View File

@ -48,7 +48,7 @@ public class TwitLongerService extends Service implements Constants {
final WeakReference<TwitLongerService> mService;
public TweetShortenerStub(TwitLongerService service) {
mService = new WeakReference<TwitLongerService>(service);
mService = new WeakReference<>(service);
}
@Override

13
twidere/src/main/java/org/mariotaku/twidere/activity/support/QuickSearchBarActivity.java
View File

@ -84,6 +84,8 @@ import org.mariotaku.twidere.view.iface.IExtendedView.OnFitSystemWindowsListener
import java.util.ArrayList;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
* Created by mariotaku on 15/1/6.
@ -516,6 +518,8 @@ public class QuickSearchBarActivity extends ThemedFragmentActivity implements On
public static class SuggestionsLoader extends AsyncTaskLoader<List<SuggestionItem>> {
private static final Pattern PATTERN_SCREEN_NAME = Pattern.compile("(?i)[@\uFF20]?([a-z0-9_]{1,20})");
private final long mAccountId;
private final String mQuery;
@ -553,7 +557,7 @@ public class QuickSearchBarActivity extends ThemedFragmentActivity implements On
final OrderBy orderBy = new OrderBy(order, ascending);
final Uri uri = Uri.withAppendedPath(CachedUsers.CONTENT_URI_WITH_SCORE, String.valueOf(mAccountId));
final Cursor usersCursor = context.getContentResolver().query(uri,
CachedUsers.COLUMNS, selection != null ? selection.getSQL() : null,
CachedUsers.COLUMNS, selection.getSQL(),
selectionArgs, orderBy.getSQL());
final CachedIndices usersIndices = new CachedIndices(usersCursor);
final int screenNamePos = result.size();
@ -567,8 +571,11 @@ public class QuickSearchBarActivity extends ThemedFragmentActivity implements On
hasName = true;
}
}
if (!hasName && mQuery.matches("(?i)[a-z0-9_]{1,20}")) {
result.add(screenNamePos, new UserScreenNameItem(mQuery, mAccountId));
if (!hasName) {
final Matcher m = PATTERN_SCREEN_NAME.matcher(mQuery);
if (m.matches()) {
result.add(screenNamePos, new UserScreenNameItem(m.group(1), mAccountId));
}
}
usersCursor.close();
} else {

7
twidere/src/main/java/org/mariotaku/twidere/fragment/support/RetweetQuoteDialogFragment.java
View File

@ -107,7 +107,11 @@ public class RetweetQuoteDialogFragment extends BaseSupportDialogFragment implem
builder.setView(view);
builder.setTitle(R.string.retweet_quote_confirm_title);
builder.setPositiveButton(isMyRetweet(status) ? R.string.cancel_retweet : R.string.retweet, this);
if (isMyRetweet(status)) {
builder.setPositiveButton(R.string.cancel_retweet, this);
} else if (!status.user_is_protected) {
builder.setPositiveButton(R.string.retweet, this);
}
builder.setNeutralButton(R.string.quote, this);
builder.setNegativeButton(android.R.string.cancel, null);
@ -116,6 +120,7 @@ public class RetweetQuoteDialogFragment extends BaseSupportDialogFragment implem
view.findViewById(R.id.item_menu).setVisibility(View.GONE);
view.findViewById(R.id.action_buttons).setVisibility(View.GONE);
view.findViewById(R.id.item_content).setFocusable(false);
view.findViewById(R.id.comment_container).setVisibility(status.user_is_protected ? View.GONE : View.VISIBLE);
mEditComment = (UserHashtagAutoCompleteEditText) view.findViewById(R.id.edit_comment);
mEditComment.setAccountId(status.account_id);
mEditComment.setLengthChecker(new METLengthChecker() {

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

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