From 743eae9b85491e2e19d7f329d55a39c360bc119a Mon Sep 17 00:00:00 2001 From: Sebastian Kaspari Date: Sat, 28 Jul 2012 11:32:14 +0200 Subject: [PATCH] Remove fullscreen option from settings. There's no need anymore on new devices and the app should not cover the notification bar. --- application/res/layout/conversations.xml | 4 +- application/res/values/settings.xml | 3 - application/res/values/strings.xml | 2 - application/res/xml/preferences.xml | 5 - .../yaaic/activity/ConversationActivity.java | 5 - application/src/org/yaaic/model/Settings.java | 39 ++--- .../org/yaaic/view/ConversationLayout.java | 148 ------------------ 7 files changed, 16 insertions(+), 190 deletions(-) delete mode 100644 application/src/org/yaaic/view/ConversationLayout.java diff --git a/application/res/layout/conversations.xml b/application/res/layout/conversations.xml index 3f20289..1949ef6 100644 --- a/application/res/layout/conversations.xml +++ b/application/res/layout/conversations.xml @@ -19,7 +19,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Yaaic. If not, see . --> -. android:drawableLeft="@android:drawable/ic_btn_speak_now" android:visibility="gone" /> - + diff --git a/application/res/values/settings.xml b/application/res/values/settings.xml index b1d2901..7e92dd5 100644 --- a/application/res/values/settings.xml +++ b/application/res/values/settings.xml @@ -60,9 +60,6 @@ ime_extract true - fullscreen_conversations - false - history_size 50 diff --git a/application/res/values/strings.xml b/application/res/values/strings.xml index bd63570..a2f5d57 100644 --- a/application/res/values/strings.xml +++ b/application/res/values/strings.xml @@ -230,8 +230,6 @@ Automatically capitalize the first word of sentences Fullscreen input in landscape Use fullscreen keyboard when in landscape mode - Fullscreen chats - Fullscreen the application when chatting History size Number of lines of conversation history to keep diff --git a/application/res/xml/preferences.xml b/application/res/xml/preferences.xml index 06196b9..64fb475 100644 --- a/application/res/xml/preferences.xml +++ b/application/res/xml/preferences.xml @@ -114,11 +114,6 @@ along with Yaaic. If not, see . android:summary="@string/settings_ime_extract_desc" android:key="@string/key_ime_extract" android:defaultValue="@string/default_ime_extract" /> - */ public class Settings @@ -44,7 +44,7 @@ public class Settings /** * Create a new Settings instance - * + * * @param context */ public Settings(Context context) @@ -55,7 +55,7 @@ public class Settings /** * Prefix all messages with a timestamp? - * + * * @return */ public boolean showTimestamp() @@ -68,7 +68,7 @@ public class Settings /** * Show icons to highlight special events - * + * * @return */ public boolean showIcons() @@ -81,7 +81,7 @@ public class Settings /** * Show colors to highlight special events? - * + * * @return */ public boolean showColors() @@ -107,7 +107,7 @@ public class Settings /** * Use 24 hour format for timestamps? - * + * * @return */ public boolean use24hFormat() @@ -120,7 +120,7 @@ public class Settings /** * Is reconnect on disconnect enabled? - * + * * @return */ public boolean isReconnectEnabled() @@ -133,7 +133,7 @@ public class Settings /** * Get the reconnect interval - * + * * @return The reconnect interval in minutes */ public int getReconnectInterval() @@ -143,7 +143,7 @@ public class Settings resources.getString(R.string.default_reconnect_interval) )); } - + /** * Ignore the automatic MOTD? * @@ -159,7 +159,7 @@ public class Settings /** * Get the quit message - * + * * @return The message to display when the user disconnects */ public String getQuitMessage() @@ -172,7 +172,7 @@ public class Settings /** * Get the font size - * + * * @return The font size for conversation messages */ public int getFontSize() @@ -185,7 +185,7 @@ public class Settings /** * Is voice recognition enabled? - * + * * @return True if voice recognition is enabled, false otherwise */ public boolean isVoiceRecognitionEnabled() @@ -198,7 +198,7 @@ public class Settings /** * Play notification sound on highlight? - * + * * @return True if sound should be played on highlight, false otherwise */ public boolean isSoundHighlightEnabled() @@ -307,17 +307,6 @@ public class Settings ); } - /** - * Whether conversations should be viewed in Fullscreen glory. - */ - public boolean fullscreenConversations() - { - return preferences.getBoolean( - resources.getString(R.string.key_fullscreen_conversation), - Boolean.parseBoolean(resources.getString(R.string.default_fullscreen_conversation)) - ); - } - /** * Get the conversation history size. * diff --git a/application/src/org/yaaic/view/ConversationLayout.java b/application/src/org/yaaic/view/ConversationLayout.java deleted file mode 100644 index 9be004e..0000000 --- a/application/src/org/yaaic/view/ConversationLayout.java +++ /dev/null @@ -1,148 +0,0 @@ -/* -Yaaic - Yet Another Android IRC Client - -Copyright 2009-2012 Sebastian Kaspari - -This file is part of Yaaic. - -Yaaic is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -Yaaic is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with Yaaic. If not, see . - */ -package org.yaaic.view; - -import org.yaaic.model.Settings; - -import android.app.Activity; -import android.content.Context; -import android.content.res.Configuration; -import android.graphics.Canvas; -import android.graphics.Rect; -import android.util.AttributeSet; -import android.view.Gravity; -import android.widget.FrameLayout; -import android.widget.LinearLayout; - -/** - * ConversationLayout: LinearLayout that resizes correctly when an IME - * comes up in fullscreen mode - * - * @author Steven Luo - */ -public class ConversationLayout extends LinearLayout -{ - private Activity activity; - - int curHeight = 0; - boolean fullscreen = false; - boolean isLandscape = false; - boolean redoLayout = false; - - /** - * Create a new conversation linear layout - * - * @param context - */ - public ConversationLayout(Context context) - { - super(context); - doInit(context); - } - - /** - * Create a new conversation linear layout - * - * @param context - * @param attrs - */ - public ConversationLayout(Context context, AttributeSet attrs) - { - super(context, attrs); - doInit(context); - } - - /** - * Initialize the ConversationLayout - */ - private void doInit(Context context) - { - activity = (Activity) context; - fullscreen = (new Settings(context)).fullscreenConversations(); - isLandscape = (activity.getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE); - } - - /** - * Get the height of the window's visible area - */ - private int getWindowHeight() - { - Rect visible = new Rect(); - getWindowVisibleDisplayFrame(visible); - return visible.height(); - } - - /** - * Adjust the height of the view to avoid scrolling and hide UI components - * if necessary to save space - * - * @author Steven Luo - * @author Reynaldo Cortorreal - */ - private void adjustHeight() - { - int height = getWindowHeight(); - - if (!fullscreen) { - return; - } - - //here to forth the code applies only to full screen - if (curHeight != height && height != 0) { - curHeight = height; - - FrameLayout.LayoutParams params = new FrameLayout.LayoutParams( - FrameLayout.LayoutParams.FILL_PARENT, - height - ); - - params.gravity = Gravity.BOTTOM | Gravity.CLIP_VERTICAL; - setLayoutParams(params); - redoLayout = true; - } - } - - /** - * onMeasure (ask the view how much space it wants) - * This is called when the window size changes, so we can hook into it to - * resize ourselves when the IME comes up - */ - @Override - protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) - { - adjustHeight(); - super.onMeasure(widthMeasureSpec, heightMeasureSpec); - } - - /** - * onDraw (draw the view) - */ - @Override - protected void onDraw(Canvas canvas) - { - if (redoLayout) { - // Layout params have changed -- force a layout update - requestLayout(); - redoLayout = false; - } - super.onDraw(canvas); - } -}