Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Allow the user to configure the auto-capitalization and auto-correction for chat messages. #329

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Allow the user to configure the auto-capitalization and auto-correction for chat messages. #329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a927163
Made the auto-correct and auto-capitalization flags of the main text …
Jan 1, 2017
6443e2c
Re-enable the multi line input type flag on the EditText as it is req…
Jan 3, 2017
1b32c12
Found a workaround for the SwiftKey multi line bug/feature by simply …
Jan 3, 2017
5454a9f
Correct indentation in the preferences XML.
Jan 4, 2017
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
33 changes: 23 additions & 10 deletions weechat-android/src/main/java/com/ubergeek42/WeechatAndroid/fragments/BufferFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
package com.ubergeek42.WeechatAndroid.fragments;

import java.util.Vector;

import android.annotation.SuppressLint;
import android.support.annotation.NonNull;
import android.support.v4.app.Fragment;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import android.content.Context;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v4.app.Fragment;
import android.text.Editable;
import android.text.InputType;
import android.text.TextWatcher;
import android.view.KeyEvent;
import android.view.LayoutInflater;
Expand All @@ -26,9 +22,9 @@
import android.widget.TextView;
import android.widget.Toast;

import com.ubergeek42.WeechatAndroid.adapters.ChatLinesAdapter;
import com.ubergeek42.WeechatAndroid.R;
import com.ubergeek42.WeechatAndroid.WeechatActivity;
import com.ubergeek42.WeechatAndroid.adapters.ChatLinesAdapter;
import com.ubergeek42.WeechatAndroid.relay.Buffer;
import com.ubergeek42.WeechatAndroid.relay.Buffer.LINES;
import com.ubergeek42.WeechatAndroid.relay.BufferEye;
Expand All @@ -38,11 +34,17 @@
import com.ubergeek42.WeechatAndroid.utils.CopyPaste;
import com.ubergeek42.weechat.ColorScheme;

import static com.ubergeek42.WeechatAndroid.service.Events.*;
import static com.ubergeek42.WeechatAndroid.service.RelayService.STATE.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.util.Vector;

import de.greenrobot.event.EventBus;

import static com.ubergeek42.WeechatAndroid.service.Events.SendMessageEvent;
import static com.ubergeek42.WeechatAndroid.service.Events.StateChangedEvent;
import static com.ubergeek42.WeechatAndroid.service.RelayService.STATE.LISTED;

