diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml index 516db95e..2298751f 100644 --- a/sample/src/main/AndroidManifest.xml +++ b/sample/src/main/AndroidManifest.xml @@ -34,160 +34,39 @@ android:name=".ex.ExamplesActivity" android:label="@string/examples_title" /> - - - - - - + - - - - - - + - - - - - - + - - - - - - + - - - - - - + - - - - - - + - - - - - - + - - - - - - + - - - - - - + - - - - - - + - - - - - - + - - - - - - + - - - - - - + - - - - - - + - - - - - - + diff --git a/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/ExamplesActivity.java b/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/ExamplesActivity.java index b7712d2d..3871365c 100644 --- a/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/ExamplesActivity.java +++ b/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/ExamplesActivity.java @@ -1,25 +1,33 @@ package com.alexvasilkov.gestures.sample.ex; -import android.content.ComponentName; -import android.content.Context; +import android.app.Activity; import android.content.Intent; -import android.content.pm.ActivityInfo; -import android.content.pm.ResolveInfo; -import android.graphics.drawable.Drawable; import android.os.Bundle; -import android.view.View; import android.view.ViewGroup; import android.widget.TextView; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; -import androidx.core.graphics.drawable.DrawableCompat; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.alexvasilkov.android.commons.ui.Views; import com.alexvasilkov.gestures.sample.R; import com.alexvasilkov.gestures.sample.base.BaseActivity; +import com.alexvasilkov.gestures.sample.ex.animations.ImageAnimationActivity; +import com.alexvasilkov.gestures.sample.ex.animations.RoundImageAnimationActivity; +import com.alexvasilkov.gestures.sample.ex.animations.cross.ImageCrossAnimationActivity; +import com.alexvasilkov.gestures.sample.ex.image.control.ImageControlActivity; +import com.alexvasilkov.gestures.sample.ex.image.crop.ImageCropActivity; +import com.alexvasilkov.gestures.sample.ex.image.pager.ViewPagerActivity; +import com.alexvasilkov.gestures.sample.ex.image.viewer.ImageViewerActivity; +import com.alexvasilkov.gestures.sample.ex.layout.pager.LayoutsInPagerActivity; +import com.alexvasilkov.gestures.sample.ex.layout.viewer.LayoutViewerActivity; +import com.alexvasilkov.gestures.sample.ex.other.markers.ImageMarkersActivity; +import com.alexvasilkov.gestures.sample.ex.other.scene.SceneActivity; +import com.alexvasilkov.gestures.sample.ex.other.text.CustomViewActivity; +import com.alexvasilkov.gestures.sample.ex.transitions.complex.ListAnyToAllActivity; +import com.alexvasilkov.gestures.sample.ex.transitions.complex.ListAnyToAnyActivity; +import com.alexvasilkov.gestures.sample.ex.transitions.recycler.RecyclerToPagerActivity; import com.alexvasilkov.gestures.sample.ex.utils.Painting; import com.bumptech.glide.Glide; @@ -39,7 +47,7 @@ protected void onCreate(Bundle savedInstanceState) { RecyclerView recyclerView = findViewById(R.id.main_list); recyclerView.setLayoutManager(new LinearLayoutManager(this)); - recyclerView.setAdapter(new SampleAdapter(getActivitiesList())); + recyclerView.setAdapter(new ExamplesAdapter(getExamplesList())); paintings = Painting.list(getResources()); } @@ -54,84 +62,198 @@ protected void onResume() { } } - private void onItemClicked(ActivityInfo info) { - Intent intent = new Intent(); - intent.setComponent(new ComponentName(this, info.name)); - startActivity(intent); - } + private static List getExamplesList() { + List items = new ArrayList<>(); - private List getActivitiesList() { - List list = new ArrayList<>(); + items.add(new ExampleGroup(R.string.example_group_image)); - Intent mainIntent = new Intent(Intent.ACTION_MAIN, null); - mainIntent.addCategory(Intent.CATEGORY_SAMPLE_CODE); + items.add(new Example( + ImageViewerActivity.class, + R.string.example_image_viewer, + R.drawable.ic_ex_image)); - String packageName = getApplicationInfo().packageName; - List resolveList = getPackageManager().queryIntentActivities(mainIntent, 0); - if (resolveList == null) { - return list; - } + items.add(new Example( + ImageControlActivity.class, + R.string.example_image_state_control, + R.drawable.ic_ex_state_control)); - for (ResolveInfo info : resolveList) { - if (packageName.equals(info.activityInfo.packageName)) { - list.add(info.activityInfo); - } - } + items.add(new Example( + ImageCropActivity.class, + R.string.example_image_cropping, + R.drawable.ic_ex_crop)); + + items.add(new Example( + ViewPagerActivity.class, + R.string.example_images_in_pager, + R.drawable.ic_ex_pager)); + + items.add(new ExampleGroup(R.string.example_group_image_animations)); + + items.add(new Example( + ImageAnimationActivity.class, + R.string.example_image_animation, + R.drawable.ic_ex_image_animation)); + + items.add(new Example( + ImageCrossAnimationActivity.class, + R.string.example_image_animation_cross, + R.drawable.ic_ex_image_animation)); + + items.add(new Example( + RoundImageAnimationActivity.class, + R.string.example_image_animation_circular, + R.drawable.ic_ex_image_animation)); + + items.add(new ExampleGroup(R.string.example_group_list_transitions)); + + items.add(new Example( + RecyclerToPagerActivity.class, + R.string.example_list_transitions_1_N, + R.drawable.ic_ex_list)); + + items.add(new Example( + ListAnyToAllActivity.class, + R.string.example_list_transitions_n_N, + R.drawable.ic_ex_complex_list)); - return list; + items.add(new Example( + ListAnyToAnyActivity.class, + R.string.example_list_transitions_n_n, + R.drawable.ic_ex_complex_list)); + + items.add(new ExampleGroup(R.string.example_group_layout)); + + items.add(new Example( + LayoutViewerActivity.class, + R.string.example_layout_viewer, + R.drawable.ic_ex_layout)); + + items.add(new Example( + LayoutsInPagerActivity.class, + R.string.example_layouts_in_pager, + R.drawable.ic_ex_pager)); + + items.add(new ExampleGroup(R.string.example_group_other)); + + items.add(new Example( + CustomViewActivity.class, + R.string.example_other_custom, + R.drawable.ic_ex_custom_text)); + + items.add(new Example( + ImageMarkersActivity.class, + R.string.example_other_markers, + R.drawable.ic_ex_markers)); + + items.add(new Example( + SceneActivity.class, + R.string.example_other_objects, + R.drawable.ic_ex_objects_control)); + + return items; } - private class SampleAdapter extends RecyclerView.Adapter { + private class ExamplesAdapter extends RecyclerView.Adapter { + private static final int viewTypeHeader = 0; + private static final int viewTypeExample = 1; - private final List list; + private final List list; - SampleAdapter(List list) { + ExamplesAdapter(List list) { this.list = list; } - @NonNull @Override - public ViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int viewType) { - return new ViewHolder(viewGroup); + public int getItemCount() { + return list.size(); + } + + @Override + public int getItemViewType(int position) { + Object item = list.get(position); + if (item instanceof Example) { + return viewTypeExample; + } else if (item instanceof ExampleGroup) { + return viewTypeHeader; + } else { + throw new IllegalArgumentException("Unknown item"); + } } + @NonNull @Override - public void onBindViewHolder(ViewHolder viewHolder, int position) { - viewHolder.info = list.get(position); - - viewHolder.text.setText(viewHolder.info.loadLabel(getPackageManager())); - - // Setting tinted example icon - Context context = ExamplesActivity.this; - Drawable icon = DrawableCompat.wrap(viewHolder.info.loadIcon(getPackageManager())); - DrawableCompat.setTint(icon, ContextCompat.getColor(context, R.color.accent)); - int padding = getResources().getDimensionPixelSize(R.dimen.example_icon_padding); - viewHolder.text.setCompoundDrawablePadding(padding); - viewHolder.text.setCompoundDrawablesWithIntrinsicBounds(icon, null, null, null); + public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + if (viewType == viewTypeExample) { + return new ExampleHolder(parent); + } else if (viewType == viewTypeHeader) { + return new HeaderHolder(parent); + } else { + throw new IllegalArgumentException("Unknown view type"); + } } @Override - public int getItemCount() { - return list == null ? 0 : list.size(); + public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) { + if (holder instanceof ExampleHolder) { + ((ExampleHolder) holder).bind((Example) list.get(position)); + } else if (holder instanceof HeaderHolder) { + ((HeaderHolder) holder).bind((ExampleGroup) list.get(position)); + } } - class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener { - final TextView text; - ActivityInfo info; - ViewHolder(ViewGroup parent) { + class ExampleHolder extends RecyclerView.ViewHolder { + private final TextView text; + private Example info; + + ExampleHolder(ViewGroup parent) { super(Views.inflate(parent, R.layout.examples_list_item)); text = (TextView) itemView; - itemView.setOnClickListener(this); + itemView.setOnClickListener( + view -> startActivity(new Intent(ExamplesActivity.this, info.screen))); } - @Override - public void onClick(@NonNull View view) { - onItemClicked(info); + void bind(Example item) { + this.info = item; + text.setText(item.titleId); + text.setCompoundDrawablesWithIntrinsicBounds(item.iconId, 0, 0, 0); } } + class HeaderHolder extends RecyclerView.ViewHolder { + private final TextView text; + + HeaderHolder(ViewGroup parent) { + super(Views.inflate(parent, R.layout.examples_list_header)); + text = (TextView) itemView; + } + + void bind(ExampleGroup item) { + text.setText(item.titleId); + } + } + } + + + private static class Example { + final Class screen; + final int titleId; + final int iconId; + + Example(Class screen, int titleId, int iconId) { + this.screen = screen; + this.titleId = titleId; + this.iconId = iconId; + } + } + + private static class ExampleGroup { + final int titleId; + + ExampleGroup(int titleId) { + this.titleId = titleId; + } } } diff --git a/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/image/animation/ImageAnimationActivity.java b/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/animations/ImageAnimationActivity.java similarity index 96% rename from sample/src/main/java/com/alexvasilkov/gestures/sample/ex/image/animation/ImageAnimationActivity.java rename to sample/src/main/java/com/alexvasilkov/gestures/sample/ex/animations/ImageAnimationActivity.java index 53175fa5..fc01105a 100644 --- a/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/image/animation/ImageAnimationActivity.java +++ b/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/animations/ImageAnimationActivity.java @@ -1,4 +1,4 @@ -package com.alexvasilkov.gestures.sample.ex.image.animation; +package com.alexvasilkov.gestures.sample.ex.animations; import android.os.Bundle; import android.view.View; @@ -53,6 +53,7 @@ protected void onCreate(Bundle savedInstanceState) { */ protected void initContentView() { setContentView(R.layout.image_animation_screen); + setTitle(R.string.example_image_animation); } @Override diff --git a/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/image/animation/RoundImageAnimationActivity.java b/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/animations/RoundImageAnimationActivity.java similarity index 82% rename from sample/src/main/java/com/alexvasilkov/gestures/sample/ex/image/animation/RoundImageAnimationActivity.java rename to sample/src/main/java/com/alexvasilkov/gestures/sample/ex/animations/RoundImageAnimationActivity.java index d438e6c3..26063a74 100644 --- a/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/image/animation/RoundImageAnimationActivity.java +++ b/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/animations/RoundImageAnimationActivity.java @@ -1,4 +1,4 @@ -package com.alexvasilkov.gestures.sample.ex.image.animation; +package com.alexvasilkov.gestures.sample.ex.animations; import com.alexvasilkov.gestures.commons.circle.CircleGestureImageView; import com.alexvasilkov.gestures.commons.circle.CircleImageView; @@ -13,6 +13,7 @@ public class RoundImageAnimationActivity extends ImageAnimationActivity { @Override protected void initContentView() { setContentView(R.layout.image_animation_round_screen); + setTitle(R.string.example_image_animation_circular); } } diff --git a/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/image/animation/cross/CrossEvents.java b/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/animations/cross/CrossEvents.java similarity index 71% rename from sample/src/main/java/com/alexvasilkov/gestures/sample/ex/image/animation/cross/CrossEvents.java rename to sample/src/main/java/com/alexvasilkov/gestures/sample/ex/animations/cross/CrossEvents.java index 09190ae3..efefa72a 100644 --- a/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/image/animation/cross/CrossEvents.java +++ b/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/animations/cross/CrossEvents.java @@ -1,4 +1,4 @@ -package com.alexvasilkov.gestures.sample.ex.image.animation.cross; +package com.alexvasilkov.gestures.sample.ex.animations.cross; class CrossEvents { diff --git a/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/image/animation/cross/FullImageActivity.java b/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/animations/cross/FullImageActivity.java similarity index 97% rename from sample/src/main/java/com/alexvasilkov/gestures/sample/ex/image/animation/cross/FullImageActivity.java rename to sample/src/main/java/com/alexvasilkov/gestures/sample/ex/animations/cross/FullImageActivity.java index e7de2974..c6d9f222 100644 --- a/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/image/animation/cross/FullImageActivity.java +++ b/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/animations/cross/FullImageActivity.java @@ -1,4 +1,4 @@ -package com.alexvasilkov.gestures.sample.ex.image.animation.cross; +package com.alexvasilkov.gestures.sample.ex.animations.cross; import android.app.Activity; import android.content.Intent; @@ -41,6 +41,7 @@ protected void onCreate(final Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.image_cross_animation_to_screen); + setTitle(R.string.example_image_animation_cross_target); image = findViewById(R.id.single_image_to); background = findViewById(R.id.single_image_to_back); diff --git a/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/image/animation/cross/ImageCrossAnimationActivity.java b/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/animations/cross/ImageCrossAnimationActivity.java similarity index 95% rename from sample/src/main/java/com/alexvasilkov/gestures/sample/ex/image/animation/cross/ImageCrossAnimationActivity.java rename to sample/src/main/java/com/alexvasilkov/gestures/sample/ex/animations/cross/ImageCrossAnimationActivity.java index 322ccd22..0ab6d2f8 100644 --- a/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/image/animation/cross/ImageCrossAnimationActivity.java +++ b/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/animations/cross/ImageCrossAnimationActivity.java @@ -1,4 +1,4 @@ -package com.alexvasilkov.gestures.sample.ex.image.animation.cross; +package com.alexvasilkov.gestures.sample.ex.animations.cross; import android.os.Bundle; import android.view.View; @@ -29,6 +29,7 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.image_cross_animation_from_screen); + setTitle(R.string.example_image_animation_cross); getSupportActionBarNotNull().setDisplayHomeAsUpEnabled(true); image = findViewById(R.id.single_image_from); diff --git a/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/image/control/ImageControlActivity.java b/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/image/control/ImageControlActivity.java index 82786564..9bdd0303 100644 --- a/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/image/control/ImageControlActivity.java +++ b/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/image/control/ImageControlActivity.java @@ -35,6 +35,7 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.image_control_screen); + setTitle(R.string.example_image_state_control); imageView = findViewById(R.id.image_control_viewer); diff --git a/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/image/crop/ImageCropActivity.java b/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/image/crop/ImageCropActivity.java index ab481c1b..c108db8d 100644 --- a/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/image/crop/ImageCropActivity.java +++ b/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/image/crop/ImageCropActivity.java @@ -32,6 +32,7 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.image_crop_screen); + setTitle(R.string.example_image_cropping); getSupportActionBarNotNull().setDisplayHomeAsUpEnabled(true); imageView = findViewById(R.id.image_crop_viewer); diff --git a/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/image/pager/ViewPagerActivity.java b/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/image/pager/ViewPagerActivity.java index d87b8c17..e23971aa 100644 --- a/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/image/pager/ViewPagerActivity.java +++ b/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/image/pager/ViewPagerActivity.java @@ -30,6 +30,7 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.image_pager_screen); + setTitle(R.string.example_images_in_pager); setInfoText(R.string.info_image_pager); // Initializing ViewPager diff --git a/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/image/viewer/ImageViewerActivity.java b/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/image/viewer/ImageViewerActivity.java index 339a284c..99e37adc 100644 --- a/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/image/viewer/ImageViewerActivity.java +++ b/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/image/viewer/ImageViewerActivity.java @@ -23,6 +23,7 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.image_viewer_screen); + setTitle(R.string.example_image_viewer); setInfoText(R.string.info_image_viewer); // Initializing image viewer diff --git a/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/layout/pager/LayoutsInPagerActivity.java b/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/layout/pager/LayoutsInPagerActivity.java index 52465635..635353d1 100644 --- a/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/layout/pager/LayoutsInPagerActivity.java +++ b/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/layout/pager/LayoutsInPagerActivity.java @@ -31,6 +31,7 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.layout_pager_screen); + setTitle(R.string.example_layouts_in_pager); final Painting[] paintings = Painting.list(getResources()); diff --git a/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/layout/viewer/LayoutViewerActivity.java b/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/layout/viewer/LayoutViewerActivity.java index 98539c95..2d4a67c0 100644 --- a/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/layout/viewer/LayoutViewerActivity.java +++ b/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/layout/viewer/LayoutViewerActivity.java @@ -26,6 +26,7 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.layout_viewer_screen); + setTitle(R.string.example_layout_viewer); layout = findViewById(R.id.frame_layout); diff --git a/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/image/markers/ImageMarkersActivity.java b/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/other/markers/ImageMarkersActivity.java similarity index 95% rename from sample/src/main/java/com/alexvasilkov/gestures/sample/ex/image/markers/ImageMarkersActivity.java rename to sample/src/main/java/com/alexvasilkov/gestures/sample/ex/other/markers/ImageMarkersActivity.java index 7599c118..cd074fa7 100644 --- a/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/image/markers/ImageMarkersActivity.java +++ b/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/other/markers/ImageMarkersActivity.java @@ -1,4 +1,4 @@ -package com.alexvasilkov.gestures.sample.ex.image.markers; +package com.alexvasilkov.gestures.sample.ex.other.markers; import android.graphics.drawable.Drawable; import android.os.Bundle; @@ -10,7 +10,7 @@ import com.alexvasilkov.gestures.sample.R; import com.alexvasilkov.gestures.sample.base.BaseSettingsActivity; -import com.alexvasilkov.gestures.sample.ex.image.markers.Marker.Mode; +import com.alexvasilkov.gestures.sample.ex.other.markers.Marker.Mode; import com.alexvasilkov.gestures.views.GestureImageView; /** @@ -27,6 +27,7 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.image_markers_screen); + setTitle(R.string.example_other_markers); // Setting up world map image = findViewById(R.id.markers_image); diff --git a/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/image/markers/Marker.java b/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/other/markers/Marker.java similarity index 97% rename from sample/src/main/java/com/alexvasilkov/gestures/sample/ex/image/markers/Marker.java rename to sample/src/main/java/com/alexvasilkov/gestures/sample/ex/other/markers/Marker.java index f7a05ced..abeaea3c 100644 --- a/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/image/markers/Marker.java +++ b/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/other/markers/Marker.java @@ -1,4 +1,4 @@ -package com.alexvasilkov.gestures.sample.ex.image.markers; +package com.alexvasilkov.gestures.sample.ex.other.markers; import android.graphics.drawable.Drawable; import android.view.Gravity; diff --git a/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/image/markers/MarkersOverlay.java b/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/other/markers/MarkersOverlay.java similarity index 98% rename from sample/src/main/java/com/alexvasilkov/gestures/sample/ex/image/markers/MarkersOverlay.java rename to sample/src/main/java/com/alexvasilkov/gestures/sample/ex/other/markers/MarkersOverlay.java index 5bf28a05..ee95a6cf 100644 --- a/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/image/markers/MarkersOverlay.java +++ b/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/other/markers/MarkersOverlay.java @@ -1,4 +1,4 @@ -package com.alexvasilkov.gestures.sample.ex.image.markers; +package com.alexvasilkov.gestures.sample.ex.other.markers; import android.content.Context; import android.graphics.Canvas; diff --git a/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/custom/scene/Item.java b/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/other/scene/Item.java similarity index 83% rename from sample/src/main/java/com/alexvasilkov/gestures/sample/ex/custom/scene/Item.java rename to sample/src/main/java/com/alexvasilkov/gestures/sample/ex/other/scene/Item.java index 362d210f..2827db0d 100644 --- a/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/custom/scene/Item.java +++ b/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/other/scene/Item.java @@ -1,4 +1,4 @@ -package com.alexvasilkov.gestures.sample.ex.custom.scene; +package com.alexvasilkov.gestures.sample.ex.other.scene; import com.alexvasilkov.gestures.State; diff --git a/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/custom/scene/SceneActivity.java b/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/other/scene/SceneActivity.java similarity index 96% rename from sample/src/main/java/com/alexvasilkov/gestures/sample/ex/custom/scene/SceneActivity.java rename to sample/src/main/java/com/alexvasilkov/gestures/sample/ex/other/scene/SceneActivity.java index aac408fc..6ae86f38 100644 --- a/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/custom/scene/SceneActivity.java +++ b/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/other/scene/SceneActivity.java @@ -1,4 +1,4 @@ -package com.alexvasilkov.gestures.sample.ex.custom.scene; +package com.alexvasilkov.gestures.sample.ex.other.scene; import android.os.Bundle; import android.view.ViewTreeObserver.OnGlobalLayoutListener; @@ -25,8 +25,9 @@ protected void onCreate(Bundle savedInstanceState) { scene = new SceneView(this); setContentView(scene); - getSupportActionBarNotNull().setDisplayHomeAsUpEnabled(true); + setTitle(R.string.example_other_objects); setInfoText(R.string.info_objects_control); + getSupportActionBarNotNull().setDisplayHomeAsUpEnabled(true); // Waiting for scene to be laid out before setting up the items scene.getViewTreeObserver().addOnGlobalLayoutListener(new OnGlobalLayoutListener() { diff --git a/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/custom/scene/SceneView.java b/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/other/scene/SceneView.java similarity index 99% rename from sample/src/main/java/com/alexvasilkov/gestures/sample/ex/custom/scene/SceneView.java rename to sample/src/main/java/com/alexvasilkov/gestures/sample/ex/other/scene/SceneView.java index addc9d31..6dc832e1 100644 --- a/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/custom/scene/SceneView.java +++ b/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/other/scene/SceneView.java @@ -1,4 +1,4 @@ -package com.alexvasilkov.gestures.sample.ex.custom.scene; +package com.alexvasilkov.gestures.sample.ex.other.scene; import android.annotation.SuppressLint; import android.content.Context; diff --git a/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/custom/text/CustomViewActivity.java b/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/other/text/CustomViewActivity.java similarity index 87% rename from sample/src/main/java/com/alexvasilkov/gestures/sample/ex/custom/text/CustomViewActivity.java rename to sample/src/main/java/com/alexvasilkov/gestures/sample/ex/other/text/CustomViewActivity.java index f66d1af7..c7f40186 100644 --- a/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/custom/text/CustomViewActivity.java +++ b/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/other/text/CustomViewActivity.java @@ -1,4 +1,4 @@ -package com.alexvasilkov.gestures.sample.ex.custom.text; +package com.alexvasilkov.gestures.sample.ex.other.text; import android.os.Bundle; @@ -16,6 +16,7 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.custom_view_screen); + setTitle(R.string.example_other_custom); getSupportActionBarNotNull().setDisplayHomeAsUpEnabled(true); final GestureTextView textView = findViewById(R.id.text_view); diff --git a/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/custom/text/GestureTextView.java b/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/other/text/GestureTextView.java similarity index 98% rename from sample/src/main/java/com/alexvasilkov/gestures/sample/ex/custom/text/GestureTextView.java rename to sample/src/main/java/com/alexvasilkov/gestures/sample/ex/other/text/GestureTextView.java index 62661b72..668166bb 100644 --- a/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/custom/text/GestureTextView.java +++ b/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/other/text/GestureTextView.java @@ -1,4 +1,4 @@ -package com.alexvasilkov.gestures.sample.ex.custom.text; +package com.alexvasilkov.gestures.sample.ex.other.text; import android.annotation.SuppressLint; import android.content.Context; diff --git a/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/list/complex/BaseComplexListActivity.java b/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/transitions/complex/BaseComplexListActivity.java similarity index 98% rename from sample/src/main/java/com/alexvasilkov/gestures/sample/ex/list/complex/BaseComplexListActivity.java rename to sample/src/main/java/com/alexvasilkov/gestures/sample/ex/transitions/complex/BaseComplexListActivity.java index 3c193d92..2cca8fc5 100644 --- a/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/list/complex/BaseComplexListActivity.java +++ b/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/transitions/complex/BaseComplexListActivity.java @@ -1,4 +1,4 @@ -package com.alexvasilkov.gestures.sample.ex.list.complex; +package com.alexvasilkov.gestures.sample.ex.transitions.complex; import android.os.Bundle; import android.view.View; diff --git a/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/list/complex/ListAdapter.java b/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/transitions/complex/ListAdapter.java similarity index 98% rename from sample/src/main/java/com/alexvasilkov/gestures/sample/ex/list/complex/ListAdapter.java rename to sample/src/main/java/com/alexvasilkov/gestures/sample/ex/transitions/complex/ListAdapter.java index 6d50b0a2..d71edc0d 100644 --- a/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/list/complex/ListAdapter.java +++ b/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/transitions/complex/ListAdapter.java @@ -1,4 +1,4 @@ -package com.alexvasilkov.gestures.sample.ex.list.complex; +package com.alexvasilkov.gestures.sample.ex.transitions.complex; import android.view.View; import android.view.ViewGroup; diff --git a/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/list/complex/ComplexListV1Activity.java b/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/transitions/complex/ListAnyToAllActivity.java similarity index 93% rename from sample/src/main/java/com/alexvasilkov/gestures/sample/ex/list/complex/ComplexListV1Activity.java rename to sample/src/main/java/com/alexvasilkov/gestures/sample/ex/transitions/complex/ListAnyToAllActivity.java index febd799e..d6030d67 100644 --- a/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/list/complex/ComplexListV1Activity.java +++ b/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/transitions/complex/ListAnyToAllActivity.java @@ -1,5 +1,6 @@ -package com.alexvasilkov.gestures.sample.ex.list.complex; +package com.alexvasilkov.gestures.sample.ex.transitions.complex; +import android.os.Bundle; import android.view.View; import androidx.annotation.NonNull; @@ -7,6 +8,7 @@ import androidx.viewpager.widget.ViewPager; import com.alexvasilkov.gestures.commons.RecyclePagerAdapter; +import com.alexvasilkov.gestures.sample.R; import com.alexvasilkov.gestures.sample.ex.utils.Painting; import com.alexvasilkov.gestures.transition.GestureTransitions; import com.alexvasilkov.gestures.transition.ViewsTransitionAnimator; @@ -21,13 +23,19 @@ * This example demonstrates images animation from RecyclerView to ViewPager when each list item can * contain from 0 to N images which should be viewed together (combined from across all list items). */ -public class ComplexListV1Activity extends BaseComplexListActivity { +public class ListAnyToAllActivity extends BaseComplexListActivity { private List paintings; private List positions; private ViewsTransitionAnimator animator; + @Override + protected void onPostCreate(Bundle savedInstanceState) { + super.onPostCreate(savedInstanceState); + setTitle(R.string.example_list_transitions_n_N); + } + @Override protected List createItems() { final List items = ListItem.createItemsV1(this); diff --git a/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/list/complex/ComplexListV2Activity.java b/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/transitions/complex/ListAnyToAnyActivity.java similarity index 89% rename from sample/src/main/java/com/alexvasilkov/gestures/sample/ex/list/complex/ComplexListV2Activity.java rename to sample/src/main/java/com/alexvasilkov/gestures/sample/ex/transitions/complex/ListAnyToAnyActivity.java index 707c535f..9497bcdb 100644 --- a/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/list/complex/ComplexListV2Activity.java +++ b/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/transitions/complex/ListAnyToAnyActivity.java @@ -1,5 +1,6 @@ -package com.alexvasilkov.gestures.sample.ex.list.complex; +package com.alexvasilkov.gestures.sample.ex.transitions.complex; +import android.os.Bundle; import android.view.View; import androidx.annotation.NonNull; @@ -7,6 +8,7 @@ import androidx.viewpager.widget.ViewPager; import com.alexvasilkov.gestures.commons.RecyclePagerAdapter; +import com.alexvasilkov.gestures.sample.R; import com.alexvasilkov.gestures.transition.GestureTransitions; import com.alexvasilkov.gestures.transition.ViewsTransitionAnimator; import com.alexvasilkov.gestures.transition.tracker.FromTracker; @@ -20,13 +22,19 @@ * This example demonstrates images animation from RecyclerView to ViewPager when each list item can * contain from 0 to N images which should be viewed independently from other list items. */ -public class ComplexListV2Activity extends BaseComplexListActivity { +public class ListAnyToAnyActivity extends BaseComplexListActivity { private List items; private ViewsTransitionAnimator animator; private int currItemPos; + @Override + protected void onPostCreate(Bundle savedInstanceState) { + super.onPostCreate(savedInstanceState); + setTitle(R.string.example_list_transitions_n_n); + } + @Override protected List createItems() { return items = ListItem.createItemsV2(this); diff --git a/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/list/complex/ListItem.java b/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/transitions/complex/ListItem.java similarity index 98% rename from sample/src/main/java/com/alexvasilkov/gestures/sample/ex/list/complex/ListItem.java rename to sample/src/main/java/com/alexvasilkov/gestures/sample/ex/transitions/complex/ListItem.java index d9e6b2f4..6690c4de 100644 --- a/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/list/complex/ListItem.java +++ b/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/transitions/complex/ListItem.java @@ -1,4 +1,4 @@ -package com.alexvasilkov.gestures.sample.ex.list.complex; +package com.alexvasilkov.gestures.sample.ex.transitions.complex; import android.content.Context; diff --git a/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/list/complex/PagerAdapter.java b/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/transitions/complex/PagerAdapter.java similarity index 96% rename from sample/src/main/java/com/alexvasilkov/gestures/sample/ex/list/complex/PagerAdapter.java rename to sample/src/main/java/com/alexvasilkov/gestures/sample/ex/transitions/complex/PagerAdapter.java index ec674e5f..49732fea 100644 --- a/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/list/complex/PagerAdapter.java +++ b/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/transitions/complex/PagerAdapter.java @@ -1,4 +1,4 @@ -package com.alexvasilkov.gestures.sample.ex.list.complex; +package com.alexvasilkov.gestures.sample.ex.transitions.complex; import android.view.ViewGroup; diff --git a/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/list/recycler/PagerAdapter.java b/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/transitions/recycler/PagerAdapter.java similarity index 96% rename from sample/src/main/java/com/alexvasilkov/gestures/sample/ex/list/recycler/PagerAdapter.java rename to sample/src/main/java/com/alexvasilkov/gestures/sample/ex/transitions/recycler/PagerAdapter.java index dab45e36..71c18fe4 100644 --- a/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/list/recycler/PagerAdapter.java +++ b/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/transitions/recycler/PagerAdapter.java @@ -1,4 +1,4 @@ -package com.alexvasilkov.gestures.sample.ex.list.recycler; +package com.alexvasilkov.gestures.sample.ex.transitions.recycler; import android.view.ViewGroup; diff --git a/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/list/recycler/RecyclerAdapter.java b/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/transitions/recycler/RecyclerAdapter.java similarity index 97% rename from sample/src/main/java/com/alexvasilkov/gestures/sample/ex/list/recycler/RecyclerAdapter.java rename to sample/src/main/java/com/alexvasilkov/gestures/sample/ex/transitions/recycler/RecyclerAdapter.java index 66055f91..091493d5 100644 --- a/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/list/recycler/RecyclerAdapter.java +++ b/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/transitions/recycler/RecyclerAdapter.java @@ -1,4 +1,4 @@ -package com.alexvasilkov.gestures.sample.ex.list.recycler; +package com.alexvasilkov.gestures.sample.ex.transitions.recycler; import android.graphics.Typeface; import android.view.View; diff --git a/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/list/recycler/RecyclerToPagerActivity.java b/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/transitions/recycler/RecyclerToPagerActivity.java similarity index 97% rename from sample/src/main/java/com/alexvasilkov/gestures/sample/ex/list/recycler/RecyclerToPagerActivity.java rename to sample/src/main/java/com/alexvasilkov/gestures/sample/ex/transitions/recycler/RecyclerToPagerActivity.java index d580ba3a..ab51ded3 100644 --- a/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/list/recycler/RecyclerToPagerActivity.java +++ b/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/transitions/recycler/RecyclerToPagerActivity.java @@ -1,4 +1,4 @@ -package com.alexvasilkov.gestures.sample.ex.list.recycler; +package com.alexvasilkov.gestures.sample.ex.transitions.recycler; import android.os.Bundle; import android.view.View; @@ -34,6 +34,7 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.list_recycler_screen); + setTitle(R.string.example_list_transitions_1_N); final Painting[] paintings = Painting.list(getResources()); diff --git a/sample/src/main/res/layout/complex_list_screen.xml b/sample/src/main/res/layout/complex_list_screen.xml index 85ad4358..98631fab 100644 --- a/sample/src/main/res/layout/complex_list_screen.xml +++ b/sample/src/main/res/layout/complex_list_screen.xml @@ -2,7 +2,7 @@ + tools:context=".ex.transitions.complex.BaseComplexListActivity"> - + diff --git a/sample/src/main/res/layout/examples_list_item.xml b/sample/src/main/res/layout/examples_list_item.xml index 83dfae1d..95194cf7 100644 --- a/sample/src/main/res/layout/examples_list_item.xml +++ b/sample/src/main/res/layout/examples_list_item.xml @@ -1,11 +1,16 @@ - + android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1" + app:drawableTint="@color/accent" + tools:drawableStart="@drawable/ic_ex_image" + tools:text="@string/example_image_viewer" /> diff --git a/sample/src/main/res/layout/examples_screen.xml b/sample/src/main/res/layout/examples_screen.xml index 28527f52..2b77329a 100644 --- a/sample/src/main/res/layout/examples_screen.xml +++ b/sample/src/main/res/layout/examples_screen.xml @@ -1,12 +1,12 @@ - + tools:context=".ex.ExamplesActivity" + tools:listitem="@layout/examples_list_item" /> diff --git a/sample/src/main/res/layout/image_markers_screen.xml b/sample/src/main/res/layout/image_markers_screen.xml index 567077bd..05d6936f 100644 --- a/sample/src/main/res/layout/image_markers_screen.xml +++ b/sample/src/main/res/layout/image_markers_screen.xml @@ -10,7 +10,7 @@ app:gest_doubleTapZoom="2" app:gest_maxZoom="4" /> - diff --git a/sample/src/main/res/values/dimens.xml b/sample/src/main/res/values/dimens.xml index 598d1106..b27c9060 100644 --- a/sample/src/main/res/values/dimens.xml +++ b/sample/src/main/res/values/dimens.xml @@ -3,7 +3,6 @@ 4dp - 32dp 12dp \ No newline at end of file diff --git a/sample/src/main/res/values/strings.xml b/sample/src/main/res/values/strings.xml index 38ad3e8a..53e55b4f 100644 --- a/sample/src/main/res/values/strings.xml +++ b/sample/src/main/res/values/strings.xml @@ -14,6 +14,32 @@ Examples + Image + Image viewer + Image state control + Image cropping + Images in pager + + Image animations + Image animation + Image animation (cross-activity) + New activity + Circular image animation + + List transitions + List transitions: ONE to ALL + List transitions: ANY to ALL + List transitions: ANY to ANY + + Layout + Layout viewer + Layouts in pager + + Extras + Custom text view + Markers overlay + Objects control + Animate Tap image to expand: WikiArt