moparisthebest/Yaaic
1
0
Fork 0
mirror of https://github.com/moparisthebest/Yaaic synced 2024-11-22 08:52:18 -05:00
Code Issues Releases Wiki Activity

Whitespace clean up and light refactoring

Browse Source 
Conflicts:

	application/src/org/yaaic/activity/ConversationActivity.java
This commit is contained in:
Rey Rey 2011-07-02 18:02:50 +02:00 committed by Sebastian Kaspari
parent 84ade9fae4
commit f7ccd50227
6 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/res/layout/about.xml
View File

@ -70,7 +70,7 @@ along with Yaaic. If not, see <http://www.gnu.org/licenses/>.
android:id="@+id/about_irclink"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/app_irc"
android:text="@string/app_irc"
android:linksClickable="false"
android:autoLink="none"
android:textSize="16sp"

6
application/res/values/settings.xml
View File

@ -54,11 +54,11 @@
<string name="key_autocap_sentences">autocap_sentences</string>
<string name="default_autocap_sentences">false</string>
<string name="key_ime_extract">Large landscape input</string>
<string name="key_ime_extract">ime_extract</string>
<string name="default_ime_extract">true</string>
<string name="key_fullscreen_conversation">Fullscreen chatting</string>
<string name="default_fullscreen_conversation">false</string>
<string name="key_fullscreen_conversation">fullscreen_conversations</string>
<string name="default_fullscreen_conversation">false</string>
<string name="key_history_size">history_size</string>
<string name="default_history_size">30</string>

4
application/res/values/strings.xml
View File

@ -220,8 +220,8 @@
<string name="settings_autocorrect_text_desc">Use dictionary to autocorrect typed text in chat</string>
<string name="settings_autocap_sentences_title">Auto-capitalize sentences</string>
<string name="settings_autocap_sentences_desc">Automatically capitalize the first word of sentences</string>
<string name="settings_ime_extract_title">Large landscape input</string>
<string name="settings_ime_extract_desc">Makes the landscape input field multilined</string>
<string name="settings_ime_extract_title">Fullscreen input in landscape</string>
<string name="settings_ime_extract_desc">Use fullscreen keyboard when in landscape mode</string>
<string name="settings_fullscreen_conversation_title">Fullscreen chats</string>
<string name="settings_fullscreen_conversation_desc">Fullscreen the application when chatting</string>
<string name="settings_history_size_title">History size</string>

4
application/src/org/yaaic/activity/AboutActivity.java
View File

@ -58,9 +58,5 @@ public class AboutActivity extends Activity
startActivity(i);
}
});
}
}

4
application/src/org/yaaic/activity/ConversationActivity.java
View File

@ -252,14 +252,14 @@ public class ConversationActivity extends Activity implements ServiceConnection,
if (settings.autoCapSentences()) {
setInputTypeFlags |= InputType.TYPE_TEXT_FLAG_CAP_SENTENCES;
}
if (isLandscape && settings.imeExtract()) {
if (isLandscape && !settings.imeExtract()) {
/* Replace the Enter key with a smiley instead of Send, to make it
more difficult to accidentally hit send
We'd like to do this in portrait too, but wouldn't have a Send
button in that case */
setInputTypeFlags |= InputType.TYPE_TEXT_VARIATION_SHORT_MESSAGE;
} else {
input.setImeOptions(input.getImeOptions());
input.setImeOptions(input.getImeOptions() | EditorInfo.IME_FLAG_NO_EXTRACT_UI);
}
input.setInputType(input.getInputType() | setInputTypeFlags);

4
application/src/org/yaaic/model/Settings.java
View File

@ -284,7 +284,7 @@ public class Settings
}
/**
* Whether conversations should be viewed in Fullscreen glory
* Whether the fullscreen keyboard should be used in landscape mode.
*/
public boolean imeExtract()
{
@ -295,7 +295,7 @@ public class Settings
}
/**
* Whether conversations should be viewed in Fullscreen glory
* Whether conversations should be viewed in Fullscreen glory.
*/
public boolean fullscreenConversations()
{