public class BufferFragment extends Fragment implements BufferEye, OnKeyListener,
OnClickListener, TextWatcher, TextView.OnEditorActionListener {

Expand Down Expand Up @@ -138,6 +140,17 @@ public void onStart() {
started = true;
uiSend.setVisibility(P.showSend ? View.VISIBLE : View.GONE);
uiTab.setVisibility(P.showTab ? View.VISIBLE : View.GONE);
int inputType = InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_MULTI_LINE;

if(P.enableAutoCorrect) {
inputType |= InputType.TYPE_TEXT_FLAG_AUTO_CORRECT;
} else {
inputType |= InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS;
}
if(P.enableAutoCapitalize) {
inputType |= InputType.TYPE_TEXT_FLAG_CAP_SENTENCES;
}
uiInput.setInputType(inputType);
uiLines.setBackgroundColor(0xFF000000 | ColorScheme.get().defaul[ColorScheme.OPT_BG]);
EventBus.getDefault().registerSticky(this);
}
Expand Down
7 changes: 6 additions & 1 deletion weechat-android/src/main/java/com/ubergeek42/WeechatAndroid/service/P.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@ public static void init(@NonNull Context context) {
public static boolean notificationEnable, notificationTicker, notificationLight, notificationVibrate;
public static String notificationSound;

public static boolean showSend, showTab, hotlistSync, volumeBtnSize;
public static boolean showSend, showTab, enableAutoCapitalize, enableAutoCorrect, hotlistSync;
public static boolean volumeBtnSize;
public static String bufferFont;

public static boolean showBufferFilter;
Expand Down Expand Up @@ -104,6 +105,8 @@ public static void loadUIPreferences() {
// buffer fragment
showSend = p.getBoolean(PREF_SHOW_SEND, PREF_SHOW_SEND_D);
showTab = p.getBoolean(PREF_SHOW_TAB, PREF_SHOW_TAB_D);
enableAutoCapitalize = p.getBoolean(PREF_ENABLE_AUTO_CAPITALIZE, PREF_ENABLE_AUTO_CAPITALIZE_D);
enableAutoCorrect = p.getBoolean(PREF_ENABLE_AUTO_CORRECT, PREF_ENABLE_AUTO_CORRECT_D);
hotlistSync = p.getBoolean(PREF_HOTLIST_SYNC, PREF_HOTLIST_SYNC_D);
volumeBtnSize = p.getBoolean(PREF_VOLUME_BTN_SIZE, PREF_VOLUME_BTN_SIZE_D);

Expand Down Expand Up @@ -223,6 +226,8 @@ public static void loadConnectionPreferences() {
// buffer fragment
case PREF_SHOW_SEND: showSend = p.getBoolean(key, PREF_SHOW_SEND_D); break;
case PREF_SHOW_TAB: showTab = p.getBoolean(key, PREF_SHOW_TAB_D); break;
case PREF_ENABLE_AUTO_CAPITALIZE: enableAutoCapitalize = p.getBoolean(key, PREF_ENABLE_AUTO_CAPITALIZE_D); break;
case PREF_ENABLE_AUTO_CORRECT: enableAutoCorrect = p.getBoolean(key, PREF_ENABLE_AUTO_CORRECT_D); break;
case PREF_HOTLIST_SYNC: hotlistSync = p.getBoolean(key, PREF_HOTLIST_SYNC_D); break;
case PREF_VOLUME_BTN_SIZE: volumeBtnSize = p.getBoolean(key, PREF_VOLUME_BTN_SIZE_D); break;

Expand Down
2 changes: 2 additions & 0 deletions weechat-android/src/main/java/com/ubergeek42/WeechatAndroid/utils/ActionEditText.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import android.content.Context;
import android.support.v7.widget.AppCompatEditText;
import android.text.InputType;
import android.util.AttributeSet;
import android.view.inputmethod.EditorInfo;
import android.view.inputmethod.InputConnection;
Expand All @@ -23,6 +24,7 @@ public ActionEditText(Context context, AttributeSet attrs, int defStyle) {
public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
InputConnection conn = super.onCreateInputConnection(outAttrs);
outAttrs.imeOptions &= ~EditorInfo.IME_FLAG_NO_ENTER_ACTION;
outAttrs.inputType &= ~InputType.TYPE_TEXT_FLAG_MULTI_LINE;
return conn;
}
}
2 changes: 2 additions & 0 deletions weechat-android/src/main/java/com/ubergeek42/WeechatAndroid/utils/Constants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ public class Constants {
// buttons
public final static String PREF_SHOW_SEND = "sendbtn_show"; final public static boolean PREF_SHOW_SEND_D = true;
public final static String PREF_SHOW_TAB = "tabbtn_show"; final public static boolean PREF_SHOW_TAB_D = true;
public final static String PREF_ENABLE_AUTO_CORRECT = "autocorrect_input"; final public static boolean PREF_ENABLE_AUTO_CORRECT_D = true;
public final static String PREF_ENABLE_AUTO_CAPITALIZE = "autocapitalize_input"; final public static boolean PREF_ENABLE_AUTO_CAPITALIZE_D = true;
public final static String PREF_VOLUME_BTN_SIZE = "volumebtn_size"; final public static boolean PREF_VOLUME_BTN_SIZE_D = true;

// notifications
Expand Down
1 change: 0 additions & 1 deletion weechat-android/src/main/res/layout/chatview_main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
android:layout_weight="1.0"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:inputType="textCapSentences|textMultiLine|textAutoCorrect"
android:imeOptions="flagNoFullscreen|flagNoExtractUi|actionSend"
android:maxLines="4"
android:minLines="1"
Expand Down
4 changes: 3 additions & 1 deletion weechat-android/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,9 +234,11 @@

<!-- buttons -->

<string name="pref_button_group">Buttons</string>
<string name="pref_button_group">Buttons &amp; input</string>
<string name="pref_tabbtn_show">Show tab button</string>
<string name="pref_sendbtn_show">Show send button</string>
<string name="pref_autocapitalize_enable">Enable keyboard auto-capitalization</string>
<string name="pref_autocorrect_enable">Enable keyboard auto-correct</string>
<string name="pref_volumebtn_size">Volume buttons change text size</string>
<string name="pref_volumebtn_size_summary">If set, volume buttons will change text size instead of volume</string>

Expand Down
2 changes: 2 additions & 0 deletions weechat-android/src/main/res/xml/preferences.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@
<PreferenceScreen android:key="button_group" android:title="@string/pref_button_group">
<CheckBoxPreference android:key="tabbtn_show" android:title="@string/pref_tabbtn_show" android:defaultValue="true" />
<CheckBoxPreference android:key="sendbtn_show" android:title="@string/pref_sendbtn_show" android:defaultValue="true" />
<CheckBoxPreference android:key="autocorrect_input" android:title="@string/pref_autocorrect_enable" android:defaultValue="true" />
<CheckBoxPreference android:key="autocapitalize_input" android:title="@string/pref_autocapitalize_enable" android:defaultValue="true" />
<CheckBoxPreference android:key="volumebtn_size" android:title="@string/pref_volumebtn_size" android:summary="@string/pref_volumebtn_size_summary" android:defaultValue="true" />
</PreferenceScreen>

Expand Down