diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ads/managers/NativeAdLoader.java b/app/src/main/java/com/d4rk/androidtutorials/java/ads/managers/NativeAdLoader.java index 124cdcec..808856d6 100644 --- a/app/src/main/java/com/d4rk/androidtutorials/java/ads/managers/NativeAdLoader.java +++ b/app/src/main/java/com/d4rk/androidtutorials/java/ads/managers/NativeAdLoader.java @@ -29,7 +29,7 @@ public class NativeAdLoader { private static final String TAG = "NativeAdLoader"; public static void load(@NonNull Context context, @NonNull ViewGroup container) { - load(context, container, R.layout.large_home_banner_native_ad, null); + load(context, container, R.layout.ad_home_banner_large, null); } public static void load(@NonNull Context context, @NonNull ViewGroup container, @LayoutRes int layoutRes) { diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ads/views/NativeAdBannerView.java b/app/src/main/java/com/d4rk/androidtutorials/java/ads/views/NativeAdBannerView.java index e5b465a1..eec659dc 100644 --- a/app/src/main/java/com/d4rk/androidtutorials/java/ads/views/NativeAdBannerView.java +++ b/app/src/main/java/com/d4rk/androidtutorials/java/ads/views/NativeAdBannerView.java @@ -20,7 +20,7 @@ */ public class NativeAdBannerView extends FrameLayout { - private int layoutRes = R.layout.large_home_banner_native_ad; + private int layoutRes = R.layout.ad_home_banner_large; public NativeAdBannerView(@NonNull Context context) { super(context); @@ -40,7 +40,7 @@ public NativeAdBannerView(@NonNull Context context, @Nullable AttributeSet attrs private void init(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) { if (attrs != null) { TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.NativeAdBannerView, defStyleAttr, 0); - layoutRes = a.getResourceId(R.styleable.NativeAdBannerView_nativeAdLayout, R.layout.large_home_banner_native_ad); + layoutRes = a.getResourceId(R.styleable.NativeAdBannerView_nativeAdLayout, R.layout.ad_home_banner_large); a.recycle(); } } diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/components/navigation/BottomSheetMenuFragment.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/components/navigation/BottomSheetMenuFragment.java index b59adeb4..50fe809e 100644 --- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/components/navigation/BottomSheetMenuFragment.java +++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/components/navigation/BottomSheetMenuFragment.java @@ -11,19 +11,19 @@ import com.d4rk.androidtutorials.java.BuildConfig; import com.d4rk.androidtutorials.java.R; -import com.d4rk.androidtutorials.java.databinding.BottomSheetMenuBinding; +import com.d4rk.androidtutorials.java.databinding.DialogBottomSheetMenuBinding; import com.d4rk.androidtutorials.java.ui.screens.settings.SettingsActivity; import com.google.android.material.bottomsheet.BottomSheetDialogFragment; public class BottomSheetMenuFragment extends BottomSheetDialogFragment { - private BottomSheetMenuBinding binding; + private DialogBottomSheetMenuBinding binding; @Override public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - binding = BottomSheetMenuBinding.inflate(inflater, container, false); + binding = DialogBottomSheetMenuBinding.inflate(inflater, container, false); binding.menuSettings.setOnClickListener(v -> { Intent intent = new Intent(requireContext(), SettingsActivity.class); diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/AndroidStudioFragment.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/AndroidStudioFragment.java index a23d2477..8038b2e8 100644 --- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/AndroidStudioFragment.java +++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/AndroidStudioFragment.java @@ -341,15 +341,15 @@ public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int adView.setLayoutParams(new RecyclerView.LayoutParams( ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)); - adView.setNativeAdLayout(R.layout.android_studio_list_native_ad); + adView.setNativeAdLayout(R.layout.ad_android_studio_list); return new AdHolder(adView); } else if (viewType == TYPE_CATEGORY) { View view = LayoutInflater.from(parent.getContext()) - .inflate(R.layout.android_studio_category_item, parent, false); + .inflate(R.layout.item_android_studio_category, parent, false); return new CategoryHolder(view); } else { View view = LayoutInflater.from(parent.getContext()) - .inflate(R.layout.android_studio_lesson_item, parent, false); + .inflate(R.layout.item_android_studio_lesson, parent, false); return new LessonHolder(view); } } diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/home/HomeFragment.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/home/HomeFragment.java index 736f16e7..5230b3b0 100644 --- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/home/HomeFragment.java +++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/home/HomeFragment.java @@ -55,8 +55,8 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat java.util.List apps = state.promotedApps(); for (int i = 0; i < apps.size(); i++) { PromotedApp app = apps.get(i); - com.d4rk.androidtutorials.java.databinding.PromotedAppItemBinding itemBinding = - com.d4rk.androidtutorials.java.databinding.PromotedAppItemBinding.inflate(inflater, promotedContainer, false); + com.d4rk.androidtutorials.java.databinding.ItemPromotedAppBinding itemBinding = + com.d4rk.androidtutorials.java.databinding.ItemPromotedAppBinding.inflate(inflater, promotedContainer, false); loadImage(app.iconUrl(), itemBinding.appIcon); itemBinding.appName.setText(app.name()); itemBinding.appDescription.setVisibility(android.view.View.GONE); diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 6f0e138a..77c151a4 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -57,7 +57,7 @@ android:id="@+id/ad_view" android:layout_width="match_parent" android:layout_height="wrap_content" - app:nativeAdLayout="@layout/bottom_app_bar_native_ad" /> + app:nativeAdLayout="@layout/ad_bottom_app_bar" /> + app:nativeAdLayout="@layout/ad_home_banner_large" /> diff --git a/app/src/main/res/layout/about_native_ad.xml b/app/src/main/res/layout/ad_about.xml similarity index 100% rename from app/src/main/res/layout/about_native_ad.xml rename to app/src/main/res/layout/ad_about.xml diff --git a/app/src/main/res/layout/android_studio_list_native_ad.xml b/app/src/main/res/layout/ad_android_studio_list.xml similarity index 100% rename from app/src/main/res/layout/android_studio_list_native_ad.xml rename to app/src/main/res/layout/ad_android_studio_list.xml diff --git a/app/src/main/res/layout/bottom_app_bar_native_ad.xml b/app/src/main/res/layout/ad_bottom_app_bar.xml similarity index 88% rename from app/src/main/res/layout/bottom_app_bar_native_ad.xml rename to app/src/main/res/layout/ad_bottom_app_bar.xml index a91f9e9d..33a44dbb 100644 --- a/app/src/main/res/layout/bottom_app_bar_native_ad.xml +++ b/app/src/main/res/layout/ad_bottom_app_bar.xml @@ -9,12 +9,13 @@ android:layout_height="wrap_content" android:orientation="vertical" android:background="?attr/colorSurfaceContainer" - android:paddingStart="16dp" - android:paddingEnd="16dp" - android:paddingTop="12dp" - android:paddingBottom="12dp"> + android:paddingHorizontal="16dp"> - + - + app:nativeAdLayout="@layout/ad_about" /> + app:nativeAdLayout="@layout/ad_home_banner_large" /> + app:nativeAdLayout="@layout/ad_home_banner_small" /> - + android:background="?attr/colorPrimaryContainer" + android:contentDescription="@null" + android:scaleType="centerCrop" + app:shapeAppearanceOverlay="@style/ShapeAppearance.Material3.Corner.Full" />