OSDN Git Service

Update button icons
authoreagletmt <eagletmt@gmail.com>
Wed, 24 Oct 2012 05:49:28 +0000 (14:49 +0900)
committereagletmt <eagletmt@gmail.com>
Wed, 24 Oct 2012 05:49:28 +0000 (14:49 +0900)
18 files changed:
CUTEn/res/drawable/add32.png [deleted file]
CUTEn/res/drawable/addcal40.png [new file with mode: 0644]
CUTEn/res/drawable/addfol40.png [new file with mode: 0644]
CUTEn/res/drawable/addlec32.png [deleted file]
CUTEn/res/drawable/back40.png [new file with mode: 0644]
CUTEn/res/drawable/cancel32.png [deleted file]
CUTEn/res/drawable/cancel40.png [new file with mode: 0644]
CUTEn/res/drawable/del40.png [new file with mode: 0644]
CUTEn/res/drawable/reload32.png [deleted file]
CUTEn/res/drawable/reload40.png [new file with mode: 0644]
CUTEn/res/layout/about.xml
CUTEn/res/layout/downloadown.xml
CUTEn/res/layout/main.xml
CUTEn/res/layout/record.xml
CUTEn/res/values/strings.xml
CUTEn/src/jp/ac/titech/sharp4k/cuten/AboutActivity.java
CUTEn/src/jp/ac/titech/sharp4k/cuten/DownloadActivity.java
CUTEn/src/jp/ac/titech/sharp4k/cuten/RecordActivity.java

diff --git a/CUTEn/res/drawable/add32.png b/CUTEn/res/drawable/add32.png
deleted file mode 100644 (file)
index ee7143c..0000000
Binary files a/CUTEn/res/drawable/add32.png and /dev/null differ
diff --git a/CUTEn/res/drawable/addcal40.png b/CUTEn/res/drawable/addcal40.png
new file mode 100644 (file)
index 0000000..218720a
Binary files /dev/null and b/CUTEn/res/drawable/addcal40.png differ
diff --git a/CUTEn/res/drawable/addfol40.png b/CUTEn/res/drawable/addfol40.png
new file mode 100644 (file)
index 0000000..2155778
Binary files /dev/null and b/CUTEn/res/drawable/addfol40.png differ
diff --git a/CUTEn/res/drawable/addlec32.png b/CUTEn/res/drawable/addlec32.png
deleted file mode 100644 (file)
index 519ee05..0000000
Binary files a/CUTEn/res/drawable/addlec32.png and /dev/null differ
diff --git a/CUTEn/res/drawable/back40.png b/CUTEn/res/drawable/back40.png
new file mode 100644 (file)
index 0000000..74698f5
Binary files /dev/null and b/CUTEn/res/drawable/back40.png differ
diff --git a/CUTEn/res/drawable/cancel32.png b/CUTEn/res/drawable/cancel32.png
deleted file mode 100644 (file)
index 1fa7bcb..0000000
Binary files a/CUTEn/res/drawable/cancel32.png and /dev/null differ
diff --git a/CUTEn/res/drawable/cancel40.png b/CUTEn/res/drawable/cancel40.png
new file mode 100644 (file)
index 0000000..2514547
Binary files /dev/null and b/CUTEn/res/drawable/cancel40.png differ
diff --git a/CUTEn/res/drawable/del40.png b/CUTEn/res/drawable/del40.png
new file mode 100644 (file)
index 0000000..5be224d
Binary files /dev/null and b/CUTEn/res/drawable/del40.png differ
diff --git a/CUTEn/res/drawable/reload32.png b/CUTEn/res/drawable/reload32.png
deleted file mode 100644 (file)
index 2ad50a6..0000000
Binary files a/CUTEn/res/drawable/reload32.png and /dev/null differ
diff --git a/CUTEn/res/drawable/reload40.png b/CUTEn/res/drawable/reload40.png
new file mode 100644 (file)
index 0000000..8aec8f4
Binary files /dev/null and b/CUTEn/res/drawable/reload40.png differ
index 9ec9b45..cd7013d 100644 (file)
         android:text="@string/author_text"
         android:textAppearance="?android:attr/textAppearanceMedium" />
 
-<Button
+<ImageButton
     android:id="@+id/button_about_return"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:text="@string/return_button_label" />
+    android:src="@drawable/back40" />
 
 </LinearLayout>
\ No newline at end of file
index 21e8ca5..d9c2400 100644 (file)
@@ -21,7 +21,7 @@
             android:id="@+id/update"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:src="@drawable/reload32" />
+            android:src="@drawable/reload40" />
 
         <LinearLayout
             android:layout_width="match_parent"
                 android:gravity="right"
                 android:orientation="vertical" >
 
-                <Button
+                <ImageButton
                     android:id="@+id/move"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/down_return_button_label" />
+                    android:src="@drawable/back40" />
+
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>
 
-    <Button
+    <ImageButton
         android:id="@+id/ok"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:text="" />
+        android:layout_alignParentBottom="true" />
 
     <ListView
         android:id="@+id/lectureList"
index 0e0a5b1..dc37d54 100644 (file)
             android:id="@+id/clearFlagBtn"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:src="@drawable/cancel32" />
+            android:src="@drawable/cancel40" />
 
         <ImageButton
             android:id="@+id/createFolderBtn"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:src="@drawable/add32" />
+            android:src="@drawable/addfol40" />
 
         <ImageButton
             android:id="@+id/updateBtn"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:src="@drawable/reload32" />
+            android:src="@drawable/reload40" />
 
         <ImageButton
             android:id="@+id/moveBtn"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="0.01"
-            android:src="@drawable/addlec32" />
+            android:src="@drawable/addcal40" />
 
     </LinearLayout>
 
index 0c738a2..66e19a5 100644 (file)
             android:id="@+id/record_update_btn"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:src="@drawable/reload32" />
+            android:src="@drawable/reload40" />
 
-        <Button
+        <ImageButton
             android:id="@+id/record_return_btn"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/return_button_label" />
+            android:src="@drawable/back40" />
 
     </LinearLayout>
 
index a76c101..af57ed5 100644 (file)
@@ -4,13 +4,11 @@
     <string name="app_name">CUTEn</string>
     <string name="lecture_title">Lecture</string>
        <string name="close_button_label">close</string>
-       <string name="return_button_label">return</string>
     <string name="about_title">About</string>
        <string name="about_message">CUTEnは講義補助を行うようなアプリケーションを提供するアプリケーション、 学習環境ミドルウェアみたいなものです。\n\n 「可愛いは正義!!」\n</string>
        <string name="version">Version: 0.5</string>
        <string name="unselected_button_label">未登録講義一覧</string>
        <string name="selected_button_label">取得済講義一覧</string>
-       <string name="down_return_button_label">講義一覧ページに戻る</string>
        <string name="launch_browser_message">下のボタンからログインページに飛び、プロフィールページに表示されているトークンを確認してください</string>
        <string name="token_input_message">トークンを下のテキストボックスに入力し、認証ボタンを押してください</string>
        <string name="authentication_button_label">認証</string>
index 5b75410..aca714f 100644 (file)
@@ -4,7 +4,6 @@ import android.app.Activity;
 import android.os.Bundle;
 import android.view.View;
 import android.view.View.OnClickListener;
-import android.widget.Button;
 
 public class AboutActivity extends Activity implements OnClickListener {
        private static final String TAG = "AboutActivity";
@@ -13,8 +12,7 @@ public class AboutActivity extends Activity implements OnClickListener {
        public void onCreate(Bundle savedInstanceState) {
                super.onCreate(savedInstanceState);
                setContentView(R.layout.about);
-               Button btn = (Button) findViewById(R.id.button_about_return);
-               btn.setOnClickListener(this);
+               findViewById(R.id.button_about_return).setOnClickListener(this);
        }
 
        @Override
index 2856a13..a2d5f33 100644 (file)
@@ -32,8 +32,8 @@ public class DownloadActivity extends BaseMenuActivity {
        private TextView tv;
        private ListView lectureList;
        private ArrayAdapter<String> haveAdapter, newAdapter;
-       private ImageButton update;
-       private Button add, delete, ok, move;
+       private ImageButton update, ok, move;
+       private Button add, delete;
        private SQLiteDatabase db;
        private ProgressDialog connectingDialog;
        private AlertDialog alertDialog;
@@ -82,7 +82,7 @@ public class DownloadActivity extends BaseMenuActivity {
                        public void onClick(View v) {
                                lectureList.setAdapter(newAdapter);
                                tv.setText("登録したい講義を選択し、下の登録ボタンを押してください");
-                               ok.setText("登録");
+                               ok.setImageResource(R.drawable.addcal40);
                                ok.setOnClickListener(new OnClickListener() {
                                        @Override
                                        public void onClick(View v) {
@@ -103,7 +103,7 @@ public class DownloadActivity extends BaseMenuActivity {
                        public void onClick(View v) {
                                lectureList.setAdapter(haveAdapter);
                                tv.setText("削除したい講義を選択し、下の削除ボタンを押してください");
-                               ok.setText("削除");
+                               ok.setImageResource(R.drawable.del40);
                                ok.setOnClickListener(new OnClickListener() {
                                        @Override
                                        public void onClick(View v) {
@@ -118,8 +118,8 @@ public class DownloadActivity extends BaseMenuActivity {
                                });
                        }
                });
-               ok = (Button) findViewById(R.id.ok);
-               move = (Button) findViewById(R.id.move);
+               ok = (ImageButton) findViewById(R.id.ok);
+               move = (ImageButton) findViewById(R.id.move);
                move.setOnClickListener(new OnClickListener() {
                        @Override
                        public void onClick(View v) {
index b0efaa3..1dbb36b 100644 (file)
@@ -9,7 +9,6 @@ import android.database.sqlite.SQLiteDatabase;
 import android.os.Bundle;
 import android.view.View;
 import android.view.View.OnClickListener;
-import android.widget.Button;
 import android.widget.ExpandableListAdapter;
 import android.widget.ExpandableListView;
 import android.widget.ExpandableListView.OnChildClickListener;
@@ -18,8 +17,7 @@ import android.widget.ImageButton;
 import android.widget.SimpleExpandableListAdapter;
 
 public class RecordActivity extends BaseMenuActivity {
-       private ImageButton updateBtn;
-       private Button returnBtn;
+       private ImageButton updateBtn, returnBtn;
        private ExpandableListView recordList;
 
        private SQLiteDatabase db;
@@ -29,7 +27,7 @@ public class RecordActivity extends BaseMenuActivity {
                setContentView(R.layout.record);
 
                updateBtn = (ImageButton) findViewById(R.id.record_update_btn);
-               returnBtn = (Button) findViewById(R.id.record_return_btn);
+               returnBtn = (ImageButton) findViewById(R.id.record_return_btn);
                recordList = (ExpandableListView) findViewById(R.id.record_expandable_view);
 
                SQLHelper sqlhelper = new SQLHelper(this);