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

Merge branch 'Use_ViewCompat_requireViewById' into 'master'

Browse Source 
Use ViewCompat.requireViewById().

See merge request fdroid/fdroidclient!958
This commit is contained in:
Hans-Christoph Steiner 2020-12-29 15:52:11 +00:00
commit d14a5200f1
1 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/src/main/java/org/fdroid/fdroid/views/categories/AppCardController.java
View File

@ -7,12 +7,12 @@ import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
import androidx.annotation.IdRes;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.app.ActivityOptionsCompat;
import androidx.core.content.ContextCompat;
import androidx.core.util.Pair;
import androidx.core.view.ViewCompat;
import androidx.recyclerview.widget.RecyclerView;
import org.fdroid.fdroid.R;
@ -60,30 +60,14 @@ public class AppCardController extends RecyclerView.ViewHolder
this.activity = activity;
icon = (ImageView) findViewAndEnsureNonNull(itemView, R.id.icon);
summary = (TextView) findViewAndEnsureNonNull(itemView, R.id.summary);
icon = ViewCompat.requireViewById(itemView, R.id.icon);
summary = ViewCompat.requireViewById(itemView, R.id.summary);
newTag = (TextView) itemView.findViewById(R.id.new_tag);
newTag = itemView.findViewById(R.id.new_tag);
itemView.setOnClickListener(this);
}
/**
* The contract that this controller has is that it will consume any layout resource, given
* it has some specific view types (with specific IDs) available. This helper function will
* throw an {@link IllegalArgumentException} if the view doesn't exist,
*/
@NonNull
private View findViewAndEnsureNonNull(View view, @IdRes int res) {
View found = view.findViewById(res);
if (found == null) {
String resName = activity.getResources().getResourceName(res);
throw new IllegalArgumentException("Layout for AppCardController requires " + resName);
}
return found;
}
public void bindApp(@NonNull App app) {
currentApp = app;