vanitasvitae/dandelion
1
0
Fork 0
mirror of https://github.com/gsantner/dandelion synced 2024-11-22 12:22:08 +01:00
Code Issues Releases Wiki Activity

Merge changes

Browse source
This commit is contained in:
Gregor Santner 2016-03-21 00:24:08 +01:00
parent 5f3b07e973
commit c5acbf20b0
7 changed files with 0 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/AndroidManifest.xml
View file

@ -52,7 +52,6 @@
<action android:name="android.intent.action.SEND" /> <action android:name="android.intent.action.SEND" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<data android:mimeType="text/*" /> <data android:mimeType="text/*" />
<data android:mimeType="image/*" />
</intent-filter> </intent-filter>
</activity> </activity>

1
app/src/main/java/de/baumann/diaspora/MainActivity.java
View file

@ -763,7 +763,6 @@ public class MainActivity extends AppCompatActivity
if (item != null) { if (item != null) {
if (conversationCount > 0) { if (conversationCount > 0) {
item.setIcon(R.drawable.ic_message_text_white_24dp); item.setIcon(R.drawable.ic_message_text_white_24dp);
item.setIcon(R.drawable.ic_bell_ring_white_24dp);
Snackbar snackbar = Snackbar Snackbar snackbar = Snackbar
.make(swipeView, R.string.new_conversations, Snackbar.LENGTH_INDEFINITE) .make(swipeView, R.string.new_conversations, Snackbar.LENGTH_INDEFINITE)
.setAction(R.string.yes, new View.OnClickListener() { .setAction(R.string.yes, new View.OnClickListener() {

BIN
app/src/main/res/mipmap-hdpi/ic_launcher.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.2 KiB

BIN
app/src/main/res/mipmap-mdpi/ic_launcher.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.2 KiB

BIN
app/src/main/res/mipmap-xhdpi/ic_launcher.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.2 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.2 KiB

BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.2 KiB