Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 20 additions & 14 deletions app/src/main/res/layout/add_bookmark_fragment.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:android.support.v7.mediarouter="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
Expand All @@ -40,19 +41,20 @@
android:paddingBottom="@dimen/add_bookmark_padding"
android:background="@color/add_bookmark_form_background"
android:orientation="vertical">

<com.iangclifton.android.floatlabel.FloatLabel
android:id="@+id/add_edit_url"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/add_bookmark_padding"
android:paddingRight="@dimen/add_bookmark_padding"
android:layout_marginBottom="@dimen/add_bookmark_section_padding"
android:hint="@string/add_title_url"
android:textSize="26sp"
android:background="@null"
android:hint="@string/add_title_url"
android:inputType="textUri|textNoSuggestions"
android:layout="@layout/float_label"
android:paddingLeft="@dimen/add_bookmark_padding"
android:paddingRight="@dimen/add_bookmark_padding"
android:singleLine="true"
android:layout="@layout/float_label"/>
android:textSize="26sp" />

<ImageView
android:layout_width="match_parent"
Expand All @@ -71,7 +73,7 @@
android:id="@+id/add_edit_description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_weight="0.92"
android:hint="@string/add_title_description"
android:inputType="text"
android:layout="@layout/float_label" />
Expand Down Expand Up @@ -198,28 +200,32 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center_horizontal">

<android.support.v7.widget.SwitchCompat
android:id="@+id/add_edit_private"
android:text="@string/add_title_private"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android.support.v7.mediarouter:switchPadding="16dp"
android:layout_height="@dimen/min_touchable_height"
android:text="@string/add_title_private"
android:textOff="No"
android:textOn="Yes" />
android:textOn="Yes"
android:textSize="18sp"
android.support.v7.mediarouter:switchPadding="16dp" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center_horizontal">

<android.support.v7.widget.SwitchCompat
android:id="@+id/add_edit_toread"
android:text="@string/add_title_toread"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android.support.v7.mediarouter:switchPadding="16dp"
android:layout_height="@dimen/min_touchable_height"
android:text="@string/add_title_toread"
android:textOff="No"
android:textOn="Yes" />
android:textOn="Yes"
android:textSize="18sp"
android.support.v7.mediarouter:switchPadding="16dp" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
Expand Down
19 changes: 10 additions & 9 deletions app/src/main/res/layout/browse_bookmark_fragment.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,14 @@
android:layout_height="match_parent" />
</android.support.v4.widget.SwipeRefreshLayout>

<com.melnykov.fab.FloatingActionButton
android:id="@+id/add_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right|bottom"
android:layout_margin="16dp"
fab:fab_colorNormal="@color/add_bookmark_action_button"
fab:fab_colorPressed="@color/add_bookmark_action_button_pressed"
android:src="@drawable/ic_menu_add"/>
<com.melnykov.fab.FloatingActionButton
android:id="@+id/add_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right|bottom"
android:layout_margin="16dp"
android:contentDescription="Add bookmark"
android:src="@drawable/ic_menu_add"
fab:fab_colorNormal="@color/add_bookmark_action_button"
fab:fab_colorPressed="@color/add_bookmark_action_button_pressed" />
</FrameLayout>
2 changes: 1 addition & 1 deletion app/src/main/res/layout/float_label.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<EditText
android:id="@id/edit_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="@dimen/min_touchable_height"
android:background="@null"
android:inputType="text|textAutoCorrect|textAutoComplete" />

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/float_label_tags.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<MultiAutoCompleteTextView
android:id="@id/edit_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="@dimen/min_touchable_height"
android:background="@null"
android:inputType="text"
android:completionThreshold="1" />
Expand Down
21 changes: 13 additions & 8 deletions app/src/main/res/layout/login_activity.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
<ImageView
Expand All @@ -38,7 +39,8 @@
android:layout_height="match_parent"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:gravity="center">
android:gravity="center"
android:weightSum="1">
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
Expand All @@ -52,7 +54,7 @@
android:id="@+id/username_edit"
android:singleLine="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="@dimen/min_touchable_height"
android:minWidth="320dp"
android:maxWidth="320dp"
android:padding="10dp"
Expand All @@ -65,7 +67,7 @@
android:id="@+id/password_edit"
android:singleLine="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="@dimen/min_touchable_height"
android:minWidth="320dp"
android:maxWidth="320dp"
android:layout_marginBottom="16dp"
Expand Down Expand Up @@ -94,13 +96,16 @@
android:text="@string/login_activity_ok_button"
android:textColor="#FFFFFF"
android:onClick="handleLogin" />

<TextView
android:id="@+id/message_bottom"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textIsSelectable="false"
android:text="@string/login_bottom_text"
android:layout_width="match_parent"
android:layout_height="@dimen/min_touchable_height"
android:layout_weight="0.05"
android:autoLink="web"
android:textColor="#FFFFFF" />
android:text="@string/login_bottom_text"
android:textColor="#FFFFFF"
android:textIsSelectable="false"
android:textSize="18sp" />
</LinearLayout>
</RelativeLayout>
6 changes: 4 additions & 2 deletions app/src/main/res/values/dimens.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,12 @@
<dimen name="add_switch_margin_right">0dp</dimen>
<dimen name="action_bar_width">265dp</dimen>

<dimen name="add_bookmark_padding">16dp</dimen>
<dimen name="add_bookmark_section_padding">12dp</dimen>
<dimen name="add_bookmark_padding">2dp</dimen>
<dimen name="add_bookmark_section_padding">2dp</dimen>
<integer name="add_bookmark_note_lines">2</integer>
<dimen name="add_bookmark_form_padding">0dp</dimen>
<dimen name="min_touchable_height">48dp</dimen>


<dimen name="account_list_height">64dp</dimen>

Expand Down