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

moved launcher icon to mipmap

This commit is contained in:
Mariotaku Lee 2015-03-19 16:34:30 +08:00
parent 2be77fd05d
commit 8db3c1ade9
21 changed files with 40 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/ColorPicker

@ -1 +1 @@
Subproject commit 845042f3d9523208415b710c742ffe417b4344f0
Subproject commit 30dd3c3e8c738f8308ccf1b2400f6595a885d0dc

1
twidere/build.gradle
View File

@ -47,6 +47,7 @@ repositories {
jcenter()
mavenCentral()
maven { url 'https://repo.commonsware.com.s3.amazonaws.com' }
maven { url "https://jitpack.io" }
}
configurations.all {

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

@ -59,7 +59,7 @@
android:allowBackup="true"
android:backupAgent="org.mariotaku.twidere.backup.TwidereBackupAgentHelper"
android:hardwareAccelerated="true"
android:icon="@drawable/ic_launcher"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:theme="@style/Theme.Blank">
<uses-library
@ -90,7 +90,7 @@
<activity
android:name=".activity.MainActivity"
android:icon="@drawable/ic_launcher"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:launchMode="singleTop"
android:theme="@style/Theme.Launcher"
@ -106,7 +106,7 @@
<activity
android:name=".activity.MainHondaJOJOActivity"
android:enabled="false"
android:icon="@drawable/ic_launcher_hondajojo"
android:icon="@mipmap/ic_launcher_hondajojo"
android:label="@string/app_name"
android:launchMode="singleTop"
android:theme="@style/Theme.Launcher"

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

@ -34,7 +34,7 @@ public class CreateComposeShortcutActivity extends Activity implements Constants
super.onCreate(savedInstanceState);
final Intent intent = new Intent();
final Intent launch_intent = new Intent(INTENT_ACTION_COMPOSE);
final ShortcutIconResource icon = Intent.ShortcutIconResource.fromContext(this, R.drawable.ic_launcher);
final ShortcutIconResource icon = Intent.ShortcutIconResource.fromContext(this, R.mipmap.ic_launcher);
intent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, launch_intent);
intent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE, icon);
intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, getString(R.string.compose));

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

