From 53c5ce1f0ff65a9dc30dfed464634f80461faa4d Mon Sep 17 00:00:00 2001 From: Akash Yadav Date: Thu, 9 Dec 2021 10:37:27 +0530 Subject: [PATCH] Fixed compiling issues --- layout-inflater/src/main/AndroidManifest.xml | 2 +- .../java/com/itsaky/layoutinflater/XMLLayoutInflater.java | 2 +- .../layoutinflater/adapters/android/view/ViewAttrAdapter.java | 4 ++-- .../main/java/com/itsaky/layoutinflater/util/ValuesTable.java | 4 ++-- sdk-info/src/main/res/raw/README.md | 2 ++ 5 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 sdk-info/src/main/res/raw/README.md diff --git a/layout-inflater/src/main/AndroidManifest.xml b/layout-inflater/src/main/AndroidManifest.xml index 191f72606..63e5b3a6a 100644 --- a/layout-inflater/src/main/AndroidManifest.xml +++ b/layout-inflater/src/main/AndroidManifest.xml @@ -1 +1 @@ - + diff --git a/layout-inflater/src/main/java/com/itsaky/layoutinflater/XMLLayoutInflater.java b/layout-inflater/src/main/java/com/itsaky/layoutinflater/XMLLayoutInflater.java index b8694faac..0848388f7 100644 --- a/layout-inflater/src/main/java/com/itsaky/layoutinflater/XMLLayoutInflater.java +++ b/layout-inflater/src/main/java/com/itsaky/layoutinflater/XMLLayoutInflater.java @@ -205,7 +205,7 @@ class XMLLayoutInflater extends BaseLayoutInflater { .asSubclass(IAttributeAdapter.class); return adapterClass.newInstance(); } catch (Throwable th) { - LOG.error (BaseApplication.getBaseInstance().getString(com.itsaky.androidide.common.R.string.err_no_attr_adapter, view.getClass().getName()), th); + LOG.error (BaseApplication.getBaseInstance().getString(com.itsaky.layoutinflater.R.string.err_no_attr_adapter, view.getClass().getName()), th); } // If we cannot find a suitable adapter, fall back to using common adapters diff --git a/layout-inflater/src/main/java/com/itsaky/layoutinflater/adapters/android/view/ViewAttrAdapter.java b/layout-inflater/src/main/java/com/itsaky/layoutinflater/adapters/android/view/ViewAttrAdapter.java index 84d0c7ad4..a3e4cc0e8 100644 --- a/layout-inflater/src/main/java/com/itsaky/layoutinflater/adapters/android/view/ViewAttrAdapter.java +++ b/layout-inflater/src/main/java/com/itsaky/layoutinflater/adapters/android/view/ViewAttrAdapter.java @@ -1,5 +1,5 @@ /************************************************************************************ - * This file is part of AndroidIDE + * This file is part of AndroidIDE. * * AndroidIDE is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -238,7 +238,7 @@ public class ViewAttrAdapter implements IAttributeAdapter { } if (!handled && params instanceof RelativeLayout.LayoutParams) { - handled = handleRelativeLayoutParams ((RelativeLayout.LayoutParams) params, view, name, value); + handled = handleRelativeLayoutParams ((RelativeLayout.LayoutParams) params, view, name, value, resFinder); } if (!handled && params instanceof ViewGroup.MarginLayoutParams) { diff --git a/layout-inflater/src/main/java/com/itsaky/layoutinflater/util/ValuesTable.java b/layout-inflater/src/main/java/com/itsaky/layoutinflater/util/ValuesTable.java index a794c502a..15e8d99a2 100644 --- a/layout-inflater/src/main/java/com/itsaky/layoutinflater/util/ValuesTable.java +++ b/layout-inflater/src/main/java/com/itsaky/layoutinflater/util/ValuesTable.java @@ -15,7 +15,7 @@ * along with AndroidIDE. If not, see . * **************************************************************************************/ -package com.itsaky.androidide.ui.util; +package com.itsaky.layoutinflater.util; import com.blankj.utilcode.util.FileIOUtils; import com.blankj.utilcode.util.FileUtils; @@ -69,7 +69,7 @@ public class ValuesTable { read.whenComplete((__, th) -> { if (th != null) { - LOG.error(BaseApplication.getBaseInstance().getString(com.itsaky.androidide.common.R.string.err_cannot_read_values), th); + LOG.error(BaseApplication.getBaseInstance().getString(com.itsaky.layoutinflater.R.string.err_cannot_read_values), th); } else { initialized = true; } diff --git a/sdk-info/src/main/res/raw/README.md b/sdk-info/src/main/res/raw/README.md new file mode 100644 index 000000000..e97c6c372 --- /dev/null +++ b/sdk-info/src/main/res/raw/README.md @@ -0,0 +1,2 @@ +# SDK Data +These files are taken directly from the Android SDK \ No newline at end of file