From 30734a940441538528af4b383b90105413ed02bf Mon Sep 17 00:00:00 2001
From: Lennart Rosam <lennart@familie-rosam.de>
Date: Sun, 22 Jan 2012 19:05:47 +0100
Subject: [PATCH] Heavy refactoring: Moved UI things to UI packages

---
 AndroidManifest.xml                                      | 16 ++++++++--------
 res/layout/main.xml                                      |  4 ++--
 res/values/strings.xml                                   |  7 +++++++
 src/eu/alefzero/owncloud/FileDownloader.java             |  3 ++-
 .../owncloud/authenticator/AccountAuthenticator.java     |  1 +
 src/eu/alefzero/owncloud/authenticator/AuthUtils.java    |  2 ++
 .../{authenticator => ui}/AuthenticatorActivity.java     |  4 +++-
 .../alefzero/owncloud/{ => ui}/FileDetailActivity.java   |  6 +++++-
 .../{MainScreen.java => ui/FileDisplayActivity.java}     | 14 +++++++++++---
 src/eu/alefzero/owncloud/{ => ui}/Preferences.java       |  9 ++++++++-
 .../owncloud/{ => ui}/PreferencesNewSession.java         |  2 +-
 .../{ => ui/adapter}/FileListActionListAdapter.java      |  6 +++++-
 .../owncloud/{ => ui/adapter}/FileListListAdapter.java   |  7 ++++++-
 .../alefzero/owncloud/ui/{ => fragment}/ActionBar.java   |  2 +-
 src/eu/alefzero/owncloud/{ => ui/fragment}/FileList.java |  7 ++++++-
 15 files changed, 68 insertions(+), 22 deletions(-)
 rename src/eu/alefzero/owncloud/{authenticator => ui}/AuthenticatorActivity.java (97%)
 rename src/eu/alefzero/owncloud/{ => ui}/FileDetailActivity.java (79%)
 rename src/eu/alefzero/owncloud/{MainScreen.java => ui/FileDisplayActivity.java} (96%)
 rename src/eu/alefzero/owncloud/{ => ui}/Preferences.java (94%)
 rename src/eu/alefzero/owncloud/{ => ui}/PreferencesNewSession.java (99%)
 rename src/eu/alefzero/owncloud/{ => ui/adapter}/FileListActionListAdapter.java (96%)
 rename src/eu/alefzero/owncloud/{ => ui/adapter}/FileListListAdapter.java (92%)
 rename src/eu/alefzero/owncloud/ui/{ => fragment}/ActionBar.java (94%)
 rename src/eu/alefzero/owncloud/{ => ui/fragment}/FileList.java (89%)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 1d6c69cc..8dd03ade 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -25,9 +25,9 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"></uses-permission>
 
     <application android:icon="@drawable/icon" android:label="@string/app_name">
-        <activity android:name=".MainScreen"
+        <activity android:name=".ui.FileDisplayActivity"
                   android:label="@string/app_name">
-            <intent-filter>
+                  <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
@@ -44,8 +44,8 @@
                 <data android:mimeType="*/*"></data>
             </intent-filter>
         </activity>
-        <activity android:name="Preferences"></activity>
-        <activity android:name="PreferencesNewSession">
+        <activity android:name=".ui.Preferences"></activity>
+        <activity android:name=".ui.PreferencesNewSession">
         </activity>
                 <service
             android:exported="true" android:name=".authenticator.AccountAuthenticatorService">
@@ -66,10 +66,10 @@
                 android:name="android.content.SyncAdapter"
                 android:resource="@xml/syncadapter_files"/>
         </service>
-         <provider android:name="cp" android:enabled="true" android:syncable="true" android:exported="false" android:authorities="org.owncloud" android:label="@string/sync_string_files"></provider>
-         <activity android:name=".authenticator.AuthenticatorActivity"></activity>
-         <service android:name="FileDownloader">
+         <provider android:name=".cp" android:enabled="true" android:syncable="true" android:exported="false" android:authorities="org.owncloud" android:label="@string/sync_string_files"></provider>
+         <activity android:name=".ui.AuthenticatorActivity"></activity>
+         <service android:name=".FileDownloader">
          </service>
-         <activity android:name="FileDetailActivity"></activity>
+         <activity android:name=".ui.FileDetailActivity"></activity>
     </application>
 </manifest>
\ No newline at end of file
diff --git a/res/layout/main.xml b/res/layout/main.xml
index 378b7777..cddcacb1 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -15,7 +15,7 @@
             android:id="@+id/actionBar"
             android:layout_height="wrap_content"
             android:layout_width="fill_parent"
