diff --git a/.idea/misc.xml b/.idea/misc.xml index c0f68edd..99202cc2 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -25,7 +25,7 @@ - + diff --git a/app/build.gradle b/app/build.gradle index 50f369d2..b81f29c6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -27,10 +27,10 @@ android { } dependencies { - implementation files('libs/colorpicker.aar') - implementation files('libs/picasso-2.5.2.jar') - implementation files('libs/twitter4j-core-4.0.6.jar') - implementation files('libs/twitter4j-core-4.0.6-sources.jar') + implementation 'org.twitter4j:twitter4j-core:4.0.6' + implementation 'com.github.QuadFlask:colorpicker:0.0.13' + implementation 'com.squareup.picasso:picasso:2.71828' + implementation 'com.android.support:appcompat-v7:27.1.1' implementation 'com.android.support:cardview-v7:27.1.1' implementation 'com.android.support:design:27.1.1' diff --git a/app/libs/colorpicker.aar b/app/libs/colorpicker.aar deleted file mode 100644 index d97641af..00000000 Binary files a/app/libs/colorpicker.aar and /dev/null differ diff --git a/app/libs/picasso-2.5.2.jar b/app/libs/picasso-2.5.2.jar deleted file mode 100644 index 6acbaa14..00000000 Binary files a/app/libs/picasso-2.5.2.jar and /dev/null differ diff --git a/app/libs/twitter4j-core-4.0.6-sources.jar b/app/libs/twitter4j-core-4.0.6-sources.jar deleted file mode 100644 index a709d502..00000000 Binary files a/app/libs/twitter4j-core-4.0.6-sources.jar and /dev/null differ diff --git a/app/libs/twitter4j-core-4.0.6.jar b/app/libs/twitter4j-core-4.0.6.jar deleted file mode 100644 index a1f86cce..00000000 Binary files a/app/libs/twitter4j-core-4.0.6.jar and /dev/null differ diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/ProfileLoader.java b/app/src/main/java/org/nuclearfog/twidda/backend/ProfileLoader.java index 4795b652..1bf55503 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/ProfileLoader.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/ProfileLoader.java @@ -246,7 +246,7 @@ public class ProfileLoader extends AsyncTask { connect.findViewById(R.id.followback).setVisibility(View.VISIBLE); } if(imgEnabled) { - Picasso.with(connect).load(profileImage+"_bigger").into(profile); + Picasso.get().load(profileImage + "_bigger").into(profile); profile.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/StatusLoader.java b/app/src/main/java/org/nuclearfog/twidda/backend/StatusLoader.java index 2deb7e1d..5afd2cf7 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/StatusLoader.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/StatusLoader.java @@ -237,7 +237,7 @@ public class StatusLoader extends AsyncTask { tweet_verify.setVisibility(View.VISIBLE); } if(toggleImg) { - Picasso.with(ui.get()).load(profile_pb).into(profile_img); + Picasso.get().load(profile_pb).into(profile_img); } if (medialinks != null && medialinks.length != 0) { View mediaButton = connect.findViewById(R.id.image_attach); diff --git a/app/src/main/java/org/nuclearfog/twidda/viewadapter/TimelineRecycler.java b/app/src/main/java/org/nuclearfog/twidda/viewadapter/TimelineRecycler.java index 4dc6888d..d6042d75 100644 --- a/app/src/main/java/org/nuclearfog/twidda/viewadapter/TimelineRecycler.java +++ b/app/src/main/java/org/nuclearfog/twidda/viewadapter/TimelineRecycler.java @@ -104,7 +104,7 @@ public class TimelineRecycler extends Adapter imple vh.favorite.setText(favorit); vh.time.setText(stringTime(tweet.time)); if(img_ldr) { - Picasso.with(parent.getContext()).load(tweet.user.profileImg+"_mini").into(vh.profile); + Picasso.get().load(tweet.user.profileImg + "_mini").into(vh.profile); } if(tweet.user.isVerified) { vh.verify.setVisibility(View.VISIBLE); diff --git a/app/src/main/java/org/nuclearfog/twidda/viewadapter/UserRecycler.java b/app/src/main/java/org/nuclearfog/twidda/viewadapter/UserRecycler.java index 3057ee86..114285d3 100644 --- a/app/src/main/java/org/nuclearfog/twidda/viewadapter/UserRecycler.java +++ b/app/src/main/java/org/nuclearfog/twidda/viewadapter/UserRecycler.java @@ -75,7 +75,7 @@ public class UserRecycler extends Adapter implements On vh.screenname.setText(user.screenname); vh.username.setText(user.username); if(loadImage) { - Picasso.with(parent.getContext()).load(user.profileImg+"_mini").into(vh.profileImg); + Picasso.get().load(user.profileImg + "_mini").into(vh.profileImg); } if(user.isVerified) { vh.verifyIco.setVisibility(View.VISIBLE); diff --git a/build.gradle b/build.gradle index 73c0da3a..e8639462 100644 --- a/build.gradle +++ b/build.gradle @@ -16,6 +16,7 @@ allprojects { repositories { jcenter() google() + maven { url "https://jitpack.io"} } }