• R/O
  • SSH
  • HTTPS

nikocale: Commit


Commit MetaInfo

Revision307 (tree)
Zeit2011-01-16 11:45:40
Autortakezoe

Log Message

同期の設定用のアクティビティを追加。

Ändern Zusammenfassung

Diff

--- nikocale_android/trunk/nikocale_android/AndroidManifest.xml (revision 306)
+++ nikocale_android/trunk/nikocale_android/AndroidManifest.xml (revision 307)
@@ -16,6 +16,9 @@
1616 <activity android:name="CalendarActivity" android:label="カレンダ表示"
1717 android:screenOrientation="portrait" android:configChanges="orientation|keyboardHidden">
1818 </activity>
19+ <activity android:name="ConfigActivity" android:label="同期の設定"
20+ android:screenOrientation="portrait" android:configChanges="orientation|keyboardHidden">
21+ </activity>
1922 </application>
2023
2124 <uses-permission android:name="android.permission.INTERNET"></uses-permission>
--- nikocale_android/trunk/nikocale_android/src/jp/sf/amateras/nikocale/android/MainActivity.java (revision 306)
+++ nikocale_android/trunk/nikocale_android/src/jp/sf/amateras/nikocale/android/MainActivity.java (revision 307)
@@ -112,6 +112,7 @@
112112 boolean result = super.onCreateOptionsMenu(menu);
113113 menu.add(Menu.NONE, Constants.MENU_ENTRY, Menu.NONE, "今日のニコカレ").setIcon(android.R.drawable.ic_menu_edit);
114114 menu.add(Menu.NONE, Constants.MENU_CALENDAR, Menu.NONE, "カレンダ表示").setIcon(android.R.drawable.ic_menu_my_calendar);
115+ menu.add(Menu.NONE, Constants.MENU_CONFIG, Menu.NONE, "同期の設定").setIcon(android.R.drawable.ic_menu_manage);
115116 return result;
116117 }
117118
@@ -120,10 +121,15 @@
120121 if(item.getItemId() == Constants.MENU_ENTRY){
121122 Intent intent = new Intent(getApplicationContext(), EntryActivity.class);
122123 startActivity(intent);
124+
123125 } else if(item.getItemId() == Constants.MENU_CALENDAR){
124126 // TODO 年月日をカレンダ表示に引き継ぐ
125127 Intent intent = new Intent(getApplicationContext(), CalendarActivity.class);
126128 startActivity(intent);
129+
130+ } else if(item.getItemId() == Constants.MENU_CONFIG){
131+ Intent intent = new Intent(getApplicationContext(), ConfigActivity.class);
132+ startActivity(intent);
127133 }
128134 return true;
129135 }
--- nikocale_android/trunk/nikocale_android/src/jp/sf/amateras/nikocale/android/ConfigActivity.java (nonexistent)
+++ nikocale_android/trunk/nikocale_android/src/jp/sf/amateras/nikocale/android/ConfigActivity.java (revision 307)
@@ -0,0 +1,14 @@
1+package jp.sf.amateras.nikocale.android;
2+
3+import android.app.Activity;
4+import android.os.Bundle;
5+
6+public class ConfigActivity extends Activity {
7+
8+ @Override
9+ public void onCreate(Bundle savedInstanceState) {
10+ super.onCreate(savedInstanceState);
11+ setContentView(R.layout.config);
12+ }
13+
14+}
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
--- nikocale_android/trunk/nikocale_android/src/jp/sf/amateras/nikocale/android/Constants.java (revision 306)
+++ nikocale_android/trunk/nikocale_android/src/jp/sf/amateras/nikocale/android/Constants.java (revision 307)
@@ -8,7 +8,7 @@
88 public static final int STATUS_NORMAL = 1;
99 public static final int STATUS_BAD = 2;
1010
11-// public static final int MENU_CONFIG = 0;
11+ public static final int MENU_CONFIG = 0;
1212 public static final int MENU_ENTRY = 1;
1313 public static final int MENU_CALENDAR = 2;
1414 // public static final int MENU_STATUS = 3;
--- nikocale_android/trunk/nikocale_android/gen/jp/sf/amateras/nikocale/android/R.java (revision 306)
+++ nikocale_android/trunk/nikocale_android/gen/jp/sf/amateras/nikocale/android/R.java (revision 307)
@@ -73,9 +73,10 @@
7373 public static final int Calendar7=0x7f06000b;
7474 public static final int Calendar8=0x7f060013;
7575 public static final int Calendar9=0x7f060014;
76- public static final int DayOfWeek=0x7f060062;
77- public static final int EntryMessageText=0x7f06005f;
78- public static final int EntrySaveButton=0x7f060060;
76+ public static final int ConfigSaveButton=0x7f06005d;
77+ public static final int DayOfWeek=0x7f060065;
78+ public static final int EntryMessageText=0x7f060062;
79+ public static final int EntrySaveButton=0x7f060063;
7980 public static final int Image1=0x7f06000c;
8081 public static final int Image10=0x7f06001c;
8182 public static final int Image11=0x7f06001d;
@@ -118,24 +119,27 @@
118119 public static final int Image7=0x7f060012;
119120 public static final int Image8=0x7f06001a;
120121 public static final int Image9=0x7f06001b;
121- public static final int ImageView01=0x7f060064;
122- public static final int ListView01=0x7f060061;
123- public static final int Name=0x7f060063;
124- public static final int RadioGroup01=0x7f06005b;
125- public static final int StatusRadio01=0x7f06005c;
126- public static final int StatusRadio02=0x7f06005d;
127- public static final int StatusRadio03=0x7f06005e;
122+ public static final int ImageView01=0x7f060067;
123+ public static final int ListView01=0x7f060064;
124+ public static final int MailAddress=0x7f06005b;
125+ public static final int Name=0x7f060066;
126+ public static final int Password=0x7f06005c;
127+ public static final int RadioGroup01=0x7f06005e;
128+ public static final int StatusRadio01=0x7f06005f;
129+ public static final int StatusRadio02=0x7f060060;
130+ public static final int StatusRadio03=0x7f060061;
128131 public static final int TableLayout01=0x7f060000;
129132 public static final int TableRow01=0x7f060001;
130133 public static final int TextView01=0x7f06005a;
131- public static final int TextView02=0x7f060065;
134+ public static final int TextView02=0x7f060068;
132135 public static final int scroller=0x7f060059;
133136 }
134137 public static final class layout {
135138 public static final int calendar=0x7f030000;
136- public static final int entry=0x7f030001;
137- public static final int main=0x7f030002;
138- public static final int rowdata=0x7f030003;
139+ public static final int config=0x7f030001;
140+ public static final int entry=0x7f030002;
141+ public static final int main=0x7f030003;
142+ public static final int rowdata=0x7f030004;
139143 }
140144 public static final class string {
141145 public static final int app_name=0x7f040000;
--- nikocale_android/trunk/nikocale_android/res/layout/config.xml (nonexistent)
+++ nikocale_android/trunk/nikocale_android/res/layout/config.xml (revision 307)
@@ -0,0 +1,20 @@
1+<?xml version="1.0" encoding="utf-8"?>
2+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
3+ android:id="@+id/scroller"
4+ android:layout_width="fill_parent"
5+ android:layout_height="wrap_content">
6+ <LinearLayout
7+ android:orientation="vertical" android:layout_width="fill_parent"
8+ android:layout_height="fill_parent">
9+ <TextView android:text="メールアドレス" android:id="@+id/TextView01"
10+ android:layout_width="wrap_content" android:layout_height="wrap_content"></TextView>
11+ <EditText android:text="" android:id="@+id/MailAddress"
12+ android:layout_width="fill_parent" android:layout_height="wrap_content"></EditText>
13+ <TextView android:text="パスワード" android:id="@+id/TextView01"
14+ android:layout_width="wrap_content" android:layout_height="wrap_content"></TextView>
15+ <EditText android:text="" android:id="@+id/Password" android:password="true"
16+ android:layout_width="fill_parent" android:layout_height="wrap_content"></EditText>
17+ <Button android:text="設定の保存" android:id="@+id/ConfigSaveButton"
18+ android:layout_width="fill_parent" android:layout_height="wrap_content"></Button>
19+ </LinearLayout>
20+</ScrollView>
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Show on old repository browser