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

fixed some lint errors 

changed interaction notification icon
This commit is contained in:
Mariotaku Lee 2016-01-28 18:50:39 +08:00
parent 27a0ac7314
commit 3c3ce96358
85 changed files with 492 additions and 569 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
twidere.component.common/src/main/java/org/mariotaku/twidere/TwidereConstants.java
View File

@ -19,6 +19,8 @@
package org.mariotaku.twidere;
import android.content.ContentResolver;
import org.mariotaku.twidere.constant.IntentConstants;
import org.mariotaku.twidere.constant.SharedPreferenceConstants;
@ -30,7 +32,6 @@ import org.mariotaku.twidere.constant.SharedPreferenceConstants;
public interface TwidereConstants extends SharedPreferenceConstants, IntentConstants {
String TWIDERE_APP_NAME = "Twidere";
String TWIDERE_PACKAGE_NAME = "org.mariotaku.twidere";
String TWIDERE_PROJECT_URL = "https://github.com/mariotaku/twidere";
String TWIDERE_PROJECT_EMAIL = "twidere.project@gmail.com";
@ -57,10 +58,9 @@ public interface TwidereConstants extends SharedPreferenceConstants, IntentConst
String SCHEME_HTTP = "http";
String SCHEME_HTTPS = "https";
String SCHEME_CONTENT = "content";
String SCHEME_CONTENT = ContentResolver.SCHEME_CONTENT;
String SCHEME_TWIDERE = "twidere";
String SCHEME_DATA = "data";
String SCHEME_FILE = "file";
String PROTOCOL_HTTP = SCHEME_HTTP + "://";
String PROTOCOL_HTTPS = SCHEME_HTTPS + "://";
@ -71,9 +71,6 @@ public interface TwidereConstants extends SharedPreferenceConstants, IntentConst
String AUTHORITY_TWIDERE_CACHE = "twidere.cache";
String AUTHORITY_USER = "user";
String AUTHORITY_HOME = "home";
String AUTHORITY_MENTIONS = "mentions";
String AUTHORITY_DIRECT_MESSAGES = "direct_messages";
String AUTHORITY_USERS = "users";
String AUTHORITY_USER_TIMELINE = "user_timeline";
String AUTHORITY_USER_MEDIA_TIMELINE = "user_media_timeline";
@ -228,12 +225,6 @@ public interface TwidereConstants extends SharedPreferenceConstants, IntentConst
String TASK_TAG_GET_TRENDS = "get_trends";
String TASK_TAG_STORE_TRENDS = "store_trends";
String SERVICE_COMMAND_REFRESH_ALL = "refresh_all";
String SERVICE_COMMAND_GET_HOME_TIMELINE = "get_home_timeline";
String SERVICE_COMMAND_GET_MENTIONS = "get_mentions";
String SERVICE_COMMAND_GET_SENT_DIRECT_MESSAGES = "get_sent_direct_messages";
String SERVICE_COMMAND_GET_RECEIVED_DIRECT_MESSAGES = "get_received_direct_messages";
String METADATA_KEY_EXTENSION = "org.mariotaku.twidere.extension";
String METADATA_KEY_EXTENSION_PERMISSIONS = "org.mariotaku.twidere.extension.permissions";
String METADATA_KEY_EXTENSION_SETTINGS = "org.mariotaku.twidere.extension.settings";
@ -251,19 +242,6 @@ public interface TwidereConstants extends SharedPreferenceConstants, IntentConst
String PERMISSION_ACCOUNTS = "accounts";
String PERMISSION_PREFERENCES = "preferences";
String TAB_TYPE_HOME_TIMELINE = "home_timeline";
String TAB_TYPE_NOTIFICATIONS_TIMELINE = "notifications_timeline";
String TAB_TYPE_TRENDS_SUGGESTIONS = "trends_suggestions";
String TAB_TYPE_DIRECT_MESSAGES = "direct_messages";
String TAB_TYPE_FAVORITES = "favorites";
String TAB_TYPE_USER_TIMELINE = "user_timeline";
String TAB_TYPE_SEARCH_STATUSES = "search_statuses";
String TAB_TYPE_LIST_TIMELINE = "list_timeline";
String TAB_TYPE_ACTIVITIES_ABOUT_ME = "activities_about_me";
String TAB_TYPE_ACTIVITIES_BY_FRIENDS = "activities_by_friends";
String TAB_TYPE_RETWEETS_OF_ME = "retweets_of_me";
int TAB_CODE_HOME_TIMELINE = 1;
int TAB_CODE_NOTIFICATIONS_TIMELINE = 2;
int TAB_CODE_DIRECT_MESSAGES = 4;

1
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/auth/OAuthToken.java
View File

@ -30,7 +30,6 @@ import org.mariotaku.twidere.api.twitter.TwitterException;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.lang.reflect.Type;
import java.nio.charset.Charset;
import java.text.ParseException;

6
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/CreateCardData.java
View File

@ -19,12 +19,6 @@
package org.mariotaku.twidere.api.twitter.model;
import com.bluelinelabs.logansquare.LoganSquare;
import java.io.IOException;
import java.util.LinkedHashMap;
import java.util.Map;
/**
* Example
* <pre>

2
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/GeoQuery.java
View File

@ -39,7 +39,7 @@ public final class GeoQuery implements ValueMap {
/**
* Creates a GeoQuery with the specified location
*
* @param location
* @param location Query location
*/
public GeoQuery(final GeoLocation location) {
this.location = location;

2
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/MediaEntity.java
View File

@ -22,8 +22,6 @@ package org.mariotaku.twidere.api.twitter.model;
import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject;
import org.mariotaku.twidere.api.gnusocial.model.Attachment;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;

2
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/TimeZone.java
View File

@ -22,8 +22,6 @@ package org.mariotaku.twidere.api.twitter.model;
import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject;
import org.mariotaku.twidere.api.twitter.model.TimeZone;
/**
* Created by mariotaku on 15/5/13.
*/

2
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/Warning.java
View File

@ -21,8 +21,6 @@ package org.mariotaku.twidere.api.twitter.model;
import com.bluelinelabs.logansquare.annotation.JsonObject;
import org.mariotaku.twidere.api.twitter.model.Warning;
/**
* Created by mariotaku on 15/5/26.
*/

12
twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableAccount.java
View File

@ -199,13 +199,17 @@ public class ParcelableAccount implements Parcelable {
public static ParcelableCredentials getCredentials(final Context context, final long accountId) {
if (context == null) return null;
try (Cursor cur = ContentResolverUtils.query(context.getContentResolver(), Accounts.CONTENT_URI,
Accounts.COLUMNS, Accounts.ACCOUNT_ID + " = " + accountId, null, null)) {
if (cur != null && cur.moveToFirst()) {
Cursor cur = ContentResolverUtils.query(context.getContentResolver(), Accounts.CONTENT_URI,
Accounts.COLUMNS, Accounts.ACCOUNT_ID + " = " + accountId, null, null);
if (cur == null) return null;
try {
if (cur.moveToFirst()) {
return ParcelableCredentialsCursorIndices.fromCursor(cur);
}
return null;
} finally {
cur.close();
}
return null;
}
public static List<ParcelableCredentials> getCredentialsList(final Context context, final boolean activatedOnly) {

1
twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableStatus.java
View File

@ -44,7 +44,6 @@ import org.mariotaku.twidere.util.HtmlEscapeHelper;
import org.mariotaku.twidere.util.TwitterContentUtils;
import java.io.IOException;
import java.util.Arrays;
import java.util.Comparator;
import java.util.Date;

2
twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableUserList.java
View File

@ -108,7 +108,7 @@ public class ParcelableUserList implements Parcelable, Comparable<ParcelableUser
this.position = position;
this.account_id = account_id;
id = list.getId();
is_public = list.getMode() == UserList.Mode.PUBLIC;
is_public = UserList.Mode.PUBLIC.equals(list.getMode());
this.is_following = is_following;
name = list.getName();
description = list.getDescription();

8
twidere.component.common/src/main/java/org/mariotaku/twidere/util/ContentValuesCreator.java
View File

@ -183,11 +183,9 @@ public final class ContentValuesCreator implements TwidereConstants {
values.put(DirectMessages.SENDER_PROFILE_IMAGE_URL, sender_profile_image_url);
values.put(DirectMessages.RECIPIENT_PROFILE_IMAGE_URL, recipient_profile_image_url);
final ParcelableMedia[] mediaArray = ParcelableMedia.fromEntities(message);
if (mediaArray != null) {
try {
values.put(DirectMessages.MEDIA_JSON, LoganSquare.serialize(Arrays.asList(mediaArray), ParcelableMedia.class));
} catch (IOException ignored) {
}
try {
values.put(DirectMessages.MEDIA_JSON, LoganSquare.serialize(Arrays.asList(mediaArray), ParcelableMedia.class));
} catch (IOException ignored) {
}
return values;
}

2
twidere.component.common/src/main/java/org/mariotaku/twidere/util/HtmlLinkExtractor.java
View File

@ -42,7 +42,7 @@ public class HtmlLinkExtractor {
* @return Vector links and link text
*/
public Vector<HtmlLink> grabLinks(final String html) {
final Vector<HtmlLink> result = new Vector<HtmlLink>();
final Vector<HtmlLink> result = new Vector<>();
final Matcher matcherTag = patternTag.matcher(html);
while (matcherTag.find()) {
final String href = matcherTag.group(1); // href

4
twidere.component.common/src/main/java/org/mariotaku/twidere/util/ParseUtils.java
View File

@ -32,10 +32,6 @@ import org.mariotaku.twidere.constant.IntentConstants;
import java.io.IOException;
import java.io.StringWriter;
import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import java.util.Iterator;
import java.util.Locale;
import java.util.Set;

13
twidere.component.common/src/main/java/org/mariotaku/twidere/util/TwidereArrayUtils.java
View File

@ -46,8 +46,8 @@ public final class TwidereArrayUtils {
if (array1 == null || array2 == null) return array1 == array2;
if (array1.length != array2.length) return false;
final int length = array1.length;
for (int i = 0; i < length; i++) {
if (!ArrayUtils.contains(array2, array1[i])) return false;
for (long anArray1 : array1) {
if (!ArrayUtils.contains(array2, anArray1)) return false;
}
return true;
}
@ -55,9 +55,8 @@ public final class TwidereArrayUtils {
public static boolean contentMatch(final Object[] array1, final Object[] array2) {
if (array1 == null || array2 == null) return array1 == array2;
if (array1.length != array2.length) return false;
final int length = array1.length;
for (int i = 0; i < length; i++) {
if (!ArrayUtils.contains(array2, array1[i])) return false;
for (Object item : array1) {
if (!ArrayUtils.contains(array2, item)) return false;
}
return true;
}
@ -75,11 +74,11 @@ public final class TwidereArrayUtils {
public static long[] intersection(final long[] array1, final long[] array2) {
if (array1 == null || array2 == null) return new long[0];
final List<Long> list1 = new ArrayList<Long>();
final List<Long> list1 = new ArrayList<>();
for (final long item : array1) {
list1.add(item);
}
final List<Long> list2 = new ArrayList<Long>();
final List<Long> list2 = new ArrayList<>();
for (final long item : array2) {
list2.add(item);
}

1
twidere.component.common/src/main/java/org/mariotaku/twidere/util/media/preview/provider/TwitterPicProvider.java
View File

@ -8,7 +8,6 @@ import org.mariotaku.restfu.http.RestHttpClient;
import org.mariotaku.twidere.model.ParcelableMedia;
import org.mariotaku.twidere.util.media.preview.PreviewMediaExtractor;
import java.util.List;
import java.util.Locale;
/**

2
twidere.component.nyan/src/main/java/org/mariotaku/twidere/nyan/NyanDrawingHelper.java
View File

@ -294,7 +294,7 @@ public class NyanDrawingHelper {
private final Paint mPaint;
private final ArrayList<Star> mStars = new ArrayList<Star>();
private final ArrayList<Star> mStars = new ArrayList<>();
private final Random mRandom = new Random();

1
twidere/src/main/java/org/mariotaku/twidere/Constants.java
View File

@ -105,5 +105,4 @@ public interface Constants extends TwidereConstants {
@Preference(type = STRING, exportable = false)
String KEY_DEVICE_SERIAL = "device_serial";
String READ_POSITION_TAG_ACTIVITIES_ABOUT_ME = "activities_about_me";
}

2
twidere/src/main/java/org/mariotaku/twidere/activity/ImageCropperActivity.java
View File

@ -23,9 +23,7 @@ import android.content.res.Resources;
import android.os.Build;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v4.view.MarginLayoutParamsCompat;
import android.support.v4.view.ViewCompat;
import android.support.v4.view.WindowCompat;
import android.view.View;
import android.view.WindowManager;

1
twidere/src/main/java/org/mariotaku/twidere/activity/NyanActivity.java
View File

@ -38,7 +38,6 @@ import org.mariotaku.twidere.R;
import org.mariotaku.twidere.nyan.NyanDaydreamService;
import org.mariotaku.twidere.nyan.NyanSurfaceHelper;
import org.mariotaku.twidere.nyan.NyanWallpaperService;
import org.mariotaku.twidere.util.DebugModeUtils;
public class NyanActivity extends Activity implements Constants, OnLongClickListener, OnSharedPreferenceChangeListener {

7
twidere/src/main/java/org/mariotaku/twidere/activity/SettingsWizardActivity.java
View File

@ -50,6 +50,7 @@ import org.mariotaku.twidere.R;
import org.mariotaku.twidere.activity.support.DataImportActivity;
import org.mariotaku.twidere.activity.support.HomeActivity;
import org.mariotaku.twidere.adapter.TabsAdapter;
import org.mariotaku.twidere.annotation.CustomTabType;
import org.mariotaku.twidere.fragment.BaseDialogFragment;
import org.mariotaku.twidere.fragment.BaseFragment;
import org.mariotaku.twidere.fragment.BasePreferenceFragment;
@ -536,9 +537,9 @@ public class SettingsWizardActivity extends Activity implements Constants {
private static final String FRAGMENT_TAG = "initial_settings_dialog";
private static final String[] DEFAULT_TAB_TYPES = {TAB_TYPE_HOME_TIMELINE,
TAB_TYPE_NOTIFICATIONS_TIMELINE, TAB_TYPE_TRENDS_SUGGESTIONS,
TAB_TYPE_DIRECT_MESSAGES};
private static final String[] DEFAULT_TAB_TYPES = {CustomTabType.HOME_TIMELINE,
CustomTabType.NOTIFICATIONS_TIMELINE, CustomTabType.TRENDS_SUGGESTIONS,
CustomTabType.DIRECT_MESSAGES};
private final SettingsWizardActivity mActivity;

1
twidere/src/main/java/org/mariotaku/twidere/activity/support/BrowserSignInActivity.java
View File

@ -41,7 +41,6 @@ import android.webkit.WebViewClient;
import android.widget.Toast;
import org.attoparser.AttoParseException;
import org.mariotaku.restfu.Pair;
import org.mariotaku.restfu.http.Authorization;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.api.twitter.TwitterOAuth;

42
twidere/src/main/java/org/mariotaku/twidere/activity/support/HomeActivity.java
View File

@ -45,6 +45,7 @@ import android.support.v4.view.ViewPager.OnPageChangeListener;
import android.support.v4.widget.DrawerLayout;
import android.support.v4.widget.DrawerLayoutAccessor;
import android.support.v7.widget.Toolbar;
import android.util.SparseIntArray;
import android.view.Gravity;
import android.view.KeyEvent;
import android.view.MenuItem;
@ -71,6 +72,7 @@ import org.mariotaku.twidere.activity.SettingsActivity;
import org.mariotaku.twidere.activity.SettingsWizardActivity;
import org.mariotaku.twidere.activity.UsageStatisticsActivity;
import org.mariotaku.twidere.adapter.support.SupportTabsAdapter;
import org.mariotaku.twidere.annotation.CustomTabType;
import org.mariotaku.twidere.fragment.CustomTabsFragment;
import org.mariotaku.twidere.fragment.iface.RefreshScrollTopInterface;
import org.mariotaku.twidere.fragment.iface.SupportFragmentCallback;
@ -107,10 +109,7 @@ import org.mariotaku.twidere.view.TintedStatusFrameLayout;
import org.mariotaku.twidere.view.iface.IHomeActionButton;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import static org.mariotaku.twidere.util.CompareUtils.classEquals;
import static org.mariotaku.twidere.util.Utils.cleanDatabasesByItemLimit;
@ -723,8 +722,6 @@ public class HomeActivity extends BaseAppCompatActivity implements OnClickListen
}
}
}
if (initialTab != -1 && mViewPager != null) {
}
final Intent extraIntent = intent.getParcelableExtra(EXTRA_EXTRA_INTENT);
if (extraIntent != null && firstCreate) {
extraIntent.setExtrasClassLoader(getClassLoader());
@ -924,13 +921,14 @@ public class HomeActivity extends BaseAppCompatActivity implements OnClickListen
}
}
private static class UpdateUnreadCountTask extends AsyncTask<Object, Object, Map<SupportTabSpec, Integer>> {
private static class UpdateUnreadCountTask extends AsyncTask<Object, Object, SparseIntArray> {
private final Context mContext;
private final ReadStateManager mReadStateManager;
private final TabPagerIndicator mIndicator;
private final List<SupportTabSpec> mTabs;
UpdateUnreadCountTask(final Context context, final ReadStateManager manager, final TabPagerIndicator indicator, final List<SupportTabSpec> tabs) {
UpdateUnreadCountTask(final Context context, final ReadStateManager manager,
final TabPagerIndicator indicator, final List<SupportTabSpec> tabs) {
mContext = context;
mReadStateManager = manager;
mIndicator = indicator;
@ -938,25 +936,30 @@ public class HomeActivity extends BaseAppCompatActivity implements OnClickListen
}
@Override
protected Map<SupportTabSpec, Integer> doInBackground(final Object... params) {
final Map<SupportTabSpec, Integer> result = new HashMap<>();
protected SparseIntArray doInBackground(final Object... params) {
final SparseIntArray result = new SparseIntArray();
for (SupportTabSpec spec : mTabs) {
if (spec.type == null) continue;
switch (spec.type) {
case TAB_TYPE_HOME_TIMELINE: {
case CustomTabType.HOME_TIMELINE: {
final long[] accountIds = Utils.getAccountIds(spec.args);
final String tagWithAccounts = Utils.getReadPositionTagWithAccounts(mContext, true, spec.tag, accountIds);
final String tagWithAccounts = Utils.getReadPositionTagWithAccounts(mContext,
true, spec.tag, accountIds);
final long position = mReadStateManager.getPosition(tagWithAccounts);
result.put(spec, DataStoreUtils.getStatusesCount(mContext, Statuses.CONTENT_URI, position, accountIds));
result.put(spec.position, DataStoreUtils.getStatusesCount(mContext,
Statuses.CONTENT_URI, position, accountIds));
break;
}
case TAB_TYPE_ACTIVITIES_ABOUT_ME: {
case CustomTabType.NOTIFICATIONS_TIMELINE: {
final long[] accountIds = Utils.getAccountIds(spec.args);
final String tagWithAccounts = Utils.getReadPositionTagWithAccounts(mContext, true, spec.tag, accountIds);
final String tagWithAccounts = Utils.getReadPositionTagWithAccounts(mContext,
true, spec.tag, accountIds);
final long position = mReadStateManager.getPosition(tagWithAccounts);
result.put(spec, DataStoreUtils.getActivitiesCount(mContext, Activities.AboutMe.CONTENT_URI, position, accountIds));
result.put(spec.position, DataStoreUtils.getActivitiesCount(mContext,
Activities.AboutMe.CONTENT_URI, position, accountIds));
break;
}
case TAB_TYPE_DIRECT_MESSAGES: {
case CustomTabType.DIRECT_MESSAGES: {
break;
}
}
@ -965,11 +968,10 @@ public class HomeActivity extends BaseAppCompatActivity implements OnClickListen
}
@Override
protected void onPostExecute(final Map<SupportTabSpec, Integer> result) {
protected void onPostExecute(final SparseIntArray result) {
mIndicator.clearBadge();
for (Entry<SupportTabSpec, Integer> entry : result.entrySet()) {
final SupportTabSpec key = entry.getKey();
mIndicator.setBadge(key.position, entry.getValue());
for (int i = 0, j = result.size(); i < j; i++) {
mIndicator.setBadge(result.keyAt(i), result.valueAt(i));
}
}

1
twidere/src/main/java/org/mariotaku/twidere/activity/support/RequestPermissionsActivity.java
View File

@ -23,7 +23,6 @@ import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import android.os.Bundle;
import android.text.Html;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.Window;

1
twidere/src/main/java/org/mariotaku/twidere/activity/support/ThemedAppCompatActivity.java
View File

@ -32,7 +32,6 @@ import org.mariotaku.twidere.BuildConfig;
import org.mariotaku.twidere.Constants;
import org.mariotaku.twidere.activity.iface.IAppCompatActivity;
import org.mariotaku.twidere.activity.iface.IThemedActivity;
import org.mariotaku.twidere.util.DebugModeUtils;
import org.mariotaku.twidere.util.StrictModeUtils;
import org.mariotaku.twidere.util.ThemeUtils;
import org.mariotaku.twidere.util.Utils;

1
twidere/src/main/java/org/mariotaku/twidere/activity/support/ThemedFragmentActivity.java
View File

@ -36,7 +36,6 @@ import org.mariotaku.twidere.Constants;
import org.mariotaku.twidere.activity.iface.IThemedActivity;
import org.mariotaku.twidere.util.ActivityTracker;
import org.mariotaku.twidere.util.AsyncTwitterWrapper;
import org.mariotaku.twidere.util.DebugModeUtils;
import org.mariotaku.twidere.util.KeyboardShortcutsHandler;
import org.mariotaku.twidere.util.KeyboardShortcutsHandler.KeyboardShortcutCallback;
import org.mariotaku.twidere.util.MediaLoaderWrapper;

4
twidere/src/main/java/org/mariotaku/twidere/adapter/AbsUserListsAdapter.java
View File

@ -20,7 +20,6 @@
package org.mariotaku.twidere.adapter;
import android.content.Context;
import android.support.annotation.NonNull;
import android.support.v7.widget.CardView;
import android.support.v7.widget.RecyclerView.ViewHolder;
import android.view.LayoutInflater;
@ -30,10 +29,7 @@ import android.view.ViewGroup;
import org.mariotaku.twidere.Constants;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.adapter.iface.IUserListsAdapter;
import org.mariotaku.twidere.util.AsyncTwitterWrapper;
import org.mariotaku.twidere.util.MediaLoaderWrapper;
import org.mariotaku.twidere.util.ThemeUtils;
import org.mariotaku.twidere.util.UserColorNameManager;
import org.mariotaku.twidere.util.Utils;
import org.mariotaku.twidere.view.holder.LoadIndicatorViewHolder;
import org.mariotaku.twidere.view.holder.UserListViewHolder;

3
twidere/src/main/java/org/mariotaku/twidere/adapter/MessageEntriesAdapter.java
View File

@ -32,6 +32,7 @@ import android.view.ViewGroup;
import org.mariotaku.twidere.Constants;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.adapter.iface.IContentCardAdapter;
import org.mariotaku.twidere.annotation.CustomTabType;
import org.mariotaku.twidere.model.StringLongPair;
import org.mariotaku.twidere.provider.TwidereDataStore.DirectMessages.ConversationEntries;
import org.mariotaku.twidere.util.ReadStateManager.OnReadStateChangeListener;
@ -182,7 +183,7 @@ public class MessageEntriesAdapter extends LoadMoreSupportAdapter<ViewHolder> im
}
public void updateReadState() {
mPositionPairs = mReadStateManager.getPositionPairs(TAB_TYPE_DIRECT_MESSAGES);
mPositionPairs = mReadStateManager.getPositionPairs(CustomTabType.DIRECT_MESSAGES);
notifyDataSetChanged();
}

1
twidere/src/main/java/org/mariotaku/twidere/adapter/iface/IStatusesAdapter.java
View File

@ -7,7 +7,6 @@ import org.mariotaku.twidere.model.ParcelableMedia;
import org.mariotaku.twidere.model.ParcelableStatus;
import org.mariotaku.twidere.util.MediaLoadingHandler;
import org.mariotaku.twidere.util.TwidereLinkify;
import org.mariotaku.twidere.view.CardMediaContainer;
import org.mariotaku.twidere.view.CardMediaContainer.PreviewStyle;
import org.mariotaku.twidere.view.holder.GapViewHolder;
import org.mariotaku.twidere.view.holder.iface.IStatusViewHolder;

31
twidere/src/main/java/org/mariotaku/twidere/annotation/CustomTabType.java Normal file
View File

@ -0,0 +1,31 @@
package org.mariotaku.twidere.annotation;
import android.support.annotation.StringDef;
/**
* Created by mariotaku on 16/1/28.
*/
@StringDef({
CustomTabType.HOME_TIMELINE,
CustomTabType.NOTIFICATIONS_TIMELINE,
CustomTabType.TRENDS_SUGGESTIONS,
CustomTabType.DIRECT_MESSAGES,
CustomTabType.FAVORITES,
CustomTabType.USER_TIMELINE,
CustomTabType.SEARCH_STATUSES,
CustomTabType.LIST_TIMELINE,
CustomTabType.ACTIVITIES_BY_FRIENDS,
CustomTabType.RETWEETS_OF_ME,
})
public @interface CustomTabType {
String HOME_TIMELINE = "home_timeline";
String NOTIFICATIONS_TIMELINE = "notifications_timeline";
String TRENDS_SUGGESTIONS = "trends_suggestions";
String DIRECT_MESSAGES = "direct_messages";
String FAVORITES = "favorites";
String USER_TIMELINE = "user_timeline";
String SEARCH_STATUSES = "search_statuses";
String LIST_TIMELINE = "list_timeline";
String ACTIVITIES_BY_FRIENDS = "activities_by_friends";
String RETWEETS_OF_ME = "retweets_of_me";
}

20
twidere/src/main/java/org/mariotaku/twidere/annotation/NotificationType.java Normal file
View File

@ -0,0 +1,20 @@
package org.mariotaku.twidere.annotation;
import android.support.annotation.StringDef;
/**
* Created by mariotaku on 16/1/28.
*/
@StringDef({
NotificationType.INTERACTIONS,
NotificationType.HOME_TIMELINE,
NotificationType.DIRECT_MESSAGES
})
public @interface NotificationType {
@NotificationType
String INTERACTIONS = "interactions";
@NotificationType
String HOME_TIMELINE = "home_timeline";
@NotificationType
String DIRECT_MESSAGES = "direct_messages";
}

17
twidere/src/main/java/org/mariotaku/twidere/annotation/ReadPositionTag.java Normal file
View File

@ -0,0 +1,17 @@
package org.mariotaku.twidere.annotation;
import android.support.annotation.StringDef;
/**
* Created by mariotaku on 16/1/28.
*/
@StringDef({
ReadPositionTag.ACTIVITIES_ABOUT_ME,
ReadPositionTag.HOME_TIMELINE,
ReadPositionTag.DIRECT_MESSAGES,
})
public @interface ReadPositionTag {
String HOME_TIMELINE = "home_timeline";
String ACTIVITIES_ABOUT_ME = "activities_about_me";
String DIRECT_MESSAGES = "direct_messages";
}

64
twidere/src/main/java/org/mariotaku/twidere/fragment/BaseFiltersFragment.java
View File

@ -19,8 +19,6 @@
package org.mariotaku.twidere.fragment;
import android.app.AlertDialog;
import android.app.AlertDialog.Builder;
import android.app.Dialog;
import android.content.BroadcastReceiver;
import android.content.ContentResolver;
@ -39,6 +37,9 @@ import android.support.v4.app.FragmentActivity;
import android.support.v4.app.LoaderManager;
import android.support.v4.content.CursorLoader;
import android.support.v4.content.Loader;
import android.support.v4.widget.SimpleCursorAdapter;
import android.support.v7.app.AlertDialog;
import android.text.TextUtils;
import android.util.SparseBooleanArray;
import android.view.ActionMode;
import android.view.LayoutInflater;
@ -50,7 +51,6 @@ import android.view.ViewGroup;
import android.widget.AbsListView.MultiChoiceModeListener;
import android.widget.AutoCompleteTextView;
import android.widget.ListView;
import android.widget.SimpleCursorAdapter;
import android.widget.TextView;
import org.mariotaku.sqliteqb.library.Columns.Column;
@ -256,19 +256,18 @@ public abstract class BaseFiltersFragment extends AbsContentListViewFragment<Sim
public static final class AddItemFragment extends BaseSupportDialogFragment implements OnClickListener {
private AutoCompleteTextView mEditText;
private android.support.v4.widget.SimpleCursorAdapter mUserAutoCompleteAdapter;
@Override
public void onClick(final DialogInterface dialog, final int which) {
switch (which) {
case DialogInterface.BUTTON_POSITIVE:
if (mEditText.length() <= 0) return;
final String text = getText();
if (TextUtils.isEmpty(text)) return;
final ContentValues values = new ContentValues();
values.put(Filters.VALUE, getText());
values.put(Filters.VALUE, text);
final Bundle args = getArguments();
final Uri uri = args.getParcelable(EXTRA_URI);
assert uri != null;
getContentResolver().insert(uri, values);
break;
}
@ -282,33 +281,44 @@ public abstract class BaseFiltersFragment extends AbsContentListViewFragment<Sim
final Context wrapped = ThemeUtils.getDialogThemedContext(activity);
final AlertDialog.Builder builder = new AlertDialog.Builder(wrapped);
buildDialog(builder);
final View view = LayoutInflater.from(wrapped).inflate(R.layout.dialog_auto_complete_textview, null);
builder.setView(view);
mEditText = (AutoCompleteTextView) view.findViewById(R.id.edit_text);
final Bundle args = getArguments();
final int auto_complete_type = args != null ? args.getInt(EXTRA_AUTO_COMPLETE_TYPE, 0) : 0;
if (auto_complete_type != 0) {
if (auto_complete_type == AUTO_COMPLETE_TYPE_SOURCES) {
mUserAutoCompleteAdapter = new SourceAutoCompleteAdapter(activity);
} else {
final ComposeAutoCompleteAdapter adapter = new ComposeAutoCompleteAdapter(activity);
adapter.setAccountId(Utils.getDefaultAccountId(activity));
mUserAutoCompleteAdapter = adapter;
}
mEditText.setAdapter(mUserAutoCompleteAdapter);
mEditText.setThreshold(1);
}
builder.setView(R.layout.dialog_auto_complete_textview);
builder.setTitle(R.string.add_rule);
builder.setPositiveButton(android.R.string.ok, this);
builder.setNegativeButton(android.R.string.cancel, this);
return builder.create();
final AlertDialog dialog = builder.create();
dialog.setOnShowListener(new DialogInterface.OnShowListener() {
@Override
public void onShow(DialogInterface dialog) {
AlertDialog alertDialog = (AlertDialog) dialog;
final AutoCompleteTextView editText = (AutoCompleteTextView) alertDialog.findViewById(R.id.edit_text);
final Bundle args = getArguments();
final int autoCompleteType;
autoCompleteType = args.getInt(EXTRA_AUTO_COMPLETE_TYPE, 0);
if (autoCompleteType != 0) {
SimpleCursorAdapter mUserAutoCompleteAdapter;
if (autoCompleteType == AUTO_COMPLETE_TYPE_SOURCES) {
mUserAutoCompleteAdapter = new SourceAutoCompleteAdapter(activity);
} else {
final ComposeAutoCompleteAdapter adapter = new ComposeAutoCompleteAdapter(activity);
adapter.setAccountId(Utils.getDefaultAccountId(activity));
mUserAutoCompleteAdapter = adapter;
}
editText.setAdapter(mUserAutoCompleteAdapter);
editText.setThreshold(1);
}
}
});
return dialog;
}
protected String getText() {
return ParseUtils.parseString(mEditText.getText());
AlertDialog alertDialog = (AlertDialog) getDialog();
final AutoCompleteTextView editText = (AutoCompleteTextView) alertDialog.findViewById(R.id.edit_text);
return ParseUtils.parseString(editText.getText());
}
private void buildDialog(final Builder builder) {
private void buildDialog(final AlertDialog.Builder builder) {
}
}

4
twidere/src/main/java/org/mariotaku/twidere/fragment/CustomTabsFragment.java
View File

@ -61,6 +61,7 @@ import org.mariotaku.sqliteqb.library.RawItemArray;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.activity.SettingsActivity;
import org.mariotaku.twidere.activity.support.CustomTabEditorActivity;
import org.mariotaku.twidere.annotation.CustomTabType;
import org.mariotaku.twidere.model.CustomTabConfiguration;
import org.mariotaku.twidere.model.CustomTabConfiguration.CustomTabConfigurationComparator;
import org.mariotaku.twidere.provider.TwidereDataStore.Tabs;
@ -234,8 +235,7 @@ public class CustomTabsFragment extends BaseFragment implements LoaderCallbacks<
final String type = entry.getKey();
final CustomTabConfiguration conf = entry.getValue();
final boolean isOfficialKeyAccountRequired = TAB_TYPE_ACTIVITIES_ABOUT_ME.equals(type)
|| TAB_TYPE_ACTIVITIES_BY_FRIENDS.equals(type);
final boolean isOfficialKeyAccountRequired = CustomTabType.ACTIVITIES_BY_FRIENDS.equals(type);
final boolean accountIdRequired = conf.getAccountRequirement() == CustomTabConfiguration.ACCOUNT_REQUIRED;
final Intent intent = new Intent(INTENT_ACTION_ADD_TAB);

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

@ -43,6 +43,7 @@ import com.squareup.otto.Subscribe;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.adapter.AbsActivitiesAdapter;
import org.mariotaku.twidere.adapter.decorator.DividerItemDecoration;
import org.mariotaku.twidere.annotation.ReadPositionTag;
import org.mariotaku.twidere.loader.iface.IExtendedLoader;
import org.mariotaku.twidere.model.ParcelableActivity;
import org.mariotaku.twidere.model.ParcelableMedia;
@ -475,6 +476,8 @@ public abstract class AbsActivitiesFragment<Data> extends AbsContentListRecycler
adapter.setData(data);
}
@ReadPositionTag
@Nullable
protected String getReadPositionTag() {
return null;
}

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

@ -47,6 +47,7 @@ import com.squareup.otto.Subscribe;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.adapter.AbsStatusesAdapter;
import org.mariotaku.twidere.adapter.iface.IStatusesAdapter.StatusAdapterListener;
import org.mariotaku.twidere.annotation.ReadPositionTag;
import org.mariotaku.twidere.loader.iface.IExtendedLoader;
import org.mariotaku.twidere.model.ParcelableMedia;
import org.mariotaku.twidere.model.ParcelableStatus;
@ -509,6 +510,8 @@ public abstract class AbsStatusesFragment<Data> extends AbsContentListRecyclerVi
adapter.setData(data);
}
@ReadPositionTag
@Nullable
protected String getReadPositionTag() {
return null;
}

2
twidere/src/main/java/org/mariotaku/twidere/fragment/support/AbsUserListsFragment.java
View File

@ -70,8 +70,6 @@ abstract class AbsUserListsFragment<Data> extends AbsContentListRecyclerViewFrag
@Override
public void onActivityCreated(@Nullable Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
final FragmentActivity activity = getActivity();
final AbsUserListsAdapter<Data> adapter = getAdapter();
final RecyclerView recyclerView = getRecyclerView();
final LinearLayoutManager layoutManager = getLayoutManager();

2
twidere/src/main/java/org/mariotaku/twidere/fragment/support/AbsUsersFragment.java
View File

@ -69,8 +69,6 @@ abstract class AbsUsersFragment<Data> extends AbsContentListRecyclerViewFragment
@Override
public void onActivityCreated(@Nullable Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
final FragmentActivity activity = getActivity();
final AbsUsersAdapter<Data> adapter = getAdapter();
final RecyclerView recyclerView = getRecyclerView();
final LinearLayoutManager layoutManager = getLayoutManager();

1
twidere/src/main/java/org/mariotaku/twidere/fragment/support/AccountsDashboardFragment.java
View File

@ -414,7 +414,6 @@ public class AccountsDashboardFragment extends BaseSupportFragment implements Lo
final View view = getView();
assert view != null;
final Context context = view.getContext();
final TwidereApplication application = TwidereApplication.getInstance(context);
mListView.setItemsCanFocus(true);
mAdapter = new MergeAdapter();
final LayoutInflater inflater = getLayoutInflater(savedInstanceState);

6
twidere/src/main/java/org/mariotaku/twidere/fragment/support/ActivitiesAboutMeFragment.java
View File

@ -23,8 +23,10 @@ import android.content.Context;
import android.net.Uri;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import org.mariotaku.twidere.adapter.ParcelableActivitiesAdapter;
import org.mariotaku.twidere.annotation.ReadPositionTag;
import org.mariotaku.twidere.provider.TwidereDataStore.Activities;
import edu.tsinghua.hotmobi.model.TimelineType;
@ -78,9 +80,11 @@ public class ActivitiesAboutMeFragment extends CursorActivitiesFragment {
return adapter;
}
@Nullable
@Override
@ReadPositionTag
protected String getReadPositionTag() {
return READ_POSITION_TAG_ACTIVITIES_ABOUT_ME;
return ReadPositionTag.ACTIVITIES_ABOUT_ME;
}
@Override

102
twidere/src/main/java/org/mariotaku/twidere/fragment/support/AddUserListMemberDialogFragment.java
View File

@ -1,102 +0,0 @@
/*
* Twidere - Twitter client for Android
*
* Copyright (C) 2012-2014 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.fragment.support;
import android.support.v7.app.AlertDialog;
import android.app.Dialog;
import android.content.Context;
import android.content.DialogInterface;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v4.app.FragmentManager;
import android.text.InputFilter;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.AutoCompleteTextView;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.adapter.ComposeAutoCompleteAdapter;
import org.mariotaku.twidere.util.AsyncTwitterWrapper;
import org.mariotaku.twidere.util.ParseUtils;
import org.mariotaku.twidere.util.ThemeUtils;
public class AddUserListMemberDialogFragment extends BaseSupportDialogFragment implements
DialogInterface.OnClickListener {
public static final String FRAGMENT_TAG = "add_user_list_member";
private AutoCompleteTextView mEditText;
private ComposeAutoCompleteAdapter mUserAutoCompleteAdapter;
@Override
public void onClick(final DialogInterface dialog, final int which) {
final Bundle args = getArguments();
if (args == null || !args.containsKey(EXTRA_ACCOUNT_ID) || !args.containsKey(EXTRA_LIST_ID) || !args.containsKey(EXTRA_USERS))
return;
switch (which) {
case DialogInterface.BUTTON_POSITIVE: {
final String mText = ParseUtils.parseString(mEditText.getText());
final AsyncTwitterWrapper twitter = mTwitterWrapper;
if (mText == null || mText.length() <= 0 || twitter == null) return;
twitter.addUserListMembersAsync(args.getLong(EXTRA_ACCOUNT_ID), args.getLong(EXTRA_LIST_ID));
break;
}
}
}
@NonNull
@Override
public Dialog onCreateDialog(final Bundle savedInstanceState) {
final Context wrapped = ThemeUtils.getDialogThemedContext(getActivity());
final AlertDialog.Builder builder = new AlertDialog.Builder(wrapped);
final View view = LayoutInflater.from(wrapped).inflate(R.layout.dialog_auto_complete_textview, null);
builder.setView(view);
mEditText = (AutoCompleteTextView) view.findViewById(R.id.edit_text);
if (savedInstanceState != null) {
mEditText.setText(savedInstanceState.getCharSequence(EXTRA_TEXT));
}
mUserAutoCompleteAdapter = new ComposeAutoCompleteAdapter(wrapped);
final Bundle args = getArguments();
mUserAutoCompleteAdapter.setAccountId(args.getLong(EXTRA_ACCOUNT_ID));
mEditText.setAdapter(mUserAutoCompleteAdapter);
mEditText.setThreshold(1);
mEditText.setFilters(new InputFilter[]{new InputFilter.LengthFilter(20)});
builder.setTitle(R.string.screen_name);
builder.setPositiveButton(android.R.string.ok, this);
builder.setNegativeButton(android.R.string.cancel, this);
return builder.create();
}
@Override
public void onSaveInstanceState(final Bundle outState) {
outState.putCharSequence(EXTRA_TEXT, mEditText.getText());
super.onSaveInstanceState(outState);
}
public static AddUserListMemberDialogFragment show(final FragmentManager fm, final long accountId, final long listId) {
final Bundle args = new Bundle();
args.putLong(EXTRA_ACCOUNT_ID, accountId);
args.putLong(EXTRA_LIST_ID, listId);
final AddUserListMemberDialogFragment f = new AddUserListMemberDialogFragment();
f.setArguments(args);
f.show(fm, FRAGMENT_TAG);
return f;
}
}

72
twidere/src/main/java/org/mariotaku/twidere/fragment/support/CreateUserListDialogFragment.java
View File

@ -20,13 +20,11 @@
package org.mariotaku.twidere.fragment.support;
import android.app.Dialog;
import android.content.Context;
import android.content.DialogInterface;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v7.app.AlertDialog;
import android.view.LayoutInflater;
import android.view.View;
import android.text.TextUtils;
import android.widget.CheckBox;
import com.rengwuxian.materialedittext.MaterialEditText;
@ -34,27 +32,24 @@ import com.rengwuxian.materialedittext.MaterialEditText;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.text.validator.UserListNameValidator;
import org.mariotaku.twidere.util.ParseUtils;
import org.mariotaku.twidere.util.ThemeUtils;
public class CreateUserListDialogFragment extends BaseSupportDialogFragment implements DialogInterface.OnClickListener {
private MaterialEditText mEditName, mEditDescription;
private CheckBox mPublicCheckBox;
private String mName, mDescription;
private long mAccountId;
private long mListId;
private boolean mIsPublic = true;
@Override
public void onClick(final DialogInterface dialog, final int which) {
if (mAccountId <= 0) return;
switch (which) {
case DialogInterface.BUTTON_POSITIVE: {
mName = ParseUtils.parseString(mEditName.getText());
mDescription = ParseUtils.parseString(mEditDescription.getText());
mIsPublic = mPublicCheckBox.isChecked();
if (mName == null || mName.length() <= 0) return;
mTwitterWrapper.createUserListAsync(mAccountId, mName, mIsPublic, mDescription);
final AlertDialog alertDialog = (AlertDialog) dialog;
final Bundle args = getArguments();
final long accountId = args.getLong(EXTRA_ACCOUNT_ID, -1);
final MaterialEditText mEditName = (MaterialEditText) alertDialog.findViewById(R.id.name);
final MaterialEditText mEditDescription = (MaterialEditText) alertDialog.findViewById(R.id.description);
final CheckBox mPublicCheckBox = (CheckBox) alertDialog.findViewById(R.id.is_public);
final String name = ParseUtils.parseString(mEditName.getText());
final String description = ParseUtils.parseString(mEditDescription.getText());
final boolean isPublic = mPublicCheckBox.isChecked();
if (TextUtils.isEmpty(name)) return;
mTwitterWrapper.createUserListAsync(accountId, name, isPublic, description);
break;
}
}
@ -64,37 +59,24 @@ public class CreateUserListDialogFragment extends BaseSupportDialogFragment impl
@NonNull
@Override
public Dialog onCreateDialog(final Bundle savedInstanceState) {
final Bundle bundle = savedInstanceState == null ? getArguments() : savedInstanceState;
mAccountId = bundle != null ? bundle.getLong(EXTRA_ACCOUNT_ID, -1) : -1;
final Context wrapped = ThemeUtils.getDialogThemedContext(getActivity());
final AlertDialog.Builder builder = new AlertDialog.Builder(wrapped);
final View view = LayoutInflater.from(wrapped).inflate(R.layout.dialog_user_list_detail_editor, null);
builder.setView(view);
mEditName = (MaterialEditText) view.findViewById(R.id.name);
mEditName.addValidator(new UserListNameValidator(getString(R.string.invalid_list_name)));
mEditDescription = (MaterialEditText) view.findViewById(R.id.description);
mPublicCheckBox = (CheckBox) view.findViewById(R.id.is_public);
if (mName != null) {
mEditName.setText(mName);
}
if (mDescription != null) {
mEditDescription.setText(mDescription);
}
mPublicCheckBox.setChecked(mIsPublic);
final AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
builder.setView(R.layout.dialog_user_list_detail_editor);
builder.setTitle(R.string.new_user_list);
builder.setPositiveButton(android.R.string.ok, this);
builder.setNegativeButton(android.R.string.cancel, this);
return builder.create();
}
@Override
public void onSaveInstanceState(final Bundle outState) {
outState.putLong(EXTRA_ACCOUNT_ID, mAccountId);
outState.putLong(EXTRA_LIST_ID, mListId);
outState.putString(EXTRA_LIST_NAME, mName);
outState.putString(EXTRA_DESCRIPTION, mDescription);
outState.putBoolean(EXTRA_IS_PUBLIC, mIsPublic);
super.onSaveInstanceState(outState);
final AlertDialog dialog = builder.create();
dialog.setOnShowListener(new DialogInterface.OnShowListener() {
@Override
public void onShow(DialogInterface dialog) {
final AlertDialog alertDialog = (AlertDialog) dialog;
MaterialEditText editName = (MaterialEditText) alertDialog.findViewById(R.id.name);
MaterialEditText editDescription = (MaterialEditText) alertDialog.findViewById(R.id.description);
CheckBox publicCheckBox = (CheckBox) alertDialog.findViewById(R.id.is_public);
editName.addValidator(new UserListNameValidator(getString(R.string.invalid_list_name)));
}
});
return dialog;
}
}

1
twidere/src/main/java/org/mariotaku/twidere/fragment/support/DraftsFragment.java
View File

@ -27,7 +27,6 @@ import android.content.Context;
import android.content.DialogInterface;
import android.content.DialogInterface.OnClickListener;
import android.content.Intent;
import android.content.SharedPreferences;
import android.database.Cursor;
import android.net.Uri;
import android.os.AsyncTask;

4
twidere/src/main/java/org/mariotaku/twidere/fragment/support/HomeTimelineFragment.java
View File

@ -23,6 +23,7 @@ import android.net.Uri;
import android.support.annotation.NonNull;
import android.support.v4.app.FragmentActivity;
import org.mariotaku.twidere.annotation.ReadPositionTag;
import org.mariotaku.twidere.provider.TwidereDataStore.Statuses;
import org.mariotaku.twidere.util.AsyncTwitterWrapper;
@ -89,8 +90,9 @@ public class HomeTimelineFragment extends CursorStatusesFragment {
}
@Override
@ReadPositionTag
protected String getReadPositionTag() {
return TAB_TYPE_HOME_TIMELINE;
return ReadPositionTag.HOME_TIMELINE;
}
}

4
twidere/src/main/java/org/mariotaku/twidere/fragment/support/MessagesConversationFragment.java
View File

@ -81,6 +81,7 @@ import org.mariotaku.twidere.adapter.AccountsSpinnerAdapter;
import org.mariotaku.twidere.adapter.MessageConversationAdapter;
import org.mariotaku.twidere.adapter.SimpleParcelableUsersAdapter;
import org.mariotaku.twidere.adapter.iface.IBaseCardAdapter.MenuButtonClickListener;
import org.mariotaku.twidere.annotation.CustomTabType;
import org.mariotaku.twidere.loader.support.UserSearchLoader;
import org.mariotaku.twidere.model.ParcelableAccount;
import org.mariotaku.twidere.model.ParcelableCredentials;
@ -857,6 +858,7 @@ public class MessagesConversationFragment extends BaseSupportFragment implements
CachedUsers.BASIC_COLUMNS, selection != null ? selection.getSQL() : null,
selectionArgs, orderBy.getSQL());
final ParcelableUserCursorIndices i = new ParcelableUserCursorIndices(c);
assert c != null;
c.moveToFirst();
while (!c.isAfterLast()) {
cachedList.add(i.newObject(c));
@ -929,7 +931,7 @@ public class MessagesConversationFragment extends BaseSupportFragment implements
if (cursor.moveToFirst()) {
final int messageIdIdx = cursor.getColumnIndex(ConversationEntries.MESSAGE_ID);
final String key = mAccount.account_id + "-" + mRecipient.id;
mReadStateManager.setPosition(TAB_TYPE_DIRECT_MESSAGES, key, cursor.getLong(messageIdIdx), false);
mReadStateManager.setPosition(CustomTabType.DIRECT_MESSAGES, key, cursor.getLong(messageIdIdx), false);
}
cursor.close();
}

59
twidere/src/main/java/org/mariotaku/twidere/fragment/support/PhishingLinkWarningDialogFragment.java
View File

@ -19,50 +19,45 @@
package org.mariotaku.twidere.fragment.support;
import android.support.v7.app.AlertDialog;
import android.app.Dialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.DialogInterface.OnClickListener;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.view.LayoutInflater;
import android.support.v7.app.AlertDialog;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.util.ThemeUtils;
public class PhishingLinkWarningDialogFragment extends BaseSupportDialogFragment implements OnClickListener {
@Override
public void onClick(final DialogInterface dialog, final int which) {
switch (which) {
case DialogInterface.BUTTON_POSITIVE: {
final Bundle args = getArguments();
if (args == null) return;
final Uri uri = args.getParcelable(EXTRA_URI);
if (uri == null) return;
final Intent intent = new Intent(Intent.ACTION_VIEW);
intent.setData(uri);
startActivity(intent);
break;
}
}
}
@NonNull
@Override
public Dialog onCreateDialog(final Bundle savedInstanceState) {
final Context wrapped = ThemeUtils.getDialogThemedContext(getActivity());
final AlertDialog.Builder builder = new AlertDialog.Builder(wrapped);
final LayoutInflater inflater = LayoutInflater.from(wrapped);
builder.setTitle(android.R.string.dialog_alert_title);
builder.setView(inflater.inflate(R.layout.dialog_phishing_link_warning, null));
builder.setPositiveButton(android.R.string.ok, this);
builder.setNegativeButton(android.R.string.cancel, null);
return builder.create();
}
public void onClick(final DialogInterface dialog, final int which) {
switch (which) {
case DialogInterface.BUTTON_POSITIVE: {
final Bundle args = getArguments();
if (args == null) return;
final Uri uri = args.getParcelable(EXTRA_URI);
if (uri == null) return;
final Intent intent = new Intent(Intent.ACTION_VIEW);
intent.setData(uri);
startActivity(intent);
break;
}
}
}
@NonNull
@Override
public Dialog onCreateDialog(final Bundle savedInstanceState) {
final AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
builder.setTitle(android.R.string.dialog_alert_title);
builder.setView(R.layout.dialog_phishing_link_warning);
builder.setPositiveButton(android.R.string.ok, this);
builder.setNegativeButton(android.R.string.cancel, null);
return builder.create();
}
}

1
twidere/src/main/java/org/mariotaku/twidere/fragment/support/SetUserNicknameDialogFragment.java
View File

@ -35,7 +35,6 @@ import android.widget.FrameLayout;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.util.ParseUtils;
import org.mariotaku.twidere.util.ThemeUtils;
import org.mariotaku.twidere.util.UserColorNameManager;
public class SetUserNicknameDialogFragment extends BaseSupportDialogFragment implements OnClickListener {

1
twidere/src/main/java/org/mariotaku/twidere/fragment/support/SupportMessageDialogFragment.java
View File

@ -23,7 +23,6 @@ import android.app.AlertDialog;
import android.app.Dialog;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v4.app.DialogFragment;
import android.support.v4.app.FragmentActivity;
/**

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

@ -20,7 +20,6 @@
package org.mariotaku.twidere.fragment.support;
import android.content.Context;
import android.content.SharedPreferences;
import android.database.Cursor;
import android.net.Uri;
import android.os.Bundle;
@ -39,8 +38,8 @@ import org.mariotaku.twidere.provider.TwidereDataStore.CachedTrends;
import org.mariotaku.twidere.util.AsyncTwitterWrapper;
import org.mariotaku.twidere.util.message.TaskStateChangedEvent;
import static org.mariotaku.twidere.util.Utils.getDefaultAccountId;
import static org.mariotaku.twidere.util.DataStoreUtils.getTableNameByUri;
import static org.mariotaku.twidere.util.Utils.getDefaultAccountId;
import static org.mariotaku.twidere.util.Utils.openTweetSearch;
public class TrendsSuggestionsFragment extends AbsContentListViewFragment<TrendsAdapter>

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

@ -414,6 +414,7 @@ public class UserFragment extends BaseSupportFragment implements OnClickListener
return;
}
final SupportTabSpec spec = mPagerAdapter.getTab(mViewPager.getCurrentItem());
assert spec.type != null;
switch (spec.type) {
case TAB_TYPE_STATUSES: {
actionBar.setSubtitle(getResources().getQuantityString(R.plurals.N_statuses,
@ -1637,7 +1638,7 @@ public class UserFragment extends BaseSupportFragment implements OnClickListener
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
@Override
public void getOutline(Outline outline) {
public void getOutline(@NonNull Outline outline) {
mColorDrawable.getOutline(outline);
outline.setAlpha(mFactor * mOutlineAlphaFactor * 0.99f);
}

3
twidere/src/main/java/org/mariotaku/twidere/graphic/ActionBarColorDrawable.java
View File

@ -23,6 +23,7 @@ import android.annotation.TargetApi;
import android.graphics.Outline;
import android.graphics.Rect;
import android.os.Build;
import android.support.annotation.NonNull;
/**
* Created by mariotaku on 14/12/8.
@ -38,7 +39,7 @@ public class ActionBarColorDrawable extends ActionBarColorDrawableBase {
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
@Override
public void getOutline(Outline outline) {
public void getOutline(@NonNull Outline outline) {
if (!isOutlineEnabled()) return;
final Rect bounds = getBounds();
// Very very dirty hack to make outline shadow in action bar not visible beneath status bar

1
twidere/src/main/java/org/mariotaku/twidere/loader/support/CursorSupportUsersLoader.java
View File

@ -42,6 +42,7 @@ public abstract class CursorSupportUsersLoader extends BaseCursorSupportUsersLoa
protected abstract PageableResponseList<User> getCursoredUsers(@NonNull Twitter twitter, Paging paging)
throws TwitterException;
@NonNull
@Override
protected final List<User> getUsers(@NonNull final Twitter twitter) throws TwitterException {
final Paging paging = new Paging();

3
twidere/src/main/java/org/mariotaku/twidere/loader/support/IDsUsersLoader.java
View File

@ -39,6 +39,7 @@ public abstract class IDsUsersLoader extends BaseCursorSupportUsersLoader {
super(context, accountId, cursor, data, fromUser);
}
@NonNull
@Override
public List<User> getUsers(@NonNull final Twitter twitter) throws TwitterException {
final Paging paging = new Paging();
@ -47,11 +48,11 @@ public abstract class IDsUsersLoader extends BaseCursorSupportUsersLoader {
paging.setCursor(getCursor());
}
final IDs ids = getIDs(twitter, paging);
if (ids == null) return null;
setCursorIds(ids);
return twitter.lookupUsers(ids.getIDs());
}
@NonNull
protected abstract IDs getIDs(@NonNull Twitter twitter, Paging paging) throws TwitterException;
}

1
twidere/src/main/java/org/mariotaku/twidere/loader/support/IncomingFriendshipsLoader.java
View File

@ -37,6 +37,7 @@ public class IncomingFriendshipsLoader extends IDsUsersLoader {
super(context, accountId, maxId, data, fromUser);
}
@NonNull
@Override
protected IDs getIDs(@NonNull final Twitter twitter, final Paging paging) throws TwitterException {
return twitter.getIncomingFriendships(paging);

1
twidere/src/main/java/org/mariotaku/twidere/loader/support/StatusFavoritersLoader.java
View File

@ -41,6 +41,7 @@ public class StatusFavoritersLoader extends IDsUsersLoader {
mStatusId = statusId;
}
@NonNull
@Override
protected IDs getIDs(@NonNull final Twitter twitter, final Paging paging) throws TwitterException {
return twitter.getStatusActivitySummary(mStatusId).getFavoriters();

1
twidere/src/main/java/org/mariotaku/twidere/loader/support/StatusRetweetersLoader.java
View File

@ -40,6 +40,7 @@ public class StatusRetweetersLoader extends IDsUsersLoader {
mStatusId = statusId;
}
@NonNull
@Override
protected IDs getIDs(@NonNull final Twitter twitter, final Paging paging) throws TwitterException {
return twitter.getRetweetersIDs(mStatusId, paging);

1
twidere/src/main/java/org/mariotaku/twidere/loader/support/TwitterAPIStatusesLoader.java
View File

@ -101,7 +101,6 @@ public abstract class TwitterAPIStatusesLoader extends ParcelableStatusesLoader
final Twitter twitter = getTwitter();
if (twitter == null) return null;
final List<Status> statuses;
final boolean truncated;
final Context context = getContext();
final SharedPreferences prefs = context.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_PRIVATE);
final int loadItemLimit = prefs.getInt(KEY_LOAD_ITEM_LIMIT, DEFAULT_LOAD_ITEM_LIMIT);

2
twidere/src/main/java/org/mariotaku/twidere/loader/support/TwitterAPIUsersLoader.java
View File

@ -49,7 +49,6 @@ public abstract class TwitterAPIUsersLoader extends ParcelableUsersLoader {
final List<User> users;
try {
users = getUsers(twitter);
if (users == null) return data;
} catch (final TwitterException e) {
Log.w(LOGTAG, e);
return data;
@ -66,5 +65,6 @@ public abstract class TwitterAPIUsersLoader extends ParcelableUsersLoader {
return data;
}
@NonNull
protected abstract List<User> getUsers(@NonNull Twitter twitter) throws TwitterException;
}

2
twidere/src/main/java/org/mariotaku/twidere/loader/support/UserSearchLoader.java
View File

@ -50,9 +50,9 @@ public class UserSearchLoader extends TwitterAPIUsersLoader {
return mQuery;
}
@NonNull
@Override
public List<User> getUsers(@NonNull final Twitter twitter) throws TwitterException {
if (twitter == null) return null;
final Paging paging = new Paging();
paging.page(mPage);
return twitter.searchUsers(mQuery, paging);

28
twidere/src/main/java/org/mariotaku/twidere/model/SupportTabSpec.java
View File

@ -21,9 +21,12 @@ package org.mariotaku.twidere.model;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.mariotaku.twidere.TwidereConstants;
import org.mariotaku.twidere.annotation.CustomTabType;
import static org.mariotaku.twidere.util.CompareUtils.bundleEquals;
import static org.mariotaku.twidere.util.CompareUtils.classEquals;
@ -33,6 +36,8 @@ public class SupportTabSpec implements Comparable<SupportTabSpec>, TwidereConsta
public CharSequence name;
public final Object icon;
@CustomTabType
@Nullable
public final String type;
public final Class<? extends Fragment> cls;
public final Bundle args;
@ -44,8 +49,9 @@ public class SupportTabSpec implements Comparable<SupportTabSpec>, TwidereConsta
this(name, icon, null, cls, args, position, tag);
}
public SupportTabSpec(final String name, final Object icon, final String type, final Class<? extends Fragment> cls,
final Bundle args, final int position, final String tag) {
public SupportTabSpec(final String name, final Object icon, @CustomTabType @Nullable final String type,
final Class<? extends Fragment> cls, final Bundle args, final int position,
final String tag) {
if (cls == null) throw new IllegalArgumentException("Fragment cannot be null!");
if (name == null && icon == null)
throw new IllegalArgumentException("You must specify a name or icon for this tab!");
@ -73,15 +79,15 @@ public class SupportTabSpec implements Comparable<SupportTabSpec>, TwidereConsta
@Override
public String toString() {
return "SupportTabSpec{" +
"name='" + name + '\'' +
", icon=" + icon +
", type='" + type + '\'' +
", cls=" + cls +
", args=" + args +
", position=" + position +
", tag='" + tag + '\'' +
'}';
return new ToStringBuilder(this)
.append("name", name)
.append("icon", icon)
.append("type", type)
.append("cls", cls)
.append("args", args)
.append("position", position)
.append("tag", tag)
.toString();
}
}

1
twidere/src/main/java/org/mariotaku/twidere/model/util/ParcelableStatusUtils.java
View File

@ -2,7 +2,6 @@ package org.mariotaku.twidere.model.util;
import android.support.annotation.NonNull;
import org.mariotaku.twidere.api.twitter.model.Status;
import org.mariotaku.twidere.model.ParcelableStatus;
/**

1
twidere/src/main/java/org/mariotaku/twidere/preference/AutoFixSwitchPreference.java
View File

@ -22,7 +22,6 @@ package org.mariotaku.twidere.preference;
import android.content.Context;
import android.content.SharedPreferences;
import android.util.AttributeSet;
import android.view.View;
import org.jraf.android.backport.switchwidget.SwitchPreference;

2
twidere/src/main/java/org/mariotaku/twidere/preference/TranslationDestinationPreference.java
View File

@ -51,8 +51,6 @@ import org.mariotaku.twidere.api.twitter.Twitter;
import org.mariotaku.twidere.api.twitter.TwitterException;
import org.mariotaku.twidere.api.twitter.model.Language;
import static org.mariotaku.twidere.util.TwitterAPIFactory.getDefaultTwitterInstance;
public class TranslationDestinationPreference extends Preference implements Constants, OnClickListener {
private SharedPreferences mPreferences;

86
twidere/src/main/java/org/mariotaku/twidere/provider/TwidereDataProvider.java
View File

@ -75,6 +75,9 @@ import org.mariotaku.twidere.BuildConfig;
import org.mariotaku.twidere.Constants;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.activity.support.HomeActivity;
import org.mariotaku.twidere.annotation.CustomTabType;
import org.mariotaku.twidere.annotation.NotificationType;
import org.mariotaku.twidere.annotation.ReadPositionTag;
import org.mariotaku.twidere.app.TwidereApplication;
import org.mariotaku.twidere.model.AccountPreferences;
import org.mariotaku.twidere.model.ActivityTitleSummaryMessage;
@ -184,14 +187,14 @@ public final class TwidereDataProvider extends ContentProvider implements Consta
};
private static PendingIntent getMarkReadDeleteIntent(Context context, String type, long accountId,
long position, boolean extraUserFollowing) {
private static PendingIntent getMarkReadDeleteIntent(Context context, @NotificationType String type,
long accountId, long position, boolean extraUserFollowing) {
return getMarkReadDeleteIntent(context, type, accountId, position, -1, -1, extraUserFollowing);
}
private static PendingIntent getMarkReadDeleteIntent(Context context, String type, long accountId,
long position, long extraId, long extraUserId,
boolean extraUserFollowing) {
private static PendingIntent getMarkReadDeleteIntent(Context context, @NotificationType String type,
long accountId, long position, long extraId,
long extraUserId, boolean extraUserFollowing) {
// Setup delete intent
final Intent intent = new Intent(context, NotificationReceiver.class);
intent.setAction(BROADCAST_NOTIFICATION_DELETED);
@ -211,17 +214,18 @@ public final class TwidereDataProvider extends ContentProvider implements Consta
return PendingIntent.getBroadcast(context, 0, intent, 0);
}
private static PendingIntent getMarkReadDeleteIntent(Context context, String type, long accountId, StringLongPair[] positions) {
private static PendingIntent getMarkReadDeleteIntent(Context context, @NotificationType String notificationType,
long accountId, StringLongPair[] positions) {
// Setup delete intent
final Intent intent = new Intent(context, NotificationReceiver.class);
final Uri.Builder linkBuilder = new Uri.Builder();
linkBuilder.scheme(SCHEME_TWIDERE);
linkBuilder.authority(AUTHORITY_NOTIFICATIONS);
linkBuilder.appendPath(type);
linkBuilder.appendPath(notificationType);
linkBuilder.appendQueryParameter(QUERY_PARAM_ACCOUNT_ID, String.valueOf(accountId));
linkBuilder.appendQueryParameter(QUERY_PARAM_READ_POSITIONS, StringLongPair.toString(positions));
linkBuilder.appendQueryParameter(QUERY_PARAM_TIMESTAMP, String.valueOf(System.currentTimeMillis()));
linkBuilder.appendQueryParameter(QUERY_PARAM_NOTIFICATION_TYPE, type);
linkBuilder.appendQueryParameter(QUERY_PARAM_NOTIFICATION_TYPE, notificationType);
intent.setData(linkBuilder.build());
return PendingIntent.getBroadcast(context, 0, intent, 0);
}
@ -586,18 +590,23 @@ public final class TwidereDataProvider extends ContentProvider implements Consta
public ParcelFileDescriptor openFile(@NonNull final Uri uri, @NonNull final String mode) throws FileNotFoundException {
final int table_id = DataStoreUtils.getTableId(uri);
final String table = DataStoreUtils.getTableNameById(table_id);
final int mode_code;
if ("r".equals(mode)) {
mode_code = ParcelFileDescriptor.MODE_READ_ONLY;
} else if ("rw".equals(mode)) {
mode_code = ParcelFileDescriptor.MODE_READ_WRITE;
} else if ("rwt".equals(mode)) {
mode_code = ParcelFileDescriptor.MODE_READ_WRITE | ParcelFileDescriptor.MODE_TRUNCATE;
} else
throw new IllegalArgumentException();
if (mode_code == ParcelFileDescriptor.MODE_READ_ONLY) {
final int modeCode;
switch (mode) {
case "r":
modeCode = ParcelFileDescriptor.MODE_READ_ONLY;
break;
case "rw":
modeCode = ParcelFileDescriptor.MODE_READ_WRITE;
break;
case "rwt":
modeCode = ParcelFileDescriptor.MODE_READ_WRITE | ParcelFileDescriptor.MODE_TRUNCATE;
break;
default:
throw new IllegalArgumentException();
}
if (modeCode == ParcelFileDescriptor.MODE_READ_ONLY) {
checkReadPermission(table_id, table, null);
} else if ((mode_code & ParcelFileDescriptor.MODE_READ_WRITE) != 0) {
} else if ((modeCode & ParcelFileDescriptor.MODE_READ_WRITE) != 0) {
checkReadPermission(table_id, table, null);
checkWritePermission(table_id, table);
}
@ -1181,7 +1190,7 @@ public final class TwidereDataProvider extends ContentProvider implements Consta
DataStoreUtils.getAccountIds(context));
for (final AccountPreferences pref : prefs) {
if (!pref.isHomeTimelineNotificationEnabled()) continue;
showTimelineNotification(pref, getPositionTag(TAB_TYPE_HOME_TIMELINE, pref.getAccountId()));
showTimelineNotification(pref, getPositionTag(CustomTabType.HOME_TIMELINE, pref.getAccountId()));
}
notifyUnreadCountChanged(NOTIFICATION_ID_HOME_TIMELINE);
break;
@ -1192,7 +1201,7 @@ public final class TwidereDataProvider extends ContentProvider implements Consta
final boolean combined = mPreferences.getBoolean(KEY_COMBINED_NOTIFICATIONS);
for (final AccountPreferences pref : prefs) {
if (!pref.isInteractionsNotificationEnabled()) continue;
showInteractionsNotification(pref, getPositionTag(READ_POSITION_TAG_ACTIVITIES_ABOUT_ME,
showInteractionsNotification(pref, getPositionTag(ReadPositionTag.ACTIVITIES_ABOUT_ME,
pref.getAccountId()), combined);
}
notifyUnreadCountChanged(NOTIFICATION_ID_INTERACTIONS_TIMELINE);
@ -1203,7 +1212,7 @@ public final class TwidereDataProvider extends ContentProvider implements Consta
DataStoreUtils.getAccountIds(context));
for (final AccountPreferences pref : prefs) {
if (!pref.isDirectMessagesNotificationEnabled()) continue;
final StringLongPair[] pairs = mReadStateManager.getPositionPairs(TAB_TYPE_DIRECT_MESSAGES);
final StringLongPair[] pairs = mReadStateManager.getPositionPairs(CustomTabType.DIRECT_MESSAGES);
showMessagesNotification(pref, pairs, valuesArray);
}
notifyUnreadCountChanged(NOTIFICATION_ID_DIRECT_MESSAGES);
@ -1276,9 +1285,10 @@ public final class TwidereDataProvider extends ContentProvider implements Consta
builder.setContentTitle(notificationTitle);
builder.setContentText(notificationContent);
builder.setCategory(NotificationCompat.CATEGORY_SOCIAL);
builder.setContentIntent(getContentIntent(context, AUTHORITY_HOME, accountId));
builder.setDeleteIntent(getMarkReadDeleteIntent(context, AUTHORITY_HOME, accountId,
statusId, false));
builder.setContentIntent(getContentIntent(context, CustomTabType.HOME_TIMELINE,
NotificationType.HOME_TIMELINE, accountId));
builder.setDeleteIntent(getMarkReadDeleteIntent(context, NotificationType.HOME_TIMELINE,
accountId, statusId, false));
builder.setNumber(statusesCount);
builder.setCategory(NotificationCompat.CATEGORY_SOCIAL);
applyNotificationPreferences(builder, pref, pref.getHomeTimelineNotificationType());
@ -1310,7 +1320,7 @@ public final class TwidereDataProvider extends ContentProvider implements Consta
final int count = c.getCount();
if (count == 0) return;
c.moveToFirst();
builder.setSmallIcon(R.drawable.ic_stat_mention);
builder.setSmallIcon(R.drawable.ic_stat_notification);
builder.setNumber(count);
builder.setCategory(NotificationCompat.CATEGORY_SOCIAL);
applyNotificationPreferences(builder, pref, pref.getHomeTimelineNotificationType());
@ -1354,11 +1364,11 @@ public final class TwidereDataProvider extends ContentProvider implements Consta
}
c.moveToNext();
}
builder.setContentIntent(getContentIntent(context, AUTHORITY_ACTIVITIES_ABOUT_ME,
accountId));
builder.setContentIntent(getContentIntent(context, CustomTabType.NOTIFICATIONS_TIMELINE,
NotificationType.INTERACTIONS, accountId));
if (timestamp != -1) {
builder.setDeleteIntent(getMarkReadDeleteIntent(context, AUTHORITY_ACTIVITIES_ABOUT_ME,
accountId, timestamp, false));
builder.setDeleteIntent(getMarkReadDeleteIntent(context,
NotificationType.INTERACTIONS, accountId, timestamp, false));
}
} finally {
c.close();
@ -1367,7 +1377,9 @@ public final class TwidereDataProvider extends ContentProvider implements Consta
mNotificationManager.notify("interactions", notificationId, builder.build());
}
private PendingIntent getContentIntent(Context context, String type, long accountId) {
private PendingIntent getContentIntent(final Context context, @CustomTabType final String type,
@NotificationType final String notificationType,
final long accountId) {
// Setup click intent
final Intent homeIntent = new Intent(context, HomeActivity.class);
final Uri.Builder homeLinkBuilder = new Uri.Builder();
@ -1381,8 +1393,10 @@ public final class TwidereDataProvider extends ContentProvider implements Consta
return PendingIntent.getActivity(context, 0, homeIntent, 0);
}
private PendingIntent getStatusContentIntent(Context context, String type, long accountId,
long statusId, long userId, boolean userFollowing) {
private PendingIntent getStatusContentIntent(final Context context, @CustomTabType final String type,
@NotificationType final String notificationType,
long accountId, long statusId,
long userId, boolean userFollowing) {
// Setup click intent
final Intent homeIntent = new Intent(Intent.ACTION_VIEW);
homeIntent.setPackage(BuildConfig.APPLICATION_ID);
@ -1543,8 +1557,10 @@ public final class TwidereDataProvider extends ContentProvider implements Consta
builder.setContentTitle(notificationTitle);
builder.setContentText(notificationContent);
builder.setCategory(NotificationCompat.CATEGORY_MESSAGE);
builder.setContentIntent(getContentIntent(context, AUTHORITY_DIRECT_MESSAGES, accountId));
builder.setDeleteIntent(getMarkReadDeleteIntent(context, AUTHORITY_DIRECT_MESSAGES, accountId, positions));
builder.setContentIntent(getContentIntent(context, CustomTabType.DIRECT_MESSAGES,
NotificationType.DIRECT_MESSAGES, accountId));
builder.setDeleteIntent(getMarkReadDeleteIntent(context,
NotificationType.DIRECT_MESSAGES, accountId, positions));
builder.setNumber(messagesCount);
builder.setWhen(when);
builder.setStyle(style);

37
twidere/src/main/java/org/mariotaku/twidere/receiver/NotificationReceiver.java
View File

@ -23,12 +23,16 @@ import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.net.Uri;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.text.TextUtils;
import org.apache.commons.lang3.math.NumberUtils;
import org.mariotaku.twidere.Constants;
import org.mariotaku.twidere.annotation.CustomTabType;
import org.mariotaku.twidere.annotation.NotificationType;
import org.mariotaku.twidere.annotation.ReadPositionTag;
import org.mariotaku.twidere.model.StringLongPair;
import org.mariotaku.twidere.util.CustomTabUtils;
import org.mariotaku.twidere.util.ReadStateManager;
import org.mariotaku.twidere.util.UriExtraUtils;
import org.mariotaku.twidere.util.Utils;
@ -50,20 +54,23 @@ public class NotificationReceiver extends BroadcastReceiver implements Constants
final Uri uri = intent.getData();
if (uri == null) return;
DependencyHolder holder = DependencyHolder.get(context);
final String type = uri.getQueryParameter(QUERY_PARAM_NOTIFICATION_TYPE);
@NotificationType
final String notificationType = uri.getQueryParameter(QUERY_PARAM_NOTIFICATION_TYPE);
final long accountId = NumberUtils.toLong(uri.getQueryParameter(QUERY_PARAM_ACCOUNT_ID), -1);
final long itemId = NumberUtils.toLong(UriExtraUtils.getExtra(uri, "item_id"), -1);
final long itemUserId = NumberUtils.toLong(UriExtraUtils.getExtra(uri, "item_user_id"), -1);
final boolean itemUserFollowing = Boolean.parseBoolean(UriExtraUtils.getExtra(uri, "item_user_following"));
final long timestamp = NumberUtils.toLong(uri.getQueryParameter(QUERY_PARAM_TIMESTAMP), -1);
if (AUTHORITY_MENTIONS.equals(type) && accountId != -1 && itemId != -1 && timestamp != -1) {
if (CustomTabType.NOTIFICATIONS_TIMELINE.equals(CustomTabUtils.getTabTypeAlias(notificationType))
&& accountId != -1 && itemId != -1 && timestamp != -1) {
final HotMobiLogger logger = holder.getHotMobiLogger();
logger.log(accountId, NotificationEvent.deleted(context, timestamp, type, accountId,
logger.log(accountId, NotificationEvent.deleted(context, timestamp, notificationType, accountId,
itemId, itemUserId, itemUserFollowing));
}
final ReadStateManager manager = holder.getReadStateManager();
final String paramReadPosition, paramReadPositions;
final String tag = getPositionTag(type);
@ReadPositionTag
final String tag = getPositionTag(notificationType);
if (tag != null && !TextUtils.isEmpty(paramReadPosition = uri.getQueryParameter(QUERY_PARAM_READ_POSITION))) {
final long def = -1;
manager.setPosition(Utils.getReadPositionTagWithAccounts(tag, accountId),
@ -83,17 +90,17 @@ public class NotificationReceiver extends BroadcastReceiver implements Constants
}
}
private static String getPositionTag(@NonNull String type) {
@ReadPositionTag
@Nullable
private static String getPositionTag(@Nullable @NotificationType String type) {
if (type == null) return null;
switch (type) {
case AUTHORITY_HOME: {
return TAB_TYPE_HOME_TIMELINE;
}
case AUTHORITY_ACTIVITIES_ABOUT_ME:
case AUTHORITY_MENTIONS: {
return TAB_TYPE_NOTIFICATIONS_TIMELINE;
}
case AUTHORITY_DIRECT_MESSAGES: {
return TAB_TYPE_DIRECT_MESSAGES;
case NotificationType.HOME_TIMELINE:
return ReadPositionTag.HOME_TIMELINE;
case NotificationType.INTERACTIONS:
return ReadPositionTag.ACTIVITIES_ABOUT_ME;
case NotificationType.DIRECT_MESSAGES: {
return ReadPositionTag.DIRECT_MESSAGES;
}
}
return null;

1
twidere/src/main/java/org/mariotaku/twidere/receiver/PowerStateReceiver.java
View File

@ -22,7 +22,6 @@ package org.mariotaku.twidere.receiver;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.widget.Toast;
import edu.tsinghua.hotmobi.HotMobiLogger;

1
twidere/src/main/java/org/mariotaku/twidere/service/BackgroundOperationService.java
View File

@ -95,7 +95,6 @@ import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.RandomAccessFile;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;

3
twidere/src/main/java/org/mariotaku/twidere/util/AsyncTwitterWrapper.java
View File

@ -40,6 +40,7 @@ import org.apache.commons.lang3.ArrayUtils;
import org.mariotaku.sqliteqb.library.Expression;
import org.mariotaku.twidere.BuildConfig;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.annotation.ReadPositionTag;
import org.mariotaku.twidere.api.twitter.Twitter;
import org.mariotaku.twidere.api.twitter.TwitterException;
import org.mariotaku.twidere.api.twitter.http.HttpResponseCode;
@ -531,7 +532,7 @@ public class AsyncTwitterWrapper extends TwitterWrapper {
protected void getReadPosition(long accountId, Twitter twitter) {
try {
CursorTimestampResponse response = twitter.getActivitiesAboutMeUnread(true);
final String tag = Utils.getReadPositionTagWithAccounts(READ_POSITION_TAG_ACTIVITIES_ABOUT_ME, accountIds);
final String tag = Utils.getReadPositionTagWithAccounts(ReadPositionTag.ACTIVITIES_ABOUT_ME, accountIds);
mReadStateManager.setPosition(tag, response.getCursor(), false);
} catch (TwitterException e) {
// Ignore

50
twidere/src/main/java/org/mariotaku/twidere/util/CustomTabUtils.java
View File

@ -36,6 +36,8 @@ import android.text.TextUtils;
import org.mariotaku.twidere.Constants;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.annotation.CustomTabType;
import org.mariotaku.twidere.annotation.ReadPositionTag;
import org.mariotaku.twidere.fragment.support.ActivitiesAboutMeFragment;
import org.mariotaku.twidere.fragment.support.ActivitiesByFriendsFragment;
import org.mariotaku.twidere.fragment.support.DirectMessagesFragment;
@ -66,42 +68,42 @@ public class CustomTabUtils implements Constants {
private static final HashMap<String, Integer> CUSTOM_TABS_ICON_NAME_MAP = new HashMap<>();
static {
CUSTOM_TABS_CONFIGURATION_MAP.put(TAB_TYPE_HOME_TIMELINE, new CustomTabConfiguration(
CUSTOM_TABS_CONFIGURATION_MAP.put(CustomTabType.HOME_TIMELINE, new CustomTabConfiguration(
HomeTimelineFragment.class, R.string.home, R.drawable.ic_action_home,
CustomTabConfiguration.ACCOUNT_OPTIONAL, CustomTabConfiguration.FIELD_TYPE_NONE, 0, false));
CUSTOM_TABS_CONFIGURATION_MAP.put(TAB_TYPE_NOTIFICATIONS_TIMELINE, new CustomTabConfiguration(
CUSTOM_TABS_CONFIGURATION_MAP.put(CustomTabType.NOTIFICATIONS_TIMELINE, new CustomTabConfiguration(
ActivitiesAboutMeFragment.class, R.string.notifications, R.drawable.ic_action_notification,
CustomTabConfiguration.ACCOUNT_OPTIONAL, CustomTabConfiguration.FIELD_TYPE_NONE, 1, false,
ExtraConfiguration.newBoolean(EXTRA_MY_FOLLOWING_ONLY, R.string.following_only, false)));
CUSTOM_TABS_CONFIGURATION_MAP.put(TAB_TYPE_DIRECT_MESSAGES, new CustomTabConfiguration(
CUSTOM_TABS_CONFIGURATION_MAP.put(CustomTabType.DIRECT_MESSAGES, new CustomTabConfiguration(
DirectMessagesFragment.class, R.string.direct_messages, R.drawable.ic_action_message,
CustomTabConfiguration.ACCOUNT_OPTIONAL, CustomTabConfiguration.FIELD_TYPE_NONE, 2, false));
CUSTOM_TABS_CONFIGURATION_MAP.put(TAB_TYPE_TRENDS_SUGGESTIONS, new CustomTabConfiguration(
CUSTOM_TABS_CONFIGURATION_MAP.put(CustomTabType.TRENDS_SUGGESTIONS, new CustomTabConfiguration(
TrendsSuggestionsFragment.class, R.string.trends, R.drawable.ic_action_hashtag,
CustomTabConfiguration.ACCOUNT_NONE, CustomTabConfiguration.FIELD_TYPE_NONE, 3, true));
CUSTOM_TABS_CONFIGURATION_MAP.put(TAB_TYPE_FAVORITES, new CustomTabConfiguration(UserFavoritesFragment.class,
CUSTOM_TABS_CONFIGURATION_MAP.put(CustomTabType.FAVORITES, new CustomTabConfiguration(UserFavoritesFragment.class,
R.string.likes, R.drawable.ic_action_heart, CustomTabConfiguration.ACCOUNT_REQUIRED,
CustomTabConfiguration.FIELD_TYPE_USER, 4));
CUSTOM_TABS_CONFIGURATION_MAP.put(TAB_TYPE_USER_TIMELINE, new CustomTabConfiguration(
CUSTOM_TABS_CONFIGURATION_MAP.put(CustomTabType.USER_TIMELINE, new CustomTabConfiguration(
UserTimelineFragment.class, R.string.users_statuses, R.drawable.ic_action_quote,
CustomTabConfiguration.ACCOUNT_REQUIRED, CustomTabConfiguration.FIELD_TYPE_USER, 5));
CUSTOM_TABS_CONFIGURATION_MAP.put(TAB_TYPE_SEARCH_STATUSES, new CustomTabConfiguration(
CUSTOM_TABS_CONFIGURATION_MAP.put(CustomTabType.SEARCH_STATUSES, new CustomTabConfiguration(
StatusesSearchFragment.class, R.string.search_statuses, R.drawable.ic_action_search,
CustomTabConfiguration.ACCOUNT_REQUIRED, CustomTabConfiguration.FIELD_TYPE_TEXT, R.string.query,
EXTRA_QUERY, 6));
CUSTOM_TABS_CONFIGURATION_MAP.put(TAB_TYPE_LIST_TIMELINE, new CustomTabConfiguration(
CUSTOM_TABS_CONFIGURATION_MAP.put(CustomTabType.LIST_TIMELINE, new CustomTabConfiguration(
UserListTimelineFragment.class, R.string.list_timeline, R.drawable.ic_action_list,
CustomTabConfiguration.ACCOUNT_REQUIRED, CustomTabConfiguration.FIELD_TYPE_USER_LIST, 7));
CUSTOM_TABS_CONFIGURATION_MAP.put(TAB_TYPE_ACTIVITIES_BY_FRIENDS, new CustomTabConfiguration(
CUSTOM_TABS_CONFIGURATION_MAP.put(CustomTabType.ACTIVITIES_BY_FRIENDS, new CustomTabConfiguration(
ActivitiesByFriendsFragment.class, R.string.activities_by_friends,
R.drawable.ic_action_accounts, CustomTabConfiguration.ACCOUNT_REQUIRED,
CustomTabConfiguration.FIELD_TYPE_NONE, 9));
CUSTOM_TABS_CONFIGURATION_MAP.put(TAB_TYPE_RETWEETS_OF_ME, new CustomTabConfiguration(
CUSTOM_TABS_CONFIGURATION_MAP.put(CustomTabType.RETWEETS_OF_ME, new CustomTabConfiguration(
RetweetsOfMeFragment.class, R.string.retweets_of_me, R.drawable.ic_action_retweet,
CustomTabConfiguration.ACCOUNT_REQUIRED, CustomTabConfiguration.FIELD_TYPE_NONE, 10));
@ -154,18 +156,22 @@ public class CustomTabUtils implements Constants {
.getColumnIndex(Tabs.TYPE), idxArguments = cur.getColumnIndex(Tabs.ARGUMENTS), idxExtras = cur
.getColumnIndex(Tabs.EXTRAS), idxPosition = cur.getColumnIndex(Tabs.POSITION);
while (!cur.isAfterLast()) {
final String type = cur.getString(idxType);
@CustomTabType
final String type = getTabTypeAlias(cur.getString(idxType));
final int position = cur.getInt(idxPosition);
final String iconType = cur.getString(idxIcon);
final String name = cur.getString(idxName);
final Bundle args = ParseUtils.jsonToBundle(cur.getString(idxArguments));
@ReadPositionTag
final String tag = getTagByType(type);
args.putInt(EXTRA_TAB_POSITION, position);
args.putBundle(EXTRA_EXTRAS, ParseUtils.jsonToBundle(cur.getString(idxExtras)));
final CustomTabConfiguration conf = getTabConfiguration(type);
final Class<? extends Fragment> cls = conf != null ? conf.getFragmentClass() : InvalidTabFragment.class;
tabs.add(new SupportTabSpec(TextUtils.isEmpty(name) ? getTabTypeName(context, type) : name,
getTabIconObject(iconType), type, cls, args, position, tag));
final String tabTypeName = getTabTypeName(context, type);
final Object tabIconObject = getTabIconObject(iconType);
tabs.add(new SupportTabSpec(TextUtils.isEmpty(name) ? tabTypeName : name, tabIconObject,
type, cls, args, position, tag));
cur.moveToNext();
}
cur.close();
@ -174,13 +180,16 @@ public class CustomTabUtils implements Constants {
}
@Nullable
private static String getTagByType(@NonNull String tabType) {
@ReadPositionTag
private static String getTagByType(@NonNull @CustomTabType String tabType) {
switch (getTabTypeAlias(tabType)) {
case TAB_TYPE_HOME_TIMELINE:
case TAB_TYPE_NOTIFICATIONS_TIMELINE:
case TAB_TYPE_ACTIVITIES_ABOUT_ME:
case TAB_TYPE_DIRECT_MESSAGES:
return tabType;
case CustomTabType.HOME_TIMELINE:
return ReadPositionTag.HOME_TIMELINE;
case "activities_about_me":
case CustomTabType.NOTIFICATIONS_TIMELINE:
return ReadPositionTag.ACTIVITIES_ABOUT_ME;
case CustomTabType.DIRECT_MESSAGES:
return ReadPositionTag.DIRECT_MESSAGES;
}
return null;
}
@ -194,12 +203,13 @@ public class CustomTabUtils implements Constants {
return CUSTOM_TABS_CONFIGURATION_MAP.get(getTabTypeAlias(tabType));
}
@CustomTabType
public static String getTabTypeAlias(String key) {
if (key == null) return null;
switch (key) {
case "mentions_timeline":
case "activities_about_me":
return TAB_TYPE_NOTIFICATIONS_TIMELINE;
return CustomTabType.NOTIFICATIONS_TIMELINE;
}
return key;
}

24
twidere/src/main/java/org/mariotaku/twidere/util/ReadStateManager.java
View File

@ -27,6 +27,8 @@ import android.support.annotation.Nullable;
import android.text.TextUtils;
import org.mariotaku.twidere.Constants;
import org.mariotaku.twidere.annotation.NotificationType;
import org.mariotaku.twidere.annotation.ReadPositionTag;
import org.mariotaku.twidere.model.StringLongPair;
import org.mariotaku.twidere.util.collection.CompactHashSet;
@ -144,14 +146,14 @@ public class ReadStateManager implements Constants {
return true;
}
public boolean setPosition(final String key, final long id) {
return setPosition(key, id, false);
public boolean setPosition(final String key, final long position) {
return setPosition(key, position, false);
}
public boolean setPosition(final String key, final long id, boolean acceptOlder) {
if (TextUtils.isEmpty(key) || !acceptOlder && getPosition(key) >= id) return false;
public boolean setPosition(final String key, final long position, boolean acceptOlder) {
if (TextUtils.isEmpty(key) || !acceptOlder && getPosition(key) >= position) return false;
final SharedPreferences.Editor editor = mPreferences.edit();
editor.putLong(key, id);
editor.putLong(key, position);
editor.apply();
return true;
}
@ -160,4 +162,16 @@ public class ReadStateManager implements Constants {
void onReadStateChanged();
}
@Nullable
@ReadPositionTag
public static String getReadPositionTagForNotificationType(@NotificationType String notificationType) {
if (notificationType == null) return null;
switch (notificationType) {
case NotificationType.INTERACTIONS: {
return ReadPositionTag.ACTIVITIES_ABOUT_ME;
}
}
return null;
}
}

1
twidere/src/main/java/org/mariotaku/twidere/util/ThemedLayoutInflaterFactory.java
View File

@ -171,7 +171,6 @@ public class ThemedLayoutInflaterFactory implements LayoutInflaterFactory {
} else {
// View context is derived from ActionBar and it's light theme, so we use contrast color
final int actionBarColor = activity.getCurrentThemeColor();
final int actionBarTheme = ThemeUtils.getActionBarThemeResource(activity.getThemeResourceId(), actionBarColor);
accentColor = ThemeUtils.getColorFromAttribute(viewContext, android.R.attr.colorForeground, 0);
noTintColor = ThemeUtils.getColorFromAttribute(viewContext, android.R.attr.colorBackground, 0);
backgroundTintColor = accentColor;

28
twidere/src/main/java/org/mariotaku/twidere/util/Utils.java
View File

@ -133,6 +133,8 @@ import org.mariotaku.twidere.activity.support.ColorPickerDialogActivity;
import org.mariotaku.twidere.activity.support.MediaViewerActivity;
import org.mariotaku.twidere.adapter.iface.IBaseAdapter;
import org.mariotaku.twidere.adapter.iface.IBaseCardAdapter;
import org.mariotaku.twidere.annotation.CustomTabType;
import org.mariotaku.twidere.annotation.ReadPositionTag;
import org.mariotaku.twidere.api.twitter.Twitter;
import org.mariotaku.twidere.api.twitter.TwitterException;
import org.mariotaku.twidere.api.twitter.model.DirectMessage;
@ -288,10 +290,9 @@ public final class Utils implements Constants {
LINK_HANDLER_URI_MATCHER.addURI(AUTHORITY_FILTERS, null, LINK_ID_FILTERS);
LINK_HANDLER_URI_MATCHER.addURI(AUTHORITY_PROFILE_EDITOR, null, LINK_ID_PROFILE_EDITOR);
HOME_TABS_URI_MATCHER.addURI(AUTHORITY_HOME, null, TAB_CODE_HOME_TIMELINE);
HOME_TABS_URI_MATCHER.addURI(AUTHORITY_MENTIONS, null, TAB_CODE_NOTIFICATIONS_TIMELINE);
HOME_TABS_URI_MATCHER.addURI(AUTHORITY_ACTIVITIES_ABOUT_ME, null, TAB_CODE_NOTIFICATIONS_TIMELINE);
HOME_TABS_URI_MATCHER.addURI(AUTHORITY_DIRECT_MESSAGES, null, TAB_CODE_DIRECT_MESSAGES);
HOME_TABS_URI_MATCHER.addURI(CustomTabType.HOME_TIMELINE, null, TAB_CODE_HOME_TIMELINE);
HOME_TABS_URI_MATCHER.addURI(CustomTabType.NOTIFICATIONS_TIMELINE, null, TAB_CODE_NOTIFICATIONS_TIMELINE);
HOME_TABS_URI_MATCHER.addURI(CustomTabType.DIRECT_MESSAGES, null, TAB_CODE_DIRECT_MESSAGES);
}
@ -921,7 +922,7 @@ public final class Utils implements Constants {
}
public static String getReadPositionTagWithAccounts(String tag, Bundle args) {
public static String getReadPositionTagWithAccounts(@ReadPositionTag String tag, Bundle args) {
final long[] accountIds = getAccountIds(args);
return getReadPositionTagWithAccounts(tag, accountIds);
}
@ -938,7 +939,10 @@ public final class Utils implements Constants {
return accountIds;
}
public static String getReadPositionTagWithAccounts(String tag, long... accountIds) {
@Nullable
public static String getReadPositionTagWithAccounts(@Nullable @ReadPositionTag final String tag,
final long... accountIds) {
if (tag == null) return null;
if (accountIds == null || accountIds.length == 0 || (accountIds.length == 1 && accountIds[0] < 0))
return tag;
final long[] accountIdsClone = accountIds.clone();
@ -946,7 +950,11 @@ public final class Utils implements Constants {
return tag + "_" + TwidereArrayUtils.toString(accountIdsClone, '_', false);
}
public static String getReadPositionTagWithAccounts(Context context, boolean activatedIfMissing, String tag, long... accountIds) {
@Nullable
public static String getReadPositionTagWithAccounts(Context context, boolean activatedIfMissing,
@Nullable @ReadPositionTag String tag,
long... accountIds) {
if (tag == null) return null;
if (accountIds == null || accountIds.length == 0 || (accountIds.length == 1 && accountIds[0] < 0)) {
final long[] activatedIds = DataStoreUtils.getActivatedAccountIds(context);
Arrays.sort(activatedIds);
@ -1811,13 +1819,13 @@ public final class Utils implements Constants {
public static String getTabType(final int code) {
switch (code) {
case TAB_CODE_HOME_TIMELINE: {
return TAB_TYPE_HOME_TIMELINE;
return CustomTabType.HOME_TIMELINE;
}
case TAB_CODE_NOTIFICATIONS_TIMELINE: {
return TAB_TYPE_NOTIFICATIONS_TIMELINE;
return CustomTabType.NOTIFICATIONS_TIMELINE;
}
case TAB_CODE_DIRECT_MESSAGES: {
return TAB_TYPE_DIRECT_MESSAGES;
return CustomTabType.DIRECT_MESSAGES;
}
}
return null;

1
twidere/src/main/java/org/mariotaku/twidere/view/HeaderDrawerLayout.java
View File

@ -194,6 +194,7 @@ public class HeaderDrawerLayout extends ViewGroup {
@Override
protected void onFinishInflate() {
super.onFinishInflate();
if (getChildCount() != 1) {
throw new IllegalArgumentException("Add subview by XML is not allowed.");
}

10
twidere/src/main/java/org/mariotaku/twidere/view/NameView.java
View File

@ -42,6 +42,7 @@ import org.mariotaku.twidere.view.themed.ThemedTextView;
public class NameView extends ThemedTextView {
private boolean mNameFirst;
private boolean mTwoLine;
private String mName, mScreenName;
@ -59,11 +60,16 @@ public class NameView extends ThemedTextView {
public NameView(final Context context, final AttributeSet attrs, final int defStyleAttr) {
super(context, attrs, defStyleAttr);
setSingleLine(true);
setEllipsize(TextUtils.TruncateAt.END);
final TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.NameView, defStyleAttr, 0);
setPrimaryTextColor(a.getColor(R.styleable.NameView_nv_primaryTextColor, 0));
setSecondaryTextColor(a.getColor(R.styleable.NameView_nv_secondaryTextColor, 0));
if (mTwoLine = a.getBoolean(R.styleable.NameView_nv_twoLine, false)) {
setSingleLine(false);
setMaxLines(2);
} else {
setSingleLine(true);
}
mPrimaryTextStyle = new StyleSpan(a.getInt(R.styleable.NameView_nv_primaryTextStyle, 0));
mSecondaryTextStyle = new StyleSpan(a.getInt(R.styleable.NameView_nv_secondaryTextStyle, 0));
a.recycle();
@ -115,7 +121,7 @@ public class NameView extends ThemedTextView {
sb.setSpan(mPrimaryTextStyle, start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
sb.setSpan(mPrimaryTextSize, start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
}
sb.append(" ");
sb.append(mTwoLine ? "\n" : "");
if (secondaryText != null) {
int start = sb.length();
if (formatter != null && !isInEditMode()) {

2
twidere/src/main/java/org/mariotaku/twidere/view/ProfileBannerSpace.java
View File

@ -1,5 +1,6 @@
package org.mariotaku.twidere.view;
import android.annotation.SuppressLint;
import android.content.Context;
import android.graphics.Canvas;
import android.graphics.Rect;
@ -43,6 +44,7 @@ public class ProfileBannerSpace extends View {
*
* @param canvas an unused parameter.
*/
@SuppressLint("MissingSuperCall")
@Override
public void draw(@NonNull final Canvas canvas) {
}

13
twidere/src/main/java/org/mariotaku/twidere/view/holder/UserViewHolder.java
View File

@ -33,7 +33,7 @@ import org.mariotaku.twidere.adapter.iface.IUsersAdapter;
import org.mariotaku.twidere.model.ParcelableUser;
import org.mariotaku.twidere.util.MediaLoaderWrapper;
import org.mariotaku.twidere.util.UserColorNameManager;
import org.mariotaku.twidere.view.ShapedImageView;
import org.mariotaku.twidere.view.NameView;
import org.mariotaku.twidere.view.iface.IColorLabelView;
import java.util.Locale;
@ -48,7 +48,8 @@ public class UserViewHolder extends ViewHolder implements OnClickListener, OnLon
private final IColorLabelView itemContent;
private final ImageView profileImageView;
private final ImageView profileTypeView;
private final TextView nameView, screenNameView, descriptionView, locationView, urlView,
private final NameView nameView;
private final TextView descriptionView, locationView, urlView,
statusesCountView, followersCountView, friendsCountView;
private UserClickListener userClickListener;
@ -59,8 +60,7 @@ public class UserViewHolder extends ViewHolder implements OnClickListener, OnLon
itemContent = (IColorLabelView) itemView.findViewById(R.id.item_content);
profileImageView = (ImageView) itemView.findViewById(R.id.profile_image);
profileTypeView = (ImageView) itemView.findViewById(R.id.profile_type);
nameView = (TextView) itemView.findViewById(R.id.name);
screenNameView = (TextView) itemView.findViewById(R.id.screen_name);
nameView = (NameView) itemView.findViewById(R.id.name);
descriptionView = (TextView) itemView.findViewById(R.id.description);
locationView = (TextView) itemView.findViewById(R.id.location);
urlView = (TextView) itemView.findViewById(R.id.url);
@ -83,8 +83,8 @@ public class UserViewHolder extends ViewHolder implements OnClickListener, OnLon
} else {
profileTypeView.setImageDrawable(null);
}
nameView.setText(manager.getUserNickname(user.id, user.name, false));
screenNameView.setText("@" + user.screen_name);
nameView.setName(manager.getUserNickname(user.id, user.name, false));
nameView.setScreenName("@" + user.screen_name);
descriptionView.setVisibility(TextUtils.isEmpty(user.description_unescaped) ? View.GONE : View.VISIBLE);
descriptionView.setText(user.description_unescaped);
locationView.setVisibility(TextUtils.isEmpty(user.location) ? View.GONE : View.VISIBLE);
@ -141,7 +141,6 @@ public class UserViewHolder extends ViewHolder implements OnClickListener, OnLon
public void setTextSize(final float textSize) {
descriptionView.setTextSize(textSize);
nameView.setTextSize(textSize);
screenNameView.setTextSize(textSize * 0.75f);
locationView.setTextSize(textSize);
urlView.setTextSize(textSize);
statusesCountView.setTextSize(textSize);

1
twidere/src/main/java/org/oshkimaadziig/george/androidutils/SpanFormatter.java
View File

@ -33,6 +33,7 @@ import java.util.regex.Pattern;
*
* @author George T. Steel
*/
@SuppressWarnings("IfCanBeSwitch")
public class SpanFormatter {
public static final Pattern FORMAT_SEQUENCE = Pattern.compile("%([0-9]+\\$|<?)([^a-zA-z%]*)([[a-zA-Z%]&&[^tT]]|[tT][a-zA-Z])");

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

@ -100,7 +100,7 @@
android:layout_height="@dimen/minimum_element_size"
android:layout_weight="0"
android:background="?selectableItemBackground"
android:contentDescription="@android:string/search_go"
android:contentDescription="@string/search"
android:onClick="onClick"
android:src="@android:drawable/ic_menu_search"/>
</LinearLayout>

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

@ -198,7 +198,7 @@
android:id="@+id/quote_indicator"
android:layout_width="@dimen/element_spacing_small"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/quoted_text"
android:layout_alignBottom="@+id/media_preview"
android:layout_alignTop="@+id/quoted_name"
android:layout_marginLeft="@dimen/element_spacing_normal"
android:layout_marginStart="@dimen/element_spacing_normal"

54
twidere/src/main/res/layout/card_item_user.xml
View File

@ -17,10 +17,11 @@
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
<android.support.v7.widget.CardView
android:id="@+id/card"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/card"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/element_spacing_small"
@ -62,7 +63,8 @@
android:layout_height="@dimen/icon_size_card_list_item"
android:layout_centerVertical="true"
android:contentDescription="@string/profile_image"
android:scaleType="fitCenter" />
android:scaleType="fitCenter"
tools:src="@mipmap/ic_launcher"/>
<ImageView
android:id="@+id/profile_type"
@ -75,40 +77,20 @@
android:layout_marginEnd="@dimen/element_spacing_minus_normal"
android:layout_marginRight="@dimen/element_spacing_minus_normal"
android:scaleType="centerInside"
tools:ignore="ContentDescription" />
tools:ignore="ContentDescription"/>
<LinearLayout
<org.mariotaku.twidere.view.NameView
android:id="@+id/name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toEndOf="@+id/profile_image"
android:layout_toRightOf="@+id/profile_image"
android:gravity="center_vertical"
android:orientation="vertical"
android:paddingEnd="0dp"
android:paddingLeft="8dp"
android:paddingRight="0dp"
android:paddingStart="8dp">
android:paddingStart="8dp"/>
<org.mariotaku.twidere.view.themed.ThemedTextView
android:id="@+id/name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary"
android:textStyle="bold"
tools:text="Name" />
<org.mariotaku.twidere.view.themed.ThemedTextView
android:id="@+id/screen_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorSecondary"
tools:text="\@username" />
</LinearLayout>
</RelativeLayout>
<org.mariotaku.twidere.view.themed.ThemedTextView
@ -117,7 +99,8 @@
android:layout_height="wrap_content"
android:padding="8dp"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorSecondary" />
android:textColor="?android:attr/textColorSecondary"
tools:text="@string/sample_status_text"/>
<org.mariotaku.twidere.view.ActionIconThemedTextView
android:id="@+id/location"
@ -128,7 +111,8 @@
android:drawableStart="@drawable/ic_indicator_location"
android:padding="8dp"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceSmall" />
android:textAppearance="?android:attr/textAppearanceSmall"
tools:text="Earth"/>
<org.mariotaku.twidere.view.ActionIconThemedTextView
android:id="@+id/url"
@ -139,7 +123,8 @@
android:drawableStart="@drawable/ic_indicator_link"
android:padding="8dp"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceSmall" />
android:textAppearance="?android:attr/textAppearanceSmall"
tools:text="https://github.com/TwidereProject"/>
<LinearLayout
android:layout_width="match_parent"
@ -156,7 +141,8 @@
android:drawablePadding="4dp"
android:drawableStart="@drawable/ic_indicator_twitter"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceSmall" />
android:textAppearance="?android:attr/textAppearanceSmall"
tools:text="255"/>
<org.mariotaku.twidere.view.themed.ThemedTextView
android:id="@+id/followers_count"
@ -167,7 +153,8 @@
android:drawablePadding="4dp"
android:drawableStart="@drawable/ic_indicator_followers"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceSmall" />
android:textAppearance="?android:attr/textAppearanceSmall"
tools:text="255"/>
<org.mariotaku.twidere.view.themed.ThemedTextView
android:id="@+id/friends_count"
@ -178,7 +165,8 @@
android:drawablePadding="4dp"
android:drawableStart="@drawable/ic_indicator_following"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceSmall" />
android:textAppearance="?android:attr/textAppearanceSmall"
tools:text="255"/>
</LinearLayout>
</org.mariotaku.twidere.view.ColorLabelLinearLayout>

83
twidere/src/main/res/layout/card_item_user_compact.xml
View File

@ -17,9 +17,11 @@
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<org.mariotaku.twidere.view.ColorLabelFrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
<org.mariotaku.twidere.view.ColorLabelFrameLayout
android:id="@+id/item_content"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?selectableItemBackground"
@ -49,7 +51,8 @@
android:layout_alignParentTop="true"
android:layout_marginEnd="@dimen/element_spacing_normal"
android:layout_marginRight="@dimen/element_spacing_normal"
android:contentDescription="@string/profile_image" />
android:contentDescription="@string/profile_image"
tools:src="@mipmap/ic_launcher"/>
<ImageView
android:id="@+id/profile_type"
@ -62,10 +65,10 @@
android:layout_marginEnd="@dimen/element_spacing_minus_normal"
android:layout_marginRight="@dimen/element_spacing_minus_normal"
android:scaleType="centerInside"
tools:ignore="ContentDescription" />
tools:ignore="ContentDescription"/>
<FrameLayout
android:id="@+id/name_frame"
<org.mariotaku.twidere.view.NameView
android:id="@+id/name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
@ -73,81 +76,58 @@
android:layout_alignParentTop="true"
android:layout_alignWithParentIfMissing="true"
android:layout_toEndOf="@id/profile_image"
android:layout_toRightOf="@id/profile_image">
android:layout_toRightOf="@id/profile_image"
app:nv_primaryTextColor="?android:attr/textColorPrimary"
app:nv_primaryTextStyle="bold"/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="start|center_vertical"
android:gravity="center_vertical"
android:orientation="horizontal">
<org.mariotaku.twidere.view.TimelineContentTextView
android:id="@+id/name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary"
android:textStyle="bold" />
<org.mariotaku.twidere.view.TimelineContentTextView
android:id="@+id/screen_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="4dp"
android:paddingRight="4dp"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorSecondary" />
</LinearLayout>
</FrameLayout>
<org.mariotaku.twidere.view.themed.ThemedTextView
android:id="@+id/description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignLeft="@+id/name_frame"
android:layout_alignStart="@+id/name_frame"
android:layout_below="@+id/name_frame"
android:layout_alignLeft="@+id/name"
android:layout_alignStart="@+id/name"
android:layout_below="@+id/name"
android:paddingTop="@dimen/element_spacing_small"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorSecondary" />
android:textColor="?android:attr/textColorSecondary"
tools:text="@string/sample_status_text"/>
<org.mariotaku.twidere.view.themed.ThemedTextView
android:id="@+id/location"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignLeft="@+id/name_frame"
android:layout_alignStart="@+id/name_frame"
android:layout_alignLeft="@+id/name"
android:layout_alignStart="@+id/name"
android:layout_below="@+id/description"
android:drawableLeft="@drawable/ic_indicator_location"
android:drawablePadding="@dimen/element_spacing_small"
android:drawableStart="@drawable/ic_indicator_location"
android:paddingTop="@dimen/element_spacing_small"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceSmall" />
android:textAppearance="?android:attr/textAppearanceSmall"
tools:text="Earth"/>
<org.mariotaku.twidere.view.themed.ThemedTextView
android:id="@+id/url"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignLeft="@+id/name_frame"
android:layout_alignStart="@+id/name_frame"
android:layout_alignLeft="@+id/name"
android:layout_alignStart="@+id/name"
android:layout_below="@+id/location"
android:drawableLeft="@drawable/ic_indicator_web"
android:drawablePadding="@dimen/element_spacing_small"
android:drawableStart="@drawable/ic_indicator_web"
android:paddingTop="@dimen/element_spacing_small"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceSmall" />
android:textAppearance="?android:attr/textAppearanceSmall"
tools:text="https://github.com/TwidereProject"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignLeft="@+id/name_frame"
android:layout_alignStart="@+id/name_frame"
android:layout_alignLeft="@+id/name"
android:layout_alignStart="@+id/name"
android:layout_below="@+id/url"
android:orientation="horizontal"
android:paddingTop="@dimen/element_spacing_small">
@ -161,7 +141,8 @@
android:drawablePadding="@dimen/element_spacing_small"
android:drawableStart="@drawable/ic_indicator_twitter"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceSmall" />
android:textAppearance="?android:attr/textAppearanceSmall"
tools:text="255"/>
<org.mariotaku.twidere.view.themed.ThemedTextView
android:id="@+id/followers_count"
@ -172,7 +153,8 @@
android:drawablePadding="@dimen/element_spacing_small"
android:drawableStart="@drawable/ic_indicator_followers"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceSmall" />
android:textAppearance="?android:attr/textAppearanceSmall"
tools:text="255"/>
<org.mariotaku.twidere.view.themed.ThemedTextView
android:id="@+id/friends_count"
@ -183,7 +165,8 @@
android:drawablePadding="@dimen/element_spacing_small"
android:drawableStart="@drawable/ic_indicator_following"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceSmall" />
android:textAppearance="?android:attr/textAppearanceSmall"
tools:text="255"/>
</LinearLayout>
</RelativeLayout>

30
twidere/src/main/res/layout/popup_account_selector.xml
View File

@ -1,30 +0,0 @@
<?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/>.
-->
<GridView
android:id="@+id/grid_view"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:numColumns="2"
android:stretchMode="columnWidth"
tools:layout_width="@dimen/popup_width_account_selector"
tools:listitem="@layout/grid_item_selector_account"/>

14
twidere/src/main/res/menu/action_direct_message.xml
View File

@ -6,18 +6,8 @@
android:icon="@drawable/ic_action_copy"
android:title="@android:string/copy"/>
<item
android:id="@+id/delete_submenu"
android:id="@id/delete"
android:icon="@drawable/ic_action_delete"
android:title="@string/delete">
<menu>
<item
android:id="@id/delete"
android:icon="@drawable/ic_action_delete"
android:title="@string/delete"/>
<item
android:icon="@drawable/ic_action_cancel"
android:title="@android:string/cancel"/>
</menu>
</item>
android:title="@string/delete"/>
</menu>

2
twidere/src/main/res/menu/action_status_text_selection.xml
View File

@ -5,7 +5,7 @@
<item
android:id="@android:id/copyUrl"
android:icon="@drawable/ic_action_web"
android:title="@android:string/copyUrl"
android:title="@string/copy_link"
app:showAsAction="always"/>
</menu>

1
twidere/src/main/res/values/attrs.xml
View File

@ -55,6 +55,7 @@
<declare-styleable name="NameView">
<attr name="nv_primaryTextColor" format="color"/>
<attr name="nv_secondaryTextColor" format="color"/>
<attr name="nv_twoLine" format="boolean"/>
<attr name="nv_primaryTextStyle"/>
<attr name="nv_secondaryTextStyle"/>
</declare-styleable>

12
twidere/src/main/svg/drawable/ic_stat_notification-mdpi.svg Normal file
View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
<!-- Generator: Sketch 3.4.4 (17249) - http://www.bohemiancoding.com/sketch -->
<title>Artboard</title>
<desc>Created with Sketch.</desc>
<defs></defs>
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
<g id="Artboard" sketch:type="MSArtboardGroup" fill="#FFFFFF">
<path d="M12,22 C13.1,22 14,21.1 14,20 L10,20 C10,21.1 10.9,22 12,22 L12,22 Z M18.5,16 L18.5,10.5 C18.5,7.43 16.37,4.86 13.5,4.18 L13.5,3.5 C13.5,2.67 12.83,2 12,2 C11.17,2 10.5,2.67 10.5,3.5 L10.5,4.18 C7.63,4.86 5.5,7.43 5.5,10.5 L5.5,16 L3.5,18 L3.5,19 L20.5,19 L20.5,18 L18.5,16 L18.5,16 Z" id="Shape" sketch:type="MSShapeGroup"></path>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 979 B