Permalink
Browse files

Merge branch 'master' of github.com:eakmeister/STEP_Android

  • Loading branch information...
2 parents 291839f + c267038 commit 1631c5e69e7325f7ffd1f280535954791907f68a Eric Kern committed Apr 5, 2012
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -1,23 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:orientation="vertical" >
- <LinearLayout
- android:id="@+id/layBtnNTable"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal" >
- <LinearLayout
- android:id="@+id/linearLayout1"
- android:layout_width="250dp"
- android:layout_height="fill_parent"
- android:orientation="vertical" >
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:baselineAligned="false"
+ android:weightSum="10"
+ android:orientation="horizontal" >
+ <RelativeLayout
+ android:id="@+id/emailRelLaySidebar"
+ android:layout_width="0dp"
+ android:layout_weight="3"
+ android:layout_height="fill_parent"
+ android:orientation="vertical" >
<Button
android:id="@+id/btnWorld"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_alignParentTop="true"
+ android:layout_width="fill_parent"
+ android:layout_height="@dimen/music_top_bar_height"
android:layout_margin="2dip"
android:background="@drawable/news_sports"
android:clickable="true"
@@ -28,8 +27,9 @@
<Button
android:id="@+id/btnFinance"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_width="fill_parent"
+ android:layout_below="@id/btnWorld"
+ android:layout_height="@dimen/music_top_bar_height"
android:layout_margin="2dip"
android:background="@drawable/news_finance"
android:textColor="#000"
@@ -39,8 +39,9 @@
<Button
android:id="@+id/btnGovernment"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_width="fill_parent"
+ android:layout_below="@id/btnFinance"
+ android:layout_height="@dimen/music_top_bar_height"
android:layout_margin="2dip"
android:background="@drawable/news_government"
android:textColor="#000"
@@ -50,21 +51,17 @@
<Button
android:id="@+id/btnSports"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_width="fill_parent"
+ android:layout_below="@id/btnGovernment"
+ android:layout_height="@dimen/music_top_bar_height"
android:layout_margin="2dip"
android:background="@drawable/news_sports"
android:textColor="#000"
android:textSize="12pt"
android:textStyle="bold" >
</Button>
- </LinearLayout>
- <ListView
- android:id="@+id/newsFrag_listview"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:visibility="visible"
- android:scrollbars="vertical" />
+ </RelativeLayout>
+
<ScrollView
android:id="@+id/scrlReadArticle"
android:layout_width="fill_parent"
@@ -74,6 +71,17 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
+ <TextView
+ android:id="@+id/txtReadTitle"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:background="#FFF"
+ android:text=""
+ android:textColor="#000"
+ android:textSize="15pt"
+ android:textStyle="bold"
+ android:typeface="serif">
+ </TextView>
<TextView
android:id="@+id/txtReadArticle"
android:layout_width="fill_parent"
@@ -112,7 +120,7 @@
</LinearLayout>
</ScrollView>
- </LinearLayout>
+
@@ -88,7 +88,7 @@ public void onClick(View V) {
// TODO Auto-generated method stub
rssReaderTask = new RssReaderTask(NewspaperFragment.this.rssReader,getActivity().findViewById(R.id.txtReadArticle),1);
rssReaderTask.execute();
- getActivity().findViewById(R.id.newsFrag_listview).setVisibility(View.GONE);
+ //getActivity().findViewById(R.id.newsFrag_listview).setVisibility(View.GONE);
getActivity().findViewById(R.id.scrlReadArticle).setVisibility(View.VISIBLE);
getActivity().findViewById(R.id.btnPrevious).setVisibility(View.GONE);
@@ -102,7 +102,7 @@ public void onClick(View V) {
// TODO Auto-generated method stub
rssReaderTask = new RssReaderTask(NewspaperFragment.this.rssReader,getActivity().findViewById(R.id.txtReadArticle),2);
rssReaderTask.execute();
- getActivity().findViewById(R.id.newsFrag_listview).setVisibility(View.GONE);
+ //getActivity().findViewById(R.id.newsFrag_listview).setVisibility(View.GONE);
getActivity().findViewById(R.id.scrlReadArticle).setVisibility(View.VISIBLE);
getActivity().findViewById(R.id.btnPrevious).setVisibility(View.GONE);
}
@@ -115,7 +115,7 @@ public void onClick(View V) {
// TODO Auto-generated method stub
rssReaderTask = new RssReaderTask(NewspaperFragment.this.rssReader,getActivity().findViewById(R.id.txtReadArticle),3);
rssReaderTask.execute();
- getActivity().findViewById(R.id.newsFrag_listview).setVisibility(View.GONE);
+ //getActivity().findViewById(R.id.newsFrag_listview).setVisibility(View.GONE);
getActivity().findViewById(R.id.scrlReadArticle).setVisibility(View.VISIBLE);
getActivity().findViewById(R.id.btnPrevious).setVisibility(View.GONE);
}
@@ -128,7 +128,7 @@ public void onClick(View V) {
// TODO Auto-generated method stub
rssReaderTask = new RssReaderTask(NewspaperFragment.this.rssReader,getActivity().findViewById(R.id.txtReadArticle),4);
rssReaderTask.execute();
- getActivity().findViewById(R.id.newsFrag_listview).setVisibility(View.GONE);
+ //getActivity().findViewById(R.id.newsFrag_listview).setVisibility(View.GONE);
getActivity().findViewById(R.id.scrlReadArticle).setVisibility(View.VISIBLE);
getActivity().findViewById(R.id.btnPrevious).setVisibility(View.GONE);
}

0 comments on commit 1631c5e

Please sign in to comment.