Skip to content

Commit d7295ff

Browse files
Paul-DSPaul-DS
committed
Update actionbar/toolbar style.
1 parent 80b9d27 commit d7295ff

12 files changed

Lines changed: 105 additions & 38 deletions

File tree

‎app/src/main/java/com/paulds/simpleftp/presentation/activities/ListServerActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ protected void onCreate(Bundle savedInstanceState) {
4242
binding = DataBindingUtil.setContentView(this, R.layout.activity_list_server);
4343
viewModel = new ListServerViewModel(this);
4444
binding.setModel(viewModel);
45-
binding.listFileRecycler.setLayoutManager(new LinearLayoutManager(this));
45+
binding.ListServerRecyclerView.setLayoutManager(new LinearLayoutManager(this));
4646
}
4747

4848
/**

‎app/src/main/java/com/paulds/simpleftp/presentation/model/EditServerViewModel.java‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import android.text.TextUtils;
1313
import android.view.View;
1414

15+
import com.paulds.simpleftp.R;
1516
import com.paulds.simpleftp.data.entities.FtpServer;
1617
import com.paulds.simpleftp.presentation.AndroidApplication;
1718
import com.paulds.simpleftp.presentation.activities.ListServerActivity;
@@ -132,6 +133,23 @@ public EditServerViewModel(Activity context, int serverId) {
132133
this.password.set(server.getPassword());
133134
}
134135

136+
/**
137+
* Gets the resource for activity title.
138+
* @return The resource to display activity title.
139+
*/
140+
@Bindable
141+
public int getTitleResource() {
142+
return this.id > 0 ? R.string.activity_edit_server_title : R.string.activity_add_server_title;
143+
}
144+
145+
/**
146+
* Back to the previous activity.
147+
* @param view The current view
148+
*/
149+
public void back(View view) {
150+
this.context.finish();
151+
}
152+
135153
/**
136154
* Create the server.
137155
* @param view The current view

‎app/src/main/java/com/paulds/simpleftp/presentation/model/ListServerViewModel.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,14 @@ public void updateList() {
9292
}
9393
}
9494

95+
/**
96+
* Back to the previous activity.
97+
* @param view The current view
98+
*/
99+
public void back(View view) {
100+
this.context.finish();
101+
}
102+
95103
/**
96104
* Called when a server is selected.
97105
* @param model The view model corresponding to the selected server.

‎app/src/main/res/drawable/ic_arrow_back_24dp.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24.0"
5+
android:viewportHeight="24.0">
6+
<path
7+
android:fillColor="#FFFFFFFF"
8+
android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
9+
</vector>

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,12 @@
2828
<TextView
2929
android:layout_width="wrap_content"
3030
android:layout_height="wrap_content"
31-
android:text="Toolbar Title"
31+
android:text="@string/app_name"
3232
android:layout_gravity="left"
33-
android:id="@+id/toolbar_title" />
33+
android:id="@+id/toolbar_title"
34+
android:textColor="@color/action_bar_text"
35+
android:textStyle="bold"
36+
android:textSize="@dimen/actionbar_title_text_size" />
3437

3538
<ImageView
3639
android:layout_width="wrap_content"

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

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,22 +81,34 @@
8181
<android.support.design.widget.AppBarLayout
8282
android:layout_width="match_parent"
8383
android:layout_height="wrap_content"
84-
android:theme="@style/AppTheme.AppBarOverlay"
85-
android:id="@+id/view">
84+
android:theme="@style/AppTheme.AppBarOverlay">
8685

8786
<android.support.v7.widget.Toolbar
88-
android:id="@+id/toolbar"
8987
android:layout_width="match_parent"
9088
android:layout_height="?attr/actionBarSize"
9189
android:background="?attr/colorPrimary"
9290
app:popupTheme="@style/AppTheme.PopupOverlay">
9391

92+
<ImageView
93+
android:layout_width="wrap_content"
94+
android:layout_height="wrap_content"
95+
android:layout_gravity="start"
96+
android:src="@drawable/ic_arrow_back_24dp"
97+
android:id="@+id/AddServer_ibBack"
98+
android:adjustViewBounds="false"
99+
android:onClick="@{model.back}"
100+
android:clickable="true"
101+
android:paddingRight="15dp" />
102+
94103
<TextView
95104
android:layout_width="wrap_content"
96105
android:layout_height="wrap_content"
97-
android:text="Add new FTP server"
98-
android:layout_gravity="left"
99-
android:id="@+id/toolbar_title" />
106+
android:text="@{model.titleResource}"
107+
android:layout_gravity="start"
108+
android:id="@+id/AddServer_teTitle"
109+
android:textColor="@color/action_bar_text"
110+
android:textSize="@dimen/abc_text_size_title_material"
111+
android:textStyle="bold" />
100112

101113
<ImageView
102114
android:layout_width="wrap_content"

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

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
tools:context="presentation.activities.ListFileActivity">
2222

2323
<android.support.v7.widget.RecyclerView
24-
android:id="@+id/list_file_recycler"
24+
android:id="@+id/ListServer_RecyclerView"
2525
android:scrollbars="vertical"
2626
android:layout_width="match_parent"
2727
android:layout_height="match_parent"
@@ -33,24 +33,34 @@
3333
<android.support.design.widget.AppBarLayout
3434
android:layout_width="match_parent"
3535
android:layout_height="wrap_content"
36-
android:theme="@style/AppTheme.AppBarOverlay"
37-
android:id="@+id/view">
36+
android:theme="@style/AppTheme.AppBarOverlay">
3837

3938
<android.support.v7.widget.Toolbar
40-
android:id="@+id/toolbar"
4139
android:layout_width="match_parent"
4240
android:layout_height="?attr/actionBarSize"
4341
android:background="?attr/colorPrimary"
4442
app:popupTheme="@style/AppTheme.PopupOverlay">
4543

44+
<ImageView
45+
android:layout_width="wrap_content"
46+
android:layout_height="wrap_content"
47+
android:layout_gravity="start"
48+
android:src="@drawable/ic_arrow_back_24dp"
49+
android:id="@+id/AddServer_ibBack"
50+
android:adjustViewBounds="false"
51+
android:onClick="@{model.back}"
52+
android:clickable="true"
53+
android:paddingRight="15dp" />
54+
4655
<TextView
4756
android:layout_width="wrap_content"
4857
android:layout_height="wrap_content"
49-
android:text="FTP Servers"
50-
android:layout_gravity="left"
51-
android:id="@+id/toolbar_title"
52-
android:textSize="@dimen/abc_text_size_medium_material"
53-
android:textStyle="bold" />
58+
android:text="@string/activity_list_server_title"
59+
android:layout_gravity="start"
60+
android:id="@+id/ListServer_teTitle"
61+
android:textSize="@dimen/actionbar_title_text_size"
62+
android:textStyle="bold"
63+
android:textColor="@color/action_bar_text" />
5464

5565
</android.support.v7.widget.Toolbar>
5666

@@ -107,8 +117,9 @@
107117
android:text="FTP Server name"
108118
android:layout_gravity="left"
109119
android:id="@+id/ConsultServer_tvName"
110-
android:textSize="@dimen/abc_text_size_medium_material"
111-
android:textStyle="bold" />
120+
android:textSize="@dimen/abc_text_size_title_material"
121+
android:textStyle="bold"
122+
android:textColor="@color/action_bar_text" />
112123

113124
<ImageView
114125
android:layout_width="wrap_content"

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

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,9 @@
1515
<android.support.design.widget.AppBarLayout
1616
android:layout_width="match_parent"
1717
android:layout_height="wrap_content"
18-
android:theme="@style/AppTheme.AppBarOverlay"
19-
android:id="@+id/view">
18+
android:theme="@style/AppTheme.AppBarOverlay">
2019

2120
<android.support.v7.widget.Toolbar
22-
android:id="@+id/toolbar"
2321
android:layout_width="match_parent"
2422
android:layout_height="?attr/actionBarSize"
2523
android:background="?attr/colorPrimary"
@@ -28,16 +26,19 @@
2826
<TextView
2927
android:layout_width="wrap_content"
3028
android:layout_height="wrap_content"
31-
android:text="Toolbar Title"
32-
android:layout_gravity="left"
33-
android:id="@+id/toolbar_title" />
29+
android:text="@string/app_name"
30+
android:layout_gravity="start"
31+
android:textColor="@color/action_bar_text"
32+
android:textSize="@dimen/actionbar_title_text_size"
33+
android:textStyle="bold"
34+
android:id="@+id/Main_teTitle" />
3435

3536
<ImageView
3637
android:layout_width="wrap_content"
3738
android:layout_height="wrap_content"
3839
android:layout_gravity="right"
3940
android:src="@drawable/ic_settings_24dp"
40-
android:id="@+id/ibServers"
41+
android:id="@+id/Main_ibServers"
4142
android:onClick="@{model.openParameters}"
4243
android:padding="15dp"
4344
android:clickable="true"
@@ -56,15 +57,15 @@
5657
android:weightSum="2">
5758

5859
<fragment
59-
android:id="@+id/firstExplorer"
60+
android:id="@+id/Main_firstExplorer"
6061
android:layout_width="match_parent"
6162
android:layout_weight="1"
6263
android:layout_height="match_parent"
6364
class="com.paulds.simpleftp.presentation.fragments.ExplorerFragment"
6465
tools:layout="@layout/fragment_explorer" />
6566

6667
<fragment
67-
android:id="@+id/secondExplorer"
68+
android:id="@+id/Main_secondExplorer"
6869
android:layout_width="match_parent"
6970
android:layout_weight="1"
7071
android:layout_height="match_parent"

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
android:fitsSystemWindows="true"
1515
tools:context="presentation.activities.ListFileActivity">
1616

17-
18-
1917
<FrameLayout
2018
android:layout_width="match_parent"
2119
android:layout_height="match_parent"
@@ -40,10 +38,9 @@
4038
</FrameLayout>
4139

4240
<android.support.v7.widget.Toolbar
43-
android:id="@+id/toolbar"
4441
android:layout_width="match_parent"
4542
android:layout_height="@dimen/explorer_toolbar_size"
46-
android:background="#DDDDDD"
43+
android:background="@color/toolbar"
4744
app:popupTheme="@style/AppTheme.PopupOverlay"
4845
android:elevation="2dp">
4946

@@ -52,15 +49,16 @@
5249
android:layout_height="wrap_content"
5350
android:text="@{model.title}"
5451
android:layout_gravity="left"
55-
android:id="@+id/toolbar_title"
56-
android:textColor="@android:color/black"/>
52+
android:id="@+id/Explorer_teTitle"
53+
android:textColor="@color/toolbar_text"
54+
android:textSize="@dimen/toolbar_title_text_size" />
5755

5856
<ImageView
5957
android:layout_width="wrap_content"
6058
android:layout_height="match_parent"
6159
android:layout_gravity="right"
6260
android:src="@drawable/ic_dns_24dp"
63-
android:id="@+id/ibServers"
61+
android:id="@+id/Explorer_ivConnect"
6462
android:onClick="@{model.showServers}"
6563
android:clickable="true"
6664
android:focusable="true"

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,7 @@
33
<color name="colorPrimary">#7AA524</color>
44
<color name="colorPrimaryDark">#62890F</color>
55
<color name="colorAccent">#7AA524</color>
6+
<color name="action_bar_text">#FFFFFF</color>
7+
<color name="toolbar_text">#000000</color>
8+
<color name="toolbar">#DDDDDD</color>
69
</resources>

0 commit comments

Comments
 (0)