Skip to content

Commit

Permalink
Merge pull request #1209 from owncloud/material_buttons
Browse files Browse the repository at this point in the history
Material buttons - before in #1090
  • Loading branch information
Maria Asensio committed Dec 29, 2015
2 parents 9954f71 + a812784 commit 7c58039
Show file tree
Hide file tree
Showing 50 changed files with 239 additions and 418 deletions.
2 changes: 1 addition & 1 deletion owncloud-android-library
Submodule owncloud-android-library updated 1 files
+18 −5 src/com/owncloud/android/lib/common/utils/Log_OC.java
Binary file added res/drawable-hdpi/ic_checkbox_blank_outline.png
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 res/drawable-hdpi/ic_checkbox_marked.png
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 res/drawable-xhdpi/ic_checkbox_blank_outline.png
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 res/drawable-xhdpi/ic_checkbox_marked.png
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 res/drawable-xxhdpi/ic_checkbox_blank_outline.png
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 res/drawable-xxhdpi/ic_checkbox_marked.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions res/layout-land/account_setup.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginBottom="10dp"
android:theme="@style/Button"
android:text="@string/auth_check_server"
android:visibility="gone"
android:contentDescription="@string/auth_check_server"/>
Expand Down
59 changes: 0 additions & 59 deletions res/layout-v11/activity_row.xml

This file was deleted.

69 changes: 0 additions & 69 deletions res/layout-v11/notification_with_progress_bar.xml

This file was deleted.

68 changes: 0 additions & 68 deletions res/layout-v14/generic_explanation.xml

This file was deleted.

2 changes: 1 addition & 1 deletion res/layout/account_setup.xml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginBottom="10dp"
android:theme="@style/Button"
android:text="@string/auth_check_server"
android:visibility="gone"
android:contentDescription="@string/auth_check_server"/>
Expand Down Expand Up @@ -96,7 +97,6 @@
android:padding="0dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_action_refresh_grey"
android:onClick="onRefreshClick"
android:visibility="gone"
android:background="@android:color/transparent"
android:contentDescription="@string/auth_refresh_button"
Expand Down
6 changes: 5 additions & 1 deletion res/layout/activity_row.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,12 @@
android:id="@+id/list_item"
android:layout_width="match_parent"
android:layout_height="48dp"
android:paddingStart="16dip"
android:paddingEnd="16dip"
android:paddingRight="16dip"
android:paddingLeft="16dip"
android:minWidth="196dip"
android:background="?android:attr/activatedBackgroundIndicator"
android:orientation="vertical" >

<LinearLayout
Expand All @@ -36,6 +39,7 @@
android:layout_width="40dip"
android:layout_height="40dip"
android:layout_gravity="center_vertical"
android:layout_marginEnd="8dip"
android:layout_marginRight="8dip"
android:duplicateParentState="true" />

Expand All @@ -44,7 +48,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textAppearance="?android:attr/textAppearanceLargePopupMenu"
android:duplicateParentState="true"
android:singleLine="true"
android:ellipsize="marquee"
Expand Down
14 changes: 7 additions & 7 deletions res/layout/drawer.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,22 +62,22 @@
android:layout_width="fill_parent"
android:layout_height="match_parent"
android:background="@color/background_color"
android:divider="#eee"
android:divider="@color/list_divider_background"
android:dividerHeight="1dp"
android:paddingTop="100dp" />

<LinearLayout
android:layout_width="fill_parent"
android:layout_height="100dp"
android:paddingTop="16dp"
android:paddingBottom="16dp"
android:paddingTop="@dimen/standard_padding"
android:paddingBottom="@dimen/standard_padding"
android:background="@color/drawer_header_color">

<ImageView
android:id="@+id/itemIcon"
android:layout_width="24sp"
android:layout_height="24sp"
android:layout_marginLeft="16sp"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginLeft="@dimen/standard_padding"
android:layout_marginBottom="3dp"
android:layout_gravity="bottom"
android:src="@drawable/ic_account_circle"
Expand All @@ -93,7 +93,7 @@
android:text="@string/app_name"
android:textColor="#FFF"
android:paddingLeft="22dp"
android:paddingRight="16dp"
android:paddingRight="@dimen/standard_padding"
android:textSize="24sp"
android:ellipsize="end"
android:singleLine="true"
Expand Down
8 changes: 4 additions & 4 deletions res/layout/drawer_list_item.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@
android:layout_alignParentLeft="true"
android:orientation="horizontal"
android:background="@color/background_color"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
android:layout_marginTop="@dimen/standard_margin"
android:layout_marginBottom="@dimen/standard_margin"
android:minHeight="?android:attr/listPreferredItemHeight">

<ImageView
android:id="@+id/itemIcon"
android:layout_width="24sp"
android:layout_height="24sp"
android:layout_marginLeft="16sp"
android:layout_marginLeft="@dimen/standard_margin"
android:layout_gravity="center_vertical"
/>

Expand All @@ -41,7 +41,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="22dp"
android:paddingRight="16dp"
android:paddingRight="@dimen/standard_margin"
android:textColor="@color/drawerMenuTextColor"
android:text="@string/app_name"
android:textStyle="normal"
Expand Down
6 changes: 3 additions & 3 deletions res/layout/drawer_radiobutton.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
android:layout_width="fill_parent"
android:layout_height="56dp"
android:gravity="center_vertical"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:textColor="#000"
android:paddingLeft="@dimen/standard_padding"
android:paddingRight="@dimen/standard_padding"
android:textColor="@color/black"
android:textSize="18dp" />
Loading

0 comments on commit 7c58039

Please sign in to comment.