From 6f07bb79a531178e83778797de82992125d81149 Mon Sep 17 00:00:00 2001 From: d954mas Date: Sat, 19 Nov 2016 14:29:45 +0300 Subject: [PATCH] remove picasso --- Habitica/build.gradle | 5 +--- Habitica/res/layout/activity_full_profile.xml | 2 +- Habitica/res/layout/activity_maintenance.xml | 2 +- Habitica/res/layout/animal_overview_item.xml | 2 +- .../avatar_background_overview_card.xml | 2 +- .../customization_grid_background_item.xml | 2 +- .../res/layout/customization_grid_item.xml | 2 +- .../layout/dialog_purchase_customization.xml | 2 +- Habitica/res/layout/fragment_group_info.xml | 2 +- Habitica/res/layout/fragment_intro.xml | 2 +- .../res/layout/fragment_quest_collect.xml | 2 +- Habitica/res/layout/gear_list_item.xml | 2 +- Habitica/res/layout/item_image_row.xml | 2 +- Habitica/res/layout/item_item.xml | 2 +- Habitica/res/layout/pet_detail_item.xml | 2 +- Habitica/res/layout/pet_imageview.xml | 2 +- Habitica/res/layout/qr_code.xml | 2 +- Habitica/res/layout/reward_item_card.xml | 2 +- Habitica/res/layout/row_shopitem.xml | 5 ++-- Habitica/res/layout/shop_header.xml | 2 +- Habitica/res/layout/skill_list_item.xml | 2 +- Habitica/res/layout/value_bar.xml | 2 +- .../android/habitica/ui/ItemDetailDialog.java | 8 ++--- .../habitica/ui/activities/MainActivity.java | 6 ++-- .../ui/activities/MaintenanceActivity.java | 8 ++--- .../CustomizationRecyclerViewAdapter.java | 6 ++-- .../ui/adapter/SkillsRecyclerViewAdapter.java | 4 +-- .../EquipmentRecyclerViewAdapter.java | 11 +++---- .../inventory/MountDetailRecyclerAdapter.java | 4 +-- .../inventory/PetDetailRecyclerAdapter.java | 4 +-- .../inventory/ShopRecyclerAdapter.java | 7 ++--- .../inventory/StableRecyclerAdapter.java | 6 ++-- .../setup/CustomizationSetupAdapter.java | 4 +-- .../QuestCollectRecyclerViewAdapter.java | 10 +++---- .../habitica/ui/helpers/DataBindingUtils.java | 17 ++++------- .../viewHolders/tasks/RewardViewHolder.java | 10 ++----- .../habitica/userpicture/UserPicture.java | 29 +++---------------- 37 files changed, 69 insertions(+), 115 deletions(-) diff --git a/Habitica/build.gradle b/Habitica/build.gradle index 7e842c384..d92b81f38 100644 --- a/Habitica/build.gradle +++ b/Habitica/build.gradle @@ -74,10 +74,7 @@ dependencies { compile 'com.android.support:recyclerview-v7:24.2.1' compile 'com.android.support:preference-v14:24.2.1' compile 'com.android.support:multidex:1.0.1' - - // Image Loading/Caching - compile 'com.squareup.picasso:picasso:2.5.2' - + //QR Code compile 'com.github.kenglxn.QRGen:android:2.2.0' diff --git a/Habitica/res/layout/activity_full_profile.xml b/Habitica/res/layout/activity_full_profile.xml index 0f16b897a..b1db9e974 100644 --- a/Habitica/res/layout/activity_full_profile.xml +++ b/Habitica/res/layout/activity_full_profile.xml @@ -294,7 +294,7 @@ android:text="@string/attributes" android:textStyle="bold" /> - - - - - - - - - - - - - - - diff --git a/Habitica/res/layout/qr_code.xml b/Habitica/res/layout/qr_code.xml index 48e498814..6a014e57d 100644 --- a/Habitica/res/layout/qr_code.xml +++ b/Habitica/res/layout/qr_code.xml @@ -20,7 +20,7 @@ android:layout_height="300dp" android:id="@+id/qrCodeWrapper"> - - - + - - - , Ha .compose(apiHelper.configureApiCallObserver()) .subscribe(new ItemsCallback(user1 -> { FrameLayout petWrapper = (FrameLayout) getLayoutInflater().inflate(R.layout.pet_imageview, null); - ImageView petImageView = (ImageView) petWrapper.findViewById(R.id.pet_imageview); + SimpleDraweeView petImageView = (SimpleDraweeView) petWrapper.findViewById(R.id.pet_imageview); DataBindingUtils.loadImage(petImageView, "Pet-" + event.usingEgg.getKey() + "-" + event.usingHatchingPotion.getKey()); String potionName = event.usingHatchingPotion.getText(); @@ -1142,7 +1142,7 @@ public class MainActivity extends BaseActivity implements Action1, Ha showSnackbar(MainActivity.this, floatingMenuWrapper, getString(R.string.notification_pet_fed, pet.getColorText(), pet.getAnimalText()), SnackbarDisplayType.NORMAL); if (feedResponse.value == -1) { FrameLayout mountWrapper = (FrameLayout) getLayoutInflater().inflate(R.layout.pet_imageview, null); - ImageView mountImageView = (ImageView) mountWrapper.findViewById(R.id.pet_imageview); + SimpleDraweeView mountImageView = (SimpleDraweeView) mountWrapper.findViewById(R.id.pet_imageview); DataBindingUtils.loadImage(mountImageView, "Mount_Icon_" + event.usingPet.getKey()); String colorName = event.usingPet.getColorText(); diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MaintenanceActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MaintenanceActivity.java index 72bd539ad..2356896b6 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MaintenanceActivity.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MaintenanceActivity.java @@ -1,10 +1,10 @@ package com.habitrpg.android.habitica.ui.activities; +import com.facebook.drawee.view.SimpleDraweeView; import com.habitrpg.android.habitica.R; import com.habitrpg.android.habitica.components.AppComponent; import com.habitrpg.android.habitica.ui.helpers.MarkdownParser; import com.magicmicky.habitrpgwrapper.lib.api.MaintenanceApiService; -import com.squareup.picasso.Picasso; import net.pherth.android.emoji_library.EmojiTextView; @@ -14,7 +14,6 @@ import android.os.Bundle; import android.text.method.LinkMovementMethod; import android.view.View; import android.widget.Button; -import android.widget.ImageView; import android.widget.TextView; import javax.inject.Inject; @@ -31,7 +30,7 @@ public class MaintenanceActivity extends BaseActivity { @BindView(R.id.titleTextView) TextView titleTextView; @BindView(R.id.imageView) - ImageView imageView; + SimpleDraweeView imageView; @BindView(R.id.descriptionTextView) EmojiTextView descriptionTextView; @BindView(R.id.playStoreButton) @@ -50,7 +49,8 @@ public class MaintenanceActivity extends BaseActivity { Bundle data = getIntent().getExtras(); this.titleTextView.setText(data.getString("title")); - Picasso.with(this).load(data.getString("imageUrl")).into(this.imageView); + + imageView.setImageURI(Uri.parse(data.getString("imageUrl"))); this.descriptionTextView.setText(MarkdownParser.parseMarkdown(data.getString("description"))); this.descriptionTextView.setMovementMethod(LinkMovementMethod.getInstance()); diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.java index dc5ebcbff..b7bbc29b0 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.java @@ -1,5 +1,6 @@ package com.habitrpg.android.habitica.ui.adapter; +import com.facebook.drawee.view.SimpleDraweeView; import com.habitrpg.android.habitica.R; import com.habitrpg.android.habitica.events.commands.OpenMenuItemCommand; import com.habitrpg.android.habitica.events.commands.UnlockPathCommand; @@ -19,7 +20,6 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.Button; -import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.RelativeLayout; import android.widget.TextView; @@ -147,7 +147,7 @@ public class CustomizationRecyclerViewAdapter extends RecyclerView.Adapter