<uses-sdk
android:minSdkVersion="14"
- android:targetSdkVersion="19" />
+ android:targetSdkVersion="22" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" >
</uses-permission>
mavenCentral()
}
dependencies {
- classpath 'com.android.tools.build:gradle:1.0.0'
+ classpath 'com.android.tools.build:gradle:1.2.3'
}
}
dependencies {
compile name: 'touch-image-view'
- compile 'com.android.support:support-v4:19.1.0'
+ compile 'com.android.support:support-v4:22.2.1'
compile project(':owncloud-android-library')
compile 'com.jakewharton:disklrucache:2.0.2'
- compile 'com.android.support:appcompat-v7:19.1.0'
+ compile 'com.android.support:appcompat-v7:22.2.1'
}
android {
- compileSdkVersion 19
- buildToolsVersion "20.0.0"
+ compileSdkVersion 22
+ buildToolsVersion "22.0.1"
sourceSets {
main {
manifest.srcFile 'AndroidManifest.xml'
# project structure.
# Project target.
-target=android-19
+target=android-22
android.library.reference.1=owncloud-android-library
android.library.reference.2=libs/android-support-appcompat-v7-exploded-aar
--- /dev/null
+<?xml version="1.0" encoding="utf-8"?>
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item
+ android:id="@android:id/background"
+ android:drawable="@drawable/owncloud_progress_bg_light" />
+ <item android:id="@android:id/secondaryProgress">
+ <scale
+ android:drawable="@drawable/owncloud_progress_secondary_light"
+ android:scaleWidth="100%" />
+ </item>
+ <item android:id="@android:id/progress">
+ <scale
+ android:drawable="@drawable/owncloud_progress_primary_light"
+ android:scaleWidth="100%" />
+ </item>
+
+</layer-list>
\ No newline at end of file
--- /dev/null
+<?xml version="1.0" encoding="utf-8"?>
+<animation-list
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:oneshot="false">
+ <item android:drawable="@drawable/owncloud_progressbar_indeterminate_1" android:duration="50" />
+ <item android:drawable="@drawable/owncloud_progressbar_indeterminate_2" android:duration="50" />
+ <item android:drawable="@drawable/owncloud_progressbar_indeterminate_3" android:duration="50" />
+ <item android:drawable="@drawable/owncloud_progressbar_indeterminate_4" android:duration="50" />
+ <item android:drawable="@drawable/owncloud_progressbar_indeterminate_5" android:duration="50" />
+ <item android:drawable="@drawable/owncloud_progressbar_indeterminate_6" android:duration="50" />
+ <item android:drawable="@drawable/owncloud_progressbar_indeterminate_7" android:duration="50" />
+ <item android:drawable="@drawable/owncloud_progressbar_indeterminate_8" android:duration="50" />
+</animation-list>
android:text="@string/auth_expired_basic_auth_toast" \r
android:visibility="gone"\r
android:layout_marginBottom="10dp"\r
+ android:textColor="#AAAAAA"\r
+ android:textColorHint="#AAAAAA"\r
android:contentDescription="@string/auth_expired_basic_auth_toast"/>\r
<FrameLayout \r
android:id="@+id/hostUrlFrame"\r
android:inputType="textUri"\r
android:drawablePadding="5dp"\r
android:paddingRight="55dp"\r
+ android:textColor="#AAAAAA"\r
+ android:textColorHint="#AAAAAA"\r
android:contentDescription="@string/auth_host_address"\r
>\r
<requestFocus />\r
android:drawableLeft="@android:drawable/stat_notify_sync"\r
android:drawablePadding="5dp"\r
android:gravity="center_vertical"\r
+ android:textColor="#AAAAAA"\r
+ android:textColorHint="#AAAAAA"\r
android:text="@string/auth_testing_connection"\r
android:contentDescription="@string/auth_testing_connection"/>\r
\r
android:checked="false"\r
android:onClick="onCheckClick"\r
android:text="@string/oauth_check_onoff"\r
+ android:textColor="#AAAAAA"\r
+ android:textColorHint="#AAAAAA"\r
android:textAppearance="?android:attr/textAppearanceSmall"\r
android:contentDescription="@string/oauth_check_onoff"\r
/>\r
android:text="@string/oauth2_url_endpoint_auth"\r
android:singleLine="true"\r
android:inputType="textUri"\r
+ android:textColor="#AAAAAA"\r
+ android:textColorHint="#AAAAAA"\r
android:visibility="gone">\r
</EditText> \r
\r
android:text="@string/oauth2_url_endpoint_access"\r
android:singleLine="true"\r
android:inputType="textUri"\r
+ android:textColor="#AAAAAA"\r
+ android:textColorHint="#AAAAAA"\r
android:visibility="gone">\r
<requestFocus />\r
</EditText> \r
android:ems="10"\r
android:hint="@string/auth_username"\r
android:inputType="textNoSuggestions"\r
+ android:textColor="#AAAAAA"\r
+ android:textColorHint="#AAAAAA"\r
android:contentDescription="@string/auth_username"\r
/>\r
\r
android:hint="@string/auth_password"\r
android:inputType="textPassword"\r
android:drawablePadding="5dp"\r
+ android:textColor="#AAAAAA"\r
+ android:textColorHint="#AAAAAA"\r
android:contentDescription="@string/auth_password"\r
/>\r
\r
android:text="@string/auth_unauthorized"\r
android:drawableLeft="@android:drawable/stat_notify_sync"\r
android:drawablePadding="5dip"\r
+ android:textColor="#AAAAAA"\r
+ android:textColorHint="#AAAAAA"\r
android:contentDescription="@string/auth_unauthorized"\r
/>\r
\r
android:paddingBottom="5dp"\r
android:paddingTop="5dp"\r
android:text="@string/auth_register"\r
- android:textColor="#0000FF"\r
+ android:textColor="#AAAAAA"\r
android:contentDescription="@string/auth_register"/>\r
</LinearLayout>\r
\r
<LinearLayout\r
android:layout_width="match_parent"\r
android:layout_height="wrap_content"\r
- android:background="@color/login_background_color"\r
+ android:background="#1D2D44"\r
android:gravity="center"\r
android:orientation="vertical"\r
android:padding="8dp" >\r
android:id="@+id/thumbnail"\r
android:layout_width="match_parent"\r
android:layout_height="wrap_content"\r
- android:layout_marginBottom="10dp"\r
+ android:layout_marginBottom="0dp"\r
android:layout_marginTop="10dp"\r
- android:background="@color/login_logo_background_color"\r
android:src="@drawable/logo"\r
android:contentDescription="@string/app_name"/>\r
\r
android:text="@string/auth_expired_basic_auth_toast"\r
android:visibility="gone"\r
android:layout_marginBottom="10dp"\r
+ android:textColor="#AAAAAA"\r
+ android:textColorHint="#AAAAAA"\r
android:contentDescription="@string/auth_expired_basic_auth_toast"/>\r
\r
<FrameLayout \r
android:id="@+id/hostUrlFrame"\r
android:layout_width="match_parent"\r
android:layout_height="wrap_content"\r
- android:layout_marginBottom="10dp"\r
+ android:layout_marginBottom="0dp"\r
>\r
<EditText\r
android:id="@+id/hostUrlInput"\r
android:inputType="textUri"\r
android:drawablePadding="5dp"\r
android:paddingRight="55dp"\r
+ android:textColor="#AAAAAA"\r
+ android:textColorHint="#AAAAAA"\r
android:contentDescription="@string/auth_host_address"\r
>\r
<requestFocus />\r
</EditText>\r
<ImageButton\r
android:id="@+id/embeddedRefreshButton"\r
- android:layout_width="48dp"\r
- android:layout_height="48dp"\r
+ android:layout_width="wrap_content"\r
+ android:layout_height="wrap_content"\r
android:layout_gravity="center_vertical|right"\r
android:layout_marginRight="5dp"\r
android:padding="0dp"\r
android:scaleType="fitCenter"\r
- android:src="@drawable/ic_action_refresh_black"\r
+ android:src="@drawable/ic_action_refresh_grey"\r
android:onClick="onRefreshClick"\r
android:visibility="gone"\r
android:background="@android:color/transparent"\r
android:drawableLeft="@android:drawable/stat_notify_sync"\r
android:drawablePadding="5dp"\r
android:gravity="center_vertical"\r
+ android:textColor="#AAAAAA"\r
+ android:textColorHint="#AAAAAA"\r
android:text="@string/auth_testing_connection"\r
android:contentDescription="@string/auth_testing_connection"/>\r
\r
android:onClick="onCheckClick"\r
android:text="@string/oauth_check_onoff"\r
android:textAppearance="?android:attr/textAppearanceSmall"\r
+ android:textColor="#AAAAAA"\r
+ android:textColorHint="#AAAAAA"\r
android:contentDescription="@string/oauth_check_onoff"\r
/>\r
\r
android:layout_height="wrap_content"\r
android:ems="10"\r
android:enabled="false"\r
+ android:textColor="#AAAAAA"\r
+ android:textColorHint="#AAAAAA"\r
android:text="@string/oauth2_url_endpoint_auth"\r
android:singleLine="true"\r
android:inputType="textUri"\r
android:text="@string/oauth2_url_endpoint_access"\r
android:singleLine="true"\r
android:inputType="textUri"\r
+ android:textColor="#AAAAAA"\r
+ android:textColorHint="#AAAAAA"\r
android:visibility="gone"/>\r
\r
<EditText\r
android:ems="10"\r
android:hint="@string/auth_username"\r
android:inputType="textNoSuggestions"\r
+ android:textColor="#AAAAAA"\r
+ android:textColorHint="#AAAAAA"\r
android:contentDescription="@string/auth_username"\r
/>\r
\r
android:ems="10"\r
android:hint="@string/auth_password"\r
android:inputType="textPassword"\r
+ android:textColor="#AAAAAA"\r
+ android:textColorHint="#AAAAAA"\r
android:contentDescription="@string/auth_password"\r
/>\r
\r
android:drawablePadding="5dp"\r
android:gravity="center_vertical"\r
android:text="@string/auth_unauthorized"\r
+ android:textColor="#AAAAAA"\r
+ android:textColorHint="#AAAAAA"\r
android:contentDescription="@string/auth_unauthorized"/>\r
\r
<Button\r
android:paddingBottom="5dp"\r
android:paddingTop="5dp"\r
android:text="@string/auth_register"\r
- android:textColor="#0000FF"\r
+ android:textColor="#AAAAAA"\r
+ android:textColorHint="#AAAAAA"\r
android:contentDescription="@string/auth_register"/>\r
\r
</LinearLayout>\r
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/left_drawer"
- android:layout_width="240dp"
- android:layout_height="match_parent"
- android:layout_gravity="start"
- android:background="@color/background_color"
- android:baselineAligned="false"
- android:clickable="true"
- android:orientation="vertical"
- android:fitsSystemWindows="true">
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+ <RelativeLayout
+ android:id="@+id/left_drawer"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_gravity="start"
+ android:gravity="center"
+ android:orientation="vertical"
+ android:fitsSystemWindows="true"
+ android:background="@color/background_color"
+ >
- <!--TODO re-enable when "Accounts" is available in Navigation Drawer-->
- <!--<LinearLayout-->
- <!--android:layout_width="match_parent"-->
- <!--android:layout_height="wrap_content"-->
- <!--android:layout_margin="5dp">-->
+ <!--TODO re-enable when "Accounts" is available in Navigation Drawer-->
+ <!--<LinearLayout-->
+ <!--android:layout_width="match_parent"-->
+ <!--android:layout_height="wrap_content"-->
+ <!--android:layout_margin="5dp">-->
- <!--<ImageView-->
- <!--android:id="@+id/drawer_userIcon"-->
- <!--android:layout_width="40dp"-->
- <!--android:layout_height="40dp"-->
- <!--android:src="@drawable/abc_ab_bottom_solid_dark_holo" />-->
+ <!--<ImageView-->
+ <!--android:id="@+id/drawer_userIcon"-->
+ <!--android:layout_width="40dp"-->
+ <!--android:layout_height="40dp"-->
+ <!--android:src="@drawable/abc_ab_bottom_solid_dark_holo" />-->
- <!--<TextView-->
- <!--android:id="@+id/drawer_username"-->
- <!--android:layout_width="wrap_content"-->
- <!--android:layout_height="wrap_content"-->
- <!--android:layout_gravity="center_vertical"-->
- <!--android:layout_marginLeft="5dp"-->
- <!--android:layout_marginStart="5dp"-->
- <!--android:textAppearance="?android:attr/textAppearanceLarge" />-->
+ <!--<TextView-->
+ <!--android:id="@+id/drawer_username"-->
+ <!--android:layout_width="wrap_content"-->
+ <!--android:layout_height="wrap_content"-->
+ <!--android:layout_gravity="center_vertical"-->
+ <!--android:layout_marginLeft="5dp"-->
+ <!--android:layout_marginStart="5dp"-->
+ <!--android:textAppearance="?android:attr/textAppearanceLarge" />-->
- <!--</LinearLayout>-->
+ <!--</LinearLayout>-->
- <!--<TextView-->
- <!--android:layout_width="fill_parent"-->
- <!--android:layout_height="2dip"-->
- <!--android:background="@color/list_item_lastmod_and_filesize_text" />-->
+ <!--<TextView-->
+ <!--android:layout_width="fill_parent"-->
+ <!--android:layout_height="2dip"-->
+ <!--android:background="@color/list_item_lastmod_and_filesize_text" />-->
- <ListView
- android:id="@+id/drawer_list"
- android:layout_width="fill_parent"
- android:layout_height="match_parent"
- android:background="@color/background_color"
- android:choiceMode="singleChoice"
- />
-</LinearLayout>
\ No newline at end of file
+ <ListView
+ android:id="@+id/drawer_list"
+ android:choiceMode="singleChoice"
+ android:layout_width="fill_parent"
+ android:layout_height="match_parent"
+ android:background="@color/background_color"
+ android:divider="#eee"
+ android:dividerHeight="1dp"
+ android:paddingTop="100dp" />
+
+ <TextView
+ android:id="@+id/tv_header"
+ android:layout_width="fill_parent"
+ android:layout_height="100dp"
+ android:layout_alignParentTop="true"
+ android:layout_centerHorizontal="true"
+ android:background="@color/owncloud_blue"
+ android:gravity="bottom"
+ android:orientation="vertical"
+ android:text="@string/app_name"
+ android:textColor="#FFF"
+ android:textStyle="bold"
+ android:padding="10dp"
+ android:textSize="24sp" />
+ </RelativeLayout>
+</merge>
\ No newline at end of file
android:layout_alignParentLeft="true"
android:orientation="horizontal"
android:background="@color/background_color"
- android:layout_marginTop="10dp"
- android:layout_marginBottom="10dp">
+ android:layout_marginTop="16dp"
+ android:layout_marginBottom="16dp"
+ android:minHeight="?android:attr/listPreferredItemHeight">
+
+ <ImageView
+ android:id="@+id/itemIcon"
+ android:layout_width="24sp"
+ android:layout_height="24sp"
+ android:layout_marginLeft="16sp"
+ android:layout_gravity="center_vertical"
+ />
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/itemTitle"
android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:gravity="center_vertical"
+ android:layout_height="wrap_content"
android:paddingLeft="16dp"
android:paddingRight="16dp"
- android:textColor="@color/textColor"
+ android:textColor="@color/drawerMenuTextColor"
android:text="@string/app_name"
- android:textAppearance="?android:attr/textAppearanceListItemSmall"
- android:minHeight="?android:attr/listPreferredItemHeightSmall"/>
+ android:layout_gravity="center_vertical"
+ android:textAppearance="?android:attr/textAppearanceListItem"
+ />
</LinearLayout>
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:progressDrawable="@android:drawable/progress_horizontal"
- android:indeterminate="false"
+ style="?android:attr/progressBarStyleHorizontal"
+ android:indeterminate="false"
android:indeterminateOnly="false"
/>
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="12dp"
- android:src="@drawable/btn_cancel"
+ android:src="@drawable/ic_cancel"
android:background="@android:color/transparent"
/>
>
<ProgressBar android:id="@+id/progressBar"
- android:layout_width="0dp"
+ android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:progressDrawable="@android:drawable/progress_horizontal"
- android:indeterminate="false"
- android:indeterminateOnly="false"
-
- />
+ style="?android:attr/progressBarStyleHorizontal"
+ android:indeterminate="false"
+ android:indeterminateOnly="false"
+
+ />
<ImageButton
android:id="@+id/cancelBtn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="12dp"
- android:src="@drawable/btn_cancel"
+ android:src="@drawable/ic_cancel"
android:background="@android:color/transparent"
/>
\r
<!-- The main content view -->\r
<LinearLayout\r
- xmlns:android="http://schemas.android.com/apk/res/android"\r
android:layout_width="match_parent"\r
android:layout_height="match_parent"\r
- android:background="@color/background_color"\r
- android:baselineAligned="false"\r
- android:orientation="horizontal"\r
- android:id="@+id/ListLayout"\r
- android:contentDescription="@string/list_layout"\r
- >\r
-\r
-\r
- <FrameLayout\r
- android:id="@+id/left_fragment_container"\r
- android:layout_width="0dp"\r
- android:layout_height="match_parent"\r
- android:layout_weight="1" />\r
-\r
- <FrameLayout\r
- android:id="@+id/right_fragment_container"\r
- android:layout_width="0dp"\r
- android:layout_height="match_parent"\r
- android:layout_weight="2" />\r
+ android:orientation="vertical">\r
+\r
+ <ProgressBar android:id="@+id/progressBar"\r
+ android:layout_width="match_parent"\r
+ android:layout_height="6dp"\r
+ android:padding="0dp"\r
+ android:layout_margin="0dp"\r
+ style="@style/Widget.ownCloud.TopProgressBar"\r
+ android:indeterminate="true"\r
+ android:indeterminateOnly="true"\r
+ android:background="#ffffff"\r
+\r
+ />\r
+\r
+ <LinearLayout\r
+ xmlns:android="http://schemas.android.com/apk/res/android"\r
+ android:layout_width="match_parent"\r
+ android:layout_height="wrap_content"\r
+ android:background="@color/background_color"\r
+\r
+ android:orientation="horizontal"\r
+ android:id="@+id/ListLayout"\r
+ android:contentDescription="@string/list_layout"\r
+ >\r
+\r
+ <FrameLayout\r
+ android:id="@+id/left_fragment_container"\r
+ android:layout_width="0dp"\r
+ android:layout_height="match_parent"\r
+ android:layout_weight="1" />\r
+\r
+ <FrameLayout\r
+ android:id="@+id/right_fragment_container"\r
+ android:layout_width="0dp"\r
+ android:layout_height="match_parent"\r
+ android:layout_weight="2" />\r
+ </LinearLayout>\r
+\r
</LinearLayout>\r
\r
<include\r
<color name="list_item_lastmod_and_filesize_text">#989898</color>
<color name="black">#000000</color>
<color name="textColor">#303030</color>
+ <color name="drawerMenuTextColor">#757575</color>
<color name="list_divider_background">#fff0f0f0</color>
-
+ <color name="owncloud_blue">#1D2D44</color>
+ <color name="login_text_color">#AAAAAA</color>
+
+
+ <!-- Colors -->
+ <color name="color_accent">@color/owncloud_blue_bright</color>
+
+ <!-- standard material color definitions -->
+ <color name="primary">@color/owncloud_blue</color>
+ <color name="primary_dark">#162233</color>
</resources>
\ No newline at end of file
<!-- Colors -->
- <color name="login_background_color">#FFFFFF</color>
- <color name="login_logo_background_color">#FFFFFF</color>
+ <color name="login_background_color">#1D2D44</color>
+ <color name="login_logo_background_color">#1D2D44</color>
<color name="background_color">#F7F7F7</color>
<color name="actionbar_start_color">#1D2D44</color>
<color name="actionbar_end_color">#1D2D44</color>
<string name="drawer_item_settings">Settings</string>
<string name="drawer_item_logs">Logs</string>
<string name="drawer_close">Close</string>
+ <string name="drawer_open">Open</string>
<string name="prefs_category_general">General</string>
<string name="prefs_category_more">More</string>
<string name="prefs_accounts">Accounts</string>
<item name="android:actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
<item name="actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
<item name="android:buttonStyle">@style/Theme.ownCloud.ButtonStyle</item>
+ <item name="colorPrimary">@color/primary</item>
+ <item name="colorPrimaryDark">@color/primary_dark</item>
+ <item name="colorAccent">@color/color_accent</item>
</style>
- <style name="Theme.ownCloud.noActionBar" parent="style/Theme.AppCompat.Light">
- <item name="android:buttonStyle">@style/Theme.ownCloud.ButtonStyle</item>
+ <style name="Theme.ownCloud.noActionBar" parent="style/Theme.AppCompat.Light.DarkActionBar">
+ <item name="android:buttonStyle">@style/Theme.ownCloud.ButtonStyle</item>
+ <item name="windowNoTitle">true</item>
+ <item name="windowActionBar">false</item>
+ <item name="colorPrimary">@color/primary</item>
+ <item name="colorPrimaryDark">@color/primary_dark</item>
+ <item name="colorAccent">@color/color_accent</item>
</style>
+ <!-- Progress bar -->
+ <style name="Widget.ownCloud.TopProgressBar" parent="android:Widget.Holo.ProgressBar.Horizontal">
+ <item name="android:progressDrawable">@drawable/actionbar_progress_horizontal</item>
+ <item name="android:indeterminateDrawable">@drawable/actionbar_progress_indeterminate_horizontal</item>
+ </style>
+
<style name="Theme.ownCloud.Fullscreen" parent="style/Theme.AppCompat">
<item name="android:windowFullscreen">true</item>
</style>
<style name="Theme.ownCloud.Widget.ActionBar"
parent="style/Widget.AppCompat.Light.ActionBar.Solid.Inverse">
- <item name="android:background">@drawable/main_header_bg</item>
+ <item name="android:background">@color/owncloud_blue</item>
<item name="background">@drawable/main_header_bg</item>
<item name="android:textColor">#ffffff</item>
<item name="android:shadowColor">#222222</item>
\r
package com.owncloud.android.authentication;\r
\r
-import java.security.cert.X509Certificate;\r
-import java.util.Map;\r
-\r
import android.accounts.Account;\r
import android.accounts.AccountManager;\r
import android.app.Dialog;\r
import com.owncloud.android.ui.dialog.SslUntrustedCertDialog.OnSslUntrustedCertListener;\r
import com.owncloud.android.utils.DisplayUtils;\r
\r
+import java.security.cert.X509Certificate;\r
+import java.util.Map;\r
+\r
/**\r
* This Activity is used to add an ownCloud account to the App\r
*/\r
\r
switch (result.getCode()) {\r
case OK_SSL:\r
- mServerStatusIcon = android.R.drawable.ic_secure;\r
+ mServerStatusIcon = R.drawable.ic_lock;\r
mServerStatusText = R.string.auth_secure_connection;\r
break;\r
\r
mServerStatusIcon = R.drawable.ic_ok;\r
} else {\r
mServerStatusText = R.string.auth_nossl_plain_ok_title;\r
- mServerStatusIcon = android.R.drawable.ic_partial_secure;\r
+ mServerStatusIcon = R.drawable.ic_lock_open;\r
}\r
break;\r
\r
mServerStatusText = R.string.auth_unknown_error_title;\r
break;\r
case OK_REDIRECT_TO_NON_SECURE_CONNECTION:\r
- mServerStatusIcon = android.R.drawable.ic_partial_secure;\r
+ mServerStatusIcon = R.drawable.ic_lock_open;\r
mServerStatusText = R.string.auth_redirect_non_secure_connection_title;\r
break;\r
default:\r
\r
switch (result.getCode()) {\r
case OK_SSL:\r
- mAuthStatusIcon = android.R.drawable.ic_secure;\r
+ mAuthStatusIcon = R.drawable.ic_lock;\r
mAuthStatusText = R.string.auth_secure_connection;\r
break;\r
\r
mAuthStatusIcon = R.drawable.ic_ok;\r
} else {\r
mAuthStatusText = R.string.auth_nossl_plain_ok_title;\r
- mAuthStatusIcon = android.R.drawable.ic_partial_secure;\r
+ mAuthStatusIcon = R.drawable.ic_lock_open;\r
}\r
break;\r
\r
private String mTitle;
private String mContentDescription;
+ private int mIcon;
// Constructors
public NavigationDrawerItem(){}
mTitle = title;
}
- public NavigationDrawerItem(String title, String contentDescription){
+ public NavigationDrawerItem(String title, String contentDescription, int icon){
mTitle = title;
mContentDescription = contentDescription;
+ mIcon = icon;
}
// Getters and Setters
public void setContentDescription(String contentDescription) {
this.mContentDescription = contentDescription;
}
+
+ public int getIcon() {
+ return mIcon;
+ }
+
+ public void setIcon(int icon) {
+ this.mIcon = icon;
+ }
}
package com.owncloud.android.ui.activity;
+import android.content.Intent;
+import android.os.Bundle;
+
import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.files.services.FileUploader;
import com.owncloud.android.lib.common.utils.Log_OC;
import com.owncloud.android.ui.dialog.ConflictsResolveDialog;
import com.owncloud.android.ui.dialog.ConflictsResolveDialog.Decision;
import com.owncloud.android.ui.dialog.ConflictsResolveDialog.OnConflictDecisionMadeListener;
-import com.owncloud.android.utils.DisplayUtils;
-
-import android.app.ActionBar;
-import android.content.Intent;
-import android.os.Bundle;
/**
* Wrapper activity which will be launched if keep-in-sync file will be modified by external
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- ActionBar actionBar = getActionBar();
- actionBar.setIcon(DisplayUtils.getSeasonalIconId());
}
@Override
import android.os.Bundle;
import android.os.Handler;
import android.os.IBinder;
-import android.support.v4.app.ActionBarDrawerToggle;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentTransaction;
import android.support.v4.view.GravityCompat;
import android.support.v4.widget.DrawerLayout;
import android.support.v7.app.ActionBar;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.ActionBarDrawerToggle;
+import android.support.v7.app.AppCompatActivity;
import android.view.View;
import android.widget.AdapterView;
-import android.widget.LinearLayout;
import android.widget.ListView;
+import android.widget.RelativeLayout;
import android.widget.Toast;
import com.owncloud.android.BuildConfig;
import com.owncloud.android.ui.adapter.NavigationDrawerListAdapter;
import com.owncloud.android.ui.dialog.LoadingDialog;
import com.owncloud.android.ui.dialog.SharePasswordDialogFragment;
-import com.owncloud.android.ui.fragment.FileDetailFragment;
-import com.owncloud.android.ui.fragment.FileFragment;
import com.owncloud.android.utils.ErrorMessageAdapter;
import java.util.ArrayList;
* Activity with common behaviour for activities handling {@link OCFile}s in ownCloud
* {@link Account}s .
*/
-public class FileActivity extends ActionBarActivity
+public class FileActivity extends AppCompatActivity
implements OnRemoteOperationListener, ComponentsGetter {
public static final String EXTRA_FILE = "com.owncloud.android.ui.activity.FILE";
// Sync the toggle state after onRestoreInstanceState has occurred.
if (mDrawerToggle != null) {
mDrawerToggle.syncState();
- if (mDrawerLayout.isDrawerOpen(GravityCompat.START)) {
+ if (isDrawerOpen()) {
getSupportActionBar().setTitle(R.string.app_name);
mDrawerToggle.setDrawerIndicatorEnabled(true);
}
}
}
+ @Override
+ public void onBackPressed() {
+ if (isDrawerOpen()) {
+ closeNavDrawer();
+ return;
+ }
+ super.onBackPressed();
+ }
+
+ public boolean isDrawerOpen() {
+ return mDrawerLayout.isDrawerOpen(GravityCompat.START);
+ }
+
+ public void closeNavDrawer() {
+ mDrawerLayout.closeDrawer(GravityCompat.START);
+ }
+
protected void initDrawer(){
// constant settings for action bar when navigation drawer is inited
getSupportActionBar().setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD);
mDrawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
// Notification Drawer
- LinearLayout navigationDrawerLayout = (LinearLayout) findViewById(R.id.left_drawer);
+ RelativeLayout navigationDrawerLayout = (RelativeLayout) findViewById(R.id.left_drawer);
mDrawerList = (ListView) navigationDrawerLayout.findViewById(R.id.drawer_list);
// TODO re-enable when "Accounts" is available in Navigation Drawer
// mDrawerItems.add(new NavigationDrawerItem(mDrawerTitles[0],
// mDrawerContentDescriptions[0]));
// All Files
- mDrawerItems.add(new NavigationDrawerItem(mDrawerTitles[0], mDrawerContentDescriptions[0]));
+ mDrawerItems.add(new NavigationDrawerItem(mDrawerTitles[0], mDrawerContentDescriptions[0],
+ R.drawable.ic_folder_open));
// TODO Enable when "On Device" is recovered
// On Device
// mDrawerContentDescriptions[2]));
// Settings
- mDrawerItems.add(new NavigationDrawerItem(mDrawerTitles[1], mDrawerContentDescriptions[1]));
+ mDrawerItems.add(new NavigationDrawerItem(mDrawerTitles[1], mDrawerContentDescriptions[1],
+ R.drawable.ic_settings));
// Logs
if (BuildConfig.DEBUG) {
mDrawerItems.add(new NavigationDrawerItem(mDrawerTitles[2],
- mDrawerContentDescriptions[2]));
+ mDrawerContentDescriptions[2],R.drawable.ic_log));
}
// setting the nav drawer list adapter
mDrawerItems);
mDrawerList.setAdapter(mNavigationDrawerAdapter);
- mDrawerToggle = new ActionBarDrawerToggle(
- this,
- mDrawerLayout,
- R.drawable.ic_drawer,
- R.string.app_name,
- R.string.drawer_close) {
+
+ mDrawerToggle = new ActionBarDrawerToggle(this, mDrawerLayout,R.string.drawer_open,R.string.drawer_close) {
/** Called when a drawer has settled in a completely closed state. */
public void onDrawerClosed(View view) {
invalidateOptionsMenu();
}
};
-
- //mDrawerToggle.setDrawerIndicatorEnabled(true);
+
// Set the list's click listener
mDrawerList.setOnItemClickListener(new DrawerItemClickListener());
// Set the drawer toggle as the DrawerListener
mDrawerLayout.setDrawerListener(mDrawerToggle);
+
}
/**
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
-import android.view.Window;
+import android.widget.ProgressBar;
import android.widget.Toast;
import com.owncloud.android.MainApp;
private boolean mDualPane;
private View mLeftFragmentContainer;
private View mRightFragmentContainer;
+ private ProgressBar mProgressBar;
private static final String KEY_WAITING_TO_PREVIEW = "WAITING_TO_PREVIEW";
private static final String KEY_SYNC_IN_PROGRESS = "SYNC_IN_PROGRESS";
@Override
protected void onCreate(Bundle savedInstanceState) {
Log_OC.v(TAG, "onCreate() start");
- requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
+ //requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
super.onCreate(savedInstanceState); // this calls onAccountChanged() when ownCloud Account
// is valid
// Navigation Drawer
initDrawer();
+ mProgressBar = (ProgressBar) findViewById(R.id.progressBar);
+
mDualPane = getResources().getBoolean(R.bool.large_land_layout);
mLeftFragmentContainer = findViewById(R.id.left_fragment_container);
mRightFragmentContainer = findViewById(R.id.right_fragment_container);
// according to the official
// documentation
- setSupportProgressBarIndeterminateVisibility(mSyncInProgress
- /*|| mRefreshSharesInProgress*/);
+ // enable ActionBar app icon to behave as action to toggle nav drawer
+ //getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+ getSupportActionBar().setHomeButtonEnabled(true);
+
+ mProgressBar.setVisibility((mSyncInProgress) ? View.VISIBLE : View.INVISIBLE);
+ //setSupportProgressBarIndeterminateVisibility(mSyncInProgress
+ /*|| mRefreshSharesInProgress*/ //);
// always AFTER setContentView(...) ; to work around bug in its implementation
+
+ initDrawer();
setBackgroundText();
protected void onStart() {
Log_OC.v(TAG, "onStart() start");
super.onStart();
- getSupportActionBar().setIcon(DisplayUtils.getSeasonalIconId());
Log_OC.v(TAG, "onStart() end");
}
@Override
public void onBackPressed() {
- OCFileListFragment listOfFiles = getListOfFilesFragment();
- if (mDualPane || getSecondFragment() == null) {
- OCFile currentDir = getCurrentDir();
- if (currentDir == null || currentDir.getParentId() == FileDataStorageManager.ROOT_PARENT_ID) {
- finish();
- return;
+ if (!isDrawerOpen()){
+ OCFileListFragment listOfFiles = getListOfFilesFragment();
+ if (mDualPane || getSecondFragment() == null) {
+ OCFile currentDir = getCurrentDir();
+ if (currentDir == null || currentDir.getParentId() == FileDataStorageManager.ROOT_PARENT_ID) {
+ finish();
+ return;
+ }
+ if (listOfFiles != null) { // should never be null, indeed
+ listOfFiles.onBrowseUp();
+ }
}
if (listOfFiles != null) { // should never be null, indeed
- listOfFiles.onBrowseUp();
+ setFile(listOfFiles.getCurrentFile());
}
+ cleanSecondFragment();
+ } else {
+ super.onBackPressed();
}
- if (listOfFiles != null) { // should never be null, indeed
- setFile(listOfFiles.getCurrentFile());
- }
- cleanSecondFragment();
-
}
@Override
}
removeStickyBroadcast(intent);
Log_OC.d(TAG, "Setting progress visibility to " + mSyncInProgress);
- setSupportProgressBarIndeterminateVisibility(mSyncInProgress
- /*|| mRefreshSharesInProgress*/);
+ mProgressBar.setVisibility((mSyncInProgress) ? View.VISIBLE : View.INVISIBLE);
+ //setSupportProgressBarIndeterminateVisibility(mSyncInProgress
+ /*|| mRefreshSharesInProgress*/ //);
setBackgroundText();
startImagePreview(getFile());
} // TODO what about other kind of previews?
}
-
+
+ //setSupportProgressBarIndeterminate(false);
+ mProgressBar.setVisibility(View.INVISIBLE);
+
} finally {
if (intent != null) {
removeStickyBroadcast(intent);
}
-
@Override
protected ServiceConnection newTransferenceServiceConnection() {
return new ListServiceConnection();
getApplicationContext()
);
synchFolderOp.execute(getAccount(), MainApp.getAppContext(), this, null, null);
-
- setSupportProgressBarIndeterminateVisibility(true);
+
+ mProgressBar.setVisibility(View.VISIBLE);
+ //setSupportProgressBarIndeterminateVisibility(true);
setBackgroundText();
}
import com.owncloud.android.ui.dialog.CreateFolderDialogFragment;
import com.owncloud.android.ui.fragment.FileFragment;
import com.owncloud.android.ui.fragment.OCFileListFragment;
-import com.owncloud.android.utils.DisplayUtils;
import com.owncloud.android.utils.ErrorMessageAdapter;
public class FolderPickerActivity extends FileActivity implements FileFragment.ContainerActivity,
@Override
protected void onStart() {
super.onStart();
- getSupportActionBar().setIcon(DisplayUtils.getSeasonalIconId());
}
/**
} else {
listView.setVisibility(View.GONE);
}
-
- ActionBar actionBar = getSupportActionBar();
- actionBar.setIcon(DisplayUtils.getSeasonalIconId());
}
public class ExplanationListAdapterView extends ArrayAdapter<String> {
setContentView(R.layout.log_send_file);
setTitle(getText(R.string.actionbar_logger));
- ActionBar actionBar = getSupportActionBar();
- actionBar.setIcon(DisplayUtils.getSeasonalIconId());
- actionBar.setDisplayHomeAsUpEnabled(true);
+ getSupportActionBar().setDisplayHomeAsUpEnabled(true);
Button deleteHistoryButton = (Button) findViewById(R.id.deleteLogHistoryButton);
Button sendHistoryButton = (Button) findViewById(R.id.sendLogHistoryButton);
TextView logTV = (TextView) findViewById(R.id.logTV);
}
setTextListeners();
-
- ActionBar actionBar = getSupportActionBar();
- actionBar.setIcon(DisplayUtils.getSeasonalIconId());
}
import android.content.SharedPreferences;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.res.Configuration;
import android.net.Uri;
-import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.os.IBinder;
import android.preference.PreferenceActivity;
import android.preference.PreferenceCategory;
import android.preference.PreferenceManager;
-//import android.support.v7.app.ActionBar;
-import android.app.ActionBar;
+import android.support.annotation.LayoutRes;
+import android.support.annotation.Nullable;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatDelegate;
+import android.support.v7.widget.Toolbar;
import android.view.ContextMenu;
import android.view.ContextMenu.ContextMenuInfo;
import android.view.Menu;
+import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
+import android.view.ViewGroup;
import android.widget.AdapterView;
import android.widget.AdapterView.OnItemLongClickListener;
import android.widget.ListAdapter;
/**
* An Activity that allows the user to change the application's settings.
+ *
+ * It proxies the necessary calls via {@link android.support.v7.app.AppCompatDelegate} to be used
+ * with AppCompat.
*/
public class Preferences extends PreferenceActivity
implements AccountManagerCallback<Boolean>, ComponentsGetter {
private DbHandler mDbHandler;
private CheckBoxPreference pCode;
private Preference pAboutApp;
+ private AppCompatDelegate mDelegate;
private PreferenceCategory mAccountsPrefCategory = null;
private final Handler mHandler = new Handler();
@SuppressWarnings("deprecation")
@Override
public void onCreate(Bundle savedInstanceState) {
+ getDelegate().installViewFactory();
+ getDelegate().onCreate(savedInstanceState);
super.onCreate(savedInstanceState);
mDbHandler = new DbHandler(getBaseContext());
addPreferencesFromResource(R.xml.preferences);
- // Set properties of Action Bar in an ugly workaround to build correctly without
- // upgrading minSdk
- // TODO : increase minSdk; scheduled for next realease, don't wont to mix with this US
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
- ActionBar actionBar = getActionBar();
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
- actionBar.setIcon(DisplayUtils.getSeasonalIconId());
- }
- actionBar.setDisplayHomeAsUpEnabled(true);
- actionBar.setTitle(R.string.actionbar_settings);
- } else {
- setTitle(R.string.actionbar_settings);
- }
+ ActionBar actionBar = getSupportActionBar();
+ actionBar.setDisplayHomeAsUpEnabled(true);
+ actionBar.setTitle(R.string.actionbar_settings);
// For adding content description tag to a title field in the action bar
int actionBarTitleId = getResources().getIdentifier("action_bar_title", "id", "android");
}
}
+ public ActionBar getSupportActionBar() {
+ return getDelegate().getSupportActionBar();
+ }
+
+ public void setSupportActionBar(@Nullable Toolbar toolbar) {
+ getDelegate().setSupportActionBar(toolbar);
+ }
+
+ @Override
+ public MenuInflater getMenuInflater() {
+ return getDelegate().getMenuInflater();
+ }
+
+ @Override
+ public void setContentView(@LayoutRes int layoutResID) {
+ getDelegate().setContentView(layoutResID);
+ }
+ @Override
+ public void setContentView(View view) {
+ getDelegate().setContentView(view);
+ }
+ @Override
+ public void setContentView(View view, ViewGroup.LayoutParams params) {
+ getDelegate().setContentView(view, params);
+ }
+
+ @Override
+ public void addContentView(View view, ViewGroup.LayoutParams params) {
+ getDelegate().addContentView(view, params);
+ }
+
+ @Override
+ protected void onPostResume() {
+ super.onPostResume();
+ getDelegate().onPostResume();
+ }
+
+ @Override
+ protected void onTitleChanged(CharSequence title, int color) {
+ super.onTitleChanged(title, color);
+ getDelegate().setTitle(title);
+ }
+
+ @Override
+ public void onConfigurationChanged(Configuration newConfig) {
+ super.onConfigurationChanged(newConfig);
+ getDelegate().onConfigurationChanged(newConfig);
+ }
+
+ @Override
+ protected void onPostCreate(Bundle savedInstanceState) {
+ super.onPostCreate(savedInstanceState);
+ getDelegate().onPostCreate(savedInstanceState);
+ }
+
@Override
protected void onDestroy() {
mDbHandler.close();
}
super.onDestroy();
+ getDelegate().onDestroy();
+ }
+
+ @Override
+ protected void onStop() {
+ super.onStop();
+ getDelegate().onStop();
+ }
+
+ public void invalidateOptionsMenu() {
+ getDelegate().invalidateOptionsMenu();
+ }
+
+ private AppCompatDelegate getDelegate() {
+ if (mDelegate == null) {
+ mDelegate = AppCompatDelegate.create(this, null);
+ }
+ return mDelegate;
}
/**
// Action bar setup
ActionBar actionBar = getSupportActionBar();
- actionBar.setIcon(DisplayUtils.getSeasonalIconId());
actionBar.setHomeButtonEnabled(true); // mandatory since Android ICS, according to the
// official documentation
actionBar.setDisplayHomeAsUpEnabled(mCurrentDir != null && mCurrentDir.getName() != null);
if (mAccountSelected) {
setAccount((Account) savedInstanceState.getParcelable(FileActivity.EXTRA_ACCOUNT));
}
-
-
- ActionBar actionBar = getSupportActionBar();
- actionBar.setIcon(DisplayUtils.getSeasonalIconId());
-
}
@Override
import android.view.View;
import android.view.ViewGroup;
import android.widget.BaseAdapter;
+import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
NavigationDrawerItem navItem = (NavigationDrawerItem) mAll.get(position);
View view = inflator.inflate(R.layout.drawer_list_item, null);
- view.setMinimumHeight(40);
+
LinearLayout itemLayout = (LinearLayout) view.findViewById(R.id.itemLayout);
itemLayout.setContentDescription(navItem.getContentDescription());
+
TextView itemText = (TextView) view.findViewById(R.id.itemTitle);
itemText.setText(navItem.getTitle());
+ if(navItem.getIcon()!=0) {
+ ImageView itemImage = (ImageView) view.findViewById(R.id.itemIcon);
+ itemImage.setImageResource(navItem.getIcon());
+ }
+
return view;
}
// TODO re-enable when "Accounts" is available in Navigation Drawer
import android.support.v4.app.DialogFragment;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentTransaction;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
import com.owncloud.android.R;
import com.owncloud.android.utils.DisplayUtils;
.create();
}
- public void showDialog(ActionBarActivity activity) {
+ public void showDialog(AppCompatActivity activity) {
Fragment prev = activity.getSupportFragmentManager().findFragmentByTag("dialog");
FragmentTransaction ft = activity.getSupportFragmentManager().beginTransaction();
if (prev != null) {
this.show(ft, "dialog");
}
- public void dismissDialog(ActionBarActivity activity) {
+ public void dismissDialog(AppCompatActivity activity) {
Fragment prev = activity.getSupportFragmentManager().findFragmentByTag(getTag());
if (prev != null) {
FragmentTransaction ft = activity.getSupportFragmentManager().beginTransaction();
projects / pub / Android / ownCloud.git / commitdiff
