mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-23 13:45:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fixed typos from 'shareWhatever' to 'sharedWhatever', and updated reference to library

Browse source
This commit is contained in:
David A. Velasco 2014-07-01 09:38:14 +02:00
parent f5a4c6bc9f
commit fe4fc7a612
5 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
owncloud-android-library

@ -1 +1 @@
Subproject commit 570c35c9214845dc744703669c0829d12fab431d
Subproject commit 48d43b576c1411be4bbf8a9b96e351fa18948a2f

4
res/layout/list_item.xml
View file

@ -110,7 +110,7 @@
android:orientation="vertical">
<ImageView
android:id="@+id/shareIcon"
android:id="@+id/sharedIcon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
@ -120,7 +120,7 @@
android:src="@drawable/sharedlink" />
<ImageView
android:id="@+id/shareWithMeIcon"
android:id="@+id/sharedWithMeIcon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"

2
src/com/owncloud/android/providers/FileContentProvider.java
View file

@ -690,7 +690,7 @@ public class FileContentProvider extends ContentProvider {
Log_OC.i("SQL", "OUT of the ADD in onUpgrade; oldVersion == " + oldVersion + ", newVersion == " + newVersion);
if (oldVersion < 7 && newVersion >= 7) {
Log_OC.i("SQL", "Entering in the #6 ADD in onUpgrade");
Log_OC.i("SQL", "Entering in the #7 ADD in onUpgrade");
db.beginTransaction();
try {
db .execSQL("ALTER TABLE " + ProviderTableMeta.FILE_TABLE_NAME +

14
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
View file

@ -114,9 +114,9 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
fileName.setText(name);
ImageView fileIcon = (ImageView) view.findViewById(R.id.imageView1);
ImageView shareIconV = (ImageView) view.findViewById(R.id.shareIcon);
ImageView shareWithMeIconV = (ImageView) view.findViewById(R.id.shareWithMeIcon);
shareWithMeIconV.setVisibility(View.GONE);
ImageView sharedIconV = (ImageView) view.findViewById(R.id.sharedIcon);
ImageView sharedWithMeIconV = (ImageView) view.findViewById(R.id.sharedWithMeIcon);
sharedWithMeIconV.setVisibility(View.GONE);
ImageView localStateView = (ImageView) view.findViewById(R.id.imageView2);
FileDownloaderBinder downloaderBinder = mTransferServiceGetter.getFileDownloaderBinder();
@ -166,7 +166,7 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
fileIcon.setImageResource(DisplayUtils.getResourceId(file.getMimetype(), file.getFileName()));
if (checkIfFileIsSharedWithMe(file)) {
shareWithMeIconV.setVisibility(View.VISIBLE);
sharedWithMeIconV.setVisibility(View.VISIBLE);
}
}
else {
@ -180,16 +180,16 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
if (checkIfFileIsSharedWithMe(file)) {
fileIcon.setImageResource(R.drawable.shared_with_me_folder);
shareWithMeIconV.setVisibility(View.VISIBLE);
sharedWithMeIconV.setVisibility(View.VISIBLE);
} else {
fileIcon.setImageResource(DisplayUtils.getResourceId(file.getMimetype(), file.getFileName()));
}
}
if (file.isShareByLink()) {
shareIconV.setVisibility(View.VISIBLE);
sharedIconV.setVisibility(View.VISIBLE);
} else {
shareIconV.setVisibility(View.GONE);
sharedIconV.setVisibility(View.GONE);
}
}

4
src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
View file

@ -135,8 +135,8 @@ public class LocalFileListAdapter extends BaseAdapter implements ListAdapter {
view.findViewById(R.id.imageView2).setVisibility(View.INVISIBLE); // not GONE; the alignment changes; ugly way to keep it
view.findViewById(R.id.imageView3).setVisibility(View.GONE);
view.findViewById(R.id.shareIcon).setVisibility(View.GONE);
view.findViewById(R.id.shareWithMeIcon).setVisibility(View.GONE);
view.findViewById(R.id.sharedIcon).setVisibility(View.GONE);
view.findViewById(R.id.sharedWithMeIcon).setVisibility(View.GONE);
}
return view;