Skip to content

Commit 0aeb425

Browse files
przybylskiprzybylski
committed
adjusting design to holo, stability for account setup
1 parent fae4448 commit 0aeb425

File tree

81 files changed

+2436
-1022
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+2436
-1022
lines changed

‎AndroidManifest.xml

+30-9
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,24 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="eu.alefzero.owncloud"
2+
<!--
3+
ownCloud Android client application
4+
5+
Copyright (C) 2012 Bartek Przybylski
6+
This program is free software: you can redistribute it and/or modify
7+
it under the terms of the GNU General Public License as published by
8+
the Free Software Foundation, either version 3 of the License, or
9+
(at your option) any later version.
10+
11+
This program is distributed in the hope that it will be useful,
12+
but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
GNU General Public License for more details.
15+
16+
You should have received a copy of the GNU General Public License
17+
along with this program. If not, see <http://www.gnu.org/licenses/>.
18+
-->
19+
<manifest package="eu.alefzero.owncloud"
420
android:versionCode="1"
5-
android:versionName="1.0" >
21+
android:versionName="1.0" xmlns:android="http://schemas.android.com/apk/res/android">
622

723
<uses-permission android:name="android.permission.GET_ACCOUNTS" />
824
<uses-permission android:name="android.permission.USE_CREDENTIALS" />
@@ -15,6 +31,7 @@
1531
<uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
1632
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
1733
<uses-permission android:name="android.permission.BROADCAST_STICKY" />
34+
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
1835

1936
<uses-sdk
2037
android:minSdkVersion="8"
@@ -27,11 +44,12 @@
2744

2845
<application
2946
android:icon="@drawable/icon"
30-
android:label="@string/app_name" >
47+
android:label="@string/app_name"
48+
android:theme="@style/Theme.ownCloud"
49+
android:uiOptions="splitActionBarWhenNarrow">
3150
<activity
3251
android:name=".ui.activity.FileDisplayActivity"
33-
android:label="@string/app_name"
34-
android:theme="@style/Theme.ownCloud" >
52+
android:label="@string/app_name">
3553
<intent-filter>
3654
<action android:name="android.intent.action.MAIN" />
3755

@@ -69,7 +87,7 @@
6987

7088
<service
7189
android:name=".authenticator.AccountAuthenticatorService"
72-
android:exported="true" >
90+
android:exported="true">
7391
<intent-filter>
7492
<action android:name="android.accounts.AccountAuthenticator" />
7593
</intent-filter>
@@ -102,7 +120,7 @@
102120
<activity
103121
android:name=".ui.activity.AuthenticatorActivity"
104122
android:exported="true"
105-
android:theme="@style/Theme.ownCloud" >
123+
android:theme="@style/Theme.ownCloud.noActionBar" >
106124
</activity>
107125

108126
<service android:name=".FileDownloader" >
@@ -125,7 +143,10 @@
125143
<activity
126144
android:name=".ui.activity.FileDetailActivity"
127145
android:theme="@style/Theme.ownCloud" >
128-
</activity>
146+
</activity>
147+
<activity android:name=".extensions.ExtensionsAvailableActivity"></activity>
148+
<activity android:name=".extensions.ExtensionsListActivity"></activity>
149+
<activity android:name=".ui.activity.AccountSelectActivity" android:uiOptions="none" android:label="@string/prefs_accounts"></activity>
129150
</application>
130151

131152
</manifest>

‎proguard.cfg

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
native <methods>;
1919
}
2020

