mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-18 06:51:55 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1685 from owncloud/change_overlay_synced_icons

Browse source 
Change overlay synced icons
This commit is contained in:
David A. Velasco 2016-06-01 17:24:27 +02:00
commit 77a9e62313
17 changed files with 13 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
res/drawable-hdpi/ic_available_offline.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 532 B

BIN
res/drawable-mdpi/ic_available_offline.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 434 B

BIN
res/drawable-xhdpi/ic_available_offline.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 572 B

BIN
res/drawable-xxhdpi/ic_available_offline.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 685 B

BIN
res/drawable/conflict_file_indicator.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2.6 KiB

BIN
res/drawable/downloading_file_indicator.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 3.8 KiB

BIN
res/drawable/ic_synced.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
res/drawable/ic_synchronizing.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3 KiB

BIN
res/drawable/ic_synchronizing_error.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
res/drawable/local_file_indicator.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 3.9 KiB

BIN
res/drawable/synchronizing_file_indicator.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 3.1 KiB

BIN
res/drawable/uploading_file_indicator.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 3.7 KiB

4
res/layout/grid_image.xml
View file

@ -54,7 +54,7 @@
android:layout_marginTop="4dp"
android:layout_marginBottom="4dp"
android:layout_marginRight="4dp"
android:src="@drawable/local_file_indicator" />
android:src="@drawable/ic_synced" />
<ImageView
android:id="@+id/favoriteIcon"
@ -63,7 +63,7 @@
android:layout_gravity="bottom|right"
android:layout_marginBottom="4dp"
android:layout_marginRight="4dp"
android:src="@drawable/ic_favorite" />
android:src="@drawable/ic_available_offline" />
</FrameLayout>
</LinearLayout>

4
res/layout/grid_item.xml
View file

@ -54,7 +54,7 @@
android:layout_gravity="bottom|right"
android:layout_marginTop="2dp"
android:layout_marginRight="2dp"
android:src="@drawable/local_file_indicator" />
android:src="@drawable/ic_synced" />
<ImageView
android:id="@+id/favoriteIcon"
@ -63,7 +63,7 @@
android:layout_gravity="bottom|right"
android:layout_marginBottom="2dp"
android:layout_marginRight="2dp"
android:src="@drawable/ic_favorite" />
android:src="@drawable/ic_available_offline" />

4
res/layout/list_item.xml
View file

@ -45,7 +45,7 @@
android:layout_height="@dimen/file_icon_size"
android:layout_gravity="top|right"
android:layout_marginRight="4dp"
android:src="@drawable/local_file_indicator" />
android:src="@drawable/ic_synced" />
<ImageView
android:id="@+id/thumbnail"
@ -60,7 +60,7 @@
android:layout_height="wrap_content"
android:layout_gravity="bottom|right"
android:layout_marginRight="4dp"
android:src="@drawable/ic_favorite" />
android:src="@drawable/ic_available_offline" />
</FrameLayout>
<LinearLayout

4
res/values/strings.xml
View file

@ -230,8 +230,8 @@
<string name="auth_can_not_auth_against_server">Cannot authenticate to this server</string>
<string name="auth_account_does_not_exist">Account does not exist in the device yet</string>
<string name="favorite">Favorite</string>
<string name="unfavorite">Unfavorite</string>
<string name="favorite">Set as available offline</string>
<string name="unfavorite">Unset as available offline</string>
<string name="common_rename">Rename</string>
<string name="common_remove">Remove</string>
<string name="confirmation_remove_alert">"Do you really want to remove %1$s?"</string>

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

@ -269,37 +269,29 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
opsBinder != null &&
opsBinder.isSynchronizing(mAccount, file.getRemotePath())
) {
localStateView.setImageResource(R.drawable.synchronizing_file_indicator);
localStateView.setImageResource(R.drawable.ic_synchronizing);
localStateView.setVisibility(View.VISIBLE);
} else if ( // downloading
downloaderBinder != null &&
downloaderBinder.isDownloading(mAccount, file)
) {
localStateView.setImageResource(
file.isFolder() ?
R.drawable.synchronizing_file_indicator :
R.drawable.downloading_file_indicator
);
localStateView.setImageResource(R.drawable.ic_synchronizing);
localStateView.setVisibility(View.VISIBLE);
} else if ( //uploading
uploaderBinder != null &&
uploaderBinder.isUploading(mAccount, file)
) {
localStateView.setImageResource(
file.isFolder() ?
R.drawable.synchronizing_file_indicator :
R.drawable.uploading_file_indicator
);
localStateView.setImageResource(R.drawable.ic_synchronizing);
localStateView.setVisibility(View.VISIBLE);
} else if (file.getEtagInConflict() != null) { // conflict
localStateView.setImageResource(R.drawable.conflict_file_indicator);
localStateView.setImageResource(R.drawable.ic_synchronizing_error);
localStateView.setVisibility(View.VISIBLE);
} else if (file.isDown()) {
localStateView.setImageResource(R.drawable.local_file_indicator);
localStateView.setImageResource(R.drawable.ic_synced);
localStateView.setVisibility(View.VISIBLE);
}