Merge pull request #4 from b-lam/develop

Merge from develop
b-lam · Apr 5, 2017 · 1bcd3fa · 1bcd3fa
2 parents a93226d + 04d41bc
commit 1bcd3fa
Show file tree

Hide file tree

Showing 28 changed files with 233 additions and 51 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 #[Resplash]
 
-<img src="https://github.com/b-lam/Resplash/blob/develop/design/Play%20Store/Resplash_Play_Store_Banner.jpg?raw=true" height="350">
+<img src="https://github.com/b-lam/Resplash/blob/develop/design/Play%20Store/Resplash_Play_Store_Banner.jpg?raw=true" width="750">
 
 **[Resplash]** is powered by [Unsplash.com](https://unsplash.com/)
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "com.b_lam.resplash"
         minSdkVersion 22
         targetSdkVersion 25
-        versionCode 1
-        versionName "1.0"
+        versionCode 2
+        versionName "1.0.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         buildConfigField("String", "UNSPLASH_APPLICATION_ID", UNSPLASH_APPLICATION_ID)
         buildConfigField("String", "UNSPLASH_SECRET", UNSPLASH_SECRET)
@@ -37,10 +37,10 @@ dependencies {
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile 'com.android.support:appcompat-v7:25.1.1'
-    compile 'com.android.support:support-v4:25.1.1'
-    compile 'com.android.support:design:25.1.1'
-    compile 'com.android.support:cardview-v7:25.1.1'
+    compile 'com.android.support:appcompat-v7:25.2.0'
+    compile 'com.android.support:support-v4:25.2.0'
+    compile 'com.android.support:design:25.2.0'
+    compile 'com.android.support:cardview-v7:25.2.0'
     testCompile 'junit:junit:4.12'
     compile 'com.squareup.retrofit2:retrofit:2.1.0'
     compile 'com.google.code.gson:gson:2.8.0'

diff --git a/app/resplash-1.0.1.apk b/app/resplash-1.0.1.apk
diff --git a/app/src/debug/ic_launcher-web.png b/app/src/debug/ic_launcher-web.png
diff --git a/app/src/debug/res/mipmap-hdpi/ic_launcher.png b/app/src/debug/res/mipmap-hdpi/ic_launcher.png
diff --git a/app/src/debug/res/mipmap-mdpi/ic_launcher.png b/app/src/debug/res/mipmap-mdpi/ic_launcher.png
diff --git a/app/src/debug/res/mipmap-xhdpi/ic_launcher.png b/app/src/debug/res/mipmap-xhdpi/ic_launcher.png
diff --git a/app/src/debug/res/mipmap-xxhdpi/ic_launcher.png b/app/src/debug/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/app/src/main/java/com/b_lam/resplash/activities/CollectionDetailActivity.java b/app/src/main/java/com/b_lam/resplash/activities/CollectionDetailActivity.java
@@ -6,8 +6,11 @@
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
+import android.support.v4.app.ActivityOptionsCompat;
+import android.support.v4.util.Pair;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.GridLayoutManager;
@@ -18,6 +21,7 @@
 import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
+import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -67,6 +71,7 @@ public class CollectionDetailActivity extends AppCompatActivity {
     private PhotoService.OnRequestPhotosListener mPhotosRequestListener;
     private String mLayoutType;
     private PhotoService photoService;
+    private SharedPreferences sharedPreferences;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -99,7 +104,7 @@ protected void onCreate(Bundle savedInstanceState) {
         mUserProfilePicture.setOnClickListener(userProfileOnClickListener);
         mUserCollection.setOnClickListener(userProfileOnClickListener);
 
-        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(Resplash.getInstance());
+        sharedPreferences = PreferenceManager.getDefaultSharedPreferences(Resplash.getInstance());
         mLayoutType = sharedPreferences.getString("item_layout", "List");
         mPage = 1;
         if(mLayoutType.equals("List") || mLayoutType.equals("Cards")){
@@ -153,7 +158,27 @@ public void onRefresh() {
         public boolean onClick(View v, IAdapter<Photo> adapter, Photo item, int position) {
             Intent i = new Intent(getApplicationContext(), DetailActivity.class);
             i.putExtra("Photo", new Gson().toJson(item));
-            startActivity(i);
+            String layout = sharedPreferences.getString("item_layout", "List");
+
+            ImageView imageView;
+
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP || sharedPreferences.getString("item_layout", "List").equals("Grid")) {
+                startActivity(i);
+            } else if (layout.equals("Cards")) {
+                imageView = (ImageView) v.findViewById(R.id.item_image_card_img);
+                if (imageView.getDrawable() != null)
+                    Resplash.getInstance().setDrawable(imageView.getDrawable());
+                startActivity(i);
+            } else {
+                imageView = (ImageView) v.findViewById(R.id.item_image_img);
+                if (imageView.getDrawable() != null)
+                    Resplash.getInstance().setDrawable(imageView.getDrawable());
+//                v.setTransitionName("photoScale");
+//                Pair<View, String> p1 = Pair.create(v, v.getTransitionName());
+//                ActivityOptionsCompat options = ActivityOptionsCompat.makeSceneTransitionAnimation(CollectionDetailActivity.this, p1);
+//                startActivity(i, options.toBundle());
+                startActivity(i);
+            }
             return false;
         }
     };

diff --git a/app/src/main/java/com/b_lam/resplash/activities/DetailActivity.java b/app/src/main/java/com/b_lam/resplash/activities/DetailActivity.java
@@ -15,9 +15,12 @@
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
 import android.preference.PreferenceManager;
+import android.support.v4.app.ActivityCompat;
+import android.support.v4.app.ActivityOptionsCompat;
 import android.support.v4.app.NotificationCompat;
 import android.support.v4.content.FileProvider;
 import android.support.v7.app.AppCompatActivity;
@@ -26,6 +29,8 @@
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.ViewTreeObserver;
+import android.view.Window;
 import android.view.animation.OvershootInterpolator;
 import android.widget.ImageButton;
 import android.widget.ImageView;
@@ -126,9 +131,10 @@ protected void onCreate(Bundle savedInstanceState) {
 
         if(Resplash.getInstance().getDrawable() != null){
             imgFull.setImageDrawable(Resplash.getInstance().getDrawable());
+            Resplash.getInstance().setDrawable(null);
         }else {
             Glide.with(DetailActivity.this)
-                    .load(mPhoto.urls.full)
+                    .load(mPhoto.urls.regular)
                     .priority(Priority.HIGH)
                     .placeholder(R.drawable.placeholder)
                     .diskCacheStrategy(DiskCacheStrategy.RESULT)
@@ -169,7 +175,6 @@ public void onRequestPhotoDetailsSuccess(Call<PhotoDetails> call, Response<Photo
                     tvDownloads.setText(NumberFormat.getInstance(Locale.CANADA).format(mPhotoDetails.downloads) + " Downloads");
                     like = mPhotoDetails.liked_by_user;
                     updateHeartButton(like);
-                    loadProgress.setVisibility(View.GONE);
                     content.setVisibility(View.VISIBLE);
                     floatingActionMenu.setVisibility(View.VISIBLE);
                 } else if (response.code() == 403) {
@@ -279,6 +284,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
 
         switch (item.getItemId()){
             case android.R.id.home:
+                getWindow().setExitTransition(null);
                 supportFinishAfterTransition();
                 return true;
             case R.id.action_share:
@@ -297,6 +303,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
 
     @Override
     public void onBackPressed(){
+        getWindow().setExitTransition(null);
         supportFinishAfterTransition();
     }
 

diff --git a/app/src/main/java/com/b_lam/resplash/activities/MainActivity.java b/app/src/main/java/com/b_lam/resplash/activities/MainActivity.java
@@ -21,11 +21,14 @@
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.text.TextUtils;
+import android.transition.Fade;
+import android.transition.Transition;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.ViewTreeObserver;
 import android.widget.ImageView;
 import android.widget.Toast;
 
@@ -207,7 +210,6 @@ public void onClick(View view) {
                 startActivity(new Intent(Intent.ACTION_VIEW, uri));
             }
         });
-
     }
 
     private Drawer.OnDrawerItemClickListener drawerItemClickListener = new Drawer.OnDrawerItemClickListener() {

diff --git a/app/src/main/java/com/b_lam/resplash/data/data/Photo.java b/app/src/main/java/com/b_lam/resplash/data/data/Photo.java
@@ -4,21 +4,28 @@
 import android.animation.ArgbEvaluator;
 import android.animation.ObjectAnimator;
 import android.animation.ValueAnimator;
+import android.app.Activity;
+import android.content.Intent;
 import android.content.SharedPreferences;
 import android.graphics.Color;
 import android.preference.PreferenceManager;
+import android.support.v4.app.ActivityOptionsCompat;
 import android.support.v4.content.ContextCompat;
 import android.support.v4.graphics.ColorUtils;
+import android.support.v4.util.Pair;
 import android.support.v7.widget.RecyclerView;
 import android.util.DisplayMetrics;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.b_lam.resplash.Resplash;
+import com.b_lam.resplash.activities.DetailActivity;
+import com.b_lam.resplash.activities.MainActivity;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.request.animation.ViewPropertyAnimation;
+import com.google.gson.Gson;
 import com.mikepenz.fastadapter.items.AbstractItem;
 import com.mikepenz.fastadapter.utils.ViewHolderFactory;
 
@@ -425,7 +432,6 @@ public void onAnimationUpdate(ValueAnimator animator) {
 
                 });
                 colorAnimation.start();
-
                 break;
             case "Cards":
                 Glide.with(holder.itemView.getContext())

diff --git a/app/src/main/java/com/b_lam/resplash/fragments/FeaturedFragment.java b/app/src/main/java/com/b_lam/resplash/fragments/FeaturedFragment.java
@@ -2,9 +2,12 @@
 
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
+import android.support.v4.app.ActivityOptionsCompat;
 import android.support.v4.app.Fragment;
+import android.support.v4.util.Pair;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -13,11 +16,15 @@
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.ViewTreeObserver;
+import android.view.Window;
+import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.Toast;
 
 import com.b_lam.resplash.Resplash;
 import com.b_lam.resplash.activities.DetailActivity;
+import com.b_lam.resplash.activities.MainActivity;
 import com.b_lam.resplash.data.data.Photo;
 import com.b_lam.resplash.data.service.PhotoService;
 import com.google.gson.Gson;
@@ -52,6 +59,7 @@ public class FeaturedFragment extends Fragment{
     private FooterAdapter<ProgressItem> mFooterAdapter;
     private int mPage, mColumns;
     private String mSort;
+    private SharedPreferences sharedPreferences;
 
     public FeaturedFragment() {
         // Required empty public constructor
@@ -72,7 +80,7 @@ public void onCreate(Bundle savedInstanceState) {
         setHasOptionsMenu(true);
         super.onCreate(savedInstanceState);
 
-        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(Resplash.getInstance());
+        sharedPreferences = PreferenceManager.getDefaultSharedPreferences(Resplash.getInstance());
         String mLayoutType = sharedPreferences.getString("item_layout", "List");
         mSort = getArguments().getString("sort", "latest");
         if(mLayoutType.equals("List") || mLayoutType.equals("Cards")){
@@ -82,7 +90,6 @@ public void onCreate(Bundle savedInstanceState) {
         }
 
         mService = PhotoService.getService();
-
     }
 
     @Override
@@ -152,7 +159,37 @@ public void onDestroy() {
         public boolean onClick(View v, IAdapter<Photo> adapter, Photo item, int position) {
             Intent i = new Intent(getContext(), DetailActivity.class);
             i.putExtra("Photo", new Gson().toJson(item));
-            startActivity(i);
+
+            String layout = sharedPreferences.getString("item_layout", "List");
+
+            ImageView imageView;
+
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP || sharedPreferences.getString("item_layout", "List").equals("Grid")) {
+                startActivity(i);
+            } else if (layout.equals("Cards")) {
+                imageView = (ImageView) v.findViewById(R.id.item_image_card_img);
+                if (imageView.getDrawable() != null)
+                    Resplash.getInstance().setDrawable(imageView.getDrawable());
+                startActivity(i);
+            } else {
+                imageView = (ImageView) v.findViewById(R.id.item_image_img);
+                if (imageView.getDrawable() != null)
+                    Resplash.getInstance().setDrawable(imageView.getDrawable());
+//                v.setTransitionName("photoScale");
+//                View navigationBar = getActivity().findViewById(android.R.id.navigationBarBackground);
+//                View statusBar = getActivity().findViewById(android.R.id.statusBarBackground);
+//
+//                Pair<View, String> p1 = Pair.create(v, v.getTransitionName());
+//                Pair<View, String> p2 = Pair.create(statusBar, Window.STATUS_BAR_BACKGROUND_TRANSITION_NAME);
+//                Pair<View, String> p3 = Pair.create(navigationBar, Window.NAVIGATION_BAR_BACKGROUND_TRANSITION_NAME);
+//
+//                ActivityOptionsCompat options = ActivityOptionsCompat.makeSceneTransitionAnimation(getActivity(), p1, p2, p3);
+//                startActivity(i, options.toBundle());
+                startActivity(i);
+            }
+
+
+
             return false;
         }
     };
@@ -205,7 +242,6 @@ public void onRequestPhotosFailed(Call<List<Photo>> call, Throwable t) {
         };
 
         mService.requestCuratedPhotos(mPage, Resplash.DEFAULT_PER_PAGE, mSort, mPhotoRequestListener);
-
     }
 
     public void fetchNew(){

diff --git a/app/src/main/java/com/b_lam/resplash/fragments/NewFragment.java b/app/src/main/java/com/b_lam/resplash/fragments/NewFragment.java
@@ -2,9 +2,12 @@
 
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
+import android.support.v4.app.ActivityOptionsCompat;
 import android.support.v4.app.Fragment;
+import android.support.v4.util.Pair;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -13,6 +16,8 @@
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.Window;
+import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.Toast;
 
@@ -52,6 +57,7 @@ public class NewFragment extends Fragment {
     private FooterAdapter<ProgressItem> mFooterAdapter;
     private int mPage, mColumns;
     private String mSort;
+    private SharedPreferences sharedPreferences;
 
     public NewFragment() {
         // Required empty public constructor
@@ -72,7 +78,7 @@ public void onCreate(Bundle savedInstanceState) {
         setHasOptionsMenu(true);
         super.onCreate(savedInstanceState);
 
-        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(Resplash.getInstance());
+        sharedPreferences = PreferenceManager.getDefaultSharedPreferences(Resplash.getInstance());
         String mLayoutType = sharedPreferences.getString("item_layout", "List");
         mSort = getArguments().getString("sort", "latest");
         if(mLayoutType.equals("List") || mLayoutType.equals("Cards")){
@@ -147,7 +153,28 @@ public void onDestroy() {
         public boolean onClick(View v, IAdapter<Photo> adapter, Photo item, int position) {
             Intent i = new Intent(getContext(), DetailActivity.class);
             i.putExtra("Photo", new Gson().toJson(item));
-            startActivity(i);
+
+            String layout = sharedPreferences.getString("item_layout", "List");
+
+            ImageView imageView;
+
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP || sharedPreferences.getString("item_layout", "List").equals("Grid")) {
+                startActivity(i);
+            } else if (layout.equals("Cards")) {
+                imageView = (ImageView) v.findViewById(R.id.item_image_card_img);
+                if (imageView.getDrawable() != null)
+                    Resplash.getInstance().setDrawable(imageView.getDrawable());
+                startActivity(i);
+            } else {
+                imageView = (ImageView) v.findViewById(R.id.item_image_img);
+                if (imageView.getDrawable() != null)
+                    Resplash.getInstance().setDrawable(imageView.getDrawable());
+//                v.setTransitionName("photoScale");
+//                Pair<View, String> p1 = Pair.create(v, v.getTransitionName());
+//                ActivityOptionsCompat options = ActivityOptionsCompat.makeSceneTransitionAnimation(getActivity(), p1);
+//                startActivity(i, options.toBundle());
+                startActivity(i);
+            }
             return false;
         }
     };