-            class="eu.alefzero.owncloud.ui.ActionBar">
+            class="eu.alefzero.owncloud.ui.fragment.ActionBar">
             <!-- Preview: layout=@layout/action_bar -->
         </fragment>
 
@@ -29,7 +29,7 @@
                 android:layout_width="0dp"
                 android:layout_height="fill_parent"
                 android:layout_weight="1"
-                class="eu.alefzero.owncloud.FileList" >
+                class="eu.alefzero.owncloud.ui.fragment.FileList" >
 
                 <!-- Preview: layout=@layout/list_layout -->
             </fragment>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 57c58a83..fb2bae7e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5,6 +5,13 @@
     <string name="main_password">Password:</string>
     <string name="main_login">Username:</string>
     <string name="main_button_login">Login</string>
+    <string name="main_welcome">Welcome to your ownCloud</string>
+    <string name="main_files">Files</string>
+    <string name="main_music">Music</string>
+    <string name="main_contacts">Contacts</string>
+    <string name="main_calendar">Calendar</string>
+    <string name="main_bookmarks">Bookmarks</string>
+    <string name="main_settings">Settings</string>
     <string name="prefs_general">General</string>
     <string name="prefs_sessions">Stored sessions</string>
     <string name="prefs_add_session">Add new session</string>
diff --git a/src/eu/alefzero/owncloud/FileDownloader.java b/src/eu/alefzero/owncloud/FileDownloader.java
index 9e4ab76e..7d3605e4 100644
--- a/src/eu/alefzero/owncloud/FileDownloader.java
+++ b/src/eu/alefzero/owncloud/FileDownloader.java
@@ -14,6 +14,7 @@ import android.os.Environment;
 import android.os.IBinder;
 import android.util.Log;
 import eu.alefzero.owncloud.authenticator.AccountAuthenticator;
