OSDN -- Open-Source-Software-Entwicklung und Downloads
Übersetzungsstatus von Deutsch translation status for de
  • R/O
  • SSH
  • HTTPS

observoice: Commit


Commit MetaInfo

Revision310 (tree)
Zeit2012-11-07 20:43:37
Autormeganetan

Log Message

スタート画面のViewPagerを廃止

Ändern Zusammenfassung

Diff

--- trunk/ov-client/observoice/src/jp/sourceforge/observoice/StartActivity.java (revision 309)
+++ trunk/ov-client/observoice/src/jp/sourceforge/observoice/StartActivity.java (revision 310)
@@ -22,23 +22,17 @@
2222 import roboguice.inject.InjectView;
2323 import android.app.Activity;
2424 import android.app.AlertDialog;
25-import android.content.Context;
2625 import android.content.Intent;
2726 import android.os.Bundle;
28-import android.support.v4.view.PagerAdapter;
29-import android.support.v4.view.ViewPager;
30-import android.view.LayoutInflater;
3127 import android.view.Menu;
3228 import android.view.MenuInflater;
3329 import android.view.MenuItem;
3430 import android.view.View;
3531 import android.view.View.OnClickListener;
36-import android.view.ViewGroup;
3732 import android.widget.AdapterView;
3833 import android.widget.AdapterView.OnItemClickListener;
3934 import android.widget.Button;
4035 import android.widget.ListView;
41-import android.widget.TextView;
4236
4337 /**
4438 * アプリを起動すると最初に表示される画面<br>
@@ -54,8 +48,8 @@
5448 private Button runLectureSearchActivityButton;
5549 @InjectView(R.id.runReviewActivityButton)
5650 private Button runReviewActivityButton;
57- @InjectView(R.id.startviewpager)
58- ViewPager mViewPager;
51+ @InjectView(R.id.nextLectureView)
52+ private ListView lectureListView;
5953
6054 // 1から7の番号をjava.util.Calendar.XXXに変換する配列
6155 // dayOfWeekSelectedを変換するのが目的
@@ -64,7 +58,6 @@
6458 java.util.Calendar.FRIDAY, java.util.Calendar.SATURDAY, java.util.Calendar.SUNDAY };
6559
6660 NextLectureListAdapter listAdapter;
67- private ListView lectureListView;
6861 private List<Course> lectures = new ArrayList<Course>();
6962
7063 //今日は何曜日？
@@ -92,22 +85,6 @@
9285 }
9386 });
9487
95- /*
96- * //ReviewActivityをまだ作っていない
97- * runReviewActivityButton.setOnClickListener(new View.OnClickListener()
98- * {
99- *
100- * @Override public void onClick(View v) { //startActivity(new
101- * Intent(ObservoiceNetworkingSampleActivity.this,
102- * ReviewActivity.class));
103- *
104- * } });
105- */
106-
107- MyPagerAdapter mPagerAdapter = new MyPagerAdapter();
108- mViewPager.setAdapter(mPagerAdapter);
109- lectureListView = mPagerAdapter.getNextLectureListView();
110-
11188 //検索用データの設定
11289 String freeWord = "";
11390 int periodToSearch = 0;
@@ -292,60 +269,6 @@
292269
293270 }
294271
295- // フリップで切り替え可能なサブビュー用のアダプタ
296- private class MyPagerAdapter extends PagerAdapter {
297- private ListView mNextLecture; // フリックページ1
298- private ListView mCommentListView; // フリックページ2
299- private TextView mLectureAbstractView;
300-
301- public MyPagerAdapter() {
302- LayoutInflater inflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
303- mNextLecture = (ListView) inflater.inflate(R.layout.next_lecture, null);
304- mCommentListView = (ListView) inflater.inflate(R.layout.comment_list_fragment, null);
305- mLectureAbstractView = (TextView) inflater.inflate(R.layout.lecture_abstract, null);
306- }
307-
308- @Override
309- public Object instantiateItem(ViewGroup container, int position) {
310- int[] pages = { R.layout.next_lecture, R.layout.comment_list_fragment,
311- R.layout.lecture_abstract };
312- int page = pages[position];
313- View view = null;
314- switch (page) {
315- case R.layout.next_lecture:
316- view = mNextLecture;
317- break;
318- case R.layout.comment_list_fragment:
319- view = mCommentListView;
320- break;
321- case R.layout.lecture_abstract:
322- view = mLectureAbstractView;
323- break;
324- }
325- container.addView(view);
326- return view;
327- }
328-
329- @Override
330- public void destroyItem(ViewGroup container, int position, Object object) {
331- ((ViewPager) container).removeView((View) object);
332- }
333-
334- @Override
335- public int getCount() {
336- return 3;
337- }
338-
339- @Override
340- public boolean isViewFromObject(View view, Object object) {
341- return view.equals(object);
342- }
343-
344- public ListView getNextLectureListView() {
345- return mNextLecture;
346- }
347- }
348-
349272 @Override
350273 public boolean onCreateOptionsMenu(Menu menu) {
351274 MenuInflater inflater = getMenuInflater();
--- trunk/ov-client/observoice/res/layout/start.xml (revision 309)
+++ trunk/ov-client/observoice/res/layout/start.xml (revision 310)
@@ -2,7 +2,8 @@
22 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
33 android:id="@+id/menu"
44 android:layout_width="fill_parent"
5- android:layout_height="fill_parent" >
5+ android:layout_height="fill_parent"
6+ android:baselineAligned="false" >
67
78 <RelativeLayout
89 android:layout_width="0dp"
@@ -9,22 +10,20 @@
910 android:layout_height="fill_parent"
1011 android:layout_weight="0.7" >
1112
12- <android.support.v4.view.ViewPager
13+ <ListView
1314 xmlns:android="http://schemas.android.com/apk/res/android"
14- android:id="@+id/startviewpager"
15+ android:id="@+id/nextLectureView"
1516 android:layout_width="fill_parent"
1617 android:layout_height="fill_parent"
17- android:layout_above="@+id/tori_button"
18- android:layout_weight="0.5" />
18+ android:layout_above="@+id/tori_button" />
1919
20- <Button
20+ <Button
2121 android:id="@+id/tori_button"
2222 style="@style/ObsvToriButton"
2323 android:layout_width="128dp"
2424 android:layout_height="128dp"
2525 android:layout_alignParentBottom="true"
26- android:layout_alignParentRight="true">
27-
26+ android:layout_alignParentRight="true" >
2827 </Button>
2928 </RelativeLayout>
3029
Show on old repository browser