Skip to content

Commit

Permalink
Card 77 (Add photo details to Trovebox Collect)
Browse files Browse the repository at this point in the history
Trovebox-Android-App:

- GalleryFragment: modified reference to the EXTRA_ADAPTER_PHOTOS
constant in the additionalSingleImageViewInit method
- MainActivity: now it doesn't implement PhotoDeletedHandler and
PhotoUpdatedHandler. Also removed photoDeleted and photoUpdated method
implementation. That is done because GalleryFragment now may register
itself to receive boradcast notifications. Also removed receiver
registering code from the  onCreate method
- PhotoDetailsActivity: now it doesn't implements PhotoDeletedHandler
and PhotoUpdatedHandler. Also removed photoDeleted and photoUpdated
method implementation. That is done because PhotoDetailsFragment now may
register itself to receive boradcast notifications. Also removed
receiver registering code from the  onCreate method
- PhotoDetailsActivity: removed EXTRA_PHOTO, EXTRA_PHOTOS,
EXTRA_ADAPTER_PHOTOS constants
- PhotoDetailsActivity.PhotoDetailsUiFragment: now it extends
PhotoDetailsFragment from common library so a lot of common
functionality is moved to that fragment
- PhotoDetailsActivity.PhotoDetailsUiFragment: replaced current instance
management fields wit the CurrentInstanceManager instance.
- UploaderService: modified reference to the EXTRA_PHOTOS constant in
the getSuccessPendingIntent method
- HorizontalListView: moved to common library
- PhotoViewHackyViewPager: moved to common library
- res/drawable-?dpi/button_private.png: moved to common library
- res/layout/activity_photo_details.xml: moved to common library
- res/layout/item_details_thum_image.xml: moved to common library
- res/layout/item_photo_details.xml: moved to common library
- res/values/colors.xml: moved detail related and ab_bg_black colors to
the common library
- res/values/dimens.xml: moved photo details related dimensions to the
common library
- res/valeus/strings.xml, res/values-ru/strings.xml,
res/values-pt/strings.xml: moved details_title_and_date_header constant
to the common library

Trovebox-Android-Common:
- GalleryFragment: added registering of photo deleted and photo updated
broadcast receivers to the onCreate method
- PhotoDetailsFragment: added. Extracted common functionality from the
Trovebox-Android-App photo details ui fragment.
- PhotoDetailsFragment: fixed thumbs offset issue caused by invalid
dimensions in pixels calculation. 104dip in pixels is not the same as
100dip+2dip+2dip in pixels at hdpi devices
- HorizontalListView: added. Moved from Trovebox Android App
- PhotoViewHackyViewPager: added. Moved from Trovebox Android App
- res/drawable-?dpi/button_private.png: added. Moved from Trovebox
Android App
- res/layout/fragment_photo_details.xml: added. Moved from Trovebox
Android App
- res/layout/item_details_thum_image.xml: added. Moved from Trovebox
Android App
- res/layout/item_photo_details.xml: added. Moved from Trovebox Android
App
- res/values/colors.xml: added detail related and ab_bg_black colors.
Moved from Trovebox Android App
- res/values/dimens.xml: added photo details related dimensions. Moved
from Trovebox Android App
- res/valeus/strings.xml, res/values-ru/strings.xml,
res/values-pt/strings.xml: added details_title_and_date_header constant.
Moved from Trovebox Android App

Trovebox-Android-Test:
- PhotoDetailsActivitTest: fixed constant references
  • Loading branch information
httpdispatch committed Feb 7, 2014
1 parent 365015d commit 9fed259
Show file tree
Hide file tree
Showing 26 changed files with 735 additions and 789 deletions.
63 changes: 0 additions & 63 deletions app/res/layout/activity_photo_details.xml

This file was deleted.

1 change: 0 additions & 1 deletion app/res/values-pt/strings.xml
Expand Up @@ -200,7 +200,6 @@
<string name="feather_failed_to_load_image">Erro para carregar foto %1$s</string>

<!-- Photo details -->
<string name="details_title_and_date_header">%1$s tirada em %2$s</string>
<string name="delete_photo_confirmation_question">Deseja remover essa foto?</string>
<string name="menu_edit">Editar</string>
<string name="menu_delete">Remover</string>
Expand Down
1 change: 0 additions & 1 deletion app/res/values-ru/strings.xml
Expand Up @@ -233,7 +233,6 @@
<string name="feather_failed_to_load_image">Не удалось загрузить изображение %1$s</string>

<!-- Photo details -->
<string name="details_title_and_date_header">%1$s снято %2$s</string>
<string name="delete_photo_confirmation_question">Вы уверены, что хотите удалить эту фотографию?</string>
<string name="menu_edit">Редактировать</string>
<string name="menu_delete">Удалить</string>
Expand Down
3 changes: 0 additions & 3 deletions app/res/values/colors.xml
Expand Up @@ -6,11 +6,8 @@
<color name="actionbar_line_bottom">#222</color>
<color name="grid_selector">#99cfcfcf</color>
<color name="tab_bar_line_top">#e3cea2</color>
<color name="detail_thumb_unselected_border">#000</color>
<color name="detail_thumb_selected_border">#9eddff</color>

<drawable name="selection_handler_drawable">#fece31</drawable>
<drawable name="ab_bg_black">#66000000</drawable>
<drawable name="ab_bg_brown">#3c2514</drawable>
<drawable name="ab_bg_brown_dark">#1b0e05</drawable>

