minor fixes in the sample project

Manabu-GT · Manabu-GT · commit 69f3235cd196 · 2016-02-01T02:53:49.000+09:00
diff --git a/sample/src/main/java/com/ms/square/android/expandabletextview/sample/DemoActivity.java b/sample/src/main/java/com/ms/square/android/expandabletextview/sample/DemoActivity.java
@@ -25,7 +25,8 @@
  * @author Manabu-GT
  */
 public class DemoActivity extends AppCompatActivity {
-    public static String POSITION = "POSITION";
+
+    private static final String POSITION = "POSITION";
 
     /**
      * The {@link android.support.v4.view.PagerAdapter} that will provide
@@ -35,21 +36,20 @@ public class DemoActivity extends AppCompatActivity {
      * may be best to switch to a
      * {@link android.support.v4.app.FragmentStatePagerAdapter}.
      */
-    SectionsPagerAdapter mSectionsPagerAdapter;
+    private SectionsPagerAdapter mSectionsPagerAdapter;
 
     /**
      * The {@link ViewPager} that will host the section contents.
      */
-    ViewPager mViewPager;
+    private ViewPager mViewPager;
 
-    TabLayout mTabLayout;
+    private TabLayout mTabLayout;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_demo);
 
-
         // Create the adapter that will return a fragment for each of the three
         // primary sections of the activity.
         mSectionsPagerAdapter = new SectionsPagerAdapter(getSupportFragmentManager());
@@ -58,9 +58,6 @@ protected void onCreate(Bundle savedInstanceState) {
         mViewPager = (ViewPager) findViewById(R.id.container);
         mViewPager.setAdapter(mSectionsPagerAdapter);
 
-        // When swiping between different sections, select the corresponding
-        // tab. We can also use ActionBar.Tab#select() to do this if we have
-        // a reference to the Tab.
         mTabLayout = (TabLayout) findViewById(R.id.tabs);
         mTabLayout.setupWithViewPager(mViewPager);
         setupTabLayout(mTabLayout);
@@ -86,7 +83,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
         return super.onOptionsItemSelected(item);
     }
 
-    public void setupTabLayout(TabLayout tabLayout) {
+    private void setupTabLayout(TabLayout tabLayout) {
         tabLayout.setTabMode(TabLayout.MODE_FIXED);
         tabLayout.setTabGravity(TabLayout.GRAVITY_FILL);
         tabLayout.setupWithViewPager(mViewPager);
@@ -104,12 +101,11 @@ protected void onRestoreInstanceState(Bundle savedInstanceState) {
         mViewPager.setCurrentItem(savedInstanceState.getInt(POSITION));
     }
 
-
     /**
      * A {@link FragmentPagerAdapter} that returns a fragment corresponding to
      * one of the sections/tabs/pages.
      */
-    public class SectionsPagerAdapter extends FragmentPagerAdapter {
+    class SectionsPagerAdapter extends FragmentPagerAdapter {
 
         public SectionsPagerAdapter(FragmentManager fm) {
             super(fm);
@@ -142,7 +138,6 @@ public CharSequence getPageTitle(int position) {
     }
 
     public static class Demo1Fragment extends Fragment {
-
         @Override
         public View onCreateView(LayoutInflater inflater, ViewGroup container,
                                  Bundle savedInstanceState) {
@@ -171,7 +166,6 @@ public void onExpandStateChanged(TextView textView, boolean isExpanded) {
     }
 
     public static class Demo2Fragment extends ListFragment {
-
         @Override
         public void onViewCreated(View view, Bundle savedInstanceState) {
             super.onViewCreated(view, savedInstanceState);
diff --git a/sample/src/main/res/layout/activity_demo.xml b/sample/src/main/res/layout/activity_demo.xml
@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
-    tools:context="com.ms.square.android.expandabletextview.sample">
+    tools:context="com.ms.square.android.expandabletextview.sample.DemoActivity">
 
     <android.support.design.widget.AppBarLayout
         android:id="@+id/appbar"
diff --git a/sample/src/main/res/layout/list_item.xml b/sample/src/main/res/layout/list_item.xml
@@ -3,33 +3,33 @@
     xmlns:expandableTextView="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical" >
+    android:orientation="vertical">
 
     <com.ms.square.android.expandabletextview.ExpandableTextView
         android:id="@+id/expand_text_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        expandableTextView:maxCollapsedLines="4"
-        expandableTextView:animAlphaStart="1">
+        expandableTextView:animAlphaStart="1"
+        expandableTextView:maxCollapsedLines="4">
 
         <TextView
             android:id="@id/expandable_text"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
             android:layout_marginLeft="10dp"
             android:layout_marginRight="10dp"
+            android:layout_marginTop="8dp"
             android:fontFamily="sans-serif-light"
-            android:textSize="16sp"
-            android:textColor="#666666" />
+            android:textColor="#666666"
+            android:textSize="16sp" />
 
         <ImageButton
             android:id="@id/expand_collapse"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:padding="16dp"
-            android:layout_gravity="right|bottom"
-            android:background="@android:color/transparent"/>
+            android:layout_gravity="end|bottom"
+            android:background="@android:color/transparent"
+            android:padding="16dp" />
     </com.ms.square.android.expandabletextview.ExpandableTextView>
 
 </LinearLayout>
