Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FDroidApp.isAppThemeLight() to avoid opaque, super long test lines

Browse Source
This commit is contained in:
Hans-Christoph Steiner 2018-02-13 17:22:00 +01:00
parent c031939379
commit 782cf9917f
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/fdroid/fdroid/FDroidApp.java
View File

@ -143,6 +143,10 @@ public class FDroidApp extends Application {
} }
} }
public static boolean isAppThemeLight() {
return curTheme == Theme.light;
}
public void applyDialogTheme(Activity activity) { public void applyDialogTheme(Activity activity) {
activity.setTheme(getCurDialogThemeResId()); activity.setTheme(getCurDialogThemeResId());
setSecureWindow(activity); setSecureWindow(activity);

21
app/src/main/java/org/fdroid/fdroid/views/apps/AppListActivity.java
View File

@ -42,7 +42,8 @@ public class AppListActivity extends AppCompatActivity implements LoaderManager.
private interface SortClause { private interface SortClause {
String NAME = Schema.AppMetadataTable.NAME + "." + Schema.AppMetadataTable.Cols.NAME + " asc"; String NAME = Schema.AppMetadataTable.NAME + "." + Schema.AppMetadataTable.Cols.NAME + " asc";
String LAST_UPDATED = Schema.AppMetadataTable.NAME + "." + Schema.AppMetadataTable.Cols.LAST_UPDATED + " desc"; String LAST_UPDATED = Schema.AppMetadataTable.NAME + "."
+ Schema.AppMetadataTable.Cols.LAST_UPDATED + " desc";
} }
@Override @Override
@ -71,16 +72,28 @@ public class AppListActivity extends AppCompatActivity implements LoaderManager.
}); });
sortImage = (ImageView) findViewById(R.id.sort); sortImage = (ImageView) findViewById(R.id.sort);
sortImage.setImageResource(FDroidApp.getCurThemeResId() == R.style.AppThemeLight ? R.drawable.ic_last_updated_black : R.drawable.ic_last_updated_white); if (FDroidApp.isAppThemeLight()) {
sortImage.setImageResource(R.drawable.ic_last_updated_black);
} else {
sortImage.setImageResource(R.drawable.ic_last_updated_white);
}
sortImage.setOnClickListener(new View.OnClickListener() { sortImage.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
if (sortClauseSelected.equalsIgnoreCase(SortClause.LAST_UPDATED)) { if (sortClauseSelected.equalsIgnoreCase(SortClause.LAST_UPDATED)) {
sortClauseSelected = SortClause.NAME; sortClauseSelected = SortClause.NAME;
sortImage.setImageResource(FDroidApp.getCurThemeResId() == R.style.AppThemeLight ? R.drawable.ic_az_black : R.drawable.ic_az_white); if (FDroidApp.isAppThemeLight()) {
sortImage.setImageResource(R.drawable.ic_az_black);
} else {
sortImage.setImageResource(R.drawable.ic_az_white);
}
} else { } else {
sortClauseSelected = SortClause.LAST_UPDATED; sortClauseSelected = SortClause.LAST_UPDATED;
sortImage.setImageResource(FDroidApp.getCurThemeResId() == R.style.AppThemeLight ? R.drawable.ic_last_updated_black : R.drawable.ic_last_updated_white); if (FDroidApp.isAppThemeLight()) {
sortImage.setImageResource(R.drawable.ic_last_updated_black);
} else {
sortImage.setImageResource(R.drawable.ic_last_updated_white);
}
} }
getSupportLoaderManager().restartLoader(0, null, AppListActivity.this); getSupportLoaderManager().restartLoader(0, null, AppListActivity.this);
appView.scrollToPosition(0); appView.scrollToPosition(0);