diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java index 79a09614f..5270362f1 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java @@ -7,7 +7,6 @@ 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.util.Log; import javax.inject.Inject; @@ -22,8 +21,7 @@ import fr.free.nrw.commons.upload.UploadService; import static android.content.ContentResolver.requestSync; -public class ContributionsActivity - extends AuthenticatedActivity { +public class ContributionsActivity extends AuthenticatedActivity { @Inject SessionManager sessionManager; @@ -52,8 +50,7 @@ public class ContributionsActivity requestAuthToken(); initDrawer(); setTitle(getString(R.string.navigation_item_home)); // Should I create a new string variable with another name instead? - - // Add tabs and fragments after Auth cookie received + // Add tabs and fragments onAuthCookieAcquired } @Override diff --git a/app/src/main/java/fr/free/nrw/commons/di/FragmentBuilderModule.java b/app/src/main/java/fr/free/nrw/commons/di/FragmentBuilderModule.java index b14d8feef..9da9fb3ce 100644 --- a/app/src/main/java/fr/free/nrw/commons/di/FragmentBuilderModule.java +++ b/app/src/main/java/fr/free/nrw/commons/di/FragmentBuilderModule.java @@ -4,6 +4,7 @@ import dagger.Module; import dagger.android.ContributesAndroidInjector; import fr.free.nrw.commons.category.CategorizationFragment; import fr.free.nrw.commons.category.SubCategoryListFragment; +import fr.free.nrw.commons.contributions.ContributionsFragment; import fr.free.nrw.commons.contributions.ContributionsListFragment; import fr.free.nrw.commons.category.CategoryImagesListFragment; import fr.free.nrw.commons.explore.categories.SearchCategoryFragment; @@ -11,6 +12,7 @@ import fr.free.nrw.commons.explore.images.SearchImageFragment; import fr.free.nrw.commons.explore.recentsearches.RecentSearchesFragment; import fr.free.nrw.commons.media.MediaDetailFragment; import fr.free.nrw.commons.media.MediaDetailPagerFragment; +import fr.free.nrw.commons.nearby.NearbyFragment; import fr.free.nrw.commons.nearby.NearbyListFragment; import fr.free.nrw.commons.nearby.NearbyMapFragment; import fr.free.nrw.commons.nearby.NoPermissionsFragment; @@ -67,4 +69,10 @@ public abstract class FragmentBuilderModule { @ContributesAndroidInjector abstract RecentSearchesFragment bindRecentSearchesFragment(); + @ContributesAndroidInjector + abstract ContributionsFragment bindContributionsFragment(); + + @ContributesAndroidInjector + abstract NearbyFragment bindNearbyFragment(); + } diff --git a/app/src/main/res/layout/activity_contributions.xml b/app/src/main/res/layout/activity_contributions.xml index 8168cb918..c375322ea 100644 --- a/app/src/main/res/layout/activity_contributions.xml +++ b/app/src/main/res/layout/activity_contributions.xml @@ -4,8 +4,8 @@ android:id="@+id/drawer_layout" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="?attr/contributionsListBackground" > - + + + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index bad958661..9cf0363f5 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -3,6 +3,7 @@ #303030 #fafafa + #1a1a1a #0c609c diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 26d9c357b..b4ffa0cf3 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,6 +1,7 @@