Skip to content

Commit

Permalink
Guy to refactor xml.
Browse files Browse the repository at this point in the history
  • Loading branch information
@s-aska
s-aska committed Jan 23, 2014
1 parent c6b61e5 commit e8ce7a9
Show file tree
Hide file tree
Showing 4 changed files with 69 additions and 337 deletions.
31 changes: 13 additions & 18 deletions res/layout/list.xml
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,19 @@
<?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:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">

<LinearLayout
android:id="@+id/container"
<ListView
android:id="@+id/list_view"
android:layout_height="0dip"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
android:layout_weight="1" />

<ListView
android:id="@+id/list_view"
android:layout_height="0dip"
android:layout_width="match_parent"
android:layout_weight="1"/>

<ProgressBar
android:id="@+id/guruguru"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"/>
</LinearLayout>
<ProgressBar
android:id="@+id/guruguru"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center" />
</LinearLayout>
71 changes: 0 additions & 71 deletions res/layout/pull_to_refresh_header.xml
View file

This file was deleted.

85 changes: 56 additions & 29 deletions res/layout/row_tweet.xml
View file
Original file line number Diff line number Diff line change
@@ -1,50 +1,54 @@
<?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="?android:attr/listPreferredItemHeight"
android:baselineAligned="false"
android:orientation="vertical"
android:paddingBottom="3dip"
android:paddingLeft="6dip"
android:paddingRight="7dip"
android:paddingTop="4dip">
android:paddingTop="4dip"
tools:layout_height="wrap_content">

<LinearLayout
android:id="@+id/action"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="2dip"
android:layout_weight="1"
android:orientation="horizontal">

<TextView
android:id="@+id/action_icon"
android:layout_width="wrap_content"
android:layout_width="48dip"
android:layout_height="wrap_content"
android:layout_marginLeft="38dip"
android:layout_marginRight="7dip"
android:textSize="12sp" />
android:layout_marginRight="6dip"
android:gravity="right"
android:textSize="12sp"
tools:text="★" />

<TextView
android:id="@+id/action_by_display_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="12sp"
android:textStyle="bold" />
android:textStyle="bold"
tools:text="Justaway Factory" />

<TextView
android:id="@+id/action_by_screen_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="4dip"
android:textColor="#666666"
android:textSize="10sp" />
android:textSize="10sp"
tools:ignore="SmallSp"
tools:text="@justawayfactory" />
</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="horizontal">

<ImageView
Expand All @@ -54,13 +58,13 @@
android:layout_marginBottom="6dip"
android:layout_marginRight="6dip"
android:layout_marginTop="1dip"
android:paddingTop="2dip"
android:contentDescription="@string/description_icon"
android:paddingTop="2dip" />
tools:src="@drawable/ic_launcher" />

<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">

<TableLayout
Expand All @@ -69,7 +73,7 @@
android:layout_marginBottom="6dip"
android:stretchColumns="0">

<TableRow>
<TableRow tools:ignore="UselessParent">

<LinearLayout
android:layout_width="0dip"
Expand All @@ -81,15 +85,18 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="12sp"
android:textStyle="bold" />
android:textStyle="bold"
tools:text="Justaway Factory" />

<TextView
android:id="@+id/screen_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="4dip"
android:textColor="#666666"
android:textSize="10sp" />
android:textSize="10sp"
tools:ignore="SmallSp"
tools:text="@justawayfactory" />

<TextView
android:id="@+id/fontello_lock"
Expand All @@ -98,7 +105,9 @@
android:layout_marginLeft="4dip"
android:text="@string/fontello_lock"
android:textColor="#666666"
android:textSize="10sp" />
android:textSize="10sp"
tools:ignore="SmallSp"
tools:text="鍵" />

</LinearLayout>

Expand All @@ -107,31 +116,34 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#666666"
android:textSize="10sp" />
android:textSize="10sp"
tools:ignore="SmallSp"
tools:text="2H" />
</TableRow>
</TableLayout>

<TextView
android:id="@+id/status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="12sp" />
android:textSize="12sp"
tools:text="Hello World." />

<LinearLayout
android:id="@+id/images"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="4dip"
android:layout_marginTop="10dip"
android:orientation="vertical"/>
android:orientation="vertical" />

<TableLayout
android:id="@+id/menu_and_via"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:stretchColumns="5">

<TableRow>
<TableRow tools:ignore="UselessParent">

<TextView
android:id="@+id/do_reply"
Expand All @@ -140,7 +152,8 @@
android:padding="6dip"
android:text="@string/fontello_reply"
android:textColor="#666666"
android:textSize="18sp" />
android:textSize="18sp"
tools:text="←" />

<TextView
android:id="@+id/do_retweet"
Expand All @@ -150,7 +163,8 @@
android:padding="6dip"
android:text="@string/fontello_retweet"
android:textColor="#666666"
android:textSize="18sp" />
android:textSize="18sp"
tools:text="■" />

<TextView
android:id="@+id/retweet_count"
Expand All @@ -159,7 +173,9 @@
android:paddingBottom="6dip"
android:paddingTop="6dip"
android:textColor="#999999"
android:textSize="10sp" />
android:textSize="10sp"
tools:ignore="SmallSp"
tools:text="12345" />

<TextView
android:id="@+id/do_fav"
Expand All @@ -171,7 +187,8 @@
android:paddingLeft="2dip"
android:text="@string/fontello_star"
android:textColor="#666666"
android:textSize="18sp" />
android:textSize="18sp"
tools:text="■" />

<TextView
android:id="@+id/fav_count"
Expand All @@ -180,7 +197,9 @@
android:paddingBottom="6dip"
android:paddingTop="6dip"
android:textColor="#999999"
android:textSize="10sp" />
android:textSize="10sp"
tools:ignore="SmallSp"
tools:text="12345" />

<LinearLayout
android:layout_width="0dip"
Expand All @@ -195,7 +214,9 @@
android:layout_gravity="right"
android:paddingBottom="2dip"
android:textColor="#666666"
android:textSize="8sp" />
android:textSize="8sp"
tools:ignore="SmallSp"
tools:text="Justaway for Android" />

<TextView
android:id="@+id/datetime"
Expand All @@ -204,7 +225,9 @@
android:paddingBottom="2dip"
android:layout_gravity="right"
android:textColor="#666666"
android:textSize="10sp" />
android:textSize="10sp"
tools:ignore="SmallSp"
tools:text="2014/01/23 15:14:30" />

</LinearLayout>
</TableRow>
Expand All @@ -215,21 +238,25 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="2dip"
android:gravity="left">
android:gravity="left"
tools:ignore="UseCompoundDrawables">

<ImageView
android:id="@+id/retweet_icon"
android:layout_width="16dip"
android:layout_height="16dip"
android:layout_marginRight="4dip"
android:contentDescription="@string/description_icon" />
android:contentDescription="@string/description_icon"
tools:src="@drawable/ic_launcher" />

<TextView
android:id="@+id/retweet_by"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="3dip"
android:textSize="8sp" />
android:textSize="8sp"
tools:ignore="SmallSp"
tools:text="@su_aska" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
Expand Down
Loading

0 comments on commit e8ce7a9

Please sign in to comment.