use view instead of dialog about no setup account

diff --git a/res/layout/files.xml b/res/layout/files.xml
index 3ff6012..9f868ca 100644 (file)
--- a/res/layout/files.xml
+++ b/res/layout/files.xml
@@ -20,7 +20,8 @@
     android:layout_width="fill_parent"\r
     android:layout_height="fill_parent"\r
     android:background="@color/owncloud_white"\r
     android:layout_width="fill_parent"\r
     android:layout_height="fill_parent"\r
     android:background="@color/owncloud_white"\r

-    android:orientation="vertical" >\r
+    android:orientation="vertical"\r
+    android:id="@+id/file_list_view">\r

 \r
     <fragment\r
         android:id="@+id/fileList"\r
 \r
     <fragment\r
         android:id="@+id/fileList"\r

diff --git a/res/layout/no_account_available.xml b/res/layout/no_account_available.xml
new file mode 100644 (file)
index 0000000..745a606
--- /dev/null
+++ b/res/layout/no_account_available.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" android:gravity="center_vertical|center_horizontal">
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:orientation="vertical" android:gravity="center_vertical|center_horizontal">
+
+        <TextView
+            android:id="@+id/textView1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginLeft="3dp"
+            android:layout_marginRight="3dp"
+            android:gravity="center"
+            android:text="@string/main_wrn_accsetup"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <Button
+            android:id="@+id/setup_account"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text="@string/main_tit_accsetup" />
+
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4eb8c62..e7bd45f 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -12,7 +12,7 @@
     <string name="main_calendar">Calendar</string>
     <string name="main_bookmarks">Bookmarks</string>
     <string name="main_settings">Settings</string>
     <string name="main_calendar">Calendar</string>
     <string name="main_bookmarks">Bookmarks</string>
     <string name="main_settings">Settings</string>

-    <string name="main_tit_accsetup">Account Setup</string>
+    <string name="main_tit_accsetup">Setup Account</string>

     <string name="main_wrn_accsetup">There are no ownCloud accounts on your device. In order to use this App, you need to create one.</string>
     
     <string name="actionbar_sync">Sync account</string>
     <string name="main_wrn_accsetup">There are no ownCloud accounts on your device. In order to use this App, you need to create one.</string>
     
     <string name="actionbar_sync">Sync account</string>

diff --git a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
index 93cf649..28749a5 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
@@ -42,6 +42,7 @@ import android.util.Log;
 import android.view.View;\r
 import android.view.ViewGroup;\r
 import android.widget.ArrayAdapter;\r
 import android.view.View;\r
 import android.view.ViewGroup;\r
 import android.widget.ArrayAdapter;\r

+import android.widget.CheckedTextView;\r

 import android.widget.EditText;\r
 import android.widget.TextView;\r
 \r
 import android.widget.EditText;\r
 import android.widget.TextView;\r
 \r


@@ -73,7 +74,7 @@ import eu.alefzero.webdav.WebdavClient;
  */\r
 \r
 public class FileDisplayActivity extends SherlockFragmentActivity implements\r
  */\r
 \r
 public class FileDisplayActivity extends SherlockFragmentActivity implements\r

-        OnNavigationListener, OnClickListener {\r
+        OnNavigationListener, OnClickListener, android.view.View.OnClickListener {\r

     private ArrayAdapter<String> mDirectories;\r
     private DataStorageManager mStorageManager;\r
     private FileListFragment mFileList;\r
     private ArrayAdapter<String> mDirectories;\r
     private DataStorageManager mStorageManager;\r
     private FileListFragment mFileList;\r


@@ -93,19 +94,12 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     public void onCreate(Bundle savedInstanceState) {\r
         super.onCreate(savedInstanceState);\r
 \r
     public void onCreate(Bundle savedInstanceState) {\r
         super.onCreate(savedInstanceState);\r
 \r

-        if (!accountsAreSetup()) {\r
-            showDialog(DIALOG_SETUP_ACCOUNT);\r
-            return;\r
-        }\r
-\r

         requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);\r
         setProgressBarIndeterminateVisibility(false);\r
         \r
         if(savedInstanceState != null){\r
             mCurrentDir = (OCFile) savedInstanceState.getParcelable(KEY_CURRENT_DIR);\r
         }\r
         requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);\r
         setProgressBarIndeterminateVisibility(false);\r
         \r
         if(savedInstanceState != null){\r
             mCurrentDir = (OCFile) savedInstanceState.getParcelable(KEY_CURRENT_DIR);\r
         }\r

-        \r
-        setContentView(R.layout.files);\r

     }\r
 \r
     @Override\r
     }\r
 \r
     @Override\r


