Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Resolved a conflict between this branch and the current tom-repo/develop one.

This commit is contained in:
PhotonQyv 2017-08-21 18:33:28 +01:00
parent ff6923a203
commit ac3be96bf3
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java
View File

@ -16,6 +16,7 @@ package fr.gouv.etalab.mastodon.activities;
import android.app.Activity; import android.app.Activity;
import android.net.Uri; import android.net.Uri;
import android.support.v4.content.ContextCompat;
import android.support.v7.app.AlertDialog; import android.support.v7.app.AlertDialog;
import android.content.ActivityNotFoundException; import android.content.ActivityNotFoundException;
import android.content.Context; import android.content.Context;
@ -279,7 +280,6 @@ public class TootActivity extends AppCompatActivity implements OnRetrieveSearcAc
} }
toot_content.setText( String.format("\n%s", sharedContent)); toot_content.setText( String.format("\n%s", sharedContent));
} }
attachments = new ArrayList<>(); attachments = new ArrayList<>();
int charsInCw = 0; int charsInCw = 0;
int charsInToot = 0; int charsInToot = 0;
@ -481,7 +481,9 @@ public class TootActivity extends AppCompatActivity implements OnRetrieveSearcAc
restoreToot(restored); restoreToot(restored);
} }
changeColor(); changeColor();
if( theme == Helper.THEME_LIGHT) {
toot_it.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.white));
}
} }