* add tab layout in table

xVemu · Feb 29, 2020 · 11cbc78 · 11cbc78
1 parent 626cbb9
commit 11cbc78
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 36 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "pl.vemu.zsme"
         minSdkVersion 23
         targetSdkVersion 29
-        versionCode 7
-        versionName "0.3.2"
+        versionCode 8
+        versionName "0.4"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

diff --git a/app/src/main/java/pl/vemu/zsme/MainActivity.java b/app/src/main/java/pl/vemu/zsme/MainActivity.java
@@ -17,7 +17,6 @@ public class MainActivity extends AppCompatActivity {
 
     private NavController navController;
 
-    // TODO save state beetwen fragments
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);

diff --git a/app/src/main/java/pl/vemu/zsme/timetableFragment/TableFragment.java b/app/src/main/java/pl/vemu/zsme/timetableFragment/TableFragment.java
@@ -9,6 +9,8 @@
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
+import com.google.android.material.tabs.TabLayoutMediator;
+
 import java.util.List;
 
 import pl.vemu.zsme.databinding.FragmentTableBinding;
@@ -41,5 +43,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
     @Override
     public void makeAdapter(List<List<Lesson>> lessons) {
         binding.viewPager.setAdapter(new TablePageAdapter(this, lessons));
+        String[] names = {"Poniedziałek", "Wtorek", "Środa", "Czwartek", "Piątek"};
+        new TabLayoutMediator(binding.tabLayout, binding.viewPager, (tab, position) -> tab.setText(names[position])).attach();
     }
 }
diff --git a/app/src/main/java/pl/vemu/zsme/timetableFragment/TableFragmentPage.java b/app/src/main/java/pl/vemu/zsme/timetableFragment/TableFragmentPage.java
@@ -7,6 +7,7 @@
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 
 import android.view.LayoutInflater;
 import android.view.View;
@@ -20,13 +21,11 @@
 public class TableFragmentPage extends Fragment {
 
     private List<Lesson> lessons = new ArrayList<>();
-    private String day;
     private FragmentTablePageBinding binding;
 
     public TableFragmentPage() { }
-    public TableFragmentPage(List<Lesson> lessons, String day) {
+    public TableFragmentPage(List<Lesson> lessons) {
         this.lessons = lessons;
-        this.day = day;
     }
 
     @Override
@@ -44,11 +43,10 @@ public void onDestroyView() {
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         LinearLayoutManager manager = new LinearLayoutManager(getContext());
-        binding.recyclerView.setLayoutManager(manager);
-
-        binding.day.setText(day);
+        RecyclerView recyclerView = (RecyclerView) binding.getRoot();
+        recyclerView.setLayoutManager(manager);
 
         TableAdapter tableAdapter = new TableAdapter(lessons);
-        binding.recyclerView.setAdapter(tableAdapter);
+        recyclerView.setAdapter(tableAdapter);
     }
 }
diff --git a/app/src/main/java/pl/vemu/zsme/timetableFragment/TablePageAdapter.java b/app/src/main/java/pl/vemu/zsme/timetableFragment/TablePageAdapter.java
@@ -18,8 +18,7 @@ public TablePageAdapter(@NonNull Fragment fragment, List<List<Lesson>> lessons)
     @NonNull
     @Override
     public Fragment createFragment(int position) {
-        String[] days = {"Poniedziałek", "Wtorek", "Środa", "Czwartek", "Piątek"};
-        return new TableFragmentPage(lessons.get(position), days[position]);
+        return new TableFragmentPage(lessons.get(position));
     }
 
     @Override

diff --git a/app/src/main/res/layout/fragment_table.xml b/app/src/main/res/layout/fragment_table.xml
@@ -1,7 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.viewpager2.widget.ViewPager2 xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/view_pager"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".timetableFragment.TableFragment" />
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
+    tools:context=".timetableFragment.TableFragment">
+
+    <com.google.android.material.tabs.TabLayout
+        android:id="@+id/tab_layout"
+        app:tabMode="auto"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
+    <androidx.viewpager2.widget.ViewPager2
+        android:id="@+id/view_pager"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"/>
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_table_page.xml b/app/src/main/res/layout/fragment_table_page.xml
@@ -1,25 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context=".timetableFragment.TableFragmentPage">
-
-    <TextView
-        android:id="@+id/day"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:textSize="18sp"
-        tools:text="@string/title" />
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/recycler_view"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
-
-    </androidx.recyclerview.widget.RecyclerView>
-
-</LinearLayout>
+    tools:context=".timetableFragment.TableFragmentPage" />
diff --git a/app/src/main/res/layout/fragment_timetable.xml b/app/src/main/res/layout/fragment_timetable.xml
@@ -17,5 +17,4 @@
         android:layout_height="0dp"
         android:layout_weight="1" />
 
-
 </LinearLayout>