From 2db6151b21dabafdd05ab21a38fb3e601c6baae3 Mon Sep 17 00:00:00 2001
From: Dmitri Yuranov <d.yuranov@gmail.com>
Date: Fri, 25 Apr 2014 13:41:07 +0200
Subject: [PATCH] Directories manager, draft

---
 res/drawable/delete_icon.png                  | Bin 0 -> 4521 bytes
 res/drawable/delete_icon_pressed.png          | Bin 0 -> 4336 bytes
 res/drawable/selection_delete.xml             |   5 +
 res/layout/dir_list.xml                       |  21 +++
 res/layout/dir_manager.xml                    |  24 +--
 .../fbreader/DirectoriesManagerActivity.java  | 159 ++++++++++++++++--
 .../preferences/PreferenceActivity.java       |   2 +-
 .../fileChooser/FileChooserCollection.java    |   7 +-
 .../fileChooser/FileChooserPreference.java    |  24 ++-
 .../FileChooserStringListPreference.java      |  46 ++++-
 .../FileChooserStringPreference.java          |   8 +
 .../android/util/FileChooserUtil.java         |  13 +-
 12 files changed, 277 insertions(+), 32 deletions(-)
 create mode 100644 res/drawable/delete_icon.png
 create mode 100644 res/drawable/delete_icon_pressed.png
 create mode 100644 res/drawable/selection_delete.xml
 create mode 100644 res/layout/dir_list.xml

