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

Merge branch 'changes_font' into develop

This commit is contained in:
tom79 2017-10-12 18:29:32 +02:00
parent 2cbbfe7971 d6c79a77c0
commit 202ed4ad69
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/src/main/assets/fonts/WorkSans-Regular.ttf Executable file
View File

Binary file not shown.

5
app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
View File

@ -15,6 +15,7 @@ package fr.gouv.etalab.mastodon.drawers;
* see <http://www.gnu.org/licenses>. */ * see <http://www.gnu.org/licenses>. */
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.Typeface;
import android.os.Handler; import android.os.Handler;
import android.support.design.widget.FloatingActionButton; import android.support.design.widget.FloatingActionButton;
import android.support.v7.app.AlertDialog; import android.support.v7.app.AlertDialog;
@ -567,6 +568,10 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf
} }
} }
} }
Typeface tf = Typeface.createFromAsset(context.getAssets(), "fonts/WorkSans-Regular.ttf");
holder.status_content.setTypeface(tf);
//Toot was translated and user asked to see it //Toot was translated and user asked to see it
if( status.isTranslationShown()){ if( status.isTranslationShown()){
holder.status_content.setVisibility(View.GONE); holder.status_content.setVisibility(View.GONE);