OSDN > 浏览软件 > Communications > Chat > Mokeline - hotline chat client for Android > SCM > SVN > 提交

Mokeline - hotline chat client for Android

mokeline: 提交

フォントサイズの変更機能を追加

--- mokelinesrc/MokeLine/AndroidManifest.xml (revision 15)

+++ mokelinesrc/MokeLine/AndroidManifest.xml (revision 16)

		@@ -1,7 +1,7 @@
1	1	<?xml version="1.0" encoding="utf-8"?>
2	2	<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3	3	package="jp.moke"
4		- android:versionName="@string/version" android:versionCode="11">
	4	+ android:versionName="@string/version" android:versionCode="12">
5	5	<uses-permission android:name="android.permission.INTERNET"></uses-permission>
6	6	<uses-sdk android:minSdkVersion="7"/>
7	7	<application android:icon="@drawable/icon" android:label="@string/app_name">

--- mokelinesrc/MokeLine/src/jp/moke/PharerougeMakaizouActivity.java (revision 15)

+++ mokelinesrc/MokeLine/src/jp/moke/PharerougeMakaizouActivity.java (revision 16)

		@@ -19,15 +19,18 @@
19	19	import android.os.Handler;
20	20	import android.os.Message;
21	21	import android.preference.PreferenceManager;
	22	+import android.util.TypedValue;
22	23	import android.view.Menu;
23	24	import android.view.MenuInflater;
24	25	import android.view.MenuItem;
25	26	import android.view.View;
	27	+import android.view.ViewGroup;
26	28	import android.view.Window;
27	29	import android.widget.ArrayAdapter;
28	30	import android.widget.Button;
29	31	import android.widget.EditText;
30	32	import android.widget.ListView;
	33	+import android.widget.TextView;
31	34	import android.widget.Toast;
32	35
33	36	public class PharerougeMakaizouActivity extends Activity implements

		@@ -39,6 +42,8 @@
39	42
40	43	ListView listView;
41	44
	45	+ int fontsize;
	46	+
42	47	/** Called when the activity is first created. */
43	48	@Override
44	49	public void onCreate(Bundle savedInstanceState) {

		@@ -69,9 +74,21 @@
69	74
70	75	// ArrayAdapter<String> adapter = new ArrayAdapter<String>(this,
71	76	// android.R.layout.simple_list_item_1);
	77	+ fontsize = Integer.parseInt(preferences.getString(
	78	+ getString(R.string.pref_fontsize), "18"));
72	79	ArrayAdapter<String> adapter = new ArrayAdapter<String>(this,
73		- R.layout.listitem, R.id.listItemText);
	80	+ R.layout.listitem, R.id.listItemText) {
	81	+ public View getView(int position, View convertView, ViewGroup parent) {
74	82
	83	+
	84	+ TextView view = (TextView) super.getView(position, convertView,
	85	+ parent);
	86	+ view.setTextSize(TypedValue.COMPLEX_UNIT_SP, (float) fontsize);
	87	+ return view;
	88	+ }
	89	+
	90	+ };
	91	+
75	92	listView = (ListView) findViewById(R.id.listView1);
76	93
77	94	listView.setAdapter(adapter);

		@@ -177,12 +194,8 @@
177	194	"");
178	195	String nick = preferences.getString(getString(R.string.pref_nick),
179	196	"");
180		- String fontsize = preferences.getString(
181		- getString(R.string.pref_fontsize),
182		- getString(R.string.default_fontsize));
183	197	if (host.length() == 0 \|\| port == 0 \|\| id.length() == 0
184		- \|\| pass.length() == 0 \|\| nick.length() == 0
185		- \|\| fontsize.length() == 0) {
	198	+ \|\| pass.length() == 0 \|\| nick.length() == 0) {
186	199	displayToast(getString(R.string.error_pref_invalid));
187	200	return;
188	201	}

--- mokelinesrc/MokeLine/res/values/strings.xml (revision 15)

+++ mokelinesrc/MokeLine/res/values/strings.xml (revision 16)

		@@ -1,7 +1,7 @@
1	1	<?xml version="1.0" encoding="utf-8"?>
2	2	<resources>
3	3	<string name="app_name">MokeLine</string>
4		- <string name="version">20111005</string>
	4	+ <string name="version">20111022</string>
5	5	<string name="error_communication">通信エラーが発生しました</string>
6	6	<string name="error_pref_invalid">設定の入力が不正です</string>
7	7	<string name="error_server_notfound">サーバが見つかりません</string>

		@@ -54,7 +54,7 @@
54	54	<string name="menu_server_orientation">画面の向き</string>
55	55	<string name="menu_server_orientation_title">次回起動時に反映されます</string>
56	56	<string name="menu_server_fontsize">フォントサイズ</string>
57		- <string name="menu_server_fontsize_title">フォントサイズ</string>
	57	+ <string name="menu_server_fontsize_title">次回起動時に反映されます</string>
58	58
59	59	<string name="menu_bookmark_load">読み込み</string>
60	60	<string name="menu_bookmark_add">追加</string>

		@@ -64,13 +64,13 @@
64	64
65	65	<string-array name="list_fontsize">
66	66	<item>大</item>
67		- <item>中</item>
	67	+ <item>中(デフォルト)</item>
68	68	<item>小</item>
69	69	</string-array>
70	70	<string-array name="list_entryvalues">
71		- <item>10</item>
72		- <item>8</item>
73		- <item>6</item>
	71	+ <item>22</item>
	72	+ <item>18</item>
	73	+ <item>16</item>
74	74	</string-array>
75	75
76	76	<string-array name="list_orientation">

--- mokelinesrc/MokeLine/res/values-en/strings.xml (revision 15)

+++ mokelinesrc/MokeLine/res/values-en/strings.xml (revision 16)

		@@ -1,7 +1,7 @@
1	1	<?xml version="1.0" encoding="utf-8"?>
2	2	<resources>
3	3	<string name="app_name">MokeLine</string>
4		- <string name="version">20111005</string>
	4	+ <string name="version">20111022</string>
5	5	<string name="error_communication">Communication error occurred</string>
6	6	<string name="error_pref_invalid">Invalid configuration</string>
7	7	<string name="error_server_notfound">Server not found</string>

		@@ -54,7 +54,7 @@
54	54	<string name="menu_server_orientation">Direction of Screen</string>
55	55	<string name="menu_server_orientation_title">Settings will take effect next startup</string>
56	56	<string name="menu_server_fontsize">Font size</string>
57		- <string name="menu_server_fontsize_title">Font size</string>
	57	+ <string name="menu_server_fontsize_title">Settings will take effect next startup</string>
58	58
59	59	<string name="menu_bookmark_load">Restore</string>
60	60	<string name="menu_bookmark_add">New</string>

		@@ -63,14 +63,14 @@
63	63
64	64
65	65	<string-array name="list_fontsize">
66		- <item>大</item>
67		- <item>中</item>
68		- <item>小</item>
	66	+ <item>Large</item>
	67	+ <item>Medium(Default)</item>
	68	+ <item>small</item>
69	69	</string-array>
70	70	<string-array name="list_entryvalues">
71		- <item>10</item>
72		- <item>8</item>
73		- <item>6</item>
	71	+ <item>22</item>
	72	+ <item>18</item>
	73	+ <item>16</item>
74	74	</string-array>
75	75
76	76	<string-array name="list_orientation">

--- mokelinesrc/MokeLine/res/xml/serverpref.xml (revision 15)

+++ mokelinesrc/MokeLine/res/xml/serverpref.xml (revision 16)

		@@ -7,5 +7,5 @@
7	7	<EditTextPreference android:title="@string/menu_server_nick" android:key="nick"></EditTextPreference>
8	8	<ListPreference android:entries="@array/list_orientation" android:title="@string/menu_server_orientation" android:entryValues="@array/list_orientationvalues" android:key="orientation" android:dialogTitle="@string/menu_server_orientation_title"></ListPreference>
9	9
10		- <ListPreference android:entryValues="@array/list_entryvalues" android:enabled="false" android:key="fontsize" android:entries="@array/list_fontsize" android:selectable="false" android:title="@string/menu_server_fontsize" android:dialogTitle="@string/menu_server_fontsize_title"></ListPreference>
	10	+ <ListPreference android:entryValues="@array/list_entryvalues" android:key="fontsize" android:entries="@array/list_fontsize" android:title="@string/menu_server_fontsize" android:dialogTitle="@string/menu_server_fontsize_title" android:selectable="true" android:enabled="true"></ListPreference>
11	11	</PreferenceScreen>