Skip to content

Commit 11b13be

Browse files
ujjwalagrawal17neslihanturan
authored andcommitted
Improvements in indentation (#1739)
1 parent 7462df4 commit 11b13be

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

app/src/main/java/fr/free/nrw/commons/category/CategoryImagesActivity.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,9 @@ public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
119119
.add(R.id.fragmentContainer, mediaDetails)
120120
.addToBackStack(null)
121121
.commit();
122-
supportFragmentManager.executePendingTransactions();
122+
// Reason for using hide, add instead of replace is to maintain scroll position after
123+
// coming back to the search activity. See https://github.com/commons-app/apps-android-commons/issues/1631
124+
// https://stackoverflow.com/questions/11353075/how-can-i-maintain-fragment-state-when-added-to-the-back-stack/19022550#19022550 supportFragmentManager.executePendingTransactions();
123125
}
124126
mediaDetails.showImage(i);
125127
forceInitBackButton();

app/src/main/java/fr/free/nrw/commons/category/CategoryImagesListFragment.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public class CategoryImagesListFragment extends DaggerFragment {
5252
@BindView(R.id.categoryImagesList) GridView gridView;
5353
@BindView(R.id.parentLayout) RelativeLayout parentLayout;
5454
private boolean hasMoreImages = true;
55-
private boolean isLoading=true;
55+
private boolean isLoading = true;
5656
private String categoryName = null;
5757

5858
@Inject CategoryImageController controller;
@@ -223,7 +223,7 @@ private void handleSuccess(List<Media> collection) {
223223
if(gridAdapter == null) {
224224
setAdapter(collection);
225225
} else {
226-
if (gridAdapter.containsAll(collection)){
226+
if (gridAdapter.containsAll(collection)) {
227227
hasMoreImages = false;
228228
return;
229229
}

app/src/main/java/fr/free/nrw/commons/explore/SearchActivity.java

+3
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,9 @@ public void onSearchImageClicked(int index) {
186186
.add(R.id.mediaContainer, mediaDetails)
187187
.addToBackStack(null)
188188
.commit();
189+
// Reason for using hide, add instead of replace is to maintain scroll position after
190+
// coming back to the search activity. See https://github.com/commons-app/apps-android-commons/issues/1631
191+
// https://stackoverflow.com/questions/11353075/how-can-i-maintain-fragment-state-when-added-to-the-back-stack/19022550#19022550
189192
supportFragmentManager.executePendingTransactions();
190193
}
191194
mediaDetails.showImage(index);

0 commit comments

Comments
 (0)