From 12cd548b7a9576211085d2cc3f3d6418c2f2fea0 Mon Sep 17 00:00:00 2001 From: neslihanturan Date: Sat, 19 May 2018 14:54:33 +0300 Subject: [PATCH] Add fragment pager --- .../nrw/commons/review/ReviewActivity.java | 42 ++++++++++++++++- .../review/ReviewOutOfContextFragment.java | 46 +++++++++++++++++++ .../commons/review/ReviewPagerAdapter.java | 34 ++++++++++++++ .../layout/out_of_context_question_layout.xml | 6 +++ 4 files changed, 126 insertions(+), 2 deletions(-) create mode 100644 app/src/main/java/fr/free/nrw/commons/review/ReviewOutOfContextFragment.java create mode 100644 app/src/main/java/fr/free/nrw/commons/review/ReviewPagerAdapter.java create mode 100644 app/src/main/res/layout/out_of_context_question_layout.xml diff --git a/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.java b/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.java index 9b42b98e9..75d79a8df 100644 --- a/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.java @@ -3,9 +3,12 @@ package fr.free.nrw.commons.review; import android.content.Context; import android.content.Intent; import android.os.Bundle; + import android.support.design.widget.NavigationView; +import android.support.v4.view.ViewPager; import android.support.v4.widget.DrawerLayout; import android.support.v7.widget.Toolbar; + import android.view.Menu; import android.view.MenuItem; @@ -13,7 +16,6 @@ import butterknife.BindView; import butterknife.ButterKnife; import fr.free.nrw.commons.R; import fr.free.nrw.commons.auth.AuthenticatedActivity; -import fr.free.nrw.commons.di.CommonsDaggerSupportFragment; /** * Created by root on 18.05.2018. @@ -28,6 +30,12 @@ public class ReviewActivity extends AuthenticatedActivity { @BindView(R.id.drawer_layout) DrawerLayout drawerLayout; + @BindView(R.id.reviewPager) + ViewPager pager; + + public static final int MAX_NUM = 4; + private ReviewPagerAdapter reviewPagerAdapter; + @Override protected void onAuthCookieAcquired(String authCookie) { @@ -43,8 +51,12 @@ public class ReviewActivity extends AuthenticatedActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_review); ButterKnife.bind(this); - initDrawer(); + + reviewPagerAdapter = new ReviewPagerAdapter(getSupportFragmentManager()); + pager.setAdapter(reviewPagerAdapter); + //pager.setAdapter(adapter); + reviewPagerAdapter.getItem(0); } @Override @@ -64,6 +76,15 @@ public class ReviewActivity extends AuthenticatedActivity { return super.onOptionsItemSelected(item); } + /** + * References ReviewPagerAdapter to null before the activity is destroyed + */ + @Override + public void onDestroy() { + //adapter.setCallback(null); + super.onDestroy(); + } + /** * Consumers should be simply using this method to use this activity. * @param context @@ -74,4 +95,21 @@ public class ReviewActivity extends AuthenticatedActivity { Intent reviewActivity = new Intent(context, ReviewActivity.class); context.startActivity(reviewActivity); } +/* + @Override + public void onYesClicked() { + Log.d("deneme","onYesClicked"); + } + + @Override + public void onNoClicked() { + Log.d("deneme","onNoClicked"); + + } + + @Override + public void onNotSureClicked() { + Log.d("deneme","onNotSureClicked"); + + }*/ } diff --git a/app/src/main/java/fr/free/nrw/commons/review/ReviewOutOfContextFragment.java b/app/src/main/java/fr/free/nrw/commons/review/ReviewOutOfContextFragment.java new file mode 100644 index 000000000..249678c49 --- /dev/null +++ b/app/src/main/java/fr/free/nrw/commons/review/ReviewOutOfContextFragment.java @@ -0,0 +1,46 @@ +package fr.free.nrw.commons.review; + +import android.os.Bundle; +import android.util.Log; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import fr.free.nrw.commons.R; +import fr.free.nrw.commons.di.CommonsDaggerSupportFragment; + +/** + * Created by root on 19.05.2018. + */ + +public class ReviewOutOfContextFragment extends CommonsDaggerSupportFragment { + + int position; + + static ReviewOutOfContextFragment init(int val) { + ReviewOutOfContextFragment truitonFrag = new ReviewOutOfContextFragment(); + // Supply val input as an argument. + Bundle args = new Bundle(); + args.putInt("val", val); + truitonFrag.setArguments(args); + return truitonFrag; + } + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + position = getArguments() != null ? getArguments().getInt("val") : 1; + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + View layoutView = inflater.inflate(R.layout.out_of_context_question_layout, container, + false); + View textView = layoutView.findViewById(R.id.testingText); + ((TextView) textView).setText("Fragment #" + position); + Log.d("deneme","Fragment #" + position); + return layoutView; + } +} diff --git a/app/src/main/java/fr/free/nrw/commons/review/ReviewPagerAdapter.java b/app/src/main/java/fr/free/nrw/commons/review/ReviewPagerAdapter.java new file mode 100644 index 000000000..a78adfacd --- /dev/null +++ b/app/src/main/java/fr/free/nrw/commons/review/ReviewPagerAdapter.java @@ -0,0 +1,34 @@ +package fr.free.nrw.commons.review; + +import android.os.Bundle; +import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentManager; +import android.support.v4.app.FragmentStatePagerAdapter; + +/** + * Created by nes on 19.05.2018. + */ + +public class ReviewPagerAdapter extends FragmentStatePagerAdapter { + + public ReviewPagerAdapter(FragmentManager fm) { + super(fm); + } + + @Override + public int getCount() { + return 3; + } + + @Override + public Fragment getItem(int position) { + switch (position) { + case 0: // Fragment # 0 - This will show image + return ReviewOutOfContextFragment.init(position); + case 1: // Fragment # 1 - This will show image + return ReviewOutOfContextFragment.init(position); + default:// Fragment # 2-9 - Will show list + return ReviewOutOfContextFragment.init(position); + } + } +} diff --git a/app/src/main/res/layout/out_of_context_question_layout.xml b/app/src/main/res/layout/out_of_context_question_layout.xml new file mode 100644 index 000000000..d8fb3247f --- /dev/null +++ b/app/src/main/res/layout/out_of_context_question_layout.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file