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

Disable emojione by default

This commit is contained in:
tom79 2020-03-15 17:12:53 +01:00
parent 3ecf20f3f0
commit 128358466f
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/app/fedilab/android/activities/PixelfedComposeActivity.java
View File

@ -655,7 +655,7 @@ public class PixelfedComposeActivity extends BaseActivity implements UploadStatu
ImageButton toot_emoji = findViewById(R.id.toot_emoji);
LinearLayout bottom_bar_tooting = findViewById(R.id.bottom_bar_tooting);
isScheduled = false;
if (sharedpreferences.getBoolean(Helper.SET_DISPLAY_EMOJI, true)) {
if (sharedpreferences.getBoolean(Helper.SET_DISPLAY_EMOJI, false)) {
final EmojiPopup emojiPopup = EmojiPopup.Builder.fromRootView(drawer_layout).build(toot_content);
toot_emoji.setOnClickListener(new View.OnClickListener() {

2
app/src/main/java/app/fedilab/android/activities/TootActivity.java
View File

@ -813,7 +813,7 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate,
}
isScheduled = false;
if (sharedpreferences.getBoolean(Helper.SET_DISPLAY_EMOJI, true)) {
if (sharedpreferences.getBoolean(Helper.SET_DISPLAY_EMOJI, false)) {
final EmojiPopup emojiPopup = EmojiPopup.Builder.fromRootView(drawer_layout).build(toot_content);
toot_emoji.setOnClickListener(v -> {

2
app/src/main/java/app/fedilab/android/fragments/ContentSettingsFragment.java
View File

@ -759,7 +759,7 @@ public class ContentSettingsFragment extends Fragment implements OnRetrieveRemot
}
});
boolean display_emoji = sharedpreferences.getBoolean(Helper.SET_DISPLAY_EMOJI, true);
boolean display_emoji = sharedpreferences.getBoolean(Helper.SET_DISPLAY_EMOJI, false);
final SwitchCompat set_display_emoji = rootView.findViewById(R.id.set_display_emoji);
set_display_emoji.setChecked(display_emoji);

4
app/src/main/java/app/fedilab/android/helper/CustomTextView.java
View File

@ -44,12 +44,14 @@ public class CustomTextView extends AppCompatTextView {
public CustomTextView(Context context) {
super(context);
final SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, android.content.Context.MODE_PRIVATE);
emoji = sharedpreferences.getBoolean(Helper.SET_DISPLAY_EMOJI, false);
}
public CustomTextView(Context context, AttributeSet attrs) {
super(context, attrs);
final SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, android.content.Context.MODE_PRIVATE);
emoji = sharedpreferences.getBoolean(Helper.SET_DISPLAY_EMOJI, true);
emoji = sharedpreferences.getBoolean(Helper.SET_DISPLAY_EMOJI, false);
final Paint.FontMetrics fontMetrics = getPaint().getFontMetrics();
final float defaultEmojiSize = fontMetrics.descent - fontMetrics.ascent;