Skip to content

Commit

Permalink
Merge pull request #528 from linxiaohao123/master
Browse files Browse the repository at this point in the history 
#89 #21 #net1314080903226lab3
  • Loading branch information
@zengsn
zengsn committed Apr 28, 2016
2 parents 8eaf261 + 0b9a05b commit 1b7fabe
Show file tree
Hide file tree
Showing 11 changed files with 263 additions and 0 deletions.
Binary file added app/src/main/res/drawable/net1314080903226-head.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable/net1314080903226/net1314080903226-head.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable/net1314080903226/net1314080903226-ic.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable/net1314080903226/net1314080903226-ic_launcher.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable/net1314080903226/net1314080903226-icon.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
50 changes: 50 additions & 0 deletions app/src/main/res/layout/activity_net1314080903226.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:orientation="vertical"
>

<RelativeLayout
android:layout_width="match_parent"
android:layout_height="@dimen/topbar_height"
android:background="@color/topbar_bg"
android:gravity="center_vertical">

<!--<ImageButton-->
<!--android:id="@+id/id_imb_topbar_icon"-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="match_parent"-->
<!--android:background="@null"-->
<!--android:src="@drawable/topbar_icon_bg" />-->
<!--android:layout_toRightOf="@id/id_imb_topbar_icon"-->
<ImageView
android:layout_width="40dp"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:src="@drawable/ic"
android:gravity="center_vertical"

android:textColor="@color/white"
android:textSize="@dimen/textsize_20" />
</RelativeLayout>
<LinearLayout
android:id="@+id/mainadv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"></LinearLayout>
<android.support.design.widget.TabLayout
android:id="@+id/id_tablayout"
style="@style/tablayoutStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content" />

<android.support.v4.view.ViewPager
android:id="@+id/id_viewpager"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1" />

</LinearLayout>
50 changes: 50 additions & 0 deletions app/src/main/res/layout/net1314080903226/activity_main_net1314080903226.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:orientation="vertical"
>

<RelativeLayout
android:layout_width="match_parent"
android:layout_height="@dimen/topbar_height"
android:background="@color/topbar_bg"
android:gravity="center_vertical">

<!--<ImageButton-->
<!--android:id="@+id/id_imb_topbar_icon"-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="match_parent"-->
<!--android:background="@null"-->
<!--android:src="@drawable/topbar_icon_bg" />-->
<!--android:layout_toRightOf="@id/id_imb_topbar_icon"-->
<ImageView
android:layout_width="40dp"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:src="@drawable/ic"
android:gravity="center_vertical"

android:textColor="@color/white"
android:textSize="@dimen/textsize_20" />
</RelativeLayout>
<LinearLayout
android:id="@+id/mainadv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"></LinearLayout>
<android.support.design.widget.TabLayout
android:id="@+id/id_tablayout"
style="@style/tablayoutStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content" />

<android.support.v4.view.ViewPager
android:id="@+id/id_viewpager"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1" />

</LinearLayout>
55 changes: 55 additions & 0 deletions app/src/main/res/layout/net1314080903226/activity_news_info_net1314080903226.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">

<RelativeLayout
android:layout_width="match_parent"
android:layout_height="@dimen/topbar_height"
android:background="@color/topbar_bg"
android:gravity="center_vertical">

<ImageButton
android:id="@+id/id_imb_back"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="@null"
android:src="@drawable/activity_back_bg" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="@string/content"
android:textColor="@color/white"
android:textSize="@dimen/textsize_20"
android:textStyle="bold" />
</RelativeLayout>
<LinearLayout
android:id="@+id/xqdav"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"></LinearLayout>
<TextView
android:id="@+id/id_loadfailed"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:textColor="@color/colorAccent"
android:textSize="@dimen/textsize_20"
android:text="@string/load_failed"
android:gravity="center"
android:visibility="gone"/>

<android.support.v4.widget.SwipeRefreshLayout
android:id="@+id/id_newsinfo_refresh"
android:layout_width="match_parent"
android:layout_height="match_parent">

<WebView
android:id="@+id/id_newsinfo_webview"
android:layout_width="match_parent"
android:layout_height="match_parent"></WebView>
</android.support.v4.widget.SwipeRefreshLayout>

</LinearLayout>
29 changes: 29 additions & 0 deletions app/src/main/res/layout/net1314080903226/fragment_main_net1314080903226.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:ptr="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">

<!--<extras.pulltorefresh.PullToRefreshListView-->
<!--android:id="@+id/id_pulltorefresh"-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="match_parent"-->
<!--android:divider="@android:color/transparent"-->
<!--android:dividerHeight="8dp"-->
<!--android:fadingEdge="none"-->
<!--ptr:ptrMode="both" />-->

<android.support.v4.widget.SwipeRefreshLayout
android:id="@+id/id_swiperefresh"
android:layout_width="match_parent"
android:layout_height="match_parent">

<android.support.v7.widget.RecyclerView
android:id="@+id/id_recycleview"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</android.support.v4.widget.SwipeRefreshLayout>


</LinearLayout>
28 changes: 28 additions & 0 deletions app/src/main/res/layout/net1314080903226/news_item_footer_net1314080903226.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="100dp"
android:gravity="center"
android:id="@+id/item_news_foot"
android:orientation="horizontal">

<com.yuedong.csdn.widget.ProgressWheel
android:id="@+id/item_news_progressbar"
android:layout_width="45dp"
android:layout_height="45dp"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
app:matProg_barColor="@color/colorPrimary"
app:matProg_progressIndeterminate="true" />

<TextView
android:id="@+id/item_news_message"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:text="loading"
android:textColor="#000000"
android:textSize="16sp" />

</LinearLayout>
51 changes: 51 additions & 0 deletions app/src/main/res/layout/net1314080903226/news_listview_item_net1314080903226.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
<?xml version="1.0" encoding="utf-8"?>

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="120dp"
android:background="@color/white"
android:layout_margin="@dimen/padding_8"
android:orientation="horizontal">

<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:paddingBottom="@dimen/padding_8"
android:orientation="vertical">

<TextView
android:id="@+id/id_newsItem_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="@dimen/padding_8"
android:singleLine="true"
android:text="@string/app_name"
android:textSize="@dimen/textsize_14"
android:textStyle="bold" />

<TextView
android:id="@+id/id_newItem_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/padding_8"
android:maxLines="2"
android:ellipsize="end"
android:textSize="@dimen/textsize_12" />

<TextView
android:id="@+id/id_newsItem_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/padding_8"
android:textSize="@dimen/textsize_10" />
</LinearLayout>

<ImageView
android:id="@+id/id_newsItem_icon"
android:layout_width="80dp"
android:layout_height="80dp"
android:scaleType="fitCenter"
android:src="@mipmap/news_default_icon" />

</LinearLayout>

0 comments on commit 1b7fabe

Please sign in to comment.