diff --git a/.idea/misc.xml b/.idea/misc.xml index a7928d9..8430a87 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -8,6 +8,8 @@ + + diff --git a/app/build.gradle b/app/build.gradle index ccb56ae..9502b6f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -42,6 +42,7 @@ implementation 'androidx.navigation:navigation-ui:2.3.5' implementation 'androidx.annotation:annotation:1.2.0' implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' + implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' testImplementation 'junit:junit:4.+' androidTestImplementation 'androidx.test.ext:junit:1.1.2' androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' @@ -49,5 +50,6 @@ implementation 'com.squareup.retrofit2:converter-jackson:2.5.0' implementation 'com.squareup.retrofit2:converter-scalars:2.1.0' implementation 'com.github.bumptech.glide:glide:4.10.0' + implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0" annotationProcessor 'com.github.bumptech.glide:compiler:4.10.0' } \ No newline at end of file diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/EditFragment.java b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/EditFragment.java index a564b35..7bdc090 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/EditFragment.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/EditFragment.java @@ -29,6 +29,7 @@ import androidx.fragment.app.Fragment; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import java.util.ArrayList; import java.util.Collection; @@ -40,7 +41,7 @@ import java.util.Comparator; -public class EditFragment extends Fragment { +public class EditFragment extends Fragment implements SwipeRefreshLayout.OnRefreshListener { private EditViewModel editViewModel; private FragmentEditBinding binding; @@ -54,6 +55,8 @@ private String AnimationName; private String AnimationLastUpDate; + private SwipeRefreshLayout mSwipeRefreshLayout; + public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { editViewModel = @@ -86,6 +89,9 @@ ListView listView = (ListView) getActivity().findViewById(R.id.list_view); + // SwipeRefreshLayoutを作成 + createSwipeRefreshLayout(); + editViewModel.getWorkJson().observe(getViewLifecycleOwner(), new Observer() { //listViewの表示をしている @@ -183,5 +189,18 @@ startActivity(intent); } + // 引っ張って更新するSwipeRefreshLayoutを作成 + public void createSwipeRefreshLayout(){ + mSwipeRefreshLayout = (SwipeRefreshLayout) getActivity().findViewById(R.id.refresh_edit); + // 色指定 + mSwipeRefreshLayout.setColorScheme(R.color.theme_color,R.color.blue,R.color.green); + mSwipeRefreshLayout.setOnRefreshListener(this); + } + // ひっぱり更新の処理 + @Override + public void onRefresh() { + + mSwipeRefreshLayout.setRefreshing(false); + } } \ No newline at end of file diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/home/HomeFragment.java b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/home/HomeFragment.java index 001e620..2f38308 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/home/HomeFragment.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/home/HomeFragment.java @@ -25,6 +25,7 @@ import androidx.fragment.app.Fragment; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import java.io.IOException; import java.util.ArrayList; @@ -32,11 +33,13 @@ import java.util.Collections; import java.util.Iterator; -public class HomeFragment extends Fragment { +public class HomeFragment extends Fragment implements SwipeRefreshLayout.OnRefreshListener { private HomeViewModel homeViewModel; private FragmentHomeBinding binding; + private SwipeRefreshLayout mSwipeRefreshLayout; + @Override public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { @@ -75,6 +78,9 @@ ListView listView = (ListView) getActivity().findViewById(R.id.animation_view); listView.addHeaderView(header); + // SwipeRefreshLayoutを作成 + createSwipeRefreshLayout(); + homeViewModel.updateGallery(acanthus); homeViewModel.getAnimationJson().observe(getViewLifecycleOwner(), new Observer>() { @@ -114,8 +120,6 @@ e.printStackTrace(); } } - - } }); } @@ -135,4 +139,19 @@ intent.putExtra("AnimationJsonData", animationJson); startActivity(intent); } + + // 引っ張って更新するSwipeRefreshLayoutを作成 + public void createSwipeRefreshLayout(){ + mSwipeRefreshLayout = (SwipeRefreshLayout) getActivity().findViewById(R.id.refresh); + // 色指定 + mSwipeRefreshLayout.setColorScheme(R.color.theme_color,R.color.blue,R.color.green); + mSwipeRefreshLayout.setOnRefreshListener(this); + } + + // ひっぱり更新の処理 + @Override + public void onRefresh() { + + mSwipeRefreshLayout.setRefreshing(false); + } } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_login_screen.xml b/app/src/main/res/layout/activity_login_screen.xml index 7d4780d..ff13fca 100644 --- a/app/src/main/res/layout/activity_login_screen.xml +++ b/app/src/main/res/layout/activity_login_screen.xml @@ -95,7 +95,7 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index fea3fe9..4b49da8 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -1,7 +1,9 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 8411f2f..8c78da0 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,5 +1,8 @@ + #ff0000 + #0000ff + #00ff00 #FFBB86FC #FF6200EE #FF3700B3