diff --git a/res/drawable/delete_icon.png b/res/drawable/delete_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..251b2ee645c6d305a0dc6e582a4e8039c225dcab
GIT binary patch
literal 4521
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
Hu0mjf2Jd(G

literal 0
HcmV?d00001

diff --git a/res/drawable/delete_icon_pressed.png b/res/drawable/delete_icon_pressed.png
new file mode 100644
index 0000000000000000000000000000000000000000..52392de84eb856009d47bfc1d672f6bc2ad7b131
GIT binary patch
literal 4336
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

literal 0
HcmV?d00001

diff --git a/res/drawable/selection_delete.xml b/res/drawable/selection_delete.xml
new file mode 100644
index 000000000..b369db4c9
--- /dev/null
+++ b/res/drawable/selection_delete.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:drawable="@drawable/delete_icon_pressed" />
+    <item android:drawable="@drawable/delete_icon" />
+</selector>
diff --git a/res/layout/dir_list.xml b/res/layout/dir_list.xml
new file mode 100644
index 000000000..06d77dbc6
--- /dev/null
+++ b/res/layout/dir_list.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_height="fill_parent"
+    android:layout_width="fill_parent"
+    
+	>
+	<ImageView
+		android:id="@+id/delete"
+		android:layout_height="wrap_content"
+		android:layout_width="wrap_content"
+		android:layout_alignParentRight="true"
+		android:src="@drawable/selection_delete"/>
+	
+	<TextView
+		android:id="@+id/title"
+		android:layout_height="wrap_content"
+		android:layout_width="match_parent"
+		android:padding="5dp"
+		android:layout_toLeftOf="@id/delete"
+		android:textSize="16dp"/>
+</RelativeLayout>
diff --git a/res/layout/dir_manager.xml b/res/layout/dir_manager.xml
index f88c4f9a5..fc9a51418 100644
--- a/res/layout/dir_manager.xml
+++ b/res/layout/dir_manager.xml
@@ -1,22 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_height="fill_parent"
+    android:layout_height="wrap_content"
     android:layout_width="fill_parent"
     >
-    <ListView
-        android:id="@+id/directories"
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:layout_alignParentTop="true"
-        />
-    <LinearLayout
+	<LinearLayout
         android:id="@+id/layout_action_buttons"
         android:layout_height="wrap_content"
         android:layout_width="match_parent"
-        android:layout_alignParentBottom="true"
-        android:layout_gravity="center_horizontal"
-        android:orientation="horizontal"        
-        >
+		android:layout_alignParentBottom="true"
+        android:orientation="horizontal">
            <Button
                 android:id="@+id/button_ok"
                 style="?android:attr/buttonBarButtonStyle"
@@ -36,4 +28,12 @@
                 android:text="Cancel"    
             />
     </LinearLayout>
+	<ListView
+		android:id="@+id/directories"
+		android:layout_height="wrap_content"
+		android:layout_width="fill_parent"
+		android:layout_alignParentTop="true"
+		android:layout_above="@id/layout_action_buttons"
+		/>
+
 </RelativeLayout>
diff --git a/src/org/geometerplus/android/fbreader/DirectoriesManagerActivity.java b/src/org/geometerplus/android/fbreader/DirectoriesManagerActivity.java
index 1467d74cb..9facf6358 100644
--- a/src/org/geometerplus/android/fbreader/DirectoriesManagerActivity.java
+++ b/src/org/geometerplus/android/fbreader/DirectoriesManagerActivity.java
@@ -20,34 +20,173 @@
 package org.geometerplus.android.fbreader;
 
 import android.os.Bundle;
+import android.os.Build;
+import android.os.Build.VERSION_CODES;
 import android.app.Activity;
 
-import android.widget.Button;
-import android.view.View;
-import android.view.View.OnClickListener;
+import java.util.ArrayList;
+import java.lang.Runnable;
+
+import android.content.Context;
+import android.content.Intent;
+
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.widget.*;
+import android.view.*;
+
+import org.geometerplus.zlibrary.core.resources.ZLResource;
+import org.geometerplus.android.util.FileChooserUtil;
 
 import org.geometerplus.zlibrary.ui.android.R;
 
 public class DirectoriesManagerActivity extends Activity{
-    public void onCreate(Bundle savedInstanceState){
+	private final int ADD_NEW_DIR_POSITION = 0;
+    public static final String DIR_LIST = "dir_list";
+	private DirectoriesAdapter myAdapter;
+	private ListView myListView;
+	private Intent myResultIntent;
+	private String myDefaultDir = "/";
+	private ArrayList<String> myDirList;
+	private int myAddNewDirPosition = 0;
+
+	public void onCreate(Bundle savedInstanceState){
         super.onCreate(savedInstanceState);
         setContentView(R.layout.dir_manager);
+		
+		myResultIntent = new Intent();
+		myDirList = getIntent().getStringArrayListExtra(DIR_LIST);
+
+		System.out.println(ZLResource.resource("dialog").getResource("waitMessage").getResource("search").getValue());
+		
         setupActionButtons();
-    }
+		myListView = (ListView) findViewById(R.id.directories);
+
+		myDirList.add(ADD_NEW_DIR_POSITION, "Add a new dir");
+		
+		setupDirectoriesAdapter(myDirList);
+	}
+	
+	private void openFileChooser(int index, String dirName){
+		FileChooserUtil.runDirectoryChooser(
+						this,
+						index,
+						"",
+						dirName,
+						true
+					);
+	}
+	
+	private void showMessage(String msg){
+		Toast.makeText(this, msg, Toast.LENGTH_SHORT).show();
+	}
+	
+	private void updateDirs(int index, Intent data){
+		String path = FileChooserUtil.pathFromData(data);
+		if(!myDirList.contains(path)){
+			myDirList.remove(index);
+			myDirList.add(index, path);
+			myAdapter.notifyDataSetChanged();
+		}else{
+			showMessage("Cannot add the duplicate directory "+path);
+		}
+	}	
+
+	private void addNewDir(Intent data){
+		String path = FileChooserUtil.pathFromData(data);
+		if(!myDirList.contains(path)){
+			myDirList.add(FileChooserUtil.pathFromData(data));
+			myAdapter.notifyDataSetChanged();
+		}else{
+			showMessage("Cannot add the duplicate directory "+path);
+		}
+	}
+
+	@Override
+	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (resultCode == RESULT_OK) {
+			System.out.println("DirectoriesManagerActivity::onActivityResult() "+requestCode);
+			if(requestCode != ADD_NEW_DIR_POSITION){
+				updateDirs(requestCode, data);
+			}else{
+				addNewDir(data);
+			}
+		}
+	}
+	
+	private void setupDirectoriesAdapter(ArrayList<String> dirs){
+		myAdapter = new DirectoriesAdapter(this, dirs);
+		myListView.setAdapter(myAdapter);
+		myListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+				@Override
+				public void onItemClick(AdapterView<?> parent, final View view, int position, long id) {
+					String dirName = (String) parent.getItemAtPosition(position);
+					if(position <= 0){
+						dirName = myDefaultDir;
+					}
+					openFileChooser(position, dirName);		
+				}
+		});
+	}
     
     private void setupActionButtons(){
         final Button okButton = (Button) findViewById(R.id.button_ok);
         okButton.setOnClickListener(new View.OnClickListener() {
-             public void onClick(View v) {  
-                onBackPressed();
+             public void onClick(View v) {
+				myDirList.remove(0);
+				myResultIntent.putStringArrayListExtra(DIR_LIST, myDirList);
+				setResult(RESULT_OK, myResultIntent);
+				finish();
              }
         });
         final Button cancelButton = (Button) findViewById(R.id.button_cancel);
         cancelButton.setOnClickListener(new View.OnClickListener() {
-             public void onClick(View v) {  
-                onBackPressed();
+             public void onClick(View v) {
+				setResult(RESULT_CANCELED);
+                finish();
              }
          });
-
     }
+
+	private class DirectoriesAdapter extends ArrayAdapter<String>{
+		public DirectoriesAdapter(Context context, ArrayList<String> dirs){
+			super(context, R.layout.dir_list, dirs);
+		}
+	
+		@Override
+		public View getView (final int position, View convertView, ViewGroup parent){
+			
+			final View view = LayoutInflater.from(getContext()).inflate(R.layout.dir_list, parent, false);
+			
+			final String dirName = (String) getItem(position);
+			
+			TextView title = (TextView) view.findViewById(R.id.title);
+			title.setText(dirName);
+			ImageView deleteButton = (ImageView) view.findViewById(R.id.delete);
+			
+			if(position != ADD_NEW_DIR_POSITION){
+				deleteButton.setVisibility(View.VISIBLE);
+				deleteButton.setOnClickListener(new View.OnClickListener() {
+					public void onClick(View v) {
+						System.out.println("DELETE: "+dirName);
+						view.animate()
+							.setDuration(300)
+							.alpha(0)
+							.setListener(new AnimatorListenerAdapter() {
+								@Override
+								public void onAnimationEnd(Animator animation) {
+									myDirList.remove(position);
+									myAdapter.notifyDataSetChanged();
+									view.setAlpha(1);
+								}
+							});
+					}
+				});
+			}else{	
+				deleteButton.setVisibility(View.INVISIBLE);
+			}
+	
+			return view;
+		}
+	}
 }
diff --git a/src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java b/src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java
index 92f40223c..cba29ee3e 100644
--- a/src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java
+++ b/src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java
@@ -58,8 +58,8 @@ public class PreferenceActivity extends ZLPreferenceActivity {
 
 	@Override
 	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-		System.out.println("PreferenceActivity::onActivityResult() "+requestCode);
         if (resultCode == RESULT_OK) {
+			System.out.println("PreferenceActivity::onActivityResult() "+requestCode);
 			myChooserCollection.update(requestCode, data);
 		}
 	}
diff --git a/src/org/geometerplus/android/fbreader/preferences/fileChooser/FileChooserCollection.java b/src/org/geometerplus/android/fbreader/preferences/fileChooser/FileChooserCollection.java
index d282b7de1..5b7dad336 100644
--- a/src/org/geometerplus/android/fbreader/preferences/fileChooser/FileChooserCollection.java
+++ b/src/org/geometerplus/android/fbreader/preferences/fileChooser/FileChooserCollection.java
@@ -57,7 +57,12 @@ public class FileChooserCollection {
 
 	public void update(int index, Intent data) {
 		try {
-			myPreferences.get(index).setValue(FileChooserUtil.pathFromData(data));
+			String path = FileChooserUtil.pathFromData(data);
+			if(path != null){
+				myPreferences.get(index).setValue(path);
+			}else{
+				myPreferences.get(index).setValue(FileChooserUtil.pathArrayFromData(data));
+			}
 		} catch (Exception e) {
 			// ignore
 		}
diff --git a/src/org/geometerplus/android/fbreader/preferences/fileChooser/FileChooserPreference.java b/src/org/geometerplus/android/fbreader/preferences/fileChooser/FileChooserPreference.java
index 3db9cd85d..a8efc95a1 100644
--- a/src/org/geometerplus/android/fbreader/preferences/fileChooser/FileChooserPreference.java
+++ b/src/org/geometerplus/android/fbreader/preferences/fileChooser/FileChooserPreference.java
@@ -19,6 +19,8 @@
 
 package org.geometerplus.android.fbreader.preferences.fileChooser;
 
+import java.util.ArrayList;
+
 import android.app.Activity;
 import android.content.Context;
 import android.preference.Preference;
@@ -29,7 +31,7 @@ import org.geometerplus.zlibrary.core.util.MiscUtil;
 import org.geometerplus.android.util.FileChooserUtil;
 
 abstract class FileChooserPreference extends Preference {
-	private final int myRegCode;
+	protected final int myRegCode;
 	private final ZLResource myResource;
 	private final boolean myChooseWritableDirectoriesOnly;
 	private final Runnable myOnValueSetAction;
@@ -47,16 +49,13 @@ abstract class FileChooserPreference extends Preference {
 
 	@Override
 	protected void onClick() {
-		FileChooserUtil.runDirectoriesManager(
-            (Activity)getContext(),
-            myRegCode*2);
-        /*FileChooserUtil.runDirectoryChooser(
+        FileChooserUtil.runDirectoryChooser(
 			(Activity)getContext(),
 			myRegCode,
 			myResource.getResource("chooserTitle").getValue(),
 			getStringValue(),
 			myChooseWritableDirectoriesOnly
-		);*/
+		);
 	}
 
 	protected abstract String getStringValue();
@@ -72,6 +71,19 @@ abstract class FileChooserPreference extends Preference {
 			myOnValueSetAction.run();
 		}
 	}
+	
+	protected final void setValue(ArrayList<String> value) {
+		if (value.isEmpty()){
+			return;
+		}
+
+		setValueInternal(value);
+
+		if (myOnValueSetAction != null) {
+			myOnValueSetAction.run();
+		}
+	}
 
 	protected abstract void setValueInternal(String value);
+	protected abstract void setValueInternal(ArrayList<String> value);
 }
diff --git a/src/org/geometerplus/android/fbreader/preferences/fileChooser/FileChooserStringListPreference.java b/src/org/geometerplus/android/fbreader/preferences/fileChooser/FileChooserStringListPreference.java
index 260a312eb..795c5d70b 100644
--- a/src/org/geometerplus/android/fbreader/preferences/fileChooser/FileChooserStringListPreference.java
+++ b/src/org/geometerplus/android/fbreader/preferences/fileChooser/FileChooserStringListPreference.java
@@ -21,9 +21,12 @@ package org.geometerplus.android.fbreader.preferences.fileChooser;
 
 import java.util.Collections;
 import java.util.List;
+import java.util.ArrayList;
 
+import android.app.Activity;
 import android.content.Context;
 
+import org.geometerplus.android.util.FileChooserUtil;
 import org.geometerplus.zlibrary.core.options.ZLStringListOption;
 import org.geometerplus.zlibrary.core.resources.ZLResource;
 
@@ -38,6 +41,22 @@ class FileChooserStringListPreference extends FileChooserPreference {
 		setSummary(getStringValue());
 	}
 
+	@Override
+	protected void onClick() {
+		FileChooserUtil.runDirectoriesManager(
+            (Activity)getContext(),
+            myRegCode,
+			getStringListValue()
+		);
+	}
+	
+	private ArrayList<String> getStringListValue(){
+		final List<String> values = myOption.getValue();
+		ArrayList<String> resList = new ArrayList<String>();
+		resList.addAll(values);
+		return resList;
+	}
+	
 	@Override
 	protected String getStringValue() {
 		final List<String> values = myOption.getValue();
@@ -46,10 +65,35 @@ class FileChooserStringListPreference extends FileChooserPreference {
 
 	@Override
 	protected void setValueInternal(String value) {
-		final List<String> currentValues = myOption.getValue();
+		//System.out.println("FileChooserStringListPreference::setValueInternal() "+value);
+		List<String> currentValues = myOption.getValue();
+		//System.out.println("1 FileChooserStringListPreference::setValueInternal() currentValue "+currentValues);
 		if (currentValues.size() != 1 || !currentValues.get(0).equals(value)) {
 			myOption.setValue(Collections.singletonList(value));
 			setSummary(value);
 		}
+		/*boolean found = false;
+		for(int i = 0; i < currentValues.size();i++){
+			if(currentValues.get(i).equals(value)){
+				currentValues.remove(i);
+				currentValues.add(i, value);
+				found = true;
+			}
+		}
+		if(!found){
+			currentValues.add(value);
+		}
+		myOption.setValue(currentValues);
+		setSummary(value);
+		System.out.println("2 FileChooserStringListPreference::setValueInternal() currentValue "+currentValues);*/
+	}
+	
+	@Override
+	protected void setValueInternal(ArrayList<String> value) {
+		System.out.println("FileChooserStringListPreference::setValueInternal() "+value);
+		if(value.size() > 0){
+			myOption.setValue(value);
+			setSummary(value.get(0));
+		}
 	}
 }
diff --git a/src/org/geometerplus/android/fbreader/preferences/fileChooser/FileChooserStringPreference.java b/src/org/geometerplus/android/fbreader/preferences/fileChooser/FileChooserStringPreference.java
index ea1b8f3a6..347b5d0d6 100644
--- a/src/org/geometerplus/android/fbreader/preferences/fileChooser/FileChooserStringPreference.java
+++ b/src/org/geometerplus/android/fbreader/preferences/fileChooser/FileChooserStringPreference.java
@@ -20,6 +20,7 @@
 package org.geometerplus.android.fbreader.preferences.fileChooser;
 
 import android.content.Context;
+import java.util.ArrayList;
 
 import org.geometerplus.zlibrary.core.options.ZLStringOption;
 import org.geometerplus.zlibrary.core.resources.ZLResource;
@@ -47,4 +48,11 @@ class FileChooserStringPreference extends FileChooserPreference {
 			setSummary(value);
 		}
 	}
+	
+	@Override
+	protected void setValueInternal(ArrayList<String> value) {
+		if(value.size() > 0){
+			setValueInternal(value.get(0));
+		}
+	}
 }
diff --git a/src/org/geometerplus/android/util/FileChooserUtil.java b/src/org/geometerplus/android/util/FileChooserUtil.java
index 2025384e3..a9e9f743b 100644
--- a/src/org/geometerplus/android/util/FileChooserUtil.java
+++ b/src/org/geometerplus/android/util/FileChooserUtil.java
@@ -19,6 +19,7 @@
 
 package org.geometerplus.android.util;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 
 import android.app.Activity;
@@ -37,8 +38,14 @@ public abstract class FileChooserUtil {
 	private FileChooserUtil() {
 	}
     
-    public static void runDirectoriesManager(Activity activity, int requestCode){
+    public static void runDirectoriesManager(
+		Activity activity,
+		int requestCode,
+		ArrayList<String> initinalValue
+	) {
 		final Intent intent = new Intent(activity, DirectoriesManagerActivity.class);
+		System.out.println(">>>>>>>>>>>>>>> "+initinalValue);
+		intent.putStringArrayListExtra(DirectoriesManagerActivity.DIR_LIST, initinalValue);
 		activity.startActivityForResult(intent, requestCode);
     }
     
@@ -68,6 +75,10 @@ public abstract class FileChooserUtil {
 		return data.getStringExtra(FileChooserActivity._FolderPath);
 	}
 
+	public static ArrayList<String> pathArrayFromData(Intent data) {
+		return data.getStringArrayListExtra(DirectoriesManagerActivity.DIR_LIST);
+	}
+
 	private static HashMap<String,String> textResources(String title) {
 		final HashMap<String,String> map = new HashMap<String,String>();