21-
-keepclasseswithmembernames class * {
21+
-keepclasseswithmembers class * {
2222
public <init>(android.content.Context, android.util.AttributeSet);
2323
}
2424

25-
-keepclasseswithmembernames class * {
25+
-keepclasseswithmembers class * {
2626
public <init>(android.content.Context, android.util.AttributeSet, int);
2727
}
2828

‎res/drawable-hdpi/ic_action_refresh.png

3.06 KB
Loading

‎res/drawable-hdpi/ic_action_refresh_black.png

3.1 KB
Loading

‎res/drawable-hdpi/ic_action_search.png

3.05 KB
Loading

‎res/drawable-hdpi/ic_action_upload.png

1.29 KB
Loading

‎res/drawable-ldpi/ic_action_refresh.png

3.14 KB
Loading

‎res/drawable-ldpi/ic_action_refresh_black.png

3.2 KB
Loading

‎res/drawable-ldpi/ic_action_search.png

3.12 KB
Loading

‎res/drawable-ldpi/ic_action_upload.png

1.43 KB
Loading

‎res/drawable-mdpi/ic_action_refresh.png

2.96 KB
Loading

‎res/drawable-mdpi/ic_action_refresh_black.png

2.99 KB
Loading

‎res/drawable-mdpi/ic_action_search.png

2.96 KB
Loading

‎res/drawable-mdpi/ic_action_upload.png

1.19 KB
Loading

‎res/drawable/common_error.png

802 Bytes
Loading

‎res/drawable/connection_secure.xml

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<!--?xml version="1.0" encoding="utf-8"? -->
2+
<shape xmlns:android="http://schemas.android.com/apk/res/android">
3+
<gradient android:endColor="#8dc73f" android:centerColor="#d4d4d4"
4+
android:startColor="#d4d4d4">
5+
<stroke android:width="1dp" color="#8dc73f">
6+
<corners android:radius="5dp">
7+
<padding android:left="7dp" android:top="7dp" android:right="7dp"
8+
android:bottom="7dp">
9+
</padding>
10+
</corners>
11+
</stroke>
12+
</gradient>
13+
</shape>

‎res/drawable/ic_ok.png

552 Bytes
Loading

‎res/drawable/icon_list_selector.xml

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
Copyright (C) 2010 The Android Open Source Project
4+
5+
Licensed under the Apache License, Version 2.0 (the "License");
6+
you may not use this file except in compliance with the License.
7+
You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
-->
17+
18+
<selector xmlns:android="http://schemas.android.com/apk/res/android" android:exitFadeDuration="@android:integer/config_mediumAnimTime">
19+
20+
<item android:drawable="@color/filelist_backgorund" android:state_window_focused="false"/>
21+
22+
<!-- Even though these two point to the same resource, have two states so the drawable will invalidate itself when coming out of pressed state. -->
23+
<item android:drawable="@android:color/holo_blue_bright" android:state_enabled="false" android:state_focused="true" android:state_pressed="true"/>
24+
<item android:drawable="@android:color/holo_blue_bright" android:state_enabled="false" android:state_focused="true"/>
25+
<item android:drawable="@android:color/holo_blue_bright" android:state_focused="true" android:state_pressed="true"/>
26+
<item android:drawable="@android:color/holo_blue_bright" android:state_focused="false" android:state_pressed="true"/>
27+
<item android:drawable="@android:color/holo_blue_bright" android:state_focused="true"/>
28+
29+
</selector>

‎res/drawable/list_selector.xml

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
Copyright (C) 2010 The Android Open Source Project
4+
5+
Licensed under the Apache License, Version 2.0 (the "License");
6+
you may not use this file except in compliance with the License.
7+
You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
-->
17+
18+
<selector xmlns:android="http://schemas.android.com/apk/res/android" android:exitFadeDuration="@android:integer/config_mediumAnimTime">
19+
20+
<item android:drawable="@color/filelist_backgorund" android:state_window_focused="false"/>
21+
22+
<!-- Even though these two point to the same resource, have two states so the drawable will invalidate itself when coming out of pressed state. -->
23+
<item android:drawable="@android:color/holo_blue_bright" android:state_enabled="false" android:state_focused="true" android:state_pressed="true"/>
24+
<item android:drawable="@android:color/holo_blue_bright" android:state_enabled="false" android:state_focused="true"/>
25+
<item android:drawable="@android:color/holo_blue_bright" android:state_focused="true" android:state_pressed="true"/>
26+
<item android:drawable="@android:color/holo_blue_bright" android:state_focused="false" android:state_pressed="true"/>
27+
<item android:drawable="@android:color/holo_blue_bright" android:state_focused="true"/>
28+
29+
</selector>

‎res/drawable/local_file_indicator.png

2.98 KB
Loading

‎res/drawable/logo_inverted.png

7.93 KB
Loading

‎res/drawable/main_header_bg.xml

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<shape xmlns:android="http://schemas.android.com/apk/res/android">
3-
<gradient
4-
android:startColor="#1D2D55"
3+
<gradient
4+
android:startColor="#1D2D44"
5+
android:centerColor="#1D2D55"
56
android:endColor="#1D2D44"
67
android:angle="270"
78
/>

‎res/drawable/no_network.png

623 Bytes
Loading

‎res/drawable/progress_small.xml

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
3+
<animated-rotate xmlns:android="http://schemas.android.com/apk/res/android"
4+
android:drawable="@drawable/spinner_inner"
5+
android:pivotX="50%"
6+
android:pivotY="50%"
7+
android:fromDegrees="0"
8+
android:toDegrees="360"
9+
android:interpolator="@android:anim/linear_interpolator"
10+
android:duration="1000"
11+
android:startOffset="0"/>

‎res/drawable/spinner_inner.png

627 Bytes
Loading

‎res/drawable/uploader_list_separator.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<shape
33
xmlns:android="http://schemas.android.com/apk/res/android">
4-
<gradient android:startColor="#fefefe" android:centerColor="#cccccc" android:endColor="#fefefe" android:angle="0"/>
4+
<gradient android:startColor="@color/filelist_icon_backgorund" android:endColor="@color/filelist_icon_backgorund" android:angle="0"/>
55
</shape>

‎res/layout-land/account_setup.xml

+176
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,176 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
ownCloud Android client application
4+
5+
Copyright (C) 2012 Bartek Przybylski
6+
This program is free software: you can redistribute it and/or modify
7+
it under the terms of the GNU General Public License as published by
8+
the Free Software Foundation, either version 3 of the License, or
9+
(at your option) any later version.
10+
11+
This program is distributed in the hope that it will be useful,
12+
but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
GNU General Public License for more details.
15+
16+
You should have received a copy of the GNU General Public License
17+
along with this program. If not, see <http://www.gnu.org/licenses/>.
18+
-->
19+
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
20+
xmlns:oc="http://schemas.android.com/apk/res/eu.alefzero.owncloud"
21+
android:layout_width="fill_parent"
22+
android:layout_height="fill_parent"
23+
android:focusable="true"
24+
android:gravity="center|fill"
25+
android:orientation="vertical" >
26+
27+
<FrameLayout
28+
android:layout_width="match_parent"
29+
android:layout_height="wrap_content"
30+
android:layout_gravity="center"
31+
android:layout_marginLeft="16dip"
32+
android:layout_marginRight="16dip"
33+
android:layout_weight="1" >
34+
35+
<LinearLayout
36+
android:layout_width="match_parent"
37+
android:layout_height="match_parent" >
38+
39+
<ImageView
40+
android:id="@+id/imageView1"
41+
android:layout_width="match_parent"
42+
android:layout_height="match_parent"
43+
android:layout_margin="7dp"
44+
android:layout_weight="1"
45+
android:src="@drawable/logo_inverted" />
46+
47+
<LinearLayout
48+
android:id="@+id/LinearLayout1"
49+
android:layout_width="match_parent"
50+
android:layout_height="wrap_content"
51+
android:layout_gravity="center"
52+
android:layout_weight="1"
53+
android:orientation="vertical" >
54+
55+
<FrameLayout
56+
android:layout_width="match_parent"
57+
android:layout_height="wrap_content"
58+
android:layout_weight="1" >
59+
60+
<EditText
61+
android:id="@+id/host_URL"
62+
android:layout_width="match_parent"
63+
android:layout_height="wrap_content"
64+
android:layout_weight="1"
65+
android:ems="10"
66+
android:hint="@string/auth_host_url"
67+
android:singleLine="true" >
68+
69+
<requestFocus />
70+
</EditText>
71+
72+
<ImageView
73+
android:id="@+id/refreshButton"
74+
android:layout_width="wrap_content"
75+
android:layout_height="wrap_content"
76+
android:layout_gravity="right|center_vertical"
77+
android:src="@drawable/ic_action_refresh_black"
78+
android:visibility="invisible" />
79+
</FrameLayout>
80+
81+
<LinearLayout
82+
android:layout_width="match_parent"
83+
android:layout_height="50dp"
84+
android:layout_weight="1" >
85+
86+
<ImageView
87+
android:id="@+id/action_indicator"
88+
android:layout_width="wrap_content"
89+
android:layout_height="wrap_content"
90+
android:layout_marginLeft="5dp"
91+
android:layout_marginRight="5dp"
92+
android:src="@android:drawable/stat_notify_sync"
93+
android:visibility="invisible" />
94+
95+
<TextView
96+
android:id="@+id/status_text"
97+
android:layout_width="wrap_content"
98+
android:layout_height="wrap_content"
99+
android:text="TextView"
100+
android:visibility="invisible" />
101+
</LinearLayout>
102+
103+
<TextView
104+
android:id="@+id/textView2"
105+
android:layout_width="wrap_content"
106+
android:layout_height="0dp"
107+
android:layout_weight="1"
108+
android:text="@string/auth_login_details"
109+
android:textAppearance="?android:attr/textAppearanceSmall" />
110+
111+
<EditText
112+
android:id="@+id/account_username"
113+
android:layout_width="match_parent"
114+
android:layout_height="0dp"
115+
android:layout_weight="1"
116+
android:ems="10"
117+
android:hint="@string/auth_username"
118+
android:singleLine="true" />
119+
120+
<FrameLayout
121+
android:layout_width="match_parent"
122+
android:layout_height="wrap_content"
123+
android:layout_weight="1" >
124+
125+
<EditText
126+
android:id="@+id/account_password"
127+
android:layout_width="match_parent"
128+
android:layout_height="wrap_content"
129+
android:layout_weight="1"
130+
android:ems="10"
131+
android:hint="@string/auth_password"
132+
android:inputType="textPassword"
133+
android:singleLine="true" />
134+
135+
<ImageView
136+
android:id="@+id/viewPassword"
137+
android:layout_width="wrap_content"
138+
android:layout_height="wrap_content"
139+
android:layout_gravity="right|center_vertical"
140+
android:src="@android:drawable/ic_menu_view"
141+
android:visibility="invisible" />
142+
</FrameLayout>
143+
</LinearLayout>
144+
</LinearLayout>
145+
</FrameLayout>
146+
147+
<RelativeLayout
148+
android:layout_width="match_parent"
149+
android:layout_height="wrap_content"
150+
android:layout_alignParentBottom="true" >
151+
152+
<LinearLayout
153+
android:layout_width="match_parent"
154+
android:layout_height="wrap_content"
155+
android:weightSum="1" >
156+
157+
<Button
158+
android:id="@+id/buttonCancel"
159+
android:layout_width="match_parent"
160+
android:layout_height="wrap_content"
161+
android:layout_weight=".5"
162+
android:text="@string/common_cancel" />
163+
164+
<Button
165+
android:id="@+id/buttonOK"
166+
android:layout_width="match_parent"
167+
android:layout_height="wrap_content"
168+
android:layout_weight=".5"
169+
android:enabled="false"
170+
android:onClick="onOkClick"
171+
android:text="@string/setup_btn_connect"
172+
android:textColor="@android:color/black" />
173+
</LinearLayout>
174+
</RelativeLayout>
175+
176+
</LinearLayout>

0 commit comments

Comments
 (0)