Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
edit user profile feature. some unused java files removed.
- Loading branch information
Mariotaku Lee
authored and
Mariotaku Lee
committed
May 26, 2012
1 parent
e2b6840
commit 282f3e6
Showing
33 changed files
with
719 additions
and
746 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<!-- | ||
/* //device/apps/common/assets/res/layout/tab_content.xml | ||
** | ||
** Copyright 2011, The Android Open Source Project | ||
** | ||
** Licensed under the Apache License, Version 2.0 (the "License"); | ||
** you may not use this file except in compliance with the License. | ||
** You may obtain a copy of the License at | ||
** | ||
** http://www.apache.org/licenses/LICENSE-2.0 | ||
** | ||
** Unless required by applicable law or agreed to in writing, software | ||
** distributed under the License is distributed on an "AS IS" BASIS, | ||
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
** See the License for the specific language governing permissions and | ||
** limitations under the License. | ||
*/ | ||
--> | ||
|
||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
android:layout_width="match_parent" | ||
android:layout_height="match_parent" | ||
android:orientation="horizontal"> | ||
|
||
<view | ||
android:id="@android:id/tabs" | ||
android:layout_width="0dp" | ||
android:layout_height="match_parent" | ||
android:layout_weight="1" | ||
class="com.viewpagerindicator.TabPageIndicator"/> | ||
|
||
<View | ||
android:layout_width="0dp" | ||
android:layout_height="match_parent" | ||
android:layout_weight="1"/> | ||
|
||
<ProgressBar | ||
android:id="@android:id/progress" | ||
style="?android:attr/progressBarStyleSmall" | ||
android:layout_width="wrap_content" | ||
android:layout_height="wrap_content" | ||
android:layout_gravity="center_vertical" | ||
android:layout_weight="0"/> | ||
|
||
</LinearLayout> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,148 +1,86 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
android:id="@+id/profile" | ||
android:layout_width="match_parent" | ||
android:layout_height="wrap_content" | ||
android:orientation="vertical"> | ||
|
||
<RelativeLayout | ||
android:id="@+id/profile" | ||
android:layout_width="match_parent" | ||
android:layout_height="wrap_content" | ||
android:gravity="center_vertical"> | ||
|
||
<org.mariotaku.twidere.widget.RoundCorneredImageView | ||
android:id="@+id/profile_image" | ||
android:layout_width="@dimen/profile_image_size" | ||
android:layout_height="@dimen/profile_image_size" | ||
android:layout_margin="8dip" | ||
android:background="@drawable/list_selector_holo_light" | ||
android:scaleType="fitCenter" | ||
android:src="@drawable/ic_profile_image_default"/> | ||
|
||
<LinearLayout | ||
android:id="@+id/name_view" | ||
android:layout_width="wrap_content" | ||
android:layout_height="wrap_content" | ||
android:layout_alignBottom="@+id/profile_image" | ||
android:layout_alignTop="@+id/profile_image" | ||
android:layout_margin="8dip" | ||
android:layout_toLeftOf="@+id/follow_indicator" | ||
android:layout_toRightOf="@+id/profile_image" | ||
android:gravity="center_vertical" | ||
android:orientation="vertical"> | ||
|
||
<TextView | ||
android:id="@+id/name" | ||
android:layout_width="wrap_content" | ||
android:layout_height="wrap_content" | ||
android:singleLine="true" | ||
android:textAppearance="?android:attr/textAppearanceMedium"/> | ||
|
||
<TextView | ||
android:id="@+id/screen_name" | ||
android:layout_width="wrap_content" | ||
android:layout_height="wrap_content" | ||
android:singleLine="true" | ||
android:textAppearance="?android:attr/textAppearanceSmall" | ||
android:textColor="?android:attr/textColorSecondary"/> | ||
</LinearLayout> | ||
|
||
<FrameLayout | ||
android:id="@+id/follow_indicator" | ||
android:layout_width="wrap_content" | ||
android:layout_height="wrap_content" | ||
android:layout_alignBottom="@+id/profile_image" | ||
android:layout_alignParentRight="true" | ||
android:layout_alignTop="@+id/profile_image" | ||
android:layout_margin="4dp" | ||
android:visibility="gone"> | ||
|
||
<Button | ||
android:id="@+id/follow" | ||
style="?android:attr/buttonStyleSmall" | ||
android:layout_width="wrap_content" | ||
android:layout_height="wrap_content" | ||
android:layout_gravity="center" | ||
android:text="@string/follow"/> | ||
|
||
<ProgressBar | ||
android:id="@+id/progress" | ||
style="?android:attr/progressBarStyleSmall" | ||
android:layout_width="wrap_content" | ||
android:layout_height="wrap_content" | ||
android:layout_gravity="center" | ||
android:layout_marginLeft="8dp" | ||
android:layout_marginRight="8dp"/> | ||
</FrameLayout> | ||
</RelativeLayout> | ||
|
||
<LinearLayout | ||
android:id="@+id/bio_view" | ||
android:layout_width="match_parent" | ||
android:layout_height="wrap_content" | ||
android:gravity="center_vertical" | ||
android:paddingBottom="8dp" | ||
android:paddingTop="8dp"> | ||
|
||
<org.mariotaku.twidere.widget.RoundCorneredImageView | ||
android:id="@+id/profile_image" | ||
android:layout_width="@dimen/profile_image_size" | ||
android:layout_height="@dimen/profile_image_size" | ||
android:layout_margin="8dp" | ||
android:background="@drawable/list_selector_holo_light" | ||
android:orientation="vertical" | ||
android:padding="8dip"> | ||
android:scaleType="fitCenter" | ||
android:src="@drawable/ic_profile_image_default"/> | ||
|
||
<TextView | ||
android:id="@+id/bio_label" | ||
android:layout_width="match_parent" | ||
android:layout_height="wrap_content" | ||
android:text="@string/bio" | ||
android:textAppearance="?android:attr/textAppearanceLarge"/> | ||
|
||
<TextView | ||
android:id="@+id/bio" | ||
android:layout_width="match_parent" | ||
android:layout_height="wrap_content" | ||
android:autoLink="all" | ||
android:textAppearance="?android:attr/textAppearanceSmall"/> | ||
</LinearLayout> | ||
<View | ||
android:id="@+id/profile_divider_vertical" | ||
android:layout_width="0.2dp" | ||
android:layout_height="wrap_content" | ||
android:layout_alignBottom="@+id/profile_image" | ||
android:layout_alignTop="@+id/profile_image" | ||
android:layout_toRightOf="@+id/profile_image" | ||
android:background="#40808080"/> | ||
|
||
<LinearLayout | ||
android:id="@+id/location_view" | ||
android:id="@+id/name_view" | ||
android:layout_width="match_parent" | ||
android:layout_height="wrap_content" | ||
android:layout_alignBottom="@+id/profile_image" | ||
android:layout_alignTop="@+id/profile_image" | ||
android:layout_toLeftOf="@+id/follow_indicator" | ||
android:layout_toRightOf="@+id/profile_divider_vertical" | ||
android:background="@drawable/list_selector_holo_light" | ||
android:gravity="center_vertical" | ||
android:orientation="vertical" | ||
android:padding="8dip"> | ||
android:paddingLeft="8dp" | ||
android:paddingRight="8dp"> | ||
|
||
<TextView | ||
android:id="@+id/location_label" | ||
android:layout_width="match_parent" | ||
android:id="@+id/name" | ||
android:layout_width="wrap_content" | ||
android:layout_height="wrap_content" | ||
android:text="@string/location" | ||
android:textAppearance="?android:attr/textAppearanceLarge"/> | ||
android:singleLine="true" | ||
android:textAppearance="?android:attr/textAppearanceMedium"/> | ||
|
||
<TextView | ||
android:id="@+id/location" | ||
android:layout_width="match_parent" | ||
android:id="@+id/screen_name" | ||
android:layout_width="wrap_content" | ||
android:layout_height="wrap_content" | ||
android:autoLink="web|map" | ||
android:textAppearance="?android:attr/textAppearanceSmall"/> | ||
android:singleLine="true" | ||
android:textAppearance="?android:attr/textAppearanceSmall" | ||
android:textColor="?android:attr/textColorSecondary"/> | ||
</LinearLayout> | ||
|
||
<LinearLayout | ||
android:id="@+id/web_view" | ||
android:layout_width="match_parent" | ||
<FrameLayout | ||
android:id="@+id/follow_indicator" | ||
android:layout_width="wrap_content" | ||
android:layout_height="wrap_content" | ||
android:background="@drawable/list_selector_holo_light" | ||
android:orientation="vertical" | ||
android:padding="8dip"> | ||
|
||
<TextView | ||
android:id="@+id/web_label" | ||
android:layout_width="match_parent" | ||
android:layout_alignBottom="@+id/profile_image" | ||
android:layout_alignParentRight="true" | ||
android:layout_alignTop="@+id/profile_image" | ||
android:layout_margin="4dp" | ||
android:visibility="gone"> | ||
|
||
<Button | ||
android:id="@+id/follow" | ||
style="?android:attr/buttonStyleSmall" | ||
android:layout_width="wrap_content" | ||
android:layout_height="wrap_content" | ||
android:text="@string/web" | ||
android:textAppearance="?android:attr/textAppearanceLarge"/> | ||
android:layout_gravity="center" | ||
android:text="@string/follow"/> | ||
|
||
<TextView | ||
android:id="@+id/web" | ||
android:layout_width="match_parent" | ||
<ProgressBar | ||
android:id="@+id/progress" | ||
style="?android:attr/progressBarStyleSmall" | ||
android:layout_width="wrap_content" | ||
android:layout_height="wrap_content" | ||
android:autoLink="web" | ||
android:textAppearance="?android:attr/textAppearanceSmall"/> | ||
</LinearLayout> | ||
android:layout_gravity="center" | ||
android:layout_marginLeft="8dp" | ||
android:layout_marginRight="8dp"/> | ||
</FrameLayout> | ||
|
||
</LinearLayout> | ||
</RelativeLayout> |
Oops, something went wrong.