@ -409,9 +409,9 @@ public abstract class AbsStatusesFragment<Data> extends BaseSupportFragment impl
private void updateRefreshProgressOffset() {
if (mSystemWindowsInsets.top == 0 || mSwipeRefreshLayout == null || isRefreshing()) return;
// 40: SwipeRefreshLayout.CIRCLE_DIAMETER
final float density = getResources().getDisplayMetrics().density;
final int swipeStart = (mSystemWindowsInsets.top - mControlBarOffsetPixels) - Math.round(40 * density);
final int progressCircleDiameter = mSwipeRefreshLayout.getProgressCircleDiameter();
final int swipeStart = (mSystemWindowsInsets.top - mControlBarOffsetPixels) - progressCircleDiameter;
// 64: SwipeRefreshLayout.DEFAULT_CIRCLE_TARGET
final int swipeDistance = Math.round(64 * density);
mSwipeRefreshLayout.setProgressViewOffset(true, swipeStart, swipeStart + swipeDistance);

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

@ -131,9 +131,9 @@ public class DirectMessagesFragment extends BaseSupportFragment implements Loade
private void updateRefreshProgressOffset() {
if (mSystemWindowsInsets.top == 0 || mSwipeRefreshLayout == null || isRefreshing()) return;
// 40: SwipeRefreshLayout.CIRCLE_DIAMETER
final float density = getResources().getDisplayMetrics().density;
final int swipeStart = (mSystemWindowsInsets.top - mControlBarOffsetPixels) - Math.round(40 * density);
final int progressCircleDiameter = mSwipeRefreshLayout.getProgressCircleDiameter();
final int swipeStart = (mSystemWindowsInsets.top - mControlBarOffsetPixels) - progressCircleDiameter;
// 64: SwipeRefreshLayout.DEFAULT_CIRCLE_TARGET
final int swipeDistance = Math.round(64 * density);
mSwipeRefreshLayout.setProgressViewOffset(true, swipeStart, swipeStart + swipeDistance);

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

@ -142,7 +142,7 @@ public class ThemePreviewPreference extends Preference implements Constants, OnS
profileView.setBackgroundResource(0);
textView.setTextIsSelectable(false);
profileImageView.setImageResource(R.drawable.ic_launcher);
profileImageView.setImageResource(R.mipmap.ic_launcher);
nameView.setText(TWIDERE_PREVIEW_NAME);
screenNameView.setText("@" + TWIDERE_PREVIEW_SCREEN_NAME);
textView.setText(toPlainText(TWIDERE_PREVIEW_TEXT_HTML));

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

@ -330,6 +330,7 @@ public class ThemeUtils implements Constants {
final CompoundButton compoundButton = (CompoundButton) view;
ViewAccessor.setButtonTintList(compoundButton, tintList);
}
// TODO support TintableBackgroundView
}

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

@ -55,7 +55,7 @@
android:layout_marginLeft="@dimen/element_spacing_normal"
android:layout_weight="0"
android:scaleType="centerInside"
android:src="@drawable/ic_launcher"
android:src="@mipmap/ic_launcher"
android:visibility="gone"/>
</LinearLayout>

0
twidere/src/main/res/drawable-hdpi/ic_launcher.png → twidere/src/main/res/mipmap-hdpi/ic_launcher.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

0
twidere/src/main/res/drawable-hdpi/ic_launcher_hondajojo.png → twidere/src/main/res/mipmap-hdpi/ic_launcher_hondajojo.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

0
twidere/src/main/res/drawable-mdpi/ic_launcher.png → twidere/src/main/res/mipmap-mdpi/ic_launcher.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.3 KiB

After

Width:  |  Height:  |  Size: 7.3 KiB

0
twidere/src/main/res/drawable-mdpi/ic_launcher_hondajojo.png → twidere/src/main/res/mipmap-mdpi/ic_launcher_hondajojo.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.4 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

0
twidere/src/main/res/drawable-xhdpi/ic_launcher.png → twidere/src/main/res/mipmap-xhdpi/ic_launcher.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

0
twidere/src/main/res/drawable-xhdpi/ic_launcher_hondajojo.png → twidere/src/main/res/mipmap-xhdpi/ic_launcher_hondajojo.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

0
twidere/src/main/res/drawable-xxhdpi/ic_launcher.png → twidere/src/main/res/mipmap-xxhdpi/ic_launcher.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

0
twidere/src/main/res/drawable-xxhdpi/ic_launcher_hondajojo.png → twidere/src/main/res/mipmap-xxhdpi/ic_launcher_hondajojo.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 35 KiB

0
twidere/src/main/res/drawable-xxxhdpi/ic_launcher.png → twidere/src/main/res/mipmap-xxxhdpi/ic_launcher.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 31 KiB

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

@ -2,27 +2,27 @@
<resources>
<style name="Widget.Twidere.ActionBar.Colored" parent="Widget.Base.Light.ActionBar.Solid">
<item name="android:background">@drawable/ab_twidere_solid_color_holo</item>
<!--<item name="android:background">@drawable/ab_twidere_solid_color_holo</item>-->
<!--<item name="android:background">@android:color/transparent</item>-->
</style>
<style name="Widget.Twidere.ActionBar.Colored.Inverse" parent="Widget.Base.Light.ActionBar.Solid.Inverse">
<item name="android:background">@drawable/ab_twidere_solid_color_holo</item>
<!--<item name="android:background">@drawable/ab_twidere_solid_color_holo</item>-->
<!--<item name="android:background">@android:color/transparent</item>-->
</style>
<style name="Widget.Twidere.ActionBar.Dark" parent="Widget.Base.ActionBar.Solid">
<item name="android:background">@drawable/ab_twidere_solid_dark_holo</item>
<!--<item name="android:background">@drawable/ab_twidere_solid_dark_holo</item>-->
<!--<item name="android:background">@android:color/transparent</item>-->
</style>
<style name="Widget.Twidere.ActionBar.Light" parent="Widget.Base.Light.ActionBar.Solid">
<item name="android:background">@drawable/ab_twidere_solid_light_holo</item>
<!--<item name="android:background">@drawable/ab_twidere_solid_light_holo</item>-->
<!--<item name="android:background">@android:color/transparent</item>-->
</style>
<style name="Widget.Twidere.ActionBar.Light.DarkActionBar" parent="Widget.Base.Light.ActionBar.Solid.Inverse">
<item name="android:background">@drawable/ab_twidere_solid_dark_holo</item>
<!--<item name="android:background">@drawable/ab_twidere_solid_dark_holo</item>-->
<!--<item name="android:background">@android:color/transparent</item>-->
</style>

49
twidere/src/main/res/values/themes_base_appcompat.xml
View File

@ -21,64 +21,57 @@
<resources>
<style name="Theme.Compat.Base" parent="Theme.AppCompat">
<!--<item name="android:colorPrimary">@color/material_light_blue</item>-->
<!--<item name="android:colorPrimaryDark">@color/material_light_blue_700</item>-->
<!--<item name="android:colorAccent">@color/material_light_blue_a200</item>-->
<!--<item name="android:colorAccent">#ccc</item>-->
<!--<item name="colorPrimary">@color/material_light_blue</item>-->
<!--<item name="colorPrimaryDark">@color/material_light_blue_700</item>-->
<!--<item name="colorAccent">@color/material_light_blue_a200</item>-->
<item name="android:textColorTertiary">@color/tertiary_text_mtrl_dark</item>
<item name="android:textColorTertiaryInverse">@color/tertiary_text_mtrl_light</item>
</style>
<style name="Theme.Compat.Base.NoActionBar" parent="Theme.AppCompat.NoActionBar">
<!--<item name="android:colorPrimary">@color/material_light_blue</item>-->
<!--<item name="android:colorPrimaryDark">@color/material_light_blue_700</item>-->
<!--<item name="android:colorAccent">@color/material_light_blue_a200</item>-->
<!--<item name="android:colorAccent">#ccc</item>-->
<!--<item name="colorPrimary">@color/material_light_blue</item>-->
<!--<item name="colorPrimaryDark">@color/material_light_blue_700</item>-->
<!--<item name="colorAccent">@color/material_light_blue_a200</item>-->
<item name="android:textColorTertiary">@color/tertiary_text_mtrl_dark</item>
<item name="android:textColorTertiaryInverse">@color/tertiary_text_mtrl_light</item>
</style>
<style name="Theme.Compat.Base.Dialog" parent="Theme.AppCompat.Dialog">
<!--<item name="android:colorPrimary">@color/material_light_blue</item>-->
<!--<item name="android:colorPrimaryDark">@color/material_light_blue_700</item>-->
<!--<item name="android:colorAccent">@color/material_light_blue_a200</item>-->
<!--<item name="android:colorAccent">#ccc</item>-->
<!--<item name="colorPrimary">@color/material_light_blue</item>-->
<!--<item name="colorPrimaryDark">@color/material_light_blue_700</item>-->
<!--<item name="colorAccent">@color/material_light_blue_a200</item>-->
<item name="android:textColorTertiary">@color/tertiary_text_mtrl_dark</item>
<item name="android:textColorTertiaryInverse">@color/tertiary_text_mtrl_light</item>
</style>
<style name="Theme.Compat.Base.Light" parent="Theme.AppCompat.Light">
<!--<item name="android:colorPrimary">@color/material_light_blue</item>-->
<!--<item name="android:colorPrimaryDark">@color/material_light_blue_700</item>-->
<!--<item name="android:colorAccent">@color/material_light_blue_a200</item>-->
<!--<item name="android:colorAccent">#aaa</item>-->
<!--<item name="colorPrimary">@color/material_light_blue</item>-->
<!--<item name="colorPrimaryDark">@color/material_light_blue_700</item>-->
<!--<item name="colorAccent">@color/material_light_blue_a200</item>-->
<item name="android:textColorTertiary">@color/tertiary_text_mtrl_light</item>
<item name="android:textColorTertiaryInverse">@color/tertiary_text_mtrl_dark</item>
</style>
<style name="Theme.Compat.Base.Light.DarkActionBar" parent="Theme.AppCompat.Light.DarkActionBar">
<!--<item name="android:colorPrimary">@color/material_light_blue</item>-->
<!--<item name="android:colorPrimaryDark">@color/material_light_blue_700</item>-->
<!--<item name="android:colorAccent">@color/material_light_blue_a200</item>-->
<!--<item name="android:colorAccent">#aaa</item>-->
<!--<item name="colorPrimary">@color/material_light_blue</item>-->
<!--<item name="colorPrimaryDark">@color/material_light_blue_700</item>-->
<!--<item name="colorAccent">@color/material_light_blue_a200</item>-->
<item name="android:textColorTertiary">@color/tertiary_text_mtrl_light</item>
<item name="android:textColorTertiaryInverse">@color/tertiary_text_mtrl_dark</item>
</style>
<style name="Theme.Compat.Base.Light.NoActionBar" parent="Theme.AppCompat.Light.NoActionBar">
<!--<item name="android:colorPrimary">@color/material_light_blue</item>-->
<!--<item name="android:colorPrimaryDark">@color/material_light_blue_700</item>-->
<!--<item name="android:colorAccent">@color/material_light_blue_a200</item>-->
<!--<item name="android:colorAccent">#aaa</item>-->
<!--<item name="colorPrimary">@color/material_light_blue</item>-->
<!--<item name="colorPrimaryDark">@color/material_light_blue_700</item>-->
<!--<item name="colorAccent">@color/material_light_blue_a200</item>-->
<item name="android:textColorTertiary">@color/tertiary_text_mtrl_light</item>
<item name="android:textColorTertiaryInverse">@color/tertiary_text_mtrl_dark</item>
</style>
<style name="Theme.Compat.Base.Light.Dialog" parent="Theme.AppCompat.Light.Dialog">
<!--<item name="android:colorPrimary">@color/material_light_blue</item>-->
<!--<item name="android:colorPrimaryDark">@color/material_light_blue_700</item>-->
<!--<item name="android:colorAccent">@color/material_light_blue_a200</item>-->
<!--<item name="android:colorAccent">#aaa</item>-->
<!--<item name="colorPrimary">@color/material_light_blue</item>-->
<!--<item name="colorPrimaryDark">@color/material_light_blue_700</item>-->
<!--<item name="colorAccent">@color/material_light_blue_a200</item>-->
<item name="android:textColorTertiary">@color/tertiary_text_mtrl_light</item>
<item name="android:textColorTertiaryInverse">@color/tertiary_text_mtrl_dark</item>
</style>

2
twidere/src/main/res/xml/about.xml
View File

@ -123,7 +123,7 @@
</PreferenceCategory>
<PreferenceCategory android:title="@string/sponsored_by">
<Preference
android:icon="@drawable/ic_launcher_hondajojo"
android:icon="@mipmap/ic_launcher_hondajojo"
android:title="@string/kuma_union">
<intent
android:action="android.intent.action.VIEW"