Skip to content

Commit

Permalink
重构用户模块、对部分常用资源设置缓存
Browse files Browse the repository at this point in the history
  • Loading branch information
@hillfly
hillfly committed Feb 16, 2014
1 parent 1600c91 commit c8a5792
Show file tree
Hide file tree
Showing 53 changed files with 2,197 additions and 5,017 deletions.
20 changes: 2 additions & 18 deletions AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,28 +134,12 @@
<activity
android:name=".activity.ImageBrowserActivity"
android:screenOrientation="portrait" >
</activity>
<activity
android:name=".activity.OtherFeedListActivity"
android:screenOrientation="portrait" >
</activity>
<activity
android:name=".activity.FeedProfileActivity"
android:screenOrientation="portrait"
android:windowSoftInputMode="adjustUnspecified|adjustResize" >
</activity>
</activity>
<activity
android:name=".activity.message.ChatActivity"
android:screenOrientation="portrait" >
</activity>
</activity>

<receiver android:name="com.immomo.momo.android.activity.wifiap.WifiapBroadcast" >
<intent-filter>
<action android:name="android.net.wifi.WIFI_STATE_CHANGED" />
<action android:name="android.net.wifi.SCAN_RESULTS" />
<action android:name="android.net.wifi.STATE_CHANGE" />
</intent-filter>
</receiver>
</application>

</manifest>
1 change: 1 addition & 0 deletions res/layout/activity_login.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
android:hint="年龄"
android:maxLength="3"
android:digits="0123456789"
android:inputType="number"
android:singleLine="true" />

<com.immomo.momo.android.view.HandyTextView
Expand Down
6 changes: 0 additions & 6 deletions res/layout/activity_otherprofile.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,10 @@
android:layout_height="wrap_content"
android:orientation="vertical" >

<include layout="@layout/include_otherprofile_photos" />

<include layout="@layout/include_otherprofile_feed" />

<include layout="@layout/include_otherprofile_accountinfo" />

<include layout="@layout/include_otherprofile_bindinfo" />

<include layout="@layout/include_otherprofile_selfintroduction" />

<include layout="@layout/include_otherprofile_joingroup" />
</LinearLayout>
</com.immomo.momo.android.view.PagerScrollView>
Expand Down
319 changes: 0 additions & 319 deletions res/layout/header_feed.xml
View file

This file was deleted.

248 changes: 6 additions & 242 deletions res/layout/include_otherprofile_accountinfo.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,243 +6,6 @@
android:paddingLeft="16dip"
android:paddingRight="16dip" >

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

<com.immomo.momo.android.view.HandyTextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
android:paddingBottom="7dip"
android:paddingLeft="10dip"
android:paddingRight="10dip"
android:paddingTop="10dip"
android:text="基本信息"
android:textColor="@color/blue"
android:textSize="14sp" />

<View
android:layout_width="fill_parent"
android:layout_height="2dip"
android:background="@color/blue"
android:orientation="vertical" >
</View>

<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="@drawable/bglistitem_selector"
android:orientation="vertical" >

<View
android:layout_width="fill_parent"
android:layout_height="1dip"
android:background="@color/devideline" />

<RelativeLayout
android:id="@+id/otherprofile_info_layout_vip"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:minHeight="50dip"
android:paddingLeft="10dip"
android:paddingRight="10dip" >

<com.immomo.momo.android.view.HandyTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:gravity="center"
android:text="会员"
android:textColor="@color/font_attribute"
android:textSize="18sp" />

<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="15dip"
android:src="@drawable/ic_profile_vip" />

<com.immomo.momo.android.view.HandyTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:drawableRight="@drawable/ic_common_arrow"
android:singleLine="true"
android:text=""
android:textColor="@color/font_value"
android:textSize="18sp" />
</RelativeLayout>

<LinearLayout
android:id="@+id/otherprofile_info_layout_momoid"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >

<View
android:layout_width="fill_parent"
android:layout_height="1dip"
android:background="@color/devideline" />

<RelativeLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:minHeight="50dip"
android:paddingLeft="10dip"
android:paddingRight="10dip" >

<com.immomo.momo.android.view.HandyTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:gravity="center"
android:text="陌陌号"
android:textColor="@color/font_attribute"
android:textSize="18sp" />

<com.immomo.momo.android.view.HandyTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:singleLine="true"
android:text="86930007"
android:textColor="@color/font_value"
android:textSize="18sp" />
</RelativeLayout>
</LinearLayout>

<LinearLayout
android:id="@+id/otherprofile_info_layout_sign"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >

<View
android:layout_width="fill_parent"
android:layout_height="1dip"
android:background="@color/devideline" />

<RelativeLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:padding="10dip" >

<com.immomo.momo.android.view.HandyTextView
android:id="@+id/otherprofile_info_htv_sign_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:text="个人签名"
android:textColor="@color/font_attribute"
android:textSize="18sp" />

<com.immomo.momo.android.view.EmoticonsTextView
android:id="@+id/otherprofile_info_htv_sign"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/otherprofile_info_htv_sign_title"
android:autoLink="all"
android:text="今天的天气真是不错的~"
android:textColor="@color/font_value"
android:textSize="16sp" />
</RelativeLayout>
</LinearLayout>
</LinearLayout>

<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:clickable="false"
android:gravity="center_vertical"
android:longClickable="false"
android:orientation="vertical" >

<View
android:layout_width="fill_parent"
android:layout_height="1dip"
android:background="@color/devideline" />

<include layout="@layout/include_industry" />
</LinearLayout>

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

<View
android:layout_width="fill_parent"
android:layout_height="1dip"
android:background="@color/devideline" />

<RelativeLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:padding="10dip" >

<com.immomo.momo.android.view.HandyTextView
android:id="@+id/otherprofile_info_htv_company_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:text="公司"
android:textColor="@color/font_attribute"
android:textSize="18sp" />

<com.immomo.momo.android.view.EmoticonsTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/otherprofile_info_htv_company_title"
android:text="青岛xxxxx有限公司"
android:textColor="@color/font_value"
android:textSize="16sp" />
</RelativeLayout>
</LinearLayout>

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

<View
android:layout_width="fill_parent"
android:layout_height="1dip"
android:background="@color/devideline" />

<RelativeLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:padding="10dip" >

<com.immomo.momo.android.view.HandyTextView
android:id="@+id/otherprofile_info_htv_school_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:text="学校"
android:textColor="@color/font_attribute"
android:textSize="18sp" />

<com.immomo.momo.android.view.EmoticonsTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/otherprofile_info_htv_school_title"
android:text="青岛xxxxx中学"
android:textColor="@color/font_value"
android:textSize="16sp" />
</RelativeLayout>
</LinearLayout>
</LinearLayout>

<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
Expand Down Expand Up @@ -286,17 +49,17 @@
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:gravity="center"
android:text="注册时间"
android:text="IP地址"
android:textColor="@color/font_attribute"
android:textSize="18sp" />

<com.immomo.momo.android.view.HandyTextView
android:id="@+id/otherprofile_htv_ipaddress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:singleLine="true"
android:text="2013-9-1"
android:textColor="@color/font_value"
android:textSize="18sp" />
</RelativeLayout>
Expand Down Expand Up @@ -325,21 +88,22 @@
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:gravity="center"
android:text="关系"
android:text="设备型号"
android:textColor="@color/font_attribute"
android:textSize="18sp" />

<com.immomo.momo.android.view.HandyTextView
android:id="@+id/otherprofile_htv_device"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:singleLine="true"
android:text="陌生人"
android:textColor="@color/font_value"
android:textSize="18sp" />
</RelativeLayout>
</LinearLayout>
</LinearLayout>

</LinearLayout>

</LinearLayout>
Loading

0 comments on commit c8a5792

Please sign in to comment.