Skip to content

Commit d4a285a

Browse files
saulmmsaulmm
committed
Added sliding to the dialer activity
1 parent b648102 commit d4a285a

File tree

5 files changed

+109
-6
lines changed

5 files changed

+109
-6
lines changed

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

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
/*
2+
* Copyright 2013 The Android Open Source Project
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package com.saulmm.material.activities;
18+
19+
import android.os.Bundle;
20+
import android.support.v4.view.ViewPager;
21+
import android.support.v7.app.ActionBarActivity;
22+
import android.support.v7.app.ActionBarDrawerToggle;
23+
import android.support.v7.widget.Toolbar;
24+
25+
import com.saulmm.material.R;
26+
import com.saulmm.material.slidingtabs.adapter.SamplePagerAdapter;
27+
import com.saulmm.material.slidingtabs.views.SlidingTabLayout;
28+
29+
public class DialerSampleActivity extends ActionBarActivity {
30+
31+
private ActionBarDrawerToggle mDrawerToggle;
32+
33+
@Override
34+
protected void onCreate(Bundle savedInstanceState) {
35+
36+
super.onCreate(savedInstanceState);
37+
setContentView(R.layout.activity_dialer);
38+
39+
configureToolbar();
40+
configurePager();
41+
}
42+
43+
private void configureToolbar() {
44+
45+
Toolbar mainToolbar = (Toolbar) findViewById(R.id.activity_dialer_toolbar);
46+
setSupportActionBar(mainToolbar);
47+
getSupportActionBar().setTitle("Sliding");
48+
}
49+
50+
private void configurePager() {
51+
52+
ViewPager mViewPager = (ViewPager) findViewById(R.id.activity_dialer_pager);
53+
mViewPager.setAdapter(new SamplePagerAdapter(this));
54+
55+
SlidingTabLayout mSlidingTabLayout = (SlidingTabLayout) findViewById(R.id.activity_dialer_tabs);
56+
mSlidingTabLayout.setViewPager(mViewPager);
57+
}
58+
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import android.view.View;
2929

3030
import com.saulmm.material.R;
31-
import com.saulmm.material.slidingtabs.fragments.SlidingTabsBasic;
31+
import com.saulmm.material.slidingtabs.fragments.SlidingTabFragment;
3232

3333
public class SlidingActivity extends ActionBarActivity {
3434

@@ -42,7 +42,7 @@ protected void onCreate(Bundle savedInstanceState) {
4242

4343
if (savedInstanceState == null) {
4444
FragmentTransaction transaction = getFragmentManager().beginTransaction();
45-
SlidingTabsBasic fragment = new SlidingTabsBasic();
45+
SlidingTabFragment fragment = new SlidingTabFragment();
4646
transaction.replace(R.id.sample_content_fragment, fragment);
4747
transaction.commit();
4848
}
@@ -52,7 +52,7 @@ protected void onCreate(Bundle savedInstanceState) {
5252
}
5353

5454
private void configureToolbar() {
55-
Toolbar mainToolbar = (Toolbar) findViewById(R.id.toolbar);
55+
Toolbar mainToolbar = (Toolbar) findViewById(R.id.dialer_toolbar);
5656
setSupportActionBar(mainToolbar);
5757
getSupportActionBar().setTitle("Sliding");
5858

‎app/src/main/java/com/saulmm/material/slidingtabs/fragments/SlidingTabsBasic.java‎ renamed to ‎app/src/main/java/com/saulmm/material/slidingtabs/fragments/SlidingTabFragment.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import com.saulmm.material.slidingtabs.views.SlidingTabLayout;
3232

3333

34-
public class SlidingTabsBasic extends Fragment {
34+
public class SlidingTabFragment extends Fragment {
3535

3636
static final String LOG_TAG = "SlidingTabsBasicFragment";
3737

@@ -43,6 +43,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
4343

4444
@Override
4545
public void onViewCreated(View view, Bundle savedInstanceState) {
46+
4647
ViewPager mViewPager = (ViewPager) view.findViewById(R.id.viewpager);
4748
mViewPager.setAdapter(new SamplePagerAdapter(getActivity()));
4849

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

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
<LinearLayout
2+
xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:orientation="vertical"
4+
android:layout_width="match_parent"
5+
android:layout_height="match_parent"
6+
android:id="@+id/sample_main_layout">
7+
8+
<android.support.v7.widget.Toolbar
9+
android:id="@+id/activity_dialer_toolbar"
10+
android:layout_height="wrap_content"
11+
android:layout_width="match_parent"
12+
android:background="?android:colorPrimary"
13+
android:minHeight="?attr/actionBarSize"/>
14+
15+
<LinearLayout
16+
android:layout_width="match_parent"
17+
android:layout_height="match_parent"
18+
android:background="#FFF"
19+
android:orientation="vertical">
20+
21+
<com.saulmm.material.slidingtabs.views.SlidingTabLayout
22+
android:id="@+id/activity_dialer_tabs"
23+
android:layout_width="match_parent"
24+
android:layout_height="wrap_content"
25+
android:elevation="10dp"/>
26+
27+
<View
28+
android:layout_width="match_parent"
29+
android:layout_height="1dp"
30+
android:background="@color/theme_default_primary"
31+
android:elevation="10dp"/>
32+
33+
<android.support.v4.view.ViewPager
34+
android:id="@+id/activity_dialer_pager"
35+
android:layout_width="match_parent"
36+
android:layout_height="0px"
37+
android:layout_weight="1"
38+
android:layout_marginBottom="10dp"
39+
android:background="@android:color/white"/>
40+
41+
</LinearLayout>
42+
43+
</LinearLayout>
44+

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
>
88

99
<android.support.v7.widget.Toolbar
10-
android:id="@+id/toolbar"
10+
android:id="@+id/dialer_toolbar"
1111
android:layout_height="wrap_content"
1212
android:layout_width="match_parent"
1313
android:background="?android:colorPrimary"
@@ -17,7 +17,7 @@
1717
android:id="@+id/row_container2"
1818
android:layout_width="match_parent"
1919
android:layout_height="match_parent"
20-
android:layout_below="@id/toolbar"
20+
android:layout_below="@id/dialer_toolbar"
2121
android:orientation="vertical"
2222
android:layout_centerHorizontal="true"
2323
android:paddingLeft="@dimen/activity_horizontal_margin"

0 commit comments

Comments
 (0)