Expand Down
4 changes: 0 additions & 4 deletions app/res/values/dimens.xml
Expand Up @@ -9,10 +9,6 @@
<dimen name="image_thumbnail_size">100dp</dimen>
<dimen name="image_thumbnail_spacing">1dp</dimen>
<dimen name="image_thumbnail_border">1dp</dimen>
<dimen name="detail_thumbnail_size">100dp</dimen>
<dimen name="detail_thumbnail_spacing">0dp</dimen>
<dimen name="detail_thumbnail_border">2dp</dimen>
<dimen name="detail_thumbnail_with_border_size">104dp</dimen>
<dimen name="profile_thumbnail_size">100dp</dimen>
<dimen name="profile_thumbnail_corner_radius">10dp</dimen>
<dimen name="select_profile_thumbnail_size">50dp</dimen>
Expand Down
1 change: 0 additions & 1 deletion app/res/values/strings.xml
Expand Up @@ -233,7 +233,6 @@
<string name="feather_failed_to_load_image">Failed to load image %1$s</string>

<!-- Photo details -->
<string name="details_title_and_date_header">%1$s taken at %2$s</string>
<string name="delete_photo_confirmation_question">Are you sure you want to delete this photo?</string>
<string name="menu_edit">Edit</string>
<string name="menu_delete">Delete</string>
Expand Down
3 changes: 2 additions & 1 deletion app/src/com/trovebox/android/app/GalleryFragment.java
Expand Up @@ -18,6 +18,7 @@
import com.trovebox.android.app.PhotoDetailsActivity.PhotoDetailsUiFragment;
import com.trovebox.android.app.model.utils.AlbumUtils;
import com.trovebox.android.app.net.ProfileResponseUtils;
import com.trovebox.android.common.fragment.photo_details.PhotoDetailsFragment;
import com.trovebox.android.common.model.Album;
import com.trovebox.android.common.model.Photo;
import com.trovebox.android.common.model.ProfileInformation;
Expand Down Expand Up @@ -103,7 +104,7 @@ protected void additionalSingleImageViewInit(View view, final Photo value) {
public void onClick(View v) {
TrackerUtils.trackButtonClickEvent("image", GalleryFragment.this);
Intent intent = new Intent(getActivity(), PhotoDetailsActivity.class);
intent.putExtra(PhotoDetailsActivity.EXTRA_ADAPTER_PHOTOS,
intent.putExtra(PhotoDetailsFragment.EXTRA_ADAPTER_PHOTOS,
new PhotosEndlessAdapter.ParametersHolder(galleryAdapter, value));
startActivity(intent);
clearImageWorkerCaches(true);
Expand Down
32 changes: 2 additions & 30 deletions app/src/com/trovebox/android/app/MainActivity.java
Expand Up @@ -33,10 +33,6 @@
import com.trovebox.android.app.twitter.TwitterUtils;
import com.trovebox.android.common.activity.CommonActivity;
import com.trovebox.android.common.model.Album;
import com.trovebox.android.common.model.Photo;
import com.trovebox.android.common.model.utils.PhotoUtils;
import com.trovebox.android.common.model.utils.PhotoUtils.PhotoDeletedHandler;
import com.trovebox.android.common.model.utils.PhotoUtils.PhotoUpdatedHandler;
import com.trovebox.android.common.provider.UploadsUtils;
import com.trovebox.android.common.provider.UploadsUtils.UploadsClearedHandler;
import com.trovebox.android.common.util.BackKeyControl;
Expand All @@ -52,8 +48,8 @@
@Addons(Activity.ADDON_SLIDER)
public class MainActivity extends CommonActivity implements LoadingControl, GalleryOpenControl,
SyncHandler, UploadsClearedHandler, TwitterLoadingControlAccessor,
FacebookLoadingControlAccessor, SyncStartedHandler, PhotoDeletedHandler,
PhotoUpdatedHandler, GalleryFragment.StartNowHandler, TitleChangedHandler {
FacebookLoadingControlAccessor, SyncStartedHandler, GalleryFragment.StartNowHandler,
TitleChangedHandler {
private static final String NAVIGATION_HANDLER_FRAGMENT_TAG = "NavigationHandlerFragment";

public static final String TAG = MainActivity.class.getSimpleName();
Expand Down Expand Up @@ -107,10 +103,6 @@ public void onCreate(Bundle savedInstanceState)
this, this));
addRegisteredReceiver(SyncUtils.getAndRegisterOnSyncStartedActionBroadcastReceiver(
TAG, this, this));
addRegisteredReceiver(PhotoUtils.getAndRegisterOnPhotoDeletedActionBroadcastReceiver(
TAG, this, this));
addRegisteredReceiver(PhotoUtils.getAndRegisterOnPhotoUpdatedActionBroadcastReceiver(
TAG, this, this));
addRegisteredReceiver(ImageCacheUtils.getAndRegisterOnDiskCacheClearedBroadcastReceiver(
TAG,
this));
Expand Down Expand Up @@ -435,26 +427,6 @@ public void syncStarted(List<String> processedFileNames) {
}
}

@Override
public void photoDeleted(Photo photo)
{
GalleryFragment galleryFragment = navigationHandlerFragment.getGalleryFragment();
if (galleryFragment != null)
{
galleryFragment.photoDeleted(photo);
}
}

@Override
public void photoUpdated(Photo photo)
{
GalleryFragment galleryFragment = navigationHandlerFragment.getGalleryFragment();
if (galleryFragment != null)
{
galleryFragment.photoUpdated(photo);
}
}

@Override
public void startNow() {
CommonUtils.debug(TAG, "Start now");
Expand Down

0 comments on commit 9fed259

Please sign in to comment.