Skip to content

Allow for settings titles to expand across multiple lines instead of being truncated #1671

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 23, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
package fr.free.nrw.commons.ui.LongTitlePreferences;

import android.content.Context;
import android.preference.EditTextPreference;
import android.util.AttributeSet;
import android.view.View;
import android.widget.TextView;

/**
* Created by seannemann on 6/27/2018.
*/

public class LongTitleEditTextPreference extends EditTextPreference {
public LongTitleEditTextPreference(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
}

public LongTitleEditTextPreference(Context context, AttributeSet attrs) {
super(context, attrs);
}

public LongTitleEditTextPreference(Context context) {

super(context);
}

@Override
protected void onBindView(View view)
{
super.onBindView(view);

TextView title= view.findViewById(android.R.id.title);
if (title != null) {
title.setSingleLine(false);
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package fr.free.nrw.commons.ui.LongTitlePreferences;

import android.content.Context;
import android.preference.ListPreference;
import android.util.AttributeSet;
import android.view.View;
import android.widget.TextView;

/**
* Created by seannemann on 6/27/2018.
*/

public class LongTitleListPreference extends ListPreference {
public LongTitleListPreference(Context context, AttributeSet attrs) {
super(context, attrs);
}

public LongTitleListPreference(Context context) {
super(context);
}

@Override
protected void onBindView(View view)
{
super.onBindView(view);

TextView title= view.findViewById(android.R.id.title);
if (title != null) {
title.setSingleLine(false);
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
package fr.free.nrw.commons.ui.LongTitlePreferences;

import android.content.Context;
import android.preference.Preference;
import android.util.AttributeSet;
import android.view.View;
import android.widget.TextView;

/**
* Created by seannemann on 6/27/2018.
*/

public class LongTitlePreference extends Preference {
public LongTitlePreference(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
}

public LongTitlePreference(Context context, AttributeSet attrs) {
super(context, attrs);
}

public LongTitlePreference(Context context) {
super(context);
}

@Override
protected void onBindView(View view)
{
super.onBindView(view);

TextView title= view.findViewById(android.R.id.title);
if (title != null) {
title.setSingleLine(false);
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
package fr.free.nrw.commons.ui.LongTitlePreferences;

import android.content.Context;
import android.preference.PreferenceCategory;
import android.util.AttributeSet;
import android.view.View;
import android.widget.TextView;

/**
* Created by seannemann on 6/27/2018.
*/

public class LongTitlePreferenceCategory extends PreferenceCategory {
public LongTitlePreferenceCategory(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
}

public LongTitlePreferenceCategory(Context context, AttributeSet attrs) {
super(context, attrs);
}

public LongTitlePreferenceCategory(Context context) {
super(context);
}

@Override
protected void onBindView(View view)
{
super.onBindView(view);

TextView title= view.findViewById(android.R.id.title);
if (title != null) {
title.setSingleLine(false);
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
package fr.free.nrw.commons.ui.LongTitlePreferences;

import android.content.Context;
import android.preference.SwitchPreference;
import android.util.AttributeSet;
import android.view.View;
import android.widget.TextView;

/**
* Created by seannemann on 6/27/2018.
*/

public class LongTitleSwitchPreference extends SwitchPreference {
public LongTitleSwitchPreference(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
}

public LongTitleSwitchPreference(Context context, AttributeSet attrs) {
super(context, attrs);
}

public LongTitleSwitchPreference(Context context) {
super(context);
}

@Override
protected void onBindView(View view)
{
super.onBindView(view);

TextView title= view.findViewById(android.R.id.title);
if (title != null) {
title.setSingleLine(false);
}
}
}
26 changes: 13 additions & 13 deletions app/src/main/res/xml/preferences.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,58 +2,58 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android">

<PreferenceCategory
<fr.free.nrw.commons.ui.LongTitlePreferences.LongTitlePreferenceCategory
android:title="@string/preference_category_appearance">

<SwitchPreference
<fr.free.nrw.commons.ui.LongTitlePreferences.LongTitleSwitchPreference
android:title="@string/preference_theme"
android:defaultValue="false"
android:summary="@string/preference_theme_summary"
android:key="theme" />

</PreferenceCategory>
</fr.free.nrw.commons.ui.LongTitlePreferences.LongTitlePreferenceCategory>

<PreferenceCategory
<fr.free.nrw.commons.ui.LongTitlePreferences.LongTitlePreferenceCategory
android:title="@string/preference_category_general">

<ListPreference
<fr.free.nrw.commons.ui.LongTitlePreferences.LongTitleListPreference
android:key="defaultLicense"
android:title="@string/preference_license"
android:entries="@array/pref_defaultLicense_entries"
android:entryValues="@array/pref_defaultLicense_values"
android:defaultValue="@string/license_pref_cc_by_sa_4_0" />

<SwitchPreference
<fr.free.nrw.commons.ui.LongTitlePreferences.LongTitleSwitchPreference
android:key="useExternalStorage"
android:title="@string/use_external_storage"
android:defaultValue="true"
android:summary="@string/use_external_storage_summary" />

<EditTextPreference
<fr.free.nrw.commons.ui.LongTitlePreferences.LongTitleEditTextPreference
android:key="uploads"
android:defaultValue="100"
android:title= "@string/set_limit"
android:inputType="numberDecimal"
android:maxLength="3" />

</PreferenceCategory>
</fr.free.nrw.commons.ui.LongTitlePreferences.LongTitlePreferenceCategory>

<!-- The key 'allowGps' was used before and has since been removed based on the discussion at #1599.
Do not reuse this key unless you revive the same feature with the changes mentioned at #1599.-->

<PreferenceCategory
<fr.free.nrw.commons.ui.LongTitlePreferences.LongTitlePreferenceCategory
android:title="@string/preference_category_feedback">

<Preference
<fr.free.nrw.commons.ui.LongTitlePreferences.LongTitlePreference
android:key="becomeBetaTester"
android:title="@string/become_a_tester_title"
android:summary="@string/become_a_tester_description">
</Preference>
</fr.free.nrw.commons.ui.LongTitlePreferences.LongTitlePreference>

<Preference
<fr.free.nrw.commons.ui.LongTitlePreferences.LongTitlePreference
android:key="sendLogFile"
android:title="@string/send_log_file"
android:summary="@string/send_log_file_description"/>

</PreferenceCategory>
</fr.free.nrw.commons.ui.LongTitlePreferences.LongTitlePreferenceCategory>
</PreferenceScreen>