@@ -209,7 +203,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
 \r
     @Override\r
     public void onBackPressed() {\r
 \r
     @Override\r
     public void onBackPressed() {\r

-        if (mDirectories.getCount() == 1) {\r
+        if (mDirectories == null || mDirectories.getCount() == 1) {\r

             finish();\r
             return;\r
         }\r
             finish();\r
             return;\r
         }\r


@@ -226,10 +220,6 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     @Override\r
     protected void onRestoreInstanceState(Bundle savedInstanceState) {\r
         super.onRestoreInstanceState(savedInstanceState);\r
     @Override\r
     protected void onRestoreInstanceState(Bundle savedInstanceState) {\r
         super.onRestoreInstanceState(savedInstanceState);\r

-        // Check, if there are ownCloud accounts\r
-        if (!accountsAreSetup()) {\r
-            showDialog(DIALOG_SETUP_ACCOUNT);\r
-        }\r

         mDirs = savedInstanceState.getStringArray(KEY_DIR_ARRAY);\r
         mDirectories = new CustomArrayAdapter<String>(this, R.layout.sherlock_spinner_dropdown_item);\r
         mDirectories.add("/");\r
         mDirs = savedInstanceState.getStringArray(KEY_DIR_ARRAY);\r
         mDirectories = new CustomArrayAdapter<String>(this, R.layout.sherlock_spinner_dropdown_item);\r
         mDirectories.add("/");\r


@@ -241,7 +231,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     @Override\r
     protected void onSaveInstanceState(Bundle outState) {\r
         super.onSaveInstanceState(outState);\r
     @Override\r
     protected void onSaveInstanceState(Bundle outState) {\r
         super.onSaveInstanceState(outState);\r

-        if(mDirectories != null){\r
+        if(mDirectories != null && mDirectories.getCount() != 0){\r

             mDirs = new String[mDirectories.getCount()-1];\r
             for (int j = mDirectories.getCount() - 2, i = 0; j >= 0; --j, ++i) {\r
                 mDirs[i] = mDirectories.getItem(j);\r
             mDirs = new String[mDirectories.getCount()-1];\r
             for (int j = mDirectories.getCount() - 2, i = 0; j >= 0; --j, ++i) {\r
                 mDirs[i] = mDirectories.getItem(j);\r


@@ -257,8 +247,13 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         \r
         //TODO: Dialog useless -> get rid of this\r
         if (!accountsAreSetup()) {\r
         \r
         //TODO: Dialog useless -> get rid of this\r
         if (!accountsAreSetup()) {\r

-            showDialog(DIALOG_SETUP_ACCOUNT);\r
+            setContentView(R.layout.no_account_available);\r
+            setProgressBarIndeterminateVisibility(false);\r
+            getSupportActionBar().setNavigationMode(ActionBar.DISPLAY_SHOW_TITLE);\r
+            findViewById(R.id.setup_account).setOnClickListener(this);\r

             return;\r
             return;\r

+        } else if (findViewById(R.id.file_list_view) == null) {\r
+            setContentView(R.layout.files);\r

         }\r
 \r
         // Listen for sync messages\r
         }\r
 \r
         // Listen for sync messages\r


@@ -324,7 +319,6 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             action_bar.setDisplayHomeAsUpEnabled(false);\r
         }\r
         \r
             action_bar.setDisplayHomeAsUpEnabled(false);\r
         }\r
         \r

-        \r

         // List dir here\r
         mFileList.listDirectory(mCurrentDir);\r
     }\r
         // List dir here\r
         mFileList.listDirectory(mCurrentDir);\r
     }\r


@@ -558,4 +552,13 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
 \r
     }\r
 \r
 \r
     }\r
 \r

+    @Override\r
+    public void onClick(View v) {\r
+        if (v.getId() == R.id.setup_account) {\r
+            Intent intent = new Intent("android.settings.ADD_ACCOUNT_SETTINGS");\r
+            intent.putExtra("authorities", new String[] { AccountAuthenticator.AUTH_TOKEN_TYPE });\r
+            startActivity(intent);\r
+        }\r
+    }\r
+\r

 }\r
 }\r