From 1973966b47b2ebad98ab4bf125464eb193997125 Mon Sep 17 00:00:00 2001 From: Siqi Liu Date: Thu, 23 Apr 2015 13:46:49 +0200 Subject: formatting for consistancy and remove unused file. TODO(siqi): try to refactor the ListItemAdapter to a separate file later. Change-Id: I01b82d1fea65cda353d5bb08da42e2faf1c8cf13 --- .../src/java/org/libreoffice/ui/FileUtilities.java | 2 +- .../java/org/libreoffice/ui/FolderIconView.java | 8 +- .../java/org/libreoffice/ui/GridItemAdapter.java | 34 +--- .../java/org/libreoffice/ui/ListItemAdapter.java | 178 --------------------- 4 files changed, 13 insertions(+), 209 deletions(-) delete mode 100644 android/experimental/LOAndroid3/src/java/org/libreoffice/ui/ListItemAdapter.java (limited to 'android') diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/FileUtilities.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/FileUtilities.java index 9650fa57f383..9c5875019169 100644 --- a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/FileUtilities.java +++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/FileUtilities.java @@ -22,7 +22,7 @@ import android.webkit.MimeTypeMap; public class FileUtilities { - private String LOGTAG = FileUtilities.class.getSimpleName(); + private static String LOGTAG = FileUtilities.class.getSimpleName(); static final int ALL = -1; diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/FolderIconView.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/FolderIconView.java index c689ba1a91c8..1c2b25f36766 100644 --- a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/FolderIconView.java +++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/FolderIconView.java @@ -27,7 +27,7 @@ import java.io.File; import java.util.Stack; public class FolderIconView extends View{ - private String TAG = "FolderIconView"; + private String LOGTAG = "FolderIconView"; private Paint mPaintBlack; private Paint mPaintGray; @@ -69,7 +69,7 @@ public class FolderIconView extends View{ @Override protected void onDraw(Canvas canvas) { super.onDraw(canvas); - Log.d(TAG, "onDraw"); + Log.d(LOGTAG, "onDraw"); //float width = (float)canvas.getWidth(); //float height = (float)canvas.getHeight(); float width = (float) this.getWidth(); @@ -83,7 +83,7 @@ public class FolderIconView extends View{ float DZx = 0.2f*outerRadius; float DZy = 0.2f*outerRadius; //Bitmap blankPage = BitmapFactory.decodeResource(getResources(), R.drawable.page); - Log.i(TAG, Float.toString(width) + "x" + Float.toString(height)); + Log.i(LOGTAG, Float.toString(width) + "x" + Float.toString(height)); canvas.drawCircle(centerX, centerY, outerRadius, mPaintGray); canvas.drawCircle(centerX, centerY, innerRadius, mPaintBlack); //Either get thumbs from directory or use generic page images @@ -107,7 +107,7 @@ public class FolderIconView extends View{ /*while(thumbs.size() < 4) {// padd out with blanks? thumbs.push(blankPage); }*/ - Log.i(TAG, Integer.toString(thumbs.size())); + Log.i(LOGTAG, Integer.toString(thumbs.size())); //should handle empty folders better // options: // don't show? diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/GridItemAdapter.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/GridItemAdapter.java index fd4d7b2bf19c..c50d3a3edd59 100644 --- a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/GridItemAdapter.java +++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/GridItemAdapter.java @@ -37,28 +37,14 @@ public class GridItemAdapter extends BaseAdapter { Context mContext; List filePaths; IFile currentDirectory; - String TAG = "GridItemAdapter"; - - public GridItemAdapter(Context mContext, List filePaths) { - this.mContext = mContext; - this.filePaths = filePaths; - for (IFile fn : filePaths) { - Log.d(TAG, fn.getName()); - } - } - - public GridItemAdapter(Context mContext, IFile currentDirectory) { - this.mContext = mContext; - this.currentDirectory = currentDirectory; - filePaths = currentDirectory.listFiles(); - } + String LOGTAG = "GridItemAdapter"; public GridItemAdapter(Context mContext, IFile currentDirectory, - List filteredFiles) - { + List filteredFiles) { this.mContext = mContext; this.currentDirectory = currentDirectory; filePaths = filteredFiles; + Log.d(LOGTAG, "currentDirectory.getName(): " + currentDirectory.getName()); } public int getCount() { @@ -66,7 +52,7 @@ public class GridItemAdapter extends BaseAdapter { } public Object getItem(int position) { - return null;//filePaths[ position ]; + return null; //filePaths[ position ]; } public long getItemId(int position) { @@ -74,8 +60,7 @@ public class GridItemAdapter extends BaseAdapter { return 0; } - public View getView(int position, View convertView, ViewGroup parent) - { + public View getView(int position, View convertView, ViewGroup parent) { LayoutInflater inflater = (LayoutInflater) mContext.getSystemService( Context.LAYOUT_INFLATER_SERVICE); @@ -97,13 +82,10 @@ public class GridItemAdapter extends BaseAdapter { // set image based on selected text ImageView imageView = (ImageView) gridView .findViewById(R.id.grid_item_image); - if (filePaths.get(position).isDirectory()) // Is a folder - { + if (filePaths.get(position).isDirectory()) { // Is a folder // Default view is a generic folder icon. imageView.setImageResource(R.drawable.folder); - } - else - { + } else { /* File thumbnailFile = new File( filePaths[position].getParent() , "." + filePaths[position].getName().split("[.]")[0] + ".png"); @@ -141,7 +123,7 @@ public class GridItemAdapter extends BaseAdapter { return gridView; } - public void update(){ + public void update() { this.notifyDataSetChanged(); } } diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/ListItemAdapter.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/ListItemAdapter.java deleted file mode 100644 index 2f91b4fc73fa..000000000000 --- a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/ListItemAdapter.java +++ /dev/null @@ -1,178 +0,0 @@ -/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ -package org.libreoffice.ui; - -import org.libreoffice.R; - -import java.io.File; -import java.text.SimpleDateFormat; -import java.util.Date; - -import android.content.Context; -import android.database.DataSetObserver; -import android.util.Log; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.view.View.OnClickListener; -import android.widget.ImageView; -import android.widget.ListAdapter; -import android.widget.TextView; - -/*Currently this is class is not used but instead is implemented as an inner class in LibreOfficeUI. - * This is because I can't get the onItemClickListener to fire on the listview so I need to set an - * onClick listener in the adapter. ( I've tried turning off the focusability etc of the listitem - * contents but no dice...) */ -public class ListItemAdapter implements ListAdapter{ - private Context mContext; - private File[] filePaths; - private final long KB = 1024; - private final long MB = 1048576; - - public ListItemAdapter(Context mContext, File[] filePaths) { - this.mContext = mContext; - this.filePaths = filePaths; - } - - public int getCount() { - // TODO Auto-generated method stub - return filePaths.length; - } - - public Object getItem(int arg0) { - // TODO Auto-generated method stub - return null; - } - - public long getItemId(int arg0) { - // TODO Auto-generated method stub - return 0; - } - - public int getItemViewType(int arg0) { - // TODO Auto-generated method stub - return 0; - } - - public View getView(int position, View convertView, ViewGroup parent) { - LayoutInflater inflater = (LayoutInflater) mContext.getSystemService( - Context.LAYOUT_INFLATER_SERVICE); - - View listItem; - - if (convertView == null) { - listItem = new View(mContext); - listItem = inflater.inflate(R.layout.file_list_item, null); - } else { - listItem = (View) convertView; - } - - listItem.setClickable(true); - listItem.setOnClickListener(new OnClickListener() { - - public void onClick(View v) { - Log.d("LIST", "click!"); - } - }); - - - - // set value into textview - TextView filename = (TextView) listItem.findViewById(R.id.file_list_item_name); - filename.setText( filePaths[ position ].getName() ); - //filename.setClickable(true); - - TextView fileSize = (TextView) listItem.findViewById(R.id.file_list_item_size); - //TODO Give size in KB , MB as appropriate. - String size = "0B"; - long length = filePaths[ position ].length(); - if( length < KB ){ - size = Long.toString( length ) + "B"; - } - if( length >= KB && length < MB){ - size = Long.toString( length/KB ) + "KB"; - } - if( length >= MB){ - size = Long.toString( length/MB ) + "MB"; - } - fileSize.setText( size ); - //fileSize.setClickable(true); - - TextView fileDate = (TextView) listItem.findViewById(R.id.file_list_item_date); - SimpleDateFormat df = new SimpleDateFormat("dd MMM yyyy hh:ss"); - Date date = new Date( filePaths[ position ].lastModified() ); - //TODO format date - fileDate.setText( df.format( date ) ); - - // set image based on selected text - ImageView imageView = (ImageView) listItem.findViewById(R.id.file_list_item_icon); - switch (FileUtilities.getType(filePaths[position].getName())) - { - case FileUtilities.DOC: - imageView.setImageResource(R.drawable.writer); - break; - case FileUtilities.CALC: - imageView.setImageResource(R.drawable.calc); - break; - case FileUtilities.DRAWING: - imageView.setImageResource(R.drawable.draw); - break; - case FileUtilities.IMPRESS: - imageView.setImageResource(R.drawable.impress); - break; - default: - break; - } - if( filePaths[position].isDirectory() ){ - //Eventually have thumbnails of each sub file on a black circle - //For now just a folder icon - imageView.setImageResource(R.drawable.folder); - } - //imageView.setClickable(true); - return listItem; - } - - public int getViewTypeCount() { - // TODO Auto-generated method stub - return 1; - } - - public boolean hasStableIds() { - // TODO Auto-generated method stub - return false; - } - - public boolean isEmpty() { - // TODO Auto-generated method stub - return false; - } - - public void registerDataSetObserver(DataSetObserver arg0) { - // TODO Auto-generated method stub - - } - - public void unregisterDataSetObserver(DataSetObserver arg0) { - // TODO Auto-generated method stub - - } - - public boolean areAllItemsEnabled() { - // TODO Auto-generated method stub - return false; - } - - public boolean isEnabled(int position) { - // TODO Auto-generated method stub - return false; - } - -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit