Skip to content

Commit

Permalink
0.0.10 version.
Browse files Browse the repository at this point in the history 
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
Show file tree
Hide file tree
Showing 33 changed files with 719 additions and 746 deletions.
4 changes: 2 additions & 2 deletions AndroidManifest.xml
View file
Expand Up @@ -2,8 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.mariotaku.twidere"
android:installLocation="auto"
android:versionCode="10"
android:versionName="0.0.9">
android:versionCode="11"
android:versionName="0.0.10">

<uses-sdk
android:minSdkVersion="8"
Expand Down
46 changes: 46 additions & 0 deletions res/layout-sw600dp-land/home_tabs.xml
View file
@@ -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>
4 changes: 2 additions & 2 deletions res/layout-sw600dp-land/main.xml
View file
Expand Up @@ -8,7 +8,7 @@
<FrameLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="0.618">
android:layout_weight="5">

<com.viewpagerindicator.ExtendedViewPager
android:id="@+id/pager"
Expand All @@ -35,7 +35,7 @@
android:id="@+id/right_pane"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="0.382">
android:layout_weight="4">

<TextView
android:layout_width="wrap_content"
Expand Down
2 changes: 1 addition & 1 deletion res/layout/refreshable_list.xml
View file
Expand Up @@ -3,4 +3,4 @@
android:id="@+id/refreshable_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layerType="software"/>
android:layerType="hardware"/>
5 changes: 5 additions & 0 deletions res/layout/select_account.xml
View file
Expand Up @@ -10,6 +10,11 @@
android:layout_height="0dp"
android:layout_weight="1"/>

<View
android:layout_width="match_parent"
android:layout_height="0.2dp"
android:background="#40808080"/>

<Button
android:id="@+id/add"
style="?android:attr/buttonStyleSmall"
Expand Down
16 changes: 6 additions & 10 deletions res/layout/status_list_item.xml
View file
Expand Up @@ -14,11 +14,11 @@
android:id="@+id/name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignTop="@+id/profile_image"
android:layout_alignParentTop="true"
android:layout_alignWithParentIfMissing="true"
android:layout_marginLeft="4dp"
android:layout_toLeftOf="@+id/time"
android:layout_toRightOf="@+id/profile_image"
android:paddingLeft="2dp"
android:paddingRight="4dp"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary"
Expand All @@ -28,15 +28,13 @@
android:id="@+id/text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignLeft="@+id/name"
android:layout_alignParentRight="true"
android:layout_alignWithParentIfMissing="true"
android:layout_below="@+id/name"
android:layout_toRightOf="@+id/profile_image"
android:paddingBottom="4dp"
android:paddingLeft="2dp"
android:paddingRight="4dp"
android:paddingBottom="2dp"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary"/>
android:textColor="?android:attr/textColorSecondary"/>

<TextView
android:id="@+id/time"
Expand All @@ -47,7 +45,6 @@
android:layout_alignWithParentIfMissing="true"
android:drawablePadding="2dp"
android:gravity="center_vertical|right"
android:padding="4dp"
android:textColor="?android:attr/textColorSecondary"/>

<TextView
Expand All @@ -58,7 +55,6 @@
android:layout_below="@+id/text"
android:layout_toRightOf="@+id/profile_image"
android:drawablePadding="2dp"
android:paddingBottom="4dp"
android:paddingLeft="4dp"
android:textColor="?android:attr/textColorSecondary"
android:visibility="gone"/>
Expand Down
186 changes: 62 additions & 124 deletions res/layout/user_profile_header.xml
View file
@@ -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>

0 comments on commit 282f3e6

Please sign in to comment.