Skip to content

Commit 3946376

Browse files
committed
Refactored the project structure
1 parent bafdbe1 commit 3946376

File tree

13 files changed

+21
-31
lines changed

13 files changed

+21
-31
lines changed

app/src/main/java/com/saulmm/material/activities/ColorActivity.java

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,19 @@
11
package com.saulmm.material.activities;
22

33
import android.animation.Animator;
4-
import android.animation.AnimatorListenerAdapter;
54
import android.app.Activity;
6-
import android.app.ActivityOptions;
75
import android.content.Context;
86
import android.content.Intent;
97
import android.content.SharedPreferences;
108
import android.os.Bundle;
11-
import android.transition.Slide;
12-
import android.transition.Transition;
13-
import android.util.DisplayMetrics;
14-
import android.util.Log;
15-
import android.util.Pair;
169
import android.util.TypedValue;
1710
import android.view.View;
18-
import android.view.ViewAnimationUtils;
1911
import android.widget.CheckBox;
2012
import android.widget.CompoundButton;
2113
import android.widget.Switch;
2214

2315
import com.saulmm.material.R;
24-
import com.saulmm.material.Utils;
16+
import com.saulmm.material.utils.Utils;
2517

2618
public class ColorActivity extends Activity {
2719

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,11 @@
1919
import android.os.Bundle;
2020
import android.support.v4.view.ViewPager;
2121
import android.support.v7.app.ActionBarActivity;
22-
import android.support.v7.app.ActionBarDrawerToggle;
2322
import android.support.v7.widget.Toolbar;
2423

2524
import com.saulmm.material.R;
26-
import com.saulmm.material.slidingtabs.adapter.DialerAdapter;
27-
import com.saulmm.material.slidingtabs.adapter.SamplePagerAdapter;
28-
import com.saulmm.material.slidingtabs.views.SlidingTabLayout;
25+
import com.saulmm.material.views.adapters.DialerPagerAdapter;
26+
import com.saulmm.material.views.widgets.SlidingTabLayout;
2927

3028
public class DialerSampleActivity extends ActionBarActivity {
3129

@@ -50,7 +48,7 @@ private void configureToolbar() {
5048
private void configurePager() {
5149

5250
ViewPager mViewPager = (ViewPager) findViewById(R.id.activity_dialer_pager);
53-
mViewPager.setAdapter(new DialerAdapter(this));
51+
mViewPager.setAdapter(new DialerPagerAdapter(this));
5452

5553
SlidingTabLayout mSlidingTabLayout = (SlidingTabLayout) findViewById(R.id.activity_dialer_tabs);
5654
mSlidingTabLayout.setViewPager(mViewPager);

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

Lines changed: 1 addition & 1 deletion
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.SlidingTabFragment;
31+
import com.saulmm.material.fragments.SlidingTabFragment;
3232

3333
public class SlidingActivity extends ActionBarActivity {
3434

app/src/main/java/com/saulmm/material/activities/TransitionFirstActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import android.view.View;
99

1010
import com.saulmm.material.R;
11-
import com.saulmm.material.Utils;
11+
import com.saulmm.material.utils.Utils;
1212

1313
public class TransitionFirstActivity extends Activity {
1414

app/src/main/java/com/saulmm/material/activities/TransitionSecondActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import android.widget.LinearLayout;
1010

1111
import com.saulmm.material.R;
12-
import com.saulmm.material.Utils;
12+
import com.saulmm.material.utils.Utils;
1313

1414
public class TransitionSecondActivity extends Activity {
1515

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,19 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.saulmm.material.slidingtabs.fragments;
17+
package com.saulmm.material.fragments;
1818

1919

2020
import android.app.Fragment;
2121
import android.os.Bundle;
22-
import android.support.v4.view.PagerAdapter;
2322
import android.support.v4.view.ViewPager;
24-
import android.util.Log;
2523
import android.view.LayoutInflater;
2624
import android.view.View;
2725
import android.view.ViewGroup;
2826

2927
import com.saulmm.material.R;
30-
import com.saulmm.material.slidingtabs.adapter.SamplePagerAdapter;
31-
import com.saulmm.material.slidingtabs.views.SlidingTabLayout;
28+
import com.saulmm.material.views.adapters.SamplePagerAdapter;
29+
import com.saulmm.material.views.widgets.SlidingTabLayout;
3230

3331

3432
public class SlidingTabFragment extends Fragment {

app/src/main/java/com/saulmm/material/Utils.java renamed to app/src/main/java/com/saulmm/material/utils/Utils.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.saulmm.material;
1+
package com.saulmm.material.utils;
22

33
import android.animation.Animator;
44
import android.animation.AnimatorListenerAdapter;
@@ -13,6 +13,8 @@
1313
import android.view.Window;
1414
import android.view.animation.PathInterpolator;
1515

16+
import com.saulmm.material.R;
17+
1618
public class Utils {
1719

1820
public static void configureWindowEnterExitExplodeTransition(Window w) {

app/src/main/java/com/saulmm/material/slidingtabs/adapter/DialerAdapter.java renamed to app/src/main/java/com/saulmm/material/views/adapters/DialerPagerAdapter.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.saulmm.material.slidingtabs.adapter;
1+
package com.saulmm.material.views.adapters;
22

33
import android.content.Context;
44
import android.support.v4.view.PagerAdapter;
@@ -9,12 +9,12 @@
99
import com.saulmm.material.R;
1010

1111
@SuppressWarnings("FieldCanBeLocal")
12-
public class DialerAdapter extends PagerAdapter {
12+
public class DialerPagerAdapter extends PagerAdapter {
1313

1414
private final String [] TITLES = {"SPEED DIAL", "RECENTS", "CONTACTS"};
1515
private Context context;
1616

17-
public DialerAdapter(Context context) {
17+
public DialerPagerAdapter(Context context) {
1818
this.context = context;
1919
}
2020

app/src/main/java/com/saulmm/material/slidingtabs/adapter/SamplePagerAdapter.java renamed to app/src/main/java/com/saulmm/material/views/adapters/SamplePagerAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.saulmm.material.slidingtabs.adapter;
1+
package com.saulmm.material.views.adapters;
22

33
import android.content.Context;
44
import android.support.v4.view.PagerAdapter;

app/src/main/java/com/saulmm/material/slidingtabs/views/SlidingTabLayout.java renamed to app/src/main/java/com/saulmm/material/views/widgets/SlidingTabLayout.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.saulmm.material.slidingtabs.views;
17+
package com.saulmm.material.views.widgets;
1818

1919
import android.content.Context;
2020
import android.graphics.Typeface;

0 commit comments

Comments
 (0)