Refactor

saulmm · saulmm · commit f5023057d1e0 · 2014-10-25T18:14:37.000+02:00
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -9,12 +9,12 @@
         android:theme="@style/AppTheme" >
 
         <activity
-            android:name=".FirstActivity"
+            android:name=".activities.TransitionFirstActivity"
             android:label="" >
         </activity>
 
         <activity
-            android:name=".SecondActivity"
+            android:name=".activities.TransitionSecondActivity"
             android:label="@string/title_activity_my_activity2" >
         </activity>
 
@@ -23,7 +23,7 @@
             android:label="@string/title_activity_nav_drawer" >
         </activity>
 
-        <activity android:name=".slidingtabs.MainActivity">
+        <activity android:name=".activities.SlidingActivity">
 
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/java/com/saulmm/material/activities/SlidingActivity.java b/app/src/main/java/com/saulmm/material/activities/SlidingActivity.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */
 
-package com.saulmm.material.slidingtabs;
+package com.saulmm.material.activities;
 
 import android.app.FragmentTransaction;
 import android.content.res.Configuration;
@@ -27,20 +27,18 @@
 import android.view.MenuItem;
 import android.view.View;
 
-import com.saulmm.material.NavigationFragment;
 import com.saulmm.material.R;
+import com.saulmm.material.slidingtabs.fragments.SlidingTabsBasicFragment;
 
-public class MainActivity extends ActionBarActivity {
-
-    public static final String TAG = "MainActivity";
+public class SlidingActivity extends ActionBarActivity {
 
     private DrawerLayout mDrawerLayout;
     private ActionBarDrawerToggle mDrawerToggle;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
+        setContentView(R.layout.activity_sliding);
 
         if (savedInstanceState == null) {
             FragmentTransaction transaction = getFragmentManager().beginTransaction();
@@ -105,7 +103,6 @@ public boolean onOptionsItemSelected(MenuItem item) {
     @Override
     protected void onPostCreate(Bundle savedInstanceState) {
         super.onPostCreate(savedInstanceState);
-        // Sync the toggle state after onRestoreInstanceState has occurred.
         mDrawerToggle.syncState();
     }
 
diff --git a/app/src/main/java/com/saulmm/material/activities/TransitionFirstActivity.java b/app/src/main/java/com/saulmm/material/activities/TransitionFirstActivity.java
@@ -1,4 +1,4 @@
-package com.saulmm.material;
+package com.saulmm.material.activities;
 
 import android.app.Activity;
 import android.app.ActivityOptions;
@@ -7,15 +7,18 @@
 import android.util.Pair;
 import android.view.View;
 
-public class FirstActivity extends Activity {
+import com.saulmm.material.R;
+import com.saulmm.material.Utils;
+
+public class TransitionFirstActivity extends Activity {
 
     private View fabButton;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_first);
+        setContentView(R.layout.activity_transition_first);
 
         // Set explode animation when enter and exit the activity
         Utils.configureWindowEnterExitTransition(getWindow());
@@ -31,9 +34,9 @@ protected void onCreate(Bundle savedInstanceState) {
         @Override
         public void onClick(View view) {
 
-        Intent i  = new Intent (FirstActivity.this, SecondActivity.class);
+        Intent i  = new Intent (TransitionFirstActivity.this, TransitionSecondActivity.class);
 
-        ActivityOptions transitionActivityOptions = ActivityOptions.makeSceneTransitionAnimation(FirstActivity.this,
+        ActivityOptions transitionActivityOptions = ActivityOptions.makeSceneTransitionAnimation(TransitionFirstActivity.this,
                 Pair.create(fabButton, "fab"));
 
         startActivity(i, transitionActivityOptions.toBundle());
diff --git a/app/src/main/java/com/saulmm/material/activities/TransitionSecondActivity.java b/app/src/main/java/com/saulmm/material/activities/TransitionSecondActivity.java
@@ -1,4 +1,4 @@
-package com.saulmm.material;
+package com.saulmm.material.activities;
 
 import android.animation.Animator;
 import android.app.Activity;
@@ -8,7 +8,10 @@
 import android.view.ViewPropertyAnimator;
 import android.widget.LinearLayout;
 
-public class SecondActivity extends Activity {
+import com.saulmm.material.R;
+import com.saulmm.material.Utils;
+
+public class TransitionSecondActivity extends Activity {
 
     private static final int NUM_VIEWS = 5;
     private static final int SCALE_DELAY = 30;
@@ -18,7 +21,7 @@ public class SecondActivity extends Activity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        setContentView(R.layout.activity_second);
+        setContentView(R.layout.activity_transition_second);
 
         rowContainer = (LinearLayout) findViewById(R.id.row_container2);
 
diff --git a/app/src/main/java/com/saulmm/material/fragments/NavigationFragment.java b/app/src/main/java/com/saulmm/material/fragments/NavigationFragment.java
@@ -1,11 +1,13 @@
-package com.saulmm.material;
+package com.saulmm.material.fragments;
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.saulmm.material.R;
+
 
 public class NavigationFragment extends Fragment {
 
diff --git a/app/src/main/java/com/saulmm/material/slidingtabs/fragments/SlidingTabsBasicFragment.java b/app/src/main/java/com/saulmm/material/slidingtabs/fragments/SlidingTabsBasicFragment.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.saulmm.material.slidingtabs;
+package com.saulmm.material.slidingtabs.fragments;
 
 
 import android.app.Fragment;
@@ -25,8 +25,6 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.TextView;
 
 import com.saulmm.material.R;
 import com.saulmm.material.slidingtabs.views.SlidingTabLayout;
@@ -54,7 +52,7 @@ public class SlidingTabsBasicFragment extends Fragment {
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
             Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.fragment_sample, container, false);
+        return inflater.inflate(R.layout.fragment_sliding, container, false);
     }
 
     // BEGIN_INCLUDE (fragment_onviewcreated)
@@ -131,7 +129,7 @@ public CharSequence getPageTitle(int position) {
         @Override
         public Object instantiateItem(ViewGroup container, int position) {
             // Inflate a new layout from our resources
-            View view = getActivity().getLayoutInflater().inflate(R.layout.pager_item,
+            View view = getActivity().getLayoutInflater().inflate(R.layout.item_sliding_pager,
                     container, false);
             // Add the newly created View to the ViewPager
 
diff --git a/app/src/main/res/layout/activity_nav_drawer.xml b/app/src/main/res/layout/activity_nav_drawer.xml
diff --git a/app/src/main/res/layout/activity_sliding.xml b/app/src/main/res/layout/activity_sliding.xml
@@ -34,7 +34,7 @@
             android:layout_width="@dimen/navigation_drawer_width"
             android:layout_height="match_parent"
             android:layout_gravity="start"
-            android:name="com.saulmm.material.NavigationFragment"/>
+            android:name="com.saulmm.material.fragments.NavigationFragment"/>
 
     </android.support.v4.widget.DrawerLayout>
 
diff --git a/app/src/main/res/layout/activity_transition_first.xml b/app/src/main/res/layout/activity_transition_first.xml
diff --git a/app/src/main/res/layout/activity_transition_second.xml b/app/src/main/res/layout/activity_transition_second.xml
diff --git a/app/src/main/res/layout/fragment_navigation_drawer.xml b/app/src/main/res/layout/fragment_navigation_drawer.xml
@@ -5,4 +5,4 @@
     android:divider="@android:color/transparent"
     android:dividerHeight="0dp"
     android:background="@color/theme_light"
-    tools:context="com.saulmm.material.NavigationFragment" />
+    tools:context="com.saulmm.material.fragments.NavigationFragment" />
diff --git a/app/src/main/res/layout/fragment_sliding.xml b/app/src/main/res/layout/fragment_sliding.xml
diff --git a/app/src/main/res/layout/item_sliding_pager.xml b/app/src/main/res/layout/item_sliding_pager.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:orientation="vertical"
+      android:gravity="center">
+
+    <View
+        android:layout_width="150dp"
+        android:layout_height="150dp"
+        android:layout_gravity="center"
+        android:background="#FFF000"
+        android:id="@+id/b1"
+        android:elevation="10dp"/>
+
+</FrameLayout>
diff --git a/app/src/main/res/layout/pager_item.xml b/app/src/main/res/layout/pager_item.xml
diff --git a/app/src/main/res/menu/my_activity2.xml b/app/src/main/res/menu/my_activity2.xml
@@ -1,6 +1,6 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context="com.saulmm.material.SecondActivity" >
+    tools:context="com.saulmm.material.activities.TransitionSecondActivity" >
     <item android:id="@+id/action_settings"
         android:title="@string/action_settings"
         android:orderInCategory="100"