+import eu.alefzero.owncloud.ui.FileDisplayActivity;
 
 public class FileDownloader extends Service {
   static final String EXTRA_ACCOUNT = "ACCOUNT";
@@ -57,7 +58,7 @@ public class FileDownloader extends Service {
     wdc.allowUnsignedCertificates();
 
     Notification n = new Notification(R.drawable.icon, "Downloading file", System.currentTimeMillis());
-    PendingIntent pi = PendingIntent.getActivity(this, 1, new Intent(this, MainScreen.class), 0);
+    PendingIntent pi = PendingIntent.getActivity(this, 1, new Intent(this, FileDisplayActivity.class), 0);
     n.setLatestEventInfo(this, "A", "B", pi);
     nm.notify(1, n);
 
diff --git a/src/eu/alefzero/owncloud/authenticator/AccountAuthenticator.java b/src/eu/alefzero/owncloud/authenticator/AccountAuthenticator.java
index 59ea5feb..e4b118c5 100644
--- a/src/eu/alefzero/owncloud/authenticator/AccountAuthenticator.java
+++ b/src/eu/alefzero/owncloud/authenticator/AccountAuthenticator.java
@@ -1,5 +1,6 @@
 package eu.alefzero.owncloud.authenticator;
 
+import eu.alefzero.owncloud.ui.AuthenticatorActivity;
 import android.accounts.*;
 import android.content.Context;
 import android.content.Intent;
diff --git a/src/eu/alefzero/owncloud/authenticator/AuthUtils.java b/src/eu/alefzero/owncloud/authenticator/AuthUtils.java
index c5068868..e444824a 100644
--- a/src/eu/alefzero/owncloud/authenticator/AuthUtils.java
+++ b/src/eu/alefzero/owncloud/authenticator/AuthUtils.java
@@ -66,6 +66,8 @@ import org.apache.http.params.HttpParams;
 import org.apache.http.params.HttpProtocolParams;
 import org.apache.http.protocol.BasicHttpContext;
 
+import eu.alefzero.owncloud.ui.AuthenticatorActivity;
+
 
 import android.content.Context;
 import android.os.Handler;
diff --git a/src/eu/alefzero/owncloud/authenticator/AuthenticatorActivity.java b/src/eu/alefzero/owncloud/ui/AuthenticatorActivity.java
similarity index 97%
rename from src/eu/alefzero/owncloud/authenticator/AuthenticatorActivity.java
rename to src/eu/alefzero/owncloud/ui/AuthenticatorActivity.java
index f292b2cc..a9121609 100644
--- a/src/eu/alefzero/owncloud/authenticator/AuthenticatorActivity.java
+++ b/src/eu/alefzero/owncloud/ui/AuthenticatorActivity.java
@@ -16,7 +16,7 @@
  *
  */
 
-package eu.alefzero.owncloud.authenticator;
+package eu.alefzero.owncloud.ui;
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -38,6 +38,8 @@ import android.view.Window;
 import android.widget.TextView;
 import android.widget.Toast;
 import eu.alefzero.owncloud.R;
+import eu.alefzero.owncloud.authenticator.AccountAuthenticator;
+import eu.alefzero.owncloud.authenticator.AuthUtils;
 import eu.alefzero.owncloud.db.ProviderMeta.ProviderTableMeta;
 
 public class AuthenticatorActivity extends AccountAuthenticatorActivity {
diff --git a/src/eu/alefzero/owncloud/FileDetailActivity.java b/src/eu/alefzero/owncloud/ui/FileDetailActivity.java
similarity index 79%
rename from src/eu/alefzero/owncloud/FileDetailActivity.java
rename to src/eu/alefzero/owncloud/ui/FileDetailActivity.java
index c0e0147b..45026fa5 100644
--- a/src/eu/alefzero/owncloud/FileDetailActivity.java
+++ b/src/eu/alefzero/owncloud/ui/FileDetailActivity.java
@@ -1,5 +1,9 @@
-package eu.alefzero.owncloud;
+package eu.alefzero.owncloud.ui;
 
+import eu.alefzero.owncloud.FileDetail;
+import eu.alefzero.owncloud.R;
+import eu.alefzero.owncloud.R.id;
+import eu.alefzero.owncloud.R.layout;
 import android.app.Activity;
 import android.content.res.Configuration;
 import android.os.Bundle;
diff --git a/src/eu/alefzero/owncloud/MainScreen.java b/src/eu/alefzero/owncloud/ui/FileDisplayActivity.java
similarity index 96%
rename from src/eu/alefzero/owncloud/MainScreen.java
rename to src/eu/alefzero/owncloud/ui/FileDisplayActivity.java
index 4ec6adc3..dd923937 100644
--- a/src/eu/alefzero/owncloud/MainScreen.java
+++ b/src/eu/alefzero/owncloud/ui/FileDisplayActivity.java
@@ -16,7 +16,7 @@
  *
  */
 
-package eu.alefzero.owncloud;
+package eu.alefzero.owncloud.ui;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -53,10 +53,18 @@ import android.view.Window;
 import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
+import eu.alefzero.owncloud.DbHandler;
+import eu.alefzero.owncloud.FileDetail;
+import eu.alefzero.owncloud.R;
+import eu.alefzero.owncloud.R.id;
+import eu.alefzero.owncloud.R.layout;
+import eu.alefzero.owncloud.R.menu;
+import eu.alefzero.owncloud.R.string;
 import eu.alefzero.owncloud.authenticator.AccountAuthenticator;
 import eu.alefzero.owncloud.db.ProviderMeta.ProviderTableMeta;
+import eu.alefzero.owncloud.ui.fragment.FileList;
 
-public class MainScreen extends FragmentActivity {
+public class FileDisplayActivity extends FragmentActivity {
   private DbHandler mDBHandler;
   private Stack<String> mParents;
   private LinkedList<String> mPath;
@@ -166,7 +174,7 @@ public class MainScreen extends FragmentActivity {
     });
     builder.setOnCancelListener(new OnCancelListener() {
       public void onCancel(DialogInterface dialog) {
-        MainScreen.this.finish();
+        FileDisplayActivity.this.finish();
       }
     });
     AlertDialog alert = builder.create();
diff --git a/src/eu/alefzero/owncloud/Preferences.java b/src/eu/alefzero/owncloud/ui/Preferences.java
similarity index 94%
rename from src/eu/alefzero/owncloud/Preferences.java
rename to src/eu/alefzero/owncloud/ui/Preferences.java
index 9ca0e256..5dc260d5 100644
--- a/src/eu/alefzero/owncloud/Preferences.java
+++ b/src/eu/alefzero/owncloud/ui/Preferences.java
@@ -1,9 +1,16 @@
-package eu.alefzero.owncloud;
+package eu.alefzero.owncloud.ui;
 
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Vector;
 
+import eu.alefzero.owncloud.DbHandler;
+import eu.alefzero.owncloud.OwnCloudSession;
+import eu.alefzero.owncloud.R;
+import eu.alefzero.owncloud.R.id;
+import eu.alefzero.owncloud.R.menu;
+import eu.alefzero.owncloud.R.xml;
+
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
diff --git a/src/eu/alefzero/owncloud/PreferencesNewSession.java b/src/eu/alefzero/owncloud/ui/PreferencesNewSession.java
similarity index 99%
rename from src/eu/alefzero/owncloud/PreferencesNewSession.java
rename to src/eu/alefzero/owncloud/ui/PreferencesNewSession.java
index bb4a9c0c..9900abf9 100644
--- a/src/eu/alefzero/owncloud/PreferencesNewSession.java
+++ b/src/eu/alefzero/owncloud/ui/PreferencesNewSession.java
@@ -1,4 +1,4 @@
-package eu.alefzero.owncloud;
+package eu.alefzero.owncloud.ui;
 
 import java.net.URI;
 import java.net.URISyntaxException;
diff --git a/src/eu/alefzero/owncloud/FileListActionListAdapter.java b/src/eu/alefzero/owncloud/ui/adapter/FileListActionListAdapter.java
similarity index 96%
rename from src/eu/alefzero/owncloud/FileListActionListAdapter.java
rename to src/eu/alefzero/owncloud/ui/adapter/FileListActionListAdapter.java
index 212a6f28..5747a7bb 100644
--- a/src/eu/alefzero/owncloud/FileListActionListAdapter.java
+++ b/src/eu/alefzero/owncloud/ui/adapter/FileListActionListAdapter.java
@@ -16,10 +16,14 @@
  *
  */
 
-package eu.alefzero.owncloud;
+package eu.alefzero.owncloud.ui.adapter;
 
 import java.io.File;
 
+import eu.alefzero.owncloud.R;
+import eu.alefzero.owncloud.R.drawable;
+import eu.alefzero.owncloud.R.id;
+import eu.alefzero.owncloud.R.layout;
 import eu.alefzero.owncloud.authenticator.AccountAuthenticator;
 import eu.alefzero.owncloud.db.ProviderMeta.ProviderTableMeta;
 import android.accounts.Account;
diff --git a/src/eu/alefzero/owncloud/FileListListAdapter.java b/src/eu/alefzero/owncloud/ui/adapter/FileListListAdapter.java
similarity index 92%
rename from src/eu/alefzero/owncloud/FileListListAdapter.java
rename to src/eu/alefzero/owncloud/ui/adapter/FileListListAdapter.java
index 3b432fca..02f1db2c 100644
--- a/src/eu/alefzero/owncloud/FileListListAdapter.java
+++ b/src/eu/alefzero/owncloud/ui/adapter/FileListListAdapter.java
@@ -1,7 +1,12 @@
-package eu.alefzero.owncloud;
+package eu.alefzero.owncloud.ui.adapter;
 
 import java.security.Provider;
 
+import eu.alefzero.owncloud.DisplayUtils;
+import eu.alefzero.owncloud.R;
+import eu.alefzero.owncloud.R.drawable;
+import eu.alefzero.owncloud.R.id;
+import eu.alefzero.owncloud.R.layout;
 import eu.alefzero.owncloud.db.ProviderMeta;
 import eu.alefzero.owncloud.db.ProviderMeta.ProviderTableMeta;
 
diff --git a/src/eu/alefzero/owncloud/ui/ActionBar.java b/src/eu/alefzero/owncloud/ui/fragment/ActionBar.java
similarity index 94%
rename from src/eu/alefzero/owncloud/ui/ActionBar.java
rename to src/eu/alefzero/owncloud/ui/fragment/ActionBar.java
index c3b13bc1..95ddef8a 100644
--- a/src/eu/alefzero/owncloud/ui/ActionBar.java
+++ b/src/eu/alefzero/owncloud/ui/fragment/ActionBar.java
@@ -1,4 +1,4 @@
-package eu.alefzero.owncloud.ui;
+package eu.alefzero.owncloud.ui.fragment;
 
 import eu.alefzero.owncloud.R;
 import android.app.Activity;
diff --git a/src/eu/alefzero/owncloud/FileList.java b/src/eu/alefzero/owncloud/ui/fragment/FileList.java
similarity index 89%
rename from src/eu/alefzero/owncloud/FileList.java
rename to src/eu/alefzero/owncloud/ui/fragment/FileList.java
index 1f62b85a..a3e3a990 100644
--- a/src/eu/alefzero/owncloud/FileList.java
+++ b/src/eu/alefzero/owncloud/ui/fragment/FileList.java
@@ -1,7 +1,12 @@
-package eu.alefzero.owncloud;
+package eu.alefzero.owncloud.ui.fragment;
 
+import eu.alefzero.owncloud.FileDetail;
+import eu.alefzero.owncloud.R;
+import eu.alefzero.owncloud.R.id;
 import eu.alefzero.owncloud.authenticator.AccountAuthenticator;
 import eu.alefzero.owncloud.db.ProviderMeta.ProviderTableMeta;
+import eu.alefzero.owncloud.ui.FileDetailActivity;
+import eu.alefzero.owncloud.ui.adapter.FileListListAdapter;
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.app.Activity;
-- 
2.11.0