Mastodon/Twidere-App-Android-Twitter-Mastodon
1
0
Fork 0
mirror of https://github.com/TwidereProject/Twidere-Android synced 2025-01-30 16:35:00 +01:00
Code Issues Releases Wiki Activity

removed twitter bird icon for default profile image

Browse Source
This commit is contained in:
Mariotaku Lee 2015-03-23 11:57:55 +08:00
parent 9ff0ffa7f9
commit 44752e47c7
24 changed files with 40 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
twidere/src/main/AndroidManifest.xml
View File

@ -2,7 +2,8 @@
<manifest
package="org.mariotaku.twidere"
xmlns:android="http://schemas.android.com/apk/res/android"
android:installLocation="auto">
android:installLocation="auto"
>
<uses-sdk/>

2
twidere/src/main/java/org/mariotaku/twidere/adapter/AccountsAdapter.java
View File

@ -72,7 +72,7 @@ public class AccountsAdapter extends SimpleDragSortCursorAdapter implements Cons
mImageLoader.displayProfileImage(holder.profile_image, cursor.getString(mIndices.profile_image_url));
} else {
mImageLoader.cancelDisplayTask(holder.profile_image);
holder.profile_image.setImageResource(R.drawable.ic_profile_image_default);
// holder.profile_image.setImageResource(R.drawable.ic_profile_image_default);
}
final boolean isMultipleChoice = mChoiceMode == ListView.CHOICE_MODE_MULTIPLE
|| mChoiceMode == ListView.CHOICE_MODE_MULTIPLE_MODAL;

2
twidere/src/main/java/org/mariotaku/twidere/adapter/AccountsSpinnerAdapter.java
View File

@ -95,7 +95,7 @@ public class AccountsSpinnerAdapter extends ArrayAdapter<ParcelableAccount> {
mImageLoader.displayProfileImage(icon, item.profile_image_url);
} else {
mImageLoader.cancelDisplayTask(icon);
icon.setImageResource(R.drawable.ic_profile_image_default);
// icon.setImageResource(R.drawable.ic_profile_image_default);
}
}
} else if (text1 != null) {

2
twidere/src/main/java/org/mariotaku/twidere/adapter/UserHashtagAutoCompleteAdapter.java
View File

@ -115,7 +115,7 @@ public class UserHashtagAutoCompleteAdapter extends SimpleCursorAdapter implemen
final String profile_image_url_string = cursor.getString(mProfileImageUrlIdx);
mProfileImageLoader.displayProfileImage(icon, profile_image_url_string);
} else {
icon.setImageResource(R.drawable.ic_profile_image_default);
// icon.setImageResource(R.drawable.ic_profile_image_default);
}
} else {
icon.setImageResource(R.drawable.ic_action_hashtag);

8
twidere/src/main/java/org/mariotaku/twidere/preference/AccountsListPreference.java
View File

@ -131,7 +131,7 @@ public abstract class AccountsListPreference extends PreferenceCategory implemen
@Override
public void onLoadingCancelled(final String imageUri, final View view) {
setIcon(R.drawable.ic_profile_image_default);
// setIcon(R.drawable.ic_profile_image_default);
}
@Override
@ -142,12 +142,12 @@ public abstract class AccountsListPreference extends PreferenceCategory implemen
@Override
public void onLoadingFailed(final String imageUri, final View view, final FailReason failReason) {
setIcon(R.drawable.ic_profile_image_default);
// setIcon(R.drawable.ic_profile_image_default);
}
@Override
public void onLoadingStarted(final String imageUri, final View view) {
setIcon(R.drawable.ic_profile_image_default);
// setIcon(R.drawable.ic_profile_image_default);
}
@Override
@ -160,7 +160,7 @@ public abstract class AccountsListPreference extends PreferenceCategory implemen
super.onAttachedToHierarchy(preferenceManager);
setTitle(mAccount.name);
setSummary(String.format("@%s", mAccount.screen_name));
setIcon(R.drawable.ic_profile_image_default);
// setIcon(R.drawable.ic_profile_image_default);
mImageLoader.loadProfileImage(mAccount.profile_image_url, this);
}

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

@ -1023,8 +1023,7 @@ public final class TwidereDataProvider extends ContentProvider implements Consta
final Bitmap profile_image = profile_image_file != null && profile_image_file.isFile() ? BitmapFactory
.decodeFile(profile_image_file.getPath()) : null;
if (profile_image != null) return Bitmap.createScaledBitmap(profile_image, w, h, true);
return Bitmap.createScaledBitmap(BitmapFactory.decodeResource(res, R.drawable.ic_profile_image_default), w, h,
true);
return Bitmap.createScaledBitmap(BitmapFactory.decodeResource(res, R.mipmap.ic_launcher), w, h, true);
}
private int getSendersCount(final List<ParcelableDirectMessage> items) {

12
twidere/src/main/java/org/mariotaku/twidere/util/MediaLoaderWrapper.java
View File

@ -51,17 +51,17 @@ public class MediaLoaderWrapper implements Constants {
final DisplayImageOptions.Builder profileOptsBuilder = new DisplayImageOptions.Builder();
profileOptsBuilder.cacheInMemory(true);
profileOptsBuilder.cacheOnDisk(true);
profileOptsBuilder.showImageForEmptyUri(R.drawable.ic_profile_image_default);
profileOptsBuilder.showImageOnFail(R.drawable.ic_profile_image_default);
profileOptsBuilder.showImageOnLoading(R.drawable.ic_profile_image_default);
// profileOptsBuilder.showImageForEmptyUri(R.drawable.ic_profile_image_default);
// profileOptsBuilder.showImageOnFail(R.drawable.ic_profile_image_default);
// profileOptsBuilder.showImageOnLoading(R.drawable.ic_profile_image_default);
profileOptsBuilder.bitmapConfig(Bitmap.Config.ARGB_8888);
profileOptsBuilder.resetViewBeforeLoading(true);
final DisplayImageOptions.Builder ovalProfileOptsBuilder = new DisplayImageOptions.Builder();
ovalProfileOptsBuilder.cacheInMemory(true);
ovalProfileOptsBuilder.cacheOnDisk(true);
ovalProfileOptsBuilder.showImageForEmptyUri(R.drawable.ic_profile_image_default);
ovalProfileOptsBuilder.showImageOnFail(R.drawable.ic_profile_image_default);
ovalProfileOptsBuilder.showImageOnLoading(R.drawable.ic_profile_image_default);
// ovalProfileOptsBuilder.showImageForEmptyUri(R.drawable.ic_profile_image_default);
// ovalProfileOptsBuilder.showImageOnFail(R.drawable.ic_profile_image_default);
// ovalProfileOptsBuilder.showImageOnLoading(R.drawable.ic_profile_image_default);
ovalProfileOptsBuilder.bitmapConfig(Bitmap.Config.ARGB_8888);
ovalProfileOptsBuilder.displayer(new OvalBitmapDisplayer());
ovalProfileOptsBuilder.resetViewBeforeLoading(true);

BIN
twidere/src/main/res/drawable-hdpi/ic_profile_image_default.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.6 KiB

BIN
twidere/src/main/res/drawable-mdpi/ic_profile_image_default.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB

BIN
twidere/src/main/res/drawable-xhdpi/ic_profile_image_default.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.1 KiB

BIN
twidere/src/main/res/drawable-xxhdpi/ic_profile_image_default.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.8 KiB

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

@ -29,7 +29,7 @@
android:orientation="horizontal"
android:showDividers="middle"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools">
>
<LinearLayout
android:layout_width="0dp"
@ -53,8 +53,7 @@
android:layout_gravity="center"
app:sivBackgroundColor="?android:colorBackground"
app:sivBorder="true"
app:sivBorderWidth="@dimen/line_width_compose_account_profile_image"
tools:src="@drawable/ic_profile_image_default"/>
app:sivBorderWidth="@dimen/line_width_compose_account_profile_image"/>
<org.mariotaku.twidere.view.BadgeView
android:id="@+id/accounts_count"

19
twidere/src/main/res/layout/card_item_activity_summary.xml
View File

@ -64,8 +64,7 @@
android:layout_width="@dimen/profile_image_size_activity_small"
android:layout_height="@dimen/profile_image_size_activity_small"
android:layout_margin="2dp"
android:contentDescription="@string/profile_image"
tools:src="@drawable/ic_profile_image_default"/>
android:contentDescription="@string/profile_image"/>
<org.mariotaku.twidere.view.ShapedImageView
android:id="@+id/activity_profile_image_1"
@ -73,8 +72,7 @@
android:layout_width="@dimen/profile_image_size_activity_small"
android:layout_height="@dimen/profile_image_size_activity_small"
android:layout_margin="2dp"
android:contentDescription="@string/profile_image"
tools:src="@drawable/ic_profile_image_default"/>
android:contentDescription="@string/profile_image"/>
<org.mariotaku.twidere.view.ShapedImageView
android:id="@+id/activity_profile_image_2"
@ -82,8 +80,7 @@
android:layout_width="@dimen/profile_image_size_activity_small"
android:layout_height="@dimen/profile_image_size_activity_small"
android:layout_margin="2dp"
android:contentDescription="@string/profile_image"
tools:src="@drawable/ic_profile_image_default"/>
android:contentDescription="@string/profile_image"/>
<org.mariotaku.twidere.view.ShapedImageView
android:id="@+id/activity_profile_image_3"
@ -91,8 +88,7 @@
android:layout_width="@dimen/profile_image_size_activity_small"
android:layout_height="@dimen/profile_image_size_activity_small"
android:layout_margin="2dp"
android:contentDescription="@string/profile_image"
tools:src="@drawable/ic_profile_image_default"/>
android:contentDescription="@string/profile_image"/>
<org.mariotaku.twidere.view.ShapedImageView
android:id="@+id/activity_profile_image_4"
@ -100,8 +96,7 @@
android:layout_width="@dimen/profile_image_size_activity_small"
android:layout_height="@dimen/profile_image_size_activity_small"
android:layout_margin="2dp"
android:contentDescription="@string/profile_image"
tools:src="@drawable/ic_profile_image_default"/>
android:contentDescription="@string/profile_image"/>
<org.mariotaku.twidere.view.themed.ThemedTextView
android:id="@+id/activity_profile_image_more_number"
@ -145,8 +140,8 @@
android:singleLine="false"
android:textAppearance="?android:textAppearanceSmall"
android:textColor="?android:textColorSecondary"
tools:textSize="12sp"
tools:text="@string/sample_status_text"/>
tools:text="@string/sample_status_text"
tools:textSize="12sp"/>
</RelativeLayout>
</android.support.v7.widget.CardView>

15
twidere/src/main/res/layout/card_item_activity_summary_compact.xml
View File

@ -52,8 +52,7 @@
android:layout_width="@dimen/profile_image_size_activity_small"
android:layout_height="@dimen/profile_image_size_activity_small"
android:layout_margin="2dp"
android:contentDescription="@string/profile_image"
tools:src="@drawable/ic_profile_image_default"/>
android:contentDescription="@string/profile_image"/>
<org.mariotaku.twidere.view.ShapedImageView
android:id="@+id/activity_profile_image_1"
@ -61,8 +60,7 @@
android:layout_width="@dimen/profile_image_size_activity_small"
android:layout_height="@dimen/profile_image_size_activity_small"
android:layout_margin="2dp"
android:contentDescription="@string/profile_image"
tools:src="@drawable/ic_profile_image_default"/>
android:contentDescription="@string/profile_image"/>
<org.mariotaku.twidere.view.ShapedImageView
android:id="@+id/activity_profile_image_2"
@ -70,8 +68,7 @@
android:layout_width="@dimen/profile_image_size_activity_small"
android:layout_height="@dimen/profile_image_size_activity_small"
android:layout_margin="2dp"
android:contentDescription="@string/profile_image"
tools:src="@drawable/ic_profile_image_default"/>
android:contentDescription="@string/profile_image"/>
<org.mariotaku.twidere.view.ShapedImageView
android:id="@+id/activity_profile_image_3"
@ -79,8 +76,7 @@
android:layout_width="@dimen/profile_image_size_activity_small"
android:layout_height="@dimen/profile_image_size_activity_small"
android:layout_margin="2dp"
android:contentDescription="@string/profile_image"
tools:src="@drawable/ic_profile_image_default"/>
android:contentDescription="@string/profile_image"/>
<org.mariotaku.twidere.view.ShapedImageView
android:id="@+id/activity_profile_image_4"
@ -88,8 +84,7 @@
android:layout_width="@dimen/profile_image_size_activity_small"
android:layout_height="@dimen/profile_image_size_activity_small"
android:layout_margin="2dp"
android:contentDescription="@string/profile_image"
tools:src="@drawable/ic_profile_image_default"/>
android:contentDescription="@string/profile_image"/>
<org.mariotaku.twidere.view.themed.ThemedTextView
android:id="@+id/activity_profile_image_more_number"

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

@ -31,7 +31,6 @@
style="?profileImageStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/element_spacing_normal"
tools:src="@drawable/ic_profile_image_default"/>
android:layout_margin="@dimen/element_spacing_normal"/>
</LinearLayout>

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

@ -73,8 +73,7 @@
android:contentDescription="@string/profile_image"
android:scaleType="centerCrop"
app:sivBorder="true"
app:sivBorderWidth="1dp"
tools:src="@drawable/ic_profile_image_default"/>
app:sivBorderWidth="1dp"/>
<ImageView
android:id="@+id/profile_type"

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

@ -117,8 +117,7 @@
android:layout_height="@dimen/icon_size_user_profile"
android:layout_alignBottom="@id/profile_name_container"
android:layout_marginLeft="@dimen/element_spacing_normal"
android:contentDescription="@string/profile_image"
android:src="@drawable/ic_profile_image_default"/>
android:contentDescription="@string/profile_image"/>
<org.mariotaku.twidere.view.BoundsImageView
android:id="@+id/profile_type"

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

@ -63,7 +63,6 @@
<org.mariotaku.twidere.view.ShapedImageView
android:id="@+id/profile_image"
style="?profileImageStyle"
tools:src="@drawable/ic_profile_image_default"
android:layout_width="@dimen/icon_size_card_details"
android:layout_height="@dimen/icon_size_card_details"
android:layout_weight="0"

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

@ -45,8 +45,7 @@
android:layout_marginLeft="@dimen/element_spacing_normal"
android:layout_marginRight="@dimen/element_spacing_normal"
android:layout_marginTop="@dimen/element_spacing_small"
android:contentDescription="@string/profile_image"
tools:src="@drawable/ic_profile_image_default"/>
android:contentDescription="@string/profile_image"/>
<RelativeLayout

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

@ -34,8 +34,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:contentDescription="@string/icon"
android:scaleType="centerCrop"
tools:src="@drawable/ic_profile_image_default"/>
android:scaleType="centerCrop"/>
<LinearLayout
android:layout_width="match_parent"

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

@ -34,8 +34,7 @@
android:layout_width="@dimen/icon_size_list_item_small"
android:layout_height="@dimen/icon_size_list_item_small"
android:contentDescription="@string/icon"
android:scaleType="centerCrop"
tools:src="@drawable/ic_profile_image_default"/>
android:scaleType="centerCrop"/>
<LinearLayout
android:layout_width="match_parent"

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

@ -64,6 +64,5 @@
android:layout_height="@dimen/icon_size_card_list_item"
android:layout_weight="0"
android:contentDescription="@string/profile_image"
android:scaleType="fitCenter"
tools:src="@drawable/ic_profile_image_default"/>
android:scaleType="fitCenter"/>
</LinearLayout>

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

@ -33,7 +33,6 @@
android:layout_height="match_parent"
android:layout_gravity="center"
android:contentDescription="@string/profile_image"
android:scaleType="centerCrop"
tools:src="@drawable/ic_profile_image_default"/>
android:scaleType="centerCrop"/>
</org.mariotaku.twidere.view.SquareFrameLayout>

2
twidere/src/main/res/values/styles.xml
View File

@ -119,12 +119,14 @@
<item name="android:scaleType">centerCrop</item>
<item name="sivBorderWidth">1dp</item>
<item name="sivCornerRadiusRatio">10%p</item>
<item name="sivBackgroundColor">?android:colorBackground</item>
</style>
<style name="Widget.Light.ProfileImage" parent="Widget.Base">
<item name="android:scaleType">centerCrop</item>
<item name="sivBorderWidth">1dp</item>
<item name="sivCornerRadiusRatio">10%p</item>
<item name="sivBackgroundColor">?android:colorBackground</item>
</style>
<style name="Widget.ProfileImage.Large">