Selaa lähdekoodia

removed fragments

David 9 vuotta sitten
vanhempi
commit
a072c866e5

+ 26 - 44
app/src/main/java/com/example/david/libretasker/MainActivity.java

@@ -1,19 +1,15 @@
 package com.example.david.libretasker;
 
-import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.design.widget.FloatingActionButton;
-import android.support.design.widget.TabLayout;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
-import android.support.v4.view.ViewPager;
 import android.support.v7.app.AppCompatActivity;
 import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.ListView;
 
 import com.example.david.libretasker.Actions.Actions;
-import com.example.david.libretasker.Events.Events;
 
 import java.util.ArrayList;
 
@@ -26,13 +22,6 @@ public class MainActivity extends AppCompatActivity {
 
         setContentView(R.layout.activity_main);
 
-        ViewPager vp = (ViewPager) findViewById(R.id.pager);
-        vp.setAdapter(new SampleFragmentPagerAdapter(getSupportFragmentManager(),
-                MainActivity.this));
-
-        TabLayout t = (TabLayout) findViewById(R.id.tlayout);
-        t.setupWithViewPager(vp);
-
         FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.floatingActionButton);
         fab.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -40,40 +29,33 @@ public class MainActivity extends AppCompatActivity {
                 Actions.Launch(getApplicationContext(), "Toast", "Clicked");
             }
         });
-        startService(new Intent(this, MainService.class));
-    }
-
-    public class SampleFragmentPagerAdapter extends FragmentPagerAdapter {
-        final int PAGE_COUNT = 3;
-        private String tabTitles[] = new String[] { "Events", "Actions", "User" };
-        private Context context;
 
-        public SampleFragmentPagerAdapter(FragmentManager fm, Context context) {
-            super(fm);
-            this.context = context;
+        ArrayList<String> list = new ArrayList<>();
+        list.add("Test1");
+        list.add("Test2");
+        ArrayAdapter adapter = new ArrayAdapter( getApplicationContext(), android.R.layout.simple_list_item_1, list);
 
-        }
+        ListView listview = (ListView) findViewById(R.id.listview2);
+        listview.setAdapter(adapter);
+        listview.setOnItemClickListener(new AdapterView.OnItemClickListener() {
 
-        @Override
-        public int getCount() {
-            return PAGE_COUNT;
-        }
-
-        @Override
-        public Fragment getItem(int position) {
-            switch (position) {
-                case 0:
-                    return PageFragment.newInstance(Events.list());
-                case 1:
-                    return PageFragment.newInstance(Actions.list());
+            @Override
+            public void onItemClick(AdapterView<?> parent, final View view,
+                                    int position, long id) {
+                final String item = (String) parent.getItemAtPosition(position);
+                view.animate().setDuration(200).alpha(0)
+                        .withEndAction(new Runnable() {
+                            @Override
+                            public void run() {
+                                //list.remove(item);
+                                //adapter.notifyDataSetChanged();
+                                view.setAlpha(1);
+                            }
+                        });
             }
-            return PageFragment.newInstance(new ArrayList<String>());
-        }
 
-        @Override
-        public CharSequence getPageTitle(int position) {
-            // Generate title based on item position
-            return tabTitles[position];
-        }
+        });
+        startService(new Intent(this, MainService.class));
     }
+
 }

+ 0 - 65
app/src/main/java/com/example/david/libretasker/PageFragment.java

@@ -1,65 +0,0 @@
-package com.example.david.libretasker;
-
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.ListView;
-
-import java.util.ArrayList;
-
-/**
- * Created by david on 01/01/17.
- */
-
-// In this case, the fragment displays simple text based on the page
-public class PageFragment extends Fragment {
-
-    public static PageFragment newInstance(ArrayList<String> elements) {
-        Bundle args = new Bundle();
-        args.putStringArrayList("elements", elements);
-        PageFragment fragment = new PageFragment();
-        fragment.setArguments(args);
-        return fragment;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.fragment_page, container, false);
-        ListView listview = (ListView) view.findViewById(R.id.listview);
-
-        final ArrayList<String> list = this.getArguments().getStringArrayList("elements");
-        final ArrayAdapter adapter = new ArrayAdapter(getActivity(), android.R.layout.simple_list_item_1, list);
-        listview.setAdapter(adapter);
-
-        listview.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-
-            @Override
-            public void onItemClick(AdapterView<?> parent, final View view,
-                                    int position, long id) {
-                final String item = (String) parent.getItemAtPosition(position);
-                view.animate().setDuration(200).alpha(0)
-                        .withEndAction(new Runnable() {
-                            @Override
-                            public void run() {
-                                //list.remove(item);
-                                //adapter.notifyDataSetChanged();
-                                view.setAlpha(1);
-                            }
-                        });
-            }
-
-        });
-        return view;
-    }
-
-}

+ 0 - 13
app/src/main/res/layout/activity_main.xml

@@ -5,19 +5,6 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <android.support.design.widget.TabLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="top"
-        app:tabMode="fixed"
-        android:id="@+id/tlayout" />
-
-    <android.support.v4.view.ViewPager xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/pager"
-        android:layout_width="match_parent"
-        android:layout_height="0px"
-        android:layout_weight="1" />
-
     <ListView xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/listview2"
         android:layout_width="wrap_content"

+ 0 - 6
app/src/main/res/layout/fragment_page.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ListView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/listview"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content" />
-