From 338f83cdd8d54b8930c02a62b54ca8033ea9c0f3 Mon Sep 17 00:00:00 2001 From: "guillermo.mazzola" Date: Sat, 10 Jun 2017 11:24:35 -0300 Subject: [PATCH] Added sample project --- .../nestedscroll/NestedScrollMapFragment.java | 14 +++ .../SupportNestedScrollMapFragment.java | 14 +++ sample/build.gradle | 24 +++++ sample/src/main/AndroidManifest.xml | 24 +++++ .../maps/nestedscroll/demo/DemoActivity.java | 75 +++++++++++++++ .../main/res/drawable/toggle_background.xml | 11 +++ sample/src/main/res/layout/activity_demo.xml | 83 ++++++++++++++++ sample/src/main/res/menu/menu_scrolling.xml | 12 +++ sample/src/main/res/values/colors.xml | 13 +++ sample/src/main/res/values/dimens.xml | 6 ++ sample/src/main/res/values/strings.xml | 95 +++++++++++++++++++ sample/src/main/res/values/styles.xml | 28 ++++++ settings.gradle | 2 +- 13 files changed, 400 insertions(+), 1 deletion(-) create mode 100644 sample/build.gradle create mode 100644 sample/src/main/AndroidManifest.xml create mode 100644 sample/src/main/java/gs/utils/maps/nestedscroll/demo/DemoActivity.java create mode 100644 sample/src/main/res/drawable/toggle_background.xml create mode 100644 sample/src/main/res/layout/activity_demo.xml create mode 100644 sample/src/main/res/menu/menu_scrolling.xml create mode 100644 sample/src/main/res/values/colors.xml create mode 100644 sample/src/main/res/values/dimens.xml create mode 100644 sample/src/main/res/values/strings.xml create mode 100644 sample/src/main/res/values/styles.xml diff --git a/library/src/main/java/gs/utils/maps/nestedscroll/NestedScrollMapFragment.java b/library/src/main/java/gs/utils/maps/nestedscroll/NestedScrollMapFragment.java index ec5faa1..2b7e650 100644 --- a/library/src/main/java/gs/utils/maps/nestedscroll/NestedScrollMapFragment.java +++ b/library/src/main/java/gs/utils/maps/nestedscroll/NestedScrollMapFragment.java @@ -5,10 +5,24 @@ import android.view.View; import android.view.ViewGroup; +import com.google.android.gms.maps.GoogleMapOptions; import com.google.android.gms.maps.MapFragment; public class NestedScrollMapFragment extends MapFragment { + public static NestedScrollMapFragment newInstance() { + return new NestedScrollMapFragment(); + } + + public static NestedScrollMapFragment newInstance(GoogleMapOptions options) { + NestedScrollMapFragment fragment = new NestedScrollMapFragment(); + + Bundle args = new Bundle(); + args.putParcelable("MapOptions", options); + fragment.setArguments(args); + return fragment; + } + @Override public View onCreateView(LayoutInflater layoutInflater, ViewGroup viewGroup, Bundle bundle) { View view = super.onCreateView(layoutInflater, viewGroup, bundle); diff --git a/library/src/main/java/gs/utils/maps/nestedscroll/SupportNestedScrollMapFragment.java b/library/src/main/java/gs/utils/maps/nestedscroll/SupportNestedScrollMapFragment.java index 2e0362b..f3ed9ce 100644 --- a/library/src/main/java/gs/utils/maps/nestedscroll/SupportNestedScrollMapFragment.java +++ b/library/src/main/java/gs/utils/maps/nestedscroll/SupportNestedScrollMapFragment.java @@ -5,10 +5,24 @@ import android.view.View; import android.view.ViewGroup; +import com.google.android.gms.maps.GoogleMapOptions; import com.google.android.gms.maps.SupportMapFragment; public class SupportNestedScrollMapFragment extends SupportMapFragment { + public static SupportNestedScrollMapFragment newInstance() { + return new SupportNestedScrollMapFragment(); + } + + public static SupportNestedScrollMapFragment newInstance(GoogleMapOptions options) { + SupportNestedScrollMapFragment fragment = new SupportNestedScrollMapFragment(); + + Bundle args = new Bundle(); + args.putParcelable("MapOptions", options); + fragment.setArguments(args); + return fragment; + } + @Override public View onCreateView(LayoutInflater layoutInflater, ViewGroup viewGroup, Bundle bundle) { View view = super.onCreateView(layoutInflater, viewGroup, bundle); diff --git a/sample/build.gradle b/sample/build.gradle new file mode 100644 index 0000000..c0b7640 --- /dev/null +++ b/sample/build.gradle @@ -0,0 +1,24 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 25 + buildToolsVersion "25.0.2" + + defaultConfig { + applicationId 'gs.utils.maps.nestedscroll.demo' + minSdkVersion 14 + targetSdkVersion 25 + versionCode 1 + versionName "1.0" + } +} + +def appCompatVersion = '25.3.1' + +dependencies { + compile project(':nestedscroll-maps') + + compile "com.android.support:design:$appCompatVersion" + compile "com.android.support:cardview-v7:$appCompatVersion" + compile 'com.google.android.gms:play-services-maps:11.0.0' +} diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml new file mode 100644 index 0000000..488f25a --- /dev/null +++ b/sample/src/main/AndroidManifest.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + diff --git a/sample/src/main/java/gs/utils/maps/nestedscroll/demo/DemoActivity.java b/sample/src/main/java/gs/utils/maps/nestedscroll/demo/DemoActivity.java new file mode 100644 index 0000000..e1bc0f9 --- /dev/null +++ b/sample/src/main/java/gs/utils/maps/nestedscroll/demo/DemoActivity.java @@ -0,0 +1,75 @@ +package gs.utils.maps.nestedscroll.demo; + +import android.os.Bundle; +import android.support.annotation.IdRes; +import android.support.design.widget.FloatingActionButton; +import android.support.v4.app.Fragment; +import android.support.v7.app.AppCompatActivity; +import android.support.v7.widget.Toolbar; +import android.view.Menu; +import android.view.View; +import android.widget.RadioGroup; +import android.widget.Toast; + +import com.google.android.gms.maps.GoogleMapOptions; +import com.google.android.gms.maps.SupportMapFragment; +import com.google.android.gms.maps.model.CameraPosition; +import com.google.android.gms.maps.model.LatLng; + +import gs.utils.maps.nestedscroll.SupportNestedScrollMapFragment; + +public class DemoActivity extends AppCompatActivity implements RadioGroup.OnCheckedChangeListener { + private final GoogleMapOptions mapOptions = new GoogleMapOptions() + .camera(CameraPosition.fromLatLngZoom(new LatLng(-38.006004, -57.543122), 14)); + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + setContentView(R.layout.activity_demo); + + Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + setSupportActionBar(toolbar); + + FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab); + fab.setOnClickListener(new View.OnClickListener() { + + @Override + public void onClick(View view) { + Toast.makeText(view.getContext(), "Click!", Toast.LENGTH_SHORT).show(); + } + + }); + + RadioGroup groupMapType = (RadioGroup) findViewById(R.id.groupMapType); + groupMapType.setOnCheckedChangeListener(this); + groupMapType.check(R.id.showNestedMap); + } + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + // Inflate the menu; this adds items to the action bar if it is present. + getMenuInflater().inflate(R.menu.menu_scrolling, menu); + return true; + } + + @Override + public void onCheckedChanged(RadioGroup group, @IdRes int checkedId) { + Fragment fragment = null; + + switch (checkedId) { + case R.id.showNestedMap: + fragment = SupportNestedScrollMapFragment.newInstance(mapOptions); + break; + + case R.id.showRegularMap: + fragment = SupportMapFragment.newInstance(mapOptions); + break; + } + + getSupportFragmentManager().beginTransaction() + .replace(R.id.contentFragment, fragment, null) + .commit(); + } + +} diff --git a/sample/src/main/res/drawable/toggle_background.xml b/sample/src/main/res/drawable/toggle_background.xml new file mode 100644 index 0000000..346ce10 --- /dev/null +++ b/sample/src/main/res/drawable/toggle_background.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/sample/src/main/res/layout/activity_demo.xml b/sample/src/main/res/layout/activity_demo.xml new file mode 100644 index 0000000..f8524d6 --- /dev/null +++ b/sample/src/main/res/layout/activity_demo.xml @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sample/src/main/res/menu/menu_scrolling.xml b/sample/src/main/res/menu/menu_scrolling.xml new file mode 100644 index 0000000..d2bceb5 --- /dev/null +++ b/sample/src/main/res/menu/menu_scrolling.xml @@ -0,0 +1,12 @@ + + + + + diff --git a/sample/src/main/res/values/colors.xml b/sample/src/main/res/values/colors.xml new file mode 100644 index 0000000..e656659 --- /dev/null +++ b/sample/src/main/res/values/colors.xml @@ -0,0 +1,13 @@ + + + + #3F51B5 + #303F9F + #FF4081 + + #808080 + #DCdCdC + #C0C0C0 + #a9a9a9 + + diff --git a/sample/src/main/res/values/dimens.xml b/sample/src/main/res/values/dimens.xml new file mode 100644 index 0000000..eeb5c0d --- /dev/null +++ b/sample/src/main/res/values/dimens.xml @@ -0,0 +1,6 @@ + + 180dp + 16dp + 16dp + 6dp + diff --git a/sample/src/main/res/values/strings.xml b/sample/src/main/res/values/strings.xml new file mode 100644 index 0000000..90b14bf --- /dev/null +++ b/sample/src/main/res/values/strings.xml @@ -0,0 +1,95 @@ + + Demo Application + + "Material is the metaphor.\n\n" + + "A material metaphor is the unifying theory of a rationalized space and a system of motion." + "The material is grounded in tactile reality, inspired by the study of paper and ink, yet " + "technologically advanced and open to imagination and magic.\n" + "Surfaces and edges of the material provide visual cues that are grounded in reality. The " + "use of familiar tactile attributes helps users quickly understand affordances. Yet the " + "flexibility of the material creates new affordances that supercede those in the physical " + "world, without breaking the rules of physics.\n" + "The fundamentals of light, surface, and movement are key to conveying how objects move, " + "interact, and exist in space and in relation to each other. Realistic lighting shows " + "seams, divides space, and indicates moving parts.\n\n" + + "Bold, graphic, intentional.\n\n" + + "The foundational elements of print based design typography, grids, space, scale, color, " + "and use of imagery guide visual treatments. These elements do far more than please the " + "eye. They create hierarchy, meaning, and focus. Deliberate color choices, edge to edge " + "imagery, large scale typography, and intentional white space create a bold and graphic " + "interface that immerse the user in the experience.\n" + "An emphasis on user actions makes core functionality immediately apparent and provides " + "waypoints for the user.\n\n" + + "Motion provides meaning.\n\n" + + "Motion respects and reinforces the user as the prime mover. Primary user actions are " + "inflection points that initiate motion, transforming the whole design.\n" + "All action takes place in a single environment. Objects are presented to the user without " + "breaking the continuity of experience even as they transform and reorganize.\n" + "Motion is meaningful and appropriate, serving to focus attention and maintain continuity. " + "Feedback is subtle yet clear. Transitions are efficient yet coherent.\n\n" + + "3D world.\n\n" + + "The material environment is a 3D space, which means all objects have x, y, and z " + "dimensions. The z-axis is perpendicularly aligned to the plane of the display, with the " + "positive z-axis extending towards the viewer. Every sheet of material occupies a single " + "position along the z-axis and has a standard 1dp thickness.\n" + "On the web, the z-axis is used for layering and not for perspective. The 3D world is " + "emulated by manipulating the y-axis.\n\n" + + "Light and shadow.\n\n" + + "Within the material environment, virtual lights illuminate the scene. Key lights create " + "directional shadows, while ambient light creates soft shadows from all angles.\n" + "Shadows in the material environment are cast by these two light sources. In Android " + "development, shadows occur when light sources are blocked by sheets of material at " + "various positions along the z-axis. On the web, shadows are depicted by manipulating the " + "y-axis only. The following example shows the card with a height of 6dp.\n\n" + + "Resting elevation.\n\n" + + "All material objects, regardless of size, have a resting elevation, or default elevation " + "that does not change. If an object changes elevation, it should return to its resting " + "elevation as soon as possible.\n\n" + + "Component elevations.\n\n" + + "The resting elevation for a component type is consistent across apps (e.g., FAB elevation " + "does not vary from 6dp in one app to 16dp in another app).\n" + "Components may have different resting elevations across platforms, depending on the depth " + "of the environment (e.g., TV has a greater depth than mobile or desktop).\n\n" + + "Responsive elevation and dynamic elevation offsets.\n\n" + + "Some component types have responsive elevation, meaning they change elevation in response " + "to user input (e.g., normal, focused, and pressed) or system events. These elevation " + "changes are consistently implemented using dynamic elevation offsets.\n" + "Dynamic elevation offsets are the goal elevation that a component moves towards, relative " + "to the component’s resting state. They ensure that elevation changes are consistent " + "across actions and component types. For example, all components that lift on press have " + "the same elevation change relative to their resting elevation.\n" + "Once the input event is completed or cancelled, the component will return to its resting " + "elevation.\n\n" + + "Avoiding elevation interference.\n\n" + + "Components with responsive elevations may encounter other components as they move between " + "their resting elevations and dynamic elevation offsets. Because material cannot pass " + "through other material, components avoid interfering with one another any number of ways, " + "whether on a per component basis or using the entire app layout.\n" + "On a component level, components can move or be removed before they cause interference. " + "For example, a floating action button (FAB) can disappear or move off screen before a " + "user picks up a card, or it can move if a snackbar appears.\n" + "On the layout level, design your app layout to minimize opportunities for interference. " + "For example, position the FAB to one side of stream of a cards so the FAB won’t interfere " + "when a user tries to pick up one of cards.\n\n" + + Settings + Nested + Regular + diff --git a/sample/src/main/res/values/styles.xml b/sample/src/main/res/values/styles.xml new file mode 100644 index 0000000..1996c83 --- /dev/null +++ b/sample/src/main/res/values/styles.xml @@ -0,0 +1,28 @@ + + + + + + + + + diff --git a/settings.gradle b/settings.gradle index ba37c4a..efafd07 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,3 @@ -include ':library' +include ':library', ':sample' project(':library').name = 'nestedscroll-maps'