Skip to content
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
4 changes: 2 additions & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
android:versionCode="56"
android:versionName="1.28.4" >
android:versionCode="57"
android:versionName="1.29.0" >

<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
import android.text.Spanned;
import android.text.TextWatcher;
import android.text.style.BackgroundColorSpan;
import android.util.Log;
import android.view.KeyEvent;
import android.view.Menu;
import android.view.MenuItem;
Expand Down Expand Up @@ -164,6 +163,9 @@ public void onCreate(Bundle savedInstanceState) {
}
mText = this.findViewById(R.id.editText1);
mText.setBackgroundResource(android.R.color.transparent);
if (!settingsService.isAutoWrapping()) {
disableEditorAutowrapping();
}
editTextUndoRedo = new EditTextUndoRedo(mText, this);

if (simpleScrolling()) {
Expand Down Expand Up @@ -431,6 +433,12 @@ void applyPreferences() {
applyColors();
}

private void disableEditorAutowrapping() {
mText.setHorizontallyScrolling(true);
mText.setHorizontalScrollBarEnabled(true);
mText.setMaxLines(Integer.MAX_VALUE);
}

private void applyFontFace() {
mText.setInputType(InputType.TYPE_TEXT_FLAG_MULTI_LINE |
InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS |
Expand Down Expand Up @@ -463,6 +471,9 @@ private void applyFontSize() {
case (SettingsService.SETTING_HUGE):
mText.setTextSize(28.0f);
break;
case (SettingsService.SETTING_EXTRA_HUGE):
mText.setTextSize(56.0f);
break;
case (SettingsService.SETTING_MEDIUM):
default:
mText.setTextSize(20.0f);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ public FontSizePreference(Context context, AttributeSet attrs) {
break;
case SettingsService.SETTING_HUGE:
selected = 4;
break;
case SettingsService.SETTING_EXTRA_HUGE:
selected = 5;
break;
}
}

Expand All @@ -72,10 +76,13 @@ public void onClick(DialogInterface dialog, int whichButton) {
case 3:
settingsService.setFontSize(SettingsService.SETTING_LARGE, getContext());
break;
case 4:
case 4:
settingsService.setFontSize(SettingsService.SETTING_HUGE, getContext());
break;
}
case 5:
settingsService.setFontSize(SettingsService.SETTING_EXTRA_HUGE, getContext());
break;
}

notifyChanged();
}
Expand All @@ -88,7 +95,8 @@ public void onClick(DialogInterface dialog, int whichButton) {
SettingsService.SETTING_SMALL,
SettingsService.SETTING_MEDIUM,
SettingsService.SETTING_LARGE,
SettingsService.SETTING_HUGE
SettingsService.SETTING_HUGE,
SettingsService.SETTING_EXTRA_HUGE
};

List<String> fonts = Arrays.asList(arrayOfFonts);
Expand Down Expand Up @@ -143,6 +151,9 @@ public View getView(int position, View convertView, @NonNull ViewGroup parent)
break;
case SettingsService.SETTING_HUGE:
tv.setTextSize(28.0f);
break;
case SettingsService.SETTING_EXTRA_HUGE:
tv.setTextSize(56.0f);
}
// general options
tv.setTextColor(Color.BLACK);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ public class SettingsService {
public static final String SETTING_ALTERNATIVE_FILE_ACCESS = "use_alternative_file_access";
public static final String SETTING_SHOW_LAST_EDITED_FILES = "show_last_edited_files";

public static final String SETTING_AUTO_WRAPPING = "auto_wrapping";

private static final String SETTING_USE_WAKE_LOCK = "use_wake_lock";
public static final String SETTING_USE_SIMPLE_SCROLLING = "use_simple_scrolling";

Expand All @@ -38,6 +40,7 @@ public class SettingsService {
public static final String SETTING_SMALL = "Small";
public static final String SETTING_LARGE = "Large";
public static final String SETTING_HUGE = "Huge";
public static final String SETTING_EXTRA_HUGE = "Extra Huge";

public static final int DEFAULT_BACKGROUND_COLOR = 0xFFDDDDDD;
public static final int DEFAULT_TEXT_COLOR = 0xFF000000;
Expand All @@ -59,6 +62,7 @@ public class SettingsService {
private boolean legacy_file_picker = false;
private boolean alternative_file_access = true;
private boolean auto_save_current_file = false;
private boolean auto_wrapping = true;

private String file_encoding = "";
private String last_filename = "";
Expand Down Expand Up @@ -93,6 +97,7 @@ public void loadSettings(Context context) {
useWakeLock = sharedPref.getBoolean(SETTING_USE_WAKE_LOCK, false);
useSimpleScrolling = sharedPref.getBoolean(SETTING_USE_SIMPLE_SCROLLING, false);
alternative_file_access = sharedPref.getBoolean(SETTING_ALTERNATIVE_FILE_ACCESS, true);
auto_wrapping = sharedPref.getBoolean(SETTING_AUTO_WRAPPING, true);
last_filename = sharedPref.getString(SETTING_LAST_FILENAME, TPStrings.EMPTY);
file_encoding = sharedPref.getString(SETTING_FILE_ENCODING, TPStrings.UTF_8);
delimiters = sharedPref.getString(SETTING_DELIMITERS, TPStrings.EMPTY);
Expand Down Expand Up @@ -281,4 +286,8 @@ public boolean useWakeLock() {
public boolean isUseSimpleScrolling() {
return this.useSimpleScrolling;
}

public boolean isAutoWrapping() {
return this.auto_wrapping;
}
}
4 changes: 3 additions & 1 deletion app/src/main/res/values-ar/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@
<string name="preferenceShowLastEditedFilesDescription">إظهار آخر الملفات التي تم تحريرها في قائمة الخيارات</string>
<string name="preferenceAutoSaveCurrentFileTitle">الحفظ التلقائي</string>
<string name="preferenceAutoSaveCurrentFileDescription">حفظ ملف التحرير الحالي تلقائيًا عند إغلاق النافذة</string>
<string name="preferenceAutowrappingDescription">التفاف السطر إذا كان النص طويلاً جدًا</string>
<string name="preferenceAutowrappingTitle">الالتفاف التلقائي للأسطر</string>
<string name="Open_Other">فتح أخرى ...</string>
<string name="Menu_Share">يشارك...</string>
<string name="Menu_Print">مطبعة</string>
Expand All @@ -112,4 +114,4 @@
<string name="readOnlyDialogButtonContinue">المتابعة في وضع القراءة فقط</string>


</resources>
</resources>
2 changes: 2 additions & 0 deletions app/src/main/res/values-cn/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,8 @@
<string name="preferenceShowLastEditedFilesDescription">在选项菜单中显示最后编辑的文件</string>
<string name="preferenceAutoSaveCurrentFileTitle">自动保存</string>
<string name="preferenceAutoSaveCurrentFileDescription">关闭窗口时自动保存当前正在编辑的文件</string>
<string name="preferenceAutowrappingDescription">当文本过长时自动换行</string>
<string name="preferenceAutowrappingTitle">自动换行</string>
<string name="Open_Other">打开其他...</string>
<string name="Menu_Share">分享</string>
<string name="Menu_Print">打印</string>
Expand Down
4 changes: 3 additions & 1 deletion app/src/main/res/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@
<string name="preferenceShowLastEditedFilesDescription">Zuletzt bearbeitete Dateien im Optionsmenü anzeigen</string>
<string name="preferenceAutoSaveCurrentFileTitle">Automatisches Speichern</string>
<string name="preferenceAutoSaveCurrentFileDescription">Speichern Sie die aktuell bearbeitete Datei automatisch, wenn das Fenster geschlossen wird</string>
<string name="preferenceAutowrappingDescription">Zeile umbrechen, wenn der Text zu lang ist</string>
<string name="preferenceAutowrappingTitle">Automatischer Zeilenumbruch</string>
<string name="Open_Other">Andere öffnen...</string>
<string name="Menu_Share">Teilen...</string>
<string name="Menu_Print">Drucken</string>
Expand All @@ -111,4 +113,4 @@
<string name="readOnlyDialogButtonContinue">Im Nur-Lese-Modus fortfahren</string>


</resources>
</resources>
2 changes: 2 additions & 0 deletions app/src/main/res/values-es/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@
<string name="preferenceShowLastEditedFilesDescription">Mostrar los últimos archivos editados en el menú de opciones</string>
<string name="preferenceAutoSaveCurrentFileTitle">Guardado automático</string>
<string name="preferenceAutoSaveCurrentFileDescription">Guardar automáticamente el archivo de edición actual cuando se cierra la ventana</string>
<string name="preferenceAutowrappingDescription">Ajustar la línea si el texto es demasiado largo</string>
<string name="preferenceAutowrappingTitle">Ajuste automático de línea</string>
<string name="Open_Other">Abierto otro...</string>
<string name="Menu_Share">Compartir...</string>
<string name="Menu_Print">Imprimir</string>
Expand Down
4 changes: 3 additions & 1 deletion app/src/main/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@
<string name="preferenceShowLastEditedFilesDescription">Afficher les derniers fichiers modifiés dans le menu des options</string>
<string name="preferenceAutoSaveCurrentFileTitle">Sauvegarde automatique</string>
<string name="preferenceAutoSaveCurrentFileDescription">Enregistrer automatiquement le fichier en cours d\'édition lorsque la fenêtre est fermée</string>
<string name="preferenceAutowrappingDescription">Retourner à la ligne si le texte est trop long</string>
<string name="preferenceAutowrappingTitle">Retour automatique à la ligne</string>
<string name="Open_Other">Ouvrir d\'autres...</string>
<string name="Menu_Share">Partager...</string>
<string name="Menu_Print">Imprimer</string>
Expand All @@ -109,4 +111,4 @@
<string name="readOnlyDialogButtonContinue">Continuer en lecture seule</string>
<string name="preferenceUseSimpleScrolling">Corriger le défilement erratique</string>
<string name="preferenceUseSimpleScrollingDescription">Activez ceci si le texte saute de manière inattendue à la fin pendant le défilement</string>
</resources>
</resources>
2 changes: 2 additions & 0 deletions app/src/main/res/values-it/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@
<string name="preferenceShowLastEditedFilesDescription">Mostra gli ultimi file modificati nel menu delle opzioni</string>
<string name="preferenceAutoSaveCurrentFileTitle">Salvataggio automatico</string>
<string name="preferenceAutoSaveCurrentFileDescription">Salva automaticamente il file attualmente in fase di modifica quando la finestra è chiusa</string>
<string name="preferenceAutowrappingDescription">Vai a capo se il testo è troppo lungo</string>
<string name="preferenceAutowrappingTitle">A capo automatico</string>
<string name="Open_Other">Apri altro…</string>
<string name="Menu_Share">Condividi…</string>
<string name="Menu_Print">Stampa</string>
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values-ja/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@
<string name="preferenceShowLastEditedFilesDescription">オプションメニューに最後に編集したファイルを表示する</string>
<string name="preferenceAutoSaveCurrentFileTitle">自動保存</string>
<string name="preferenceAutoSaveCurrentFileDescription">ウィンドウを閉じたときに現在編集中のファイルを自動的に保存する</string>
<string name="preferenceAutowrappingDescription">テキストが長い場合に自動で改行する</string>
<string name="preferenceAutowrappingTitle">自動改行</string>
<string name="Open_Other">他を開く...</string>
<string name="Menu_Share">共有...</string>
<string name="Menu_Print">印刷する</string>
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values-pl/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@
<string name="preferenceShowLastEditedFilesDescription">Pokaż ostatnio edytowane pliki w menu opcji</string>
<string name="preferenceAutoSaveCurrentFileTitle">Autozapisywanie</string>
<string name="preferenceAutoSaveCurrentFileDescription">Automatycznie zapisuj aktualnie edytowany plik, gdy okno jest zamknięte</string>
<string name="preferenceAutowrappingDescription">Zawijaj wiersz, jeśli tekst jest zbyt długi</string>
<string name="preferenceAutowrappingTitle">Automatyczne zawijanie wierszy</string>
<string name="Open_Other">Otwórz inne…</string>
<string name="Menu_Share">Udostępnij...</string>
<string name="Menu_Print">Wydrukować</string>
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values-pt/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@
<string name="preferenceShowLastEditedFilesDescription">Mostrar os últimos arquivos editados no menu de opções</string>
<string name="preferenceAutoSaveCurrentFileTitle">Salvamento automático</string>
<string name="preferenceAutoSaveCurrentFileDescription">Salva automaticamente o arquivo em edição atual quando a janela é fechada</string>
<string name="preferenceAutowrappingDescription">Quebrar a linha se o texto for muito longo</string>
<string name="preferenceAutowrappingTitle">Quebra automática de linha</string>
<string name="Open_Other">Abra outro...</string>
<string name="Menu_Share">Compartilhar…</string>
<string name="Menu_Print">Imprimir</string>
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values-ru/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@
<string name="preferenceShowLastEditedFilesDescription">Показывать последние отредактированные файлы в меню параметров</string>
<string name="preferenceAutoSaveCurrentFileTitle">Автосохранение</string>
<string name="preferenceAutoSaveCurrentFileDescription">Автоматически сохранять текущий редактируемый файл при закрытии окна</string>
<string name="preferenceAutowrappingDescription">Переносить строку, если текст слишком длинный</string>
<string name="preferenceAutowrappingTitle">Автоперенос строк</string>
<string name="Open_Other">Открыть другой...</string>
<string name="Menu_Share">Поделиться...</string>
<string name="Menu_Print">Распечатать</string>
Expand Down
12 changes: 7 additions & 5 deletions app/src/main/res/values-tr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,12 @@
<string name="preferenceSearchSelectionColor">Arama Sonucu Vurgu Rengi</string>
<string name="preferenceShowLastEditedFilesTitle">Son Düzenlenen Dosyaları Göster</string>
<string name="preferenceShowLastEditedFilesDescription">Seçenekler menüsünde son düzenlenen dosyaları göster</string>

<string name="preferenceAutoSaveCurrentFileTitle">Otomatik kaydetme</string>
<string name="preferenceAutoSaveCurrentFileDescription">Pencere kapatıldığında, o anda düzenlenen dosyayı otomatik olarak kaydet</string>
<string name="Open_Other">Diğer aç…</string>

<string name="preferenceAutoSaveCurrentFileTitle">Otomatik kaydetme</string>
<string name="preferenceAutoSaveCurrentFileDescription">Pencere kapatıldığında, o anda düzenlenen dosyayı otomatik olarak kaydet</string>
<string name="preferenceAutowrappingDescription">Metin çok uzunsa satırı kaydır</string>
<string name="preferenceAutowrappingTitle">Otomatik satır kaydırma</string>
<string name="Open_Other">Diğer aç…</string>
<string name="Menu_Share">Paylaş…</string>
<string name="Menu_Print">Yazdır</string>

Expand All @@ -112,4 +114,4 @@
<string name="readOnlyDialogButtonContinue">Salt okunur olarak devam et</string>


</resources>
</resources>
2 changes: 2 additions & 0 deletions app/src/main/res/values-uk/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@
<string name="preferenceShowLastEditedFilesDescription">Показати останні змінені файли в меню параметрів</string>
<string name="preferenceAutoSaveCurrentFileTitle">Автозбереження</string>
<string name="preferenceAutoSaveCurrentFileDescription">Автоматично зберігати поточний файл після закриття вікна</string>
<string name="preferenceAutowrappingDescription">Переносити рядок, якщо текст надто довгий</string>
<string name="preferenceAutowrappingTitle">Автоперенесення рядків</string>
<string name="Open_Other">Відкрити інші…</string>
<string name="Menu_Share">Поділитися…</string>
<string name="Menu_Print">Роздрукувати</string>
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,8 @@

<string name="preferenceAutoSaveCurrentFileTitle">Autosaving</string>
<string name="preferenceAutoSaveCurrentFileDescription">Automatically save currently editing file when window is closed</string>
<string name="preferenceAutowrappingTitle">Autowrapping</string>
<string name="preferenceAutowrappingDescription">wrap the line if text too long</string>
<string name="Open_Other">Open other…</string>


Expand Down
6 changes: 6 additions & 0 deletions app/src/main/res/xml/preferences.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@
android:summary="@string/preferenceAutoSaveCurrentFileDescription"
android:defaultValue="false" />

<CheckBoxPreference
android:key="auto_wrapping"
android:title="@string/preferenceAutowrappingTitle"
android:summary="@string/preferenceAutowrappingDescription"
android:defaultValue="true" />

<CheckBoxPreference
android:key="use_wake_lock"
android:title="@string/preferenceUseWakeLockTitle"
Expand Down
2 changes: 2 additions & 0 deletions fastlane/metadata/android/en-US/changelogs/57.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- added extra large text size (feature request of Arun)
- add a setting to disable auto-wrapping (feature request of Dave)
2 changes: 2 additions & 0 deletions fastlane/metadata/android/es-ES/changelogs/57.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Se agregó un tamaño de texto extra grande (función solicitada por Arun).
- Se agregó una opción para deshabilitar el ajuste automático (función solicitada por Dave).
2 changes: 2 additions & 0 deletions fastlane/metadata/android/pl-PL/changelogs/57.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- dodano bardzo duży rozmiar tekstu (prośba Aruna)
- dodano ustawienie wyłączające automatyczne zawijanie tekstu (prośba Dave'a)
2 changes: 2 additions & 0 deletions fastlane/metadata/android/ru-RU/changelogs/57.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Добавлен очень большой размер текста (запрос от Аруна)
- Добавлена ​​настройка для отключения автоматического переноса строк (запрос от Дейва)
16 changes: 0 additions & 16 deletions scripts/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.