diff --git a/README.md b/README.md index bfaca926..8efb06ce 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![GitHub release](https://img.shields.io/github/tag/diaspora-for-android/dandelion.svg)](https://github.com/diaspora-for-android/dandelion/releases) [![Build Status](https://travis-ci.org/Diaspora-for-Android/dandelion.svg?branch=master)](https://travis-ci.org/Diaspora-for-Android/dandelion) -[![Translate - with Stringlate](https://img.shields.io/badge/stringlate-translate-green.svg)](https://lonamiwebs.github.io/stringlate/translate?git=https%3A%2F%2Fgithub.com%2Fdiaspora-for-android%2Fdandelion.git) +[![Translate - with Stringlate](https://img.shields.io/badge/stringlate-translate-green.svg)](https://lonamiwebs.github.io/stringlate/translate?git=https%3A%2F%2Fgithub.com%2Fdiaspora-for-android%2Fdandelion.git&mail=gro.xobliam@@rentnasg) [![Chat - Matrix](https://img.shields.io/badge/chat-on%20matrix-blue.svg)](https://matrix.to/#/#dandelion:matrix.org) [![Chat - FreeNode IRC](https://img.shields.io/badge/chat-on%20irc-blue.svg)](https://kiwiirc.com/client/irc.freenode.net/?nick=dandelion-anon|?##dandelion) [![Donate Bitcoin](https://img.shields.io/badge/donate-bitcoin-orange.svg)](http://gsantner.net/#donate) [![Donate LiberaPay](https://img.shields.io/badge/donate-liberapay-orange.svg)](https://liberapay.com/gsantner/donate) diff --git a/app/src/main/ic_launcher-web.png b/app/src/main/ic_launcher-web.png index 39e28103..0a8685ce 100644 Binary files a/app/src/main/ic_launcher-web.png and b/app/src/main/ic_launcher-web.png differ diff --git a/app/src/main/ic_launcher_test-web.png b/app/src/main/ic_launcher_test-web.png new file mode 100644 index 00000000..8f31241c Binary files /dev/null and b/app/src/main/ic_launcher_test-web.png differ diff --git a/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ThemedActivity.java b/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ThemedActivity.java index fd3aaef7..bec88c4e 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ThemedActivity.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ThemedActivity.java @@ -22,6 +22,7 @@ import android.annotation.TargetApi; import android.app.ActivityManager; import android.content.pm.ActivityInfo; import android.graphics.drawable.BitmapDrawable; +import android.graphics.drawable.Drawable; import android.os.Build; import android.support.v7.app.AppCompatActivity; @@ -69,15 +70,7 @@ public abstract class ThemedActivity extends AppCompatActivity { */ @TargetApi(Build.VERSION_CODES.LOLLIPOP) private void updateRecentAppColor() { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - BitmapDrawable drawable = ((BitmapDrawable) getDrawable(R.drawable.ic_launcher)); - if (drawable != null) { - setTaskDescription(new ActivityManager.TaskDescription( - getResources().getString(R.string.app_name), - drawable.getBitmap(), - getAppSettings().getPrimaryColor())); - } - } + } protected void updateScreenRotation() { diff --git a/app/src/main/res/drawable-anydpi-v26/ic_launcher.xml b/app/src/main/res/drawable-anydpi-v26/ic_launcher.xml new file mode 100644 index 00000000..bbd3e021 --- /dev/null +++ b/app/src/main/res/drawable-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/drawable-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 00000000..bbd3e021 --- /dev/null +++ b/app/src/main/res/drawable-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable-anydpi-v26/ic_launcher_test.xml b/app/src/main/res/drawable-anydpi-v26/ic_launcher_test.xml new file mode 100644 index 00000000..f1b3aaa2 --- /dev/null +++ b/app/src/main/res/drawable-anydpi-v26/ic_launcher_test.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable-anydpi-v26/ic_launcher_test_round.xml b/app/src/main/res/drawable-anydpi-v26/ic_launcher_test_round.xml new file mode 100644 index 00000000..f1b3aaa2 --- /dev/null +++ b/app/src/main/res/drawable-anydpi-v26/ic_launcher_test_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable-hdpi/ic_launcher.png b/app/src/main/res/drawable-hdpi/ic_launcher.png index 4e38e5c2..6f647c49 100644 Binary files a/app/src/main/res/drawable-hdpi/ic_launcher.png and b/app/src/main/res/drawable-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_launcher_round.png b/app/src/main/res/drawable-hdpi/ic_launcher_round.png new file mode 100644 index 00000000..6f647c49 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_launcher_test.png b/app/src/main/res/drawable-hdpi/ic_launcher_test.png index 2e1ab3f5..c30acbbc 100644 Binary files a/app/src/main/res/drawable-hdpi/ic_launcher_test.png and b/app/src/main/res/drawable-hdpi/ic_launcher_test.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_launcher_test_round.png b/app/src/main/res/drawable-hdpi/ic_launcher_test_round.png new file mode 100644 index 00000000..c30acbbc Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_launcher_test_round.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_launcher.png b/app/src/main/res/drawable-mdpi/ic_launcher.png index 375b47d7..a9db7c16 100644 Binary files a/app/src/main/res/drawable-mdpi/ic_launcher.png and b/app/src/main/res/drawable-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_launcher_round.png b/app/src/main/res/drawable-mdpi/ic_launcher_round.png new file mode 100644 index 00000000..a9db7c16 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_launcher_test.png b/app/src/main/res/drawable-mdpi/ic_launcher_test.png index 7f0dec56..f23d1091 100644 Binary files a/app/src/main/res/drawable-mdpi/ic_launcher_test.png and b/app/src/main/res/drawable-mdpi/ic_launcher_test.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_launcher_test_round.png b/app/src/main/res/drawable-mdpi/ic_launcher_test_round.png new file mode 100644 index 00000000..f23d1091 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_launcher_test_round.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_launcher.png b/app/src/main/res/drawable-xhdpi/ic_launcher.png index 16dc7a29..c97e5b53 100644 Binary files a/app/src/main/res/drawable-xhdpi/ic_launcher.png and b/app/src/main/res/drawable-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_launcher_round.png b/app/src/main/res/drawable-xhdpi/ic_launcher_round.png new file mode 100644 index 00000000..c97e5b53 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_launcher_test.png b/app/src/main/res/drawable-xhdpi/ic_launcher_test.png index 066d7f73..43025584 100644 Binary files a/app/src/main/res/drawable-xhdpi/ic_launcher_test.png and b/app/src/main/res/drawable-xhdpi/ic_launcher_test.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_launcher_test_round.png b/app/src/main/res/drawable-xhdpi/ic_launcher_test_round.png new file mode 100644 index 00000000..43025584 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_launcher_test_round.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_launcher.png b/app/src/main/res/drawable-xxhdpi/ic_launcher.png index 80bb0633..11c9bd14 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_launcher.png and b/app/src/main/res/drawable-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_launcher_round.png b/app/src/main/res/drawable-xxhdpi/ic_launcher_round.png new file mode 100644 index 00000000..11c9bd14 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_launcher_test.png b/app/src/main/res/drawable-xxhdpi/ic_launcher_test.png index cb862934..3993c4e4 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_launcher_test.png and b/app/src/main/res/drawable-xxhdpi/ic_launcher_test.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_launcher_test_round.png b/app/src/main/res/drawable-xxhdpi/ic_launcher_test_round.png new file mode 100644 index 00000000..3993c4e4 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_launcher_test_round.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_launcher.png b/app/src/main/res/drawable-xxxhdpi/ic_launcher.png index bdde0721..48f09459 100644 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_launcher.png and b/app/src/main/res/drawable-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_launcher_round.png b/app/src/main/res/drawable-xxxhdpi/ic_launcher_round.png new file mode 100644 index 00000000..48f09459 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_launcher_test.png b/app/src/main/res/drawable-xxxhdpi/ic_launcher_test.png index dbb8dee8..72aabea6 100644 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_launcher_test.png and b/app/src/main/res/drawable-xxxhdpi/ic_launcher_test.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_launcher_test_round.png b/app/src/main/res/drawable-xxxhdpi/ic_launcher_test_round.png new file mode 100644 index 00000000..72aabea6 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_launcher_test_round.png differ diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 00000000..10e5177c --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 00000000..2610c60c --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,12 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_launcher_test_background.xml b/app/src/main/res/drawable/ic_launcher_test_background.xml new file mode 100644 index 00000000..e7de1de8 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_test_background.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_launcher_test_foreground.xml b/app/src/main/res/drawable/ic_launcher_test_foreground.xml new file mode 100644 index 00000000..2610c60c --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_test_foreground.xml @@ -0,0 +1,12 @@ + + + + + diff --git a/metadata/en-US/full_description.txt b/metadata/en-US/full_description.txt index 2332973c..120c4be9 100644 --- a/metadata/en-US/full_description.txt +++ b/metadata/en-US/full_description.txt @@ -12,7 +12,7 @@ It adds useful features to your networking experience: Support the project: - ✋ Translate using Stringlate + ✋ Translate using StringlateJoin discussion on MatrixMore information about contributionsSupport main developer diff --git a/sc_edit.svg b/sc_edit.svg deleted file mode 100644 index b5074d99..00000000 --- a/sc_edit.svg +++ /dev/null @@ -1,386 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - -