Skip to content

Commit ff2d4b4

Browse files
Paul-DSPaul-DS
committed
Update forms style.
1 parent 454bb9d commit ff2d4b4

9 files changed

Lines changed: 103 additions & 77 deletions

File tree

‎app/src/main/java/com/paulds/simpleftp/presentation/binders/FormBindings.java‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import android.databinding.BaseObservable;
44
import android.databinding.BindingAdapter;
55
import android.databinding.ObservableField;
6+
import android.support.design.widget.TextInputLayout;
67
import android.text.Editable;
78
import android.text.TextWatcher;
89
import android.util.Pair;
@@ -12,6 +13,8 @@
1213

1314
import com.paulds.simpleftp.presentation.model.FieldViewModel;
1415

16+
import org.w3c.dom.Text;
17+
1518
/**
1619
* Class used to defined bindings used in forms views.
1720
*
@@ -51,9 +54,23 @@ public void afterTextChanged(Editable s) {
5154
view.setText(newValue);
5255
}
5356

57+
TextInputLayout parentLayout = view.getParent() instanceof TextInputLayout
58+
? (TextInputLayout)view.getParent()
59+
: null;
60+
5461
String newError = observable.getError();
55-
if (view.getError() != newError) {
56-
view.setError(newError);
62+
String oldError = parentLayout != null
63+
? (String)parentLayout.getError()
64+
: (String)view.getError();
65+
66+
if (oldError != newError) {
67+
if(parentLayout != null) {
68+
parentLayout.setError(newError);
69+
}
70+
else {
71+
view.setError(newError);
72+
}
73+
5774
}
5875
}
5976

‎app/src/main/res/layout-land/activity_main.xml‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,18 @@
1414

1515
<android.support.design.widget.AppBarLayout
1616
android:layout_width="match_parent"
17-
android:layout_height="wrap_content"
18-
android:theme="@style/AppTheme.AppBarOverlay"
19-
android:id="@+id/view">
17+
android:layout_height="wrap_content">
2018

2119
<android.support.v7.widget.Toolbar
22-
android:id="@+id/toolbar"
2320
android:layout_width="match_parent"
2421
android:layout_height="?attr/actionBarSize"
25-
android:background="?attr/colorPrimary"
26-
app:popupTheme="@style/AppTheme.PopupOverlay">
22+
android:background="?attr/colorPrimary">
2723

2824
<TextView
2925
android:layout_width="wrap_content"
3026
android:layout_height="wrap_content"
3127
android:text="@string/app_name"
32-
android:layout_gravity="left"
28+
android:layout_gravity="start"
3329
android:id="@+id/toolbar_title"
3430
android:textColor="@color/action_bar_text"
3531
android:textStyle="bold"

‎app/src/main/res/layout/activity_edit_server.xml‎

Lines changed: 71 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -14,80 +14,111 @@
1414
android:fitsSystemWindows="true"
1515
tools:context="presentation.activities.ListFileActivity">
1616

17-
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
18-
android:orientation="vertical" android:layout_width="match_parent"
17+
<LinearLayout
18+
android:orientation="vertical"
19+
android:layout_width="match_parent"
1920
android:layout_height="match_parent"
20-
app:layout_behavior="@string/appbar_scrolling_view_behavior">
21+
app:layout_behavior="@string/appbar_scrolling_view_behavior"
22+
android:padding="10dp">
2123

22-
<EditText
24+
<android.support.design.widget.TextInputLayout
2325
android:layout_width="match_parent"
24-
android:layout_height="wrap_content"
25-
android:id="@+id/AddServer_etName"
26-
android:hint="Name"
27-
app:binding="@{model.name}" />
26+
android:layout_height="wrap_content">
27+
28+
<EditText
29+
android:layout_width="match_parent"
30+
android:layout_height="wrap_content"
31+
android:id="@+id/AddServer_etName"
32+
android:hint="@string/activity_edit_server_name"
33+
app:binding="@{model.name}" />
34+
35+
</android.support.design.widget.TextInputLayout>
2836

2937
<LinearLayout
3038
android:orientation="horizontal"
3139
android:layout_width="match_parent"
3240
android:layout_height="wrap_content"
3341
android:weightSum="1">
3442

35-
<EditText
36-
android:layout_width="wrap_content"
43+
<android.support.design.widget.TextInputLayout
44+
android:layout_width="0dp"
3745
android:layout_height="wrap_content"
38-
android:id="@+id/AddServer_etHost"
39-
android:hint="Hostname"
40-
android:layout_weight="1"
41-
app:binding="@{model.host}" />
46+
android:layout_weight="1">
4247

43-
<EditText
48+
<EditText
49+
android:layout_width="match_parent"
50+
android:layout_height="wrap_content"
51+
android:id="@+id/AddServer_etHost"
52+
android:hint="@string/activity_edit_server_hostname"
53+
app:binding="@{model.host}" />
54+
55+
</android.support.design.widget.TextInputLayout>
56+
57+
<android.support.design.widget.TextInputLayout
4458
android:layout_width="60dp"
45-
android:layout_height="wrap_content"
46-
android:inputType="number"
47-
android:ems="10"
48-
android:id="@+id/AddServer_etPort"
49-
android:hint="Port"
50-
android:layout_gravity="center_horizontal"
51-
app:binding="@{model.port}" />
59+
android:layout_height="wrap_content">
60+
61+
<EditText
62+
android:layout_width="match_parent"
63+
android:layout_height="wrap_content"
64+
android:inputType="number"
65+
android:ems="10"
66+
android:id="@+id/AddServer_etPort"
67+
android:hint="@string/activity_edit_server_port"
68+
android:layout_gravity="center_horizontal"
69+
app:binding="@{model.port}" />
70+
71+
</android.support.design.widget.TextInputLayout>
5272

5373
</LinearLayout>
5474

5575
<Switch
5676
android:layout_width="wrap_content"
5777
android:layout_height="wrap_content"
58-
android:text="Anonymous connexion"
78+
android:text="@string/activity_edit_server_is_anonymous"
5979
android:id="@+id/AddServer_swAnonymous"
6080
android:layout_gravity="center_horizontal"
61-
app:binding="@{model.isAnonymous}"/>
81+
app:binding="@{model.isAnonymous}"
82+
android:paddingTop="15dp" />
6283

63-
<EditText
84+
<android.support.design.widget.TextInputLayout
6485
android:layout_width="match_parent"
65-
android:layout_height="wrap_content"
66-
android:id="@+id/AddServer_etLogin"
67-
android:hint="Login"
68-
app:binding="@{model.login}" />
86+
android:layout_height="wrap_content">
87+
88+
<EditText
89+
android:layout_width="match_parent"
90+
android:layout_height="wrap_content"
91+
android:id="@+id/AddServer_etLogin"
92+
android:hint="@string/activity_edit_server_login"
93+
app:binding="@{model.login}" />
94+
95+
</android.support.design.widget.TextInputLayout>
6996

70-
<EditText
97+
<android.support.design.widget.TextInputLayout
7198
android:layout_width="match_parent"
72-
android:layout_height="wrap_content"
73-
android:inputType="textPassword"
74-
android:ems="10"
75-
android:id="@+id/AddServer_etPassword"
76-
android:hint="Password"
77-
app:binding="@{model.password}" />
99+
android:layout_height="wrap_content">
100+
101+
<EditText
102+
android:layout_width="match_parent"
103+
android:layout_height="wrap_content"
104+
android:inputType="textPassword"
105+
android:ems="10"
106+
android:id="@+id/AddServer_etPassword"
107+
android:hint="@string/activity_edit_server_password"
108+
app:binding="@{model.password}" />
109+
110+
</android.support.design.widget.TextInputLayout>
78111

79112
</LinearLayout>
80113

81114
<android.support.design.widget.AppBarLayout
82115
android:layout_width="match_parent"
83-
android:layout_height="wrap_content"
84-
android:theme="@style/AppTheme.AppBarOverlay">
116+
android:layout_height="wrap_content">
85117

86118
<android.support.v7.widget.Toolbar
87119
android:layout_width="match_parent"
88120
android:layout_height="?attr/actionBarSize"
89-
android:background="?attr/colorPrimary"
90-
app:popupTheme="@style/AppTheme.PopupOverlay">
121+
android:background="?attr/colorPrimary">
91122

92123
<ImageView
93124
android:layout_width="wrap_content"

‎app/src/main/res/layout/activity_list_server.xml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,12 @@
3232

3333
<android.support.design.widget.AppBarLayout
3434
android:layout_width="match_parent"
35-
android:layout_height="wrap_content"
36-
android:theme="@style/AppTheme.AppBarOverlay">
35+
android:layout_height="wrap_content">
3736

3837
<android.support.v7.widget.Toolbar
3938
android:layout_width="match_parent"
4039
android:layout_height="?attr/actionBarSize"
41-
android:background="?attr/colorPrimary"
42-
app:popupTheme="@style/AppTheme.PopupOverlay">
40+
android:background="?attr/colorPrimary">
4341

4442
<ImageView
4543
android:layout_width="wrap_content"
@@ -102,7 +100,6 @@
102100
<android.support.design.widget.AppBarLayout
103101
android:layout_width="match_parent"
104102
android:layout_height="wrap_content"
105-
android:theme="@style/AppTheme.AppBarOverlay"
106103
android:id="@+id/view2">
107104

108105
<android.support.v7.widget.Toolbar

‎app/src/main/res/layout/activity_main.xml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,12 @@
1414

1515
<android.support.design.widget.AppBarLayout
1616
android:layout_width="match_parent"
17-
android:layout_height="wrap_content"
18-
android:theme="@style/AppTheme.AppBarOverlay">
17+
android:layout_height="wrap_content">
1918

2019
<android.support.v7.widget.Toolbar
2120
android:layout_width="match_parent"
2221
android:layout_height="?attr/actionBarSize"
23-
android:background="?attr/colorPrimary"
24-
app:popupTheme="@style/AppTheme.PopupOverlay">
22+
android:background="?attr/colorPrimary">
2523

2624
<TextView
2725
android:layout_width="wrap_content"

‎app/src/main/res/layout/fragment_explorer.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
android:layout_width="match_parent"
4242
android:layout_height="@dimen/toolbar_size"
4343
android:background="@color/toolbar"
44-
app:popupTheme="@style/AppTheme.PopupOverlay"
4544
android:elevation="2dp">
4645

4746
<TextView

‎app/src/main/res/values-v21/styles.xml‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎app/src/main/res/values/strings.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
33
<string name="activity_list_server_title">Favorites servers</string>
44
<string name="activity_add_server_title">Add new favorite</string>
55
<string name="activity_edit_server_title">Edit favorite</string>
6+
<string name="activity_edit_server_name">Name</string>
7+
<string name="activity_edit_server_hostname">Hostname</string>
8+
<string name="activity_edit_server_port">Port</string>
9+
<string name="activity_edit_server_is_anonymous">Anonymous connection</string>
10+
<string name="activity_edit_server_login">Login</string>
11+
<string name="activity_edit_server_password">Password</string>
612
<string name="dialog_create_folder_message">Enter the folder name:</string>
713
<string name="dialog_create_folder_positive_button">Create</string>
814
<string name="dialog_create_folder_negative_button">Cancel</string>

‎app/src/main/res/values/styles.xml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,4 @@
88
<item name="colorAccent">@color/colorAccent</item>
99
</style>
1010

11-
<style name="AppTheme.NoActionBar" parent="Base.Theme.AppCompat.Light.DarkActionBar">
12-
<item name="windowActionBar">false</item>
13-
<item name="windowNoTitle">true</item>
14-
</style>
15-
16-
<style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
17-
18-
<style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
19-
2011
</resources>

0 commit comments

Comments
 (0)