Skip to content

Commit 3f1102b

Browse files
saulmmsaulmm
committed
Created the elevation sample
1 parent e8a64be commit 3f1102b

File tree

7 files changed

+123
-132
lines changed

7 files changed

+123
-132
lines changed

‎app/src/main/AndroidManifest.xml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,31 +7,31 @@
77
android:icon="@drawable/ic_launcher"
88
android:label=""
99
android:theme="@style/AppTheme" >
10-
11-
<activity
12-
android:name=".activities.TransitionFirstActivity">
10+
<activity android:name="com.saulmm.material.activities.TransitionFirstActivity" >
1311
</activity>
14-
1512
<activity
16-
android:name=".activities.TransitionSecondActivity"
13+
android:name="com.saulmm.material.activities.TransitionSecondActivity"
1714
android:label="@string/title_activity_my_activity2" >
1815
</activity>
19-
20-
<activity
21-
android:name=".activities.SlidingActivity" >
16+
<activity android:name="com.saulmm.material.activities.SlidingActivity" >
2217
</activity>
18+
<activity
19+
android:name="com.saulmm.material.activities.DialerSampleActivity"
20+
android:screenOrientation="portrait" >
2321

24-
<activity android:name=".activities.DialerSampleActivity"
25-
android:screenOrientation="portrait">
22+
</activity>
23+
<activity
24+
android:name="com.saulmm.material.activities.ColorActivity"
25+
android:label="@string/title_activity_color" />
26+
<activity
27+
android:name="com.saulmm.material.activities.ElevationSampleActivity"
28+
android:label="@string/title_activity_elevation_sample" >
2629

2730
<intent-filter>
2831
<action android:name="android.intent.action.MAIN" />
2932
<category android:name="android.intent.category.LAUNCHER" />
3033
</intent-filter>
3134
</activity>
32-
33-
<activity
34-
android:name=".activities.ColorActivity"
35-
android:label="@string/title_activity_color" />
3635
</application>
36+
3737
</manifest>

‎app/src/main/java/com/saulmm/material/activities/DialerSampleActivity.java‎

Lines changed: 1 addition & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import com.saulmm.material.views.adapters.SamplePagerAdapter;
2222
import com.saulmm.material.views.widgets.SlidingTabLayout;
2323

24-
public class DialerSampleActivity extends ActionBarActivity implements ViewPager.OnPageChangeListener {
24+
public class DialerSampleActivity extends ActionBarActivity {
2525

2626
private int screenWidth;
2727
private ImageButton fabButton;
@@ -35,50 +35,6 @@ protected void onCreate(Bundle savedInstanceState) {
3535
setContentView(R.layout.activity_dialer);
3636

3737
configureToolbar();
38-
configurePager();
39-
configureFab();
40-
configureDialer();
41-
42-
dialerKeysContainer = (FrameLayout) findViewById(R.id.activity_dialer_frame_container);
43-
44-
// Get the screen with
45-
Display display = getWindowManager().getDefaultDisplay();
46-
Point size = new Point();
47-
display.getSize(size);
48-
screenWidth = size.x;
49-
}
50-
51-
private void configureFab() {
52-
53-
fabButton = (ImageButton) findViewById(R.id.view_fab_button);
54-
fabButton.setOnClickListener(new View.OnClickListener() {
55-
@Override
56-
public void onClick(View v) {
57-
58-
absolutefabPosition = v.getX();
59-
GUIUtils.hideViewByScale(fabButton);
60-
dialerKeysContainer.setVisibility(View.VISIBLE);
61-
62-
Animation showDialerContainerAnimation = AnimationUtils.loadAnimation(DialerSampleActivity.this, R.anim.translate_down_on);
63-
showDialerContainerAnimation.setAnimationListener(new Animation.AnimationListener() {
64-
@Override
65-
public void onAnimationStart(Animation animation) {}
66-
67-
@Override
68-
public void onAnimationEnd(Animation animation) {
69-
70-
fabButton.setBackgroundResource(R.drawable.ripple_dialer_call);
71-
fabButton.setX(screenWidth / 2 - fabButton.getWidth() / 2);
72-
GUIUtils.showViewByScale(fabButton);
73-
}
74-
75-
@Override
76-
public void onAnimationRepeat(Animation animation) {}
77-
});
78-
79-
dialerKeysContainer.startAnimation(showDialerContainerAnimation);
80-
}
81-
});
8238
}
8339

8440
private void configureToolbar() {
@@ -88,77 +44,4 @@ private void configureToolbar() {
8844
setSupportActionBar(mainToolbar);
8945
getSupportActionBar().setTitle("Dialer");
9046
}
91-
92-
private void configurePager() {
93-
94-
ViewPager tabsViewPAger = (ViewPager) findViewById(R.id.activity_dialer_pager);
95-
tabsViewPAger.setAdapter(new SamplePagerAdapter(this));
96-
tabsViewPAger.setCurrentItem(1);
97-
98-
SlidingTabLayout mSlidingTabLayout = (SlidingTabLayout) findViewById(R.id.activity_dialer_tabs);
99-
mSlidingTabLayout.addPagerListener(this);
100-
mSlidingTabLayout.setViewPager(tabsViewPAger);
101-
}
102-
103-
private void configureDialer() {
104-
105-
GridView dialerGrid = (GridView) findViewById(R.id.activity_dialer_pad);
106-
dialerGrid.setAdapter(new ArrayAdapter<String>(this, R.layout.list_item_dialer,
107-
getResources().getStringArray(R.array.dialer_numbers)));
108-
}
109-
110-
@Override
111-
public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
112-
113-
float fabButtonPosition = (screenWidth / 2 - fabButton.getWidth()) * positionOffset;
114-
115-
116-
if (fabButtonPosition != 0 && position != 1) {
117-
118-
absolutefabPosition = fabButtonPosition + (screenWidth/2 - fabButton.getWidth()/2);
119-
fabButton.setX(absolutefabPosition);
120-
}
121-
}
122-
123-
@Override
124-
public void onBackPressed() {
125-
126-
if (dialerKeysContainer.getVisibility() == View.VISIBLE) {
127-
128-
Animation hideAnimation = AnimationUtils.loadAnimation(this, R.anim.translate_down_off);
129-
hideAnimation.setAnimationListener(new Animation.AnimationListener() {
130-
@Override
131-
public void onAnimationStart(Animation animation) {
132-
133-
GUIUtils.hideViewByScale(fabButton);
134-
}
135-
136-
@Override
137-
public void onAnimationEnd(Animation animation) {
138-
139-
dialerKeysContainer.setVisibility(View.INVISIBLE);
140-
fabButton.setBackgroundResource(R.drawable.ripple_dialer_idle);
141-
GUIUtils.showViewByScale(fabButton);
142-
143-
fabButton.setX(absolutefabPosition);
144-
}
145-
146-
@Override
147-
public void onAnimationRepeat(Animation animation) {}
148-
});
149-
150-
dialerKeysContainer.startAnimation(hideAnimation);
151-
152-
153-
154-
} else {
155-
super.onBackPressed();
156-
}
157-
}
158-
159-
@Override
160-
public void onPageSelected(int position) {}
161-
162-
@Override
163-
public void onPageScrollStateChanged(int state) {}
16447
}

‎app/src/main/java/com/saulmm/material/activities/ElevationSampleActivity.java‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
package com.saulmm.material.activities;
2+
3+
import android.app.Activity;
4+
import android.os.Bundle;
5+
import android.view.Menu;
6+
import android.view.MenuItem;
7+
8+
import com.saulmm.material.R;
9+
10+
public class ElevationSampleActivity extends Activity {
11+
12+
@Override
13+
protected void onCreate(Bundle savedInstanceState) {
14+
super.onCreate(savedInstanceState);
15+
setContentView(R.layout.activity_elevation_sample);
16+
}
17+
}

‎app/src/main/res/drawable/translation_selector.xml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<selector xmlns:android="http://schemas.android.com/apk/res/android">
2+
<item android:state_pressed="true">
3+
<set>
4+
<objectAnimator android:propertyName="translationZ"
5+
android:duration="@android:integer/config_shortAnimTime"
6+
android:valueTo="10dp"
7+
android:valueType="floatType"/>
8+
</set>
9+
</item>
10+
<item
11+
android:state_pressed="false"
12+
>
13+
<set>
14+
<objectAnimator android:propertyName="translationZ"
15+
android:duration="100"
16+
android:valueTo="2dp"
17+
android:valueType="floatType"/>
18+
</set>
19+
</item>
20+
</selector>

‎app/src/main/res/layout/activity_elevation_sample.xml‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
2+
xmlns:tools="http://schemas.android.com/tools"
3+
xmlns:card_view="http://schemas.android.com/apk/res-auto"
4+
android:layout_width="match_parent"
5+
android:layout_height="match_parent"
6+
android:background="#EAEAEA"
7+
>
8+
9+
<android.support.v7.widget.Toolbar
10+
android:layout_height="wrap_content"
11+
android:layout_width="match_parent"
12+
android:background="?android:colorPrimary"
13+
android:minHeight="?attr/actionBarSize"
14+
android:elevation="5dp"
15+
/>
16+
17+
<LinearLayout
18+
android:layout_width="match_parent"
19+
android:layout_height="wrap_content"
20+
android:orientation="vertical"
21+
android:layout_gravity="center_vertical"
22+
android:layout_marginLeft="@dimen/activity_horizontal_margin"
23+
android:layout_marginRight="@dimen/activity_horizontal_margin"
24+
>
25+
26+
<android.support.v7.widget.CardView
27+
android:layout_gravity="center"
28+
android:layout_width="100dp"
29+
android:layout_height="96dp"
30+
android:layout_marginTop="16dp"
31+
android:stateListAnimator="@drawable/translation_selector"
32+
android:elevation="2dp"
33+
android:clickable="true"
34+
card_view:cardCornerRadius="4dp"
35+
/>
36+
37+
<android.support.v7.widget.CardView
38+
android:layout_gravity="center"
39+
android:layout_width="100dp"
40+
android:layout_height="96dp"
41+
android:layout_marginTop="16dp"
42+
android:stateListAnimator="@drawable/translation_selector"
43+
android:elevation="2dp"
44+
android:clickable="true"
45+
card_view:cardCornerRadius="4dp"
46+
/>
47+
48+
<android.support.v7.widget.CardView
49+
android:layout_gravity="center"
50+
android:layout_width="100dp"
51+
android:layout_height="96dp"
52+
android:layout_marginTop="16dp"
53+
android:layout_marginBottom="@dimen/activity_vertical_margin"
54+
android:stateListAnimator="@drawable/translation_selector"
55+
android:elevation="2dp"
56+
android:clickable="true"
57+
card_view:cardCornerRadius="4dp"
58+
/>
59+
60+
</LinearLayout>
61+
</FrameLayout>

‎app/src/main/res/menu/menu_elevation_sample.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<menu xmlns:android="http://schemas.android.com/apk/res/android"
2+
xmlns:tools="http://schemas.android.com/tools"
3+
tools:context="com.saulmm.material.activities.ElevationSampleActivity">
4+
<item android:id="@+id/action_settings"
5+
android:title="@string/action_settings"
6+
android:orderInCategory="100"
7+
android:showAsAction="never"/>
8+
</menu>

‎app/src/main/res/values/strings.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,6 @@
2626
<item>#</item>
2727
</string-array>
2828

29+
<string name="title_activity_elevation_sample">ElevationSampleActivity</string>
30+
2931
</resources>

0 commit comments

Comments
 (0)