mirror/monocles_chat
1
0
Fork 1
mirror of https://codeberg.org/monocles/monocles_chat.git synced 2025-01-30 16:51:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

don't show icons in settings

Browse source
This commit is contained in:
Christian Schneppe 2020-12-11 16:03:35 +01:00
parent 3d96292c41
commit b9def66409
No known key found for this signature in database
GPG key ID: F30B8D686B44D87E
5 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/eu/siacs/conversations/ui/SetSettingsActivity.java
View file

@ -18,6 +18,7 @@ import eu.siacs.conversations.entities.Account;
import eu.siacs.conversations.services.XmppConnectionService;
import eu.siacs.conversations.utils.AccountUtils;
import eu.siacs.conversations.utils.FirstStartManager;
import eu.siacs.conversations.utils.ThemeHelper;
import static eu.siacs.conversations.ui.SettingsActivity.BROADCAST_LAST_ACTIVITY;
import static eu.siacs.conversations.ui.SettingsActivity.CHAT_STATES;
@ -57,6 +58,7 @@ public class SetSettingsActivity extends XmppActivity implements XmppConnectionS
this.binding.next.setOnClickListener(this::next);
createInfoMenu();
getDefaults();
setTheme(ThemeHelper.find(this));
}
private void createInfoMenu() {

10
src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
View file

@ -38,6 +38,7 @@ import eu.siacs.conversations.persistance.FileBackend;
import eu.siacs.conversations.services.ExportBackupService;
import eu.siacs.conversations.services.MemorizingTrustManager;
import eu.siacs.conversations.ui.util.StyledAttributes;
import eu.siacs.conversations.utils.ThemeHelper;
import eu.siacs.conversations.utils.TimeFrameUtils;
import eu.siacs.conversations.xmpp.Jid;
import me.drakeet.support.toast.ToastCompat;
@ -90,9 +91,7 @@ public class SettingsActivity extends XmppActivity implements
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
this.mTheme = findTheme();
setTheme(this.mTheme);
updateTheme();
setTheme(ThemeHelper.find(this));
setContentView(R.layout.activity_settings);
FragmentManager fm = getFragmentManager();
mSettingsFragment = (SettingsFragment) fm.findFragmentById(R.id.settings_content);
@ -309,6 +308,7 @@ public class SettingsActivity extends XmppActivity implements
deleteOmemoPreference.setOnPreferenceClickListener(preference -> deleteOmemoIdentities());
}
PreferenceScreen ExpertPreferenceScreen = (PreferenceScreen) mSettingsFragment.findPreference("expert");
final Preference useBundledEmojis = mSettingsFragment.findPreference("use_bundled_emoji");
if (useBundledEmojis != null) {
Log.d(Config.LOGTAG, "Bundled Emoji checkbox checked: " + isBundledEmojiChecked);
@ -320,8 +320,8 @@ public class SettingsActivity extends XmppActivity implements
PreferenceCategory UICatergory = (PreferenceCategory) mSettingsFragment.findPreference("UI");
UICatergory.removePreference(useBundledEmojis);
if (UICatergory.getPreferenceCount() == 0) {
if (mainPreferenceScreen != null) {
mainPreferenceScreen.removePreference(UICatergory);
if (ExpertPreferenceScreen != null) {
ExpertPreferenceScreen.removePreference(UICatergory);
}
}
}

1
src/main/java/eu/siacs/conversations/ui/SettingsFragment.java
View file

@ -20,7 +20,6 @@ public class SettingsFragment extends PreferenceFragment {
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
addPreferencesFromResource(R.xml.preferences);
// Remove from standard preferences if the flag ONLY_INTERNAL_STORAGE is false
if (!Config.ONLY_INTERNAL_STORAGE) {
PreferenceCategory mCategory = (PreferenceCategory) findPreference("security_options");

5
src/main/res/layout/activity_set_settings.xml
View file

@ -1,7 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:tools="http://schemas.android.com/tools"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:card_view="http://schemas.android.com/apk/res-auto">
<layout xmlns:android="http://schemas.android.com/apk/res/android">
<LinearLayout
android:layout_width="match_parent"
@ -220,6 +218,7 @@
android:layout_height="match_parent"
android:gravity="center_vertical" />
</TableRow>
<TableRow
android:layout_width="fill_parent"
android:layout_height="wrap_content"

7
src/main/res/xml/preferences.xml
View file

@ -3,7 +3,6 @@
android:key="main_screen">
<!--UI-->
<PreferenceScreen
android:icon="?attr/ic_settings_ui"
android:key="userinterface"
android:title="@string/pref_ui_options">
<intent
@ -115,7 +114,6 @@
</PreferenceScreen>
<!--Notifications-->
<PreferenceScreen
android:icon="?attr/ic_settings_notifications"
android:key="notifications"
android:title="@string/pref_notification_settings">
<intent
@ -206,7 +204,6 @@
</PreferenceScreen>
<!--Attachments-->
<PreferenceScreen
android:icon="?attr/ic_settings_attachments"
android:key="attachments"
android:title="@string/pref_attachments">
<intent
@ -260,7 +257,6 @@
</PreferenceScreen>
<!--status-->
<PreferenceScreen
android:icon="?attr/ic_settings_status"
android:key="presence"
android:title="@string/pref_presence_settings">
<intent
@ -298,7 +294,6 @@
</PreferenceScreen>
<!--Security and Privacy-->
<PreferenceScreen
android:icon="?attr/ic_settings_security"
android:key="security"
android:title="@string/pref_security_settings">
<intent
@ -403,7 +398,6 @@
</PreferenceScreen>
<!--Expert-->
<PreferenceScreen
android:icon="?attr/ic_settings_expert"
android:key="expert"
android:title="@string/pref_expert_options">
<intent
@ -516,7 +510,6 @@
</PreferenceScreen>
<!--About-->
<eu.siacs.conversations.ui.AboutPreference
android:icon="?attr/ic_settings_about"
android:summary="@string/pref_about_conversations_summary"
android:title="@string/title_activity_about" />