diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 18b1a3542..ded24eeb6 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -4,13 +4,43 @@ ### Operating System & Version (eg: Mac OSX 10.11): -### Support Libraries Version (eg: 23.3.0): +### AndroidX Version +### Describe your Issue -### Describe your Issue: +### Relevant information +Add relevant project settings from `*.csproj` file: -### Steps to Reproduce (with link to sample solution if possible): +Packages used: + +``` + + +``` + +Build settings (tools) + +``` + d8 + r8 + true + true +``` + + +or even better - links to the existing code: +* https://github.com/xamarin/AndroidX/blob/master/samples/BuildAll/BuildAll/BuildAll.csproj#L41-L44 + +* https://github.com/xamarin/AndroidX/blob/master/samples/BuildXamarinFormsApp/BuildXamarinFormsApp/BuildXamarinFormsApp.Android/BuildXamarinFormsApp.Android.csproj#L57-L58 + +NOTE: Please DO NOT submit screenshot images. Images are not searchable! + +### Minimal Repro Code Sample + +If you want to speed up investigation and bug fixing: please provide minimal repro sample for tests. + +### Steps to Reproduce (with link to sample solution if possible): ### Include any relevant Exception Stack traces, build logs, adb logs: diff --git a/build.cake b/build.cake index 81e96b50f..a856eca92 100644 --- a/build.cake +++ b/build.cake @@ -533,6 +533,7 @@ private IEnumerable<(string Path, bool IsPublic)> GetXmlMetadata(string xpath, S Task("libs") .IsDependentOn("metadata-verify") + .IsDependentOn("libs-native") .Does(() => { var settings = new MSBuildSettings() @@ -551,6 +552,20 @@ Task("libs") MSBuild("./generated/AndroidX.sln", settings); }); +Task("libs-native") + .Does(() => +{ + string root = "./source/com.google.android.material/material.extensions/"; + + RunGradle(root, "build"); + + DirectoryPath outputDir = MakeAbsolute((DirectoryPath)"./externals/"); + EnsureDirectoryExists(outputDir); + + CopyFileToDirectory($"{root}/extensions-aar/build/outputs/aar/extensions-aar-release.aar", outputDir); + Unzip($"{outputDir}/extensions-aar-release.aar", $"{outputDir}/extensions-aar"); +}); + Task("nuget") .IsDependentOn("libs") .Does(() => diff --git a/config.json b/config.json index bfe90445f..114acfde5 100644 --- a/config.json +++ b/config.json @@ -4,7 +4,8 @@ "additionalProjects": [ "source/migration/Dummy/Xamarin.AndroidX.Migration.Dummy.csproj", - "source/androidx.appcompat/typeforwarders/androidx.appcompat.appcompat-resources-typeforwarders.csproj" + "source/androidx.appcompat/typeforwarders/androidx.appcompat.appcompat-resources-typeforwarders.csproj", + "source/com.google.android.material/Xamarin.Google.Android.Material.Extensions/Xamarin.Google.Android.Material.Extensions.csproj" ], "templates" : [ { diff --git a/mappings/dependencies.json b/mappings/dependencies.json index 0950957ae..cae4ef717 100644 --- a/mappings/dependencies.json +++ b/mappings/dependencies.json @@ -58,9 +58,7 @@ }, { "id": "Xamarin.AndroidX.Migration", - "dependencies": [ - "Xamarin.AndroidX.MultiDex" - ] + "dependencies": [] }, { "id": "Xamarin.AndroidX.Annotation.Experimental", @@ -574,10 +572,6 @@ "id": "Xamarin.AndroidX.MultiDex", "dependencies": [] }, - { - "id": "Xamarin.AndroidX.Migration.Tool", - "dependencies": [] - }, { "id": "Xamarin.AndroidX.Navigation.Common", "dependencies": [ @@ -777,6 +771,12 @@ "Xamarin.AndroidX.Room.Runtime", "Xamarin.Google.Guava.ListenableFuture" ] + }, + { + "id": "Xamarin.Google.Android.Material.Extensions", + "dependencies": [ + "Xamarin.Google.Android.Material" + ] } ] } \ No newline at end of file diff --git a/source/androidx.annotation/annotation/merge.targets b/source/androidx.annotation/Annotation/merge.targets similarity index 100% rename from source/androidx.annotation/annotation/merge.targets rename to source/androidx.annotation/Annotation/merge.targets diff --git a/source/androidx.annotation/Annotation/transforms/EnumFields.xml b/source/androidx.annotation/Annotation/transforms/EnumFields.xml new file mode 100644 index 000000000..3117b6ed3 --- /dev/null +++ b/source/androidx.annotation/Annotation/transforms/EnumFields.xml @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/source/androidx.annotation/Annotation/transforms/EnumMethods.xml b/source/androidx.annotation/Annotation/transforms/EnumMethods.xml new file mode 100644 index 000000000..5aefdf814 --- /dev/null +++ b/source/androidx.annotation/Annotation/transforms/EnumMethods.xml @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/source/androidx.annotation/Annotation/transforms/Metadata.Namespaces.xml b/source/androidx.annotation/Annotation/transforms/Metadata.Namespaces.xml new file mode 100644 index 000000000..dacfa5764 --- /dev/null +++ b/source/androidx.annotation/Annotation/transforms/Metadata.Namespaces.xml @@ -0,0 +1,11 @@ + + + AndroidX.Annotations + \ No newline at end of file diff --git a/source/androidx.annotation/Annotation/transforms/Metadata.ParameterNames.xml b/source/androidx.annotation/Annotation/transforms/Metadata.ParameterNames.xml new file mode 100644 index 000000000..20b694022 --- /dev/null +++ b/source/androidx.annotation/Annotation/transforms/Metadata.ParameterNames.xml @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/source/androidx.annotation/Annotation/transforms/Metadata.xml b/source/androidx.annotation/Annotation/transforms/Metadata.xml new file mode 100644 index 000000000..20b694022 --- /dev/null +++ b/source/androidx.annotation/Annotation/transforms/Metadata.xml @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/source/androidx.browser/browser/Transforms/Metadata.Namespaces.xml b/source/androidx.browser/browser/Transforms/Metadata.Namespaces.xml index 3ef64b965..b967c6bb5 100644 --- a/source/androidx.browser/browser/Transforms/Metadata.Namespaces.xml +++ b/source/androidx.browser/browser/Transforms/Metadata.Namespaces.xml @@ -23,5 +23,4 @@ AndroidX.Browser.Trusted.Sharing - \ No newline at end of file diff --git a/source/androidx.work/work-runtime/Transforms/Metadata.xml b/source/androidx.work/work-runtime/Transforms/Metadata.xml index c8c25312e..1cfd20174 100644 --- a/source/androidx.work/work-runtime/Transforms/Metadata.xml +++ b/source/androidx.work/work-runtime/Transforms/Metadata.xml @@ -188,7 +188,7 @@ - + + + MonoAndroid90 + true + Xamarin.Google.Android.Material.Extensions + Resources + Assets + False + True + Resources\Resource.designer.cs + Google.Android.Material + true + true + true + d8 + r8 + + + + + Xamarin.Google.Android.Material.Extensions + Xamarin AndroidX - material extensions + Xamarin.Android bindings for AndroidX - material extensions + Xamarin.Android bindings for AndroidX - material extensions + Xamarin AndroidX Xamarin.AndroidX Support Google material extensions + Microsoft + Microsoft + © Microsoft Corporation. All rights reserved. + https://go.microsoft.com/fwlink/?linkid=2113238 + LICENSE.md + https://go.microsoft.com/fwlink/?linkid=2099392 + 1.1.0-rc3$(PackageVersionSuffix) + true + + $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb + + + + class-parse + XAJavaInterop1 + AndroidX.Fragment.App.Fragment + + + + + + + + + + + + + + + + + Additions/%(RecursiveDir)/%(Filename)%(Extension) + + + + + + Transforms/%(RecursiveDir)/%(Filename)%(Extension) + + + + + + + + + + + + + + + + + + + + + + diff --git a/source/com.google.android.material/Xamarin.Google.Android.Material.Extensions/transforms/EnumFields.xml b/source/com.google.android.material/Xamarin.Google.Android.Material.Extensions/transforms/EnumFields.xml new file mode 100644 index 000000000..3117b6ed3 --- /dev/null +++ b/source/com.google.android.material/Xamarin.Google.Android.Material.Extensions/transforms/EnumFields.xml @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/source/com.google.android.material/Xamarin.Google.Android.Material.Extensions/transforms/EnumMethods.xml b/source/com.google.android.material/Xamarin.Google.Android.Material.Extensions/transforms/EnumMethods.xml new file mode 100644 index 000000000..345808d57 --- /dev/null +++ b/source/com.google.android.material/Xamarin.Google.Android.Material.Extensions/transforms/EnumMethods.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/source/com.google.android.material/Xamarin.Google.Android.Material.Extensions/transforms/Metadata.Namespaces.xml b/source/com.google.android.material/Xamarin.Google.Android.Material.Extensions/transforms/Metadata.Namespaces.xml new file mode 100644 index 000000000..74e69d49c --- /dev/null +++ b/source/com.google.android.material/Xamarin.Google.Android.Material.Extensions/transforms/Metadata.Namespaces.xml @@ -0,0 +1,11 @@ + + + + Xamarin.Google.Android.Material.Extensions + + + \ No newline at end of file diff --git a/source/com.google.android.material/Xamarin.Google.Android.Material.Extensions/transforms/Metadata.ParameterNames.xml b/source/com.google.android.material/Xamarin.Google.Android.Material.Extensions/transforms/Metadata.ParameterNames.xml new file mode 100644 index 000000000..9495e200d --- /dev/null +++ b/source/com.google.android.material/Xamarin.Google.Android.Material.Extensions/transforms/Metadata.ParameterNames.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/source/com.google.android.material/Xamarin.Google.Android.Material.Extensions/transforms/Metadata.xml b/source/com.google.android.material/Xamarin.Google.Android.Material.Extensions/transforms/Metadata.xml new file mode 100644 index 000000000..9495e200d --- /dev/null +++ b/source/com.google.android.material/Xamarin.Google.Android.Material.Extensions/transforms/Metadata.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/source/com.google.android.material/material.extensions/.gitignore b/source/com.google.android.material/material.extensions/.gitignore new file mode 100644 index 000000000..603b14077 --- /dev/null +++ b/source/com.google.android.material/material.extensions/.gitignore @@ -0,0 +1,14 @@ +*.iml +.gradle +/local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml +.DS_Store +/build +/captures +.externalNativeBuild +.cxx diff --git a/source/com.google.android.material/material.extensions/.idea/.name b/source/com.google.android.material/material.extensions/.idea/.name new file mode 100644 index 000000000..b10e41b9b --- /dev/null +++ b/source/com.google.android.material/material.extensions/.idea/.name @@ -0,0 +1 @@ +App.Xamarin.Google.Android.Material.Extensions \ No newline at end of file diff --git a/source/com.google.android.material/material.extensions/.idea/codeStyles/Project.xml b/source/com.google.android.material/material.extensions/.idea/codeStyles/Project.xml new file mode 100644 index 000000000..681f41ae2 --- /dev/null +++ b/source/com.google.android.material/material.extensions/.idea/codeStyles/Project.xml @@ -0,0 +1,116 @@ + + + + + + + +
+ + + + xmlns:android + + ^$ + + + +
+
+ + + + xmlns:.* + + ^$ + + + BY_NAME + +
+
+ + + + .*:id + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + .*:name + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + name + + ^$ + + + +
+
+ + + + style + + ^$ + + + +
+
+ + + + .* + + ^$ + + + BY_NAME + +
+
+ + + + .* + + http://schemas.android.com/apk/res/android + + + ANDROID_ATTRIBUTE_ORDER + +
+
+ + + + .* + + .* + + + BY_NAME + +
+ + + + + \ No newline at end of file diff --git a/source/com.google.android.material/material.extensions/.idea/gradle.xml b/source/com.google.android.material/material.extensions/.idea/gradle.xml new file mode 100644 index 000000000..c72ec5d33 --- /dev/null +++ b/source/com.google.android.material/material.extensions/.idea/gradle.xml @@ -0,0 +1,20 @@ + + + + + + \ No newline at end of file diff --git a/source/com.google.android.material/material.extensions/.idea/misc.xml b/source/com.google.android.material/material.extensions/.idea/misc.xml new file mode 100644 index 000000000..37a750962 --- /dev/null +++ b/source/com.google.android.material/material.extensions/.idea/misc.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/source/com.google.android.material/material.extensions/.idea/runConfigurations.xml b/source/com.google.android.material/material.extensions/.idea/runConfigurations.xml new file mode 100644 index 000000000..7f68460d8 --- /dev/null +++ b/source/com.google.android.material/material.extensions/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/source/com.google.android.material/material.extensions/app/.gitignore b/source/com.google.android.material/material.extensions/app/.gitignore new file mode 100644 index 000000000..796b96d1c --- /dev/null +++ b/source/com.google.android.material/material.extensions/app/.gitignore @@ -0,0 +1 @@ +/build diff --git a/source/com.google.android.material/material.extensions/app/build.gradle b/source/com.google.android.material/material.extensions/app/build.gradle new file mode 100644 index 000000000..483dde819 --- /dev/null +++ b/source/com.google.android.material/material.extensions/app/build.gradle @@ -0,0 +1,34 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 29 + buildToolsVersion "29.0.3" + + defaultConfig { + applicationId "com.xamarin.google.android.material.extensions.app" + minSdkVersion 16 + targetSdkVersion 29 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + +} + +dependencies { + implementation fileTree(dir: 'libs', include: ['*.jar']) + + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + testImplementation 'junit:junit:4.12' + androidTestImplementation 'androidx.test.ext:junit:1.1.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' +} diff --git a/source/com.google.android.material/material.extensions/app/proguard-rules.pro b/source/com.google.android.material/material.extensions/app/proguard-rules.pro new file mode 100644 index 000000000..f1b424510 --- /dev/null +++ b/source/com.google.android.material/material.extensions/app/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile diff --git a/source/com.google.android.material/material.extensions/app/src/androidTest/java/com/xamarin/google/android/material/extensions/app/ExampleInstrumentedTest.java b/source/com.google.android.material/material.extensions/app/src/androidTest/java/com/xamarin/google/android/material/extensions/app/ExampleInstrumentedTest.java new file mode 100644 index 000000000..c85d05579 --- /dev/null +++ b/source/com.google.android.material/material.extensions/app/src/androidTest/java/com/xamarin/google/android/material/extensions/app/ExampleInstrumentedTest.java @@ -0,0 +1,27 @@ +package com.xamarin.google.android.material.extensions.app; + +import android.content.Context; + +import androidx.test.platform.app.InstrumentationRegistry; +import androidx.test.ext.junit.runners.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import static org.junit.Assert.*; + +/** + * Instrumented test, which will execute on an Android device. + * + * @see Testing documentation + */ +@RunWith(AndroidJUnit4.class) +public class ExampleInstrumentedTest { + @Test + public void useAppContext() { + // Context of the app under test. + Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); + + assertEquals("com.xamarin.google.android.material.extensions.app", appContext.getPackageName()); + } +} diff --git a/source/com.google.android.material/material.extensions/app/src/main/AndroidManifest.xml b/source/com.google.android.material/material.extensions/app/src/main/AndroidManifest.xml new file mode 100644 index 000000000..156a5ed82 --- /dev/null +++ b/source/com.google.android.material/material.extensions/app/src/main/AndroidManifest.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/source/com.google.android.material/material.extensions/app/src/main/java/com/xamarin/google/android/material/extensions/app/MainActivity.java b/source/com.google.android.material/material.extensions/app/src/main/java/com/xamarin/google/android/material/extensions/app/MainActivity.java new file mode 100644 index 000000000..aad209316 --- /dev/null +++ b/source/com.google.android.material/material.extensions/app/src/main/java/com/xamarin/google/android/material/extensions/app/MainActivity.java @@ -0,0 +1,14 @@ +package com.xamarin.google.android.material.extensions.app; + +import androidx.appcompat.app.AppCompatActivity; + +import android.os.Bundle; + +public class MainActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); + } +} diff --git a/source/com.google.android.material/material.extensions/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/source/com.google.android.material/material.extensions/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 000000000..fde1368fc --- /dev/null +++ b/source/com.google.android.material/material.extensions/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/source/com.google.android.material/material.extensions/app/src/main/res/drawable/ic_launcher_background.xml b/source/com.google.android.material/material.extensions/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 000000000..1e4408cae --- /dev/null +++ b/source/com.google.android.material/material.extensions/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/source/com.google.android.material/material.extensions/app/src/main/res/layout/activity_main.xml b/source/com.google.android.material/material.extensions/app/src/main/res/layout/activity_main.xml new file mode 100644 index 000000000..4fc244418 --- /dev/null +++ b/source/com.google.android.material/material.extensions/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,18 @@ + + + + + + \ No newline at end of file diff --git a/source/com.google.android.material/material.extensions/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/source/com.google.android.material/material.extensions/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 000000000..eca70cfe5 --- /dev/null +++ b/source/com.google.android.material/material.extensions/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/source/com.google.android.material/material.extensions/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/source/com.google.android.material/material.extensions/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 000000000..eca70cfe5 --- /dev/null +++ b/source/com.google.android.material/material.extensions/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/source/com.google.android.material/material.extensions/app/src/main/res/mipmap-hdpi/ic_launcher.png b/source/com.google.android.material/material.extensions/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..a571e6009 Binary files /dev/null and b/source/com.google.android.material/material.extensions/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/source/com.google.android.material/material.extensions/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/source/com.google.android.material/material.extensions/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 000000000..61da551c5 Binary files /dev/null and b/source/com.google.android.material/material.extensions/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/source/com.google.android.material/material.extensions/app/src/main/res/mipmap-mdpi/ic_launcher.png b/source/com.google.android.material/material.extensions/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..c41dd2853 Binary files /dev/null and b/source/com.google.android.material/material.extensions/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/source/com.google.android.material/material.extensions/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/source/com.google.android.material/material.extensions/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 000000000..db5080a75 Binary files /dev/null and b/source/com.google.android.material/material.extensions/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/source/com.google.android.material/material.extensions/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/source/com.google.android.material/material.extensions/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..6dba46dab Binary files /dev/null and b/source/com.google.android.material/material.extensions/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/source/com.google.android.material/material.extensions/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/source/com.google.android.material/material.extensions/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 000000000..da31a871c Binary files /dev/null and b/source/com.google.android.material/material.extensions/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/source/com.google.android.material/material.extensions/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/source/com.google.android.material/material.extensions/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..15ac68172 Binary files /dev/null and b/source/com.google.android.material/material.extensions/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/source/com.google.android.material/material.extensions/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/source/com.google.android.material/material.extensions/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 000000000..b216f2d31 Binary files /dev/null and b/source/com.google.android.material/material.extensions/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/source/com.google.android.material/material.extensions/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/source/com.google.android.material/material.extensions/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..f25a41974 Binary files /dev/null and b/source/com.google.android.material/material.extensions/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/source/com.google.android.material/material.extensions/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/source/com.google.android.material/material.extensions/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 000000000..e96783ccc Binary files /dev/null and b/source/com.google.android.material/material.extensions/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/source/com.google.android.material/material.extensions/app/src/main/res/values/colors.xml b/source/com.google.android.material/material.extensions/app/src/main/res/values/colors.xml new file mode 100644 index 000000000..030098fe0 --- /dev/null +++ b/source/com.google.android.material/material.extensions/app/src/main/res/values/colors.xml @@ -0,0 +1,6 @@ + + + #6200EE + #3700B3 + #03DAC5 + diff --git a/source/com.google.android.material/material.extensions/app/src/main/res/values/strings.xml b/source/com.google.android.material/material.extensions/app/src/main/res/values/strings.xml new file mode 100644 index 000000000..6f44860fc --- /dev/null +++ b/source/com.google.android.material/material.extensions/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + App.Xamarin.Google.Android.Material.Extensions + diff --git a/source/com.google.android.material/material.extensions/app/src/main/res/values/styles.xml b/source/com.google.android.material/material.extensions/app/src/main/res/values/styles.xml new file mode 100644 index 000000000..5885930df --- /dev/null +++ b/source/com.google.android.material/material.extensions/app/src/main/res/values/styles.xml @@ -0,0 +1,11 @@ + + + + + + diff --git a/source/com.google.android.material/material.extensions/app/src/test/java/com/xamarin/google/android/material/extensions/app/ExampleUnitTest.java b/source/com.google.android.material/material.extensions/app/src/test/java/com/xamarin/google/android/material/extensions/app/ExampleUnitTest.java new file mode 100644 index 000000000..db2292463 --- /dev/null +++ b/source/com.google.android.material/material.extensions/app/src/test/java/com/xamarin/google/android/material/extensions/app/ExampleUnitTest.java @@ -0,0 +1,17 @@ +package com.xamarin.google.android.material.extensions.app; + +import org.junit.Test; + +import static org.junit.Assert.*; + +/** + * Example local unit test, which will execute on the development machine (host). + * + * @see Testing documentation + */ +public class ExampleUnitTest { + @Test + public void addition_isCorrect() { + assertEquals(4, 2 + 2); + } +} \ No newline at end of file diff --git a/source/com.google.android.material/material.extensions/build.gradle b/source/com.google.android.material/material.extensions/build.gradle new file mode 100644 index 000000000..659b03c26 --- /dev/null +++ b/source/com.google.android.material/material.extensions/build.gradle @@ -0,0 +1,29 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. + +buildscript { + + repositories { + google() + jcenter() + + } + dependencies { + classpath 'com.android.tools.build:gradle:3.6.2' + + + // NOTE: Do not place your application dependencies here; they belong + // in the individual module build.gradle files + } +} + +allprojects { + repositories { + google() + jcenter() + + } +} + +task clean(type: Delete) { + delete rootProject.buildDir +} diff --git a/source/com.google.android.material/material.extensions/extensions-aar/.gitignore b/source/com.google.android.material/material.extensions/extensions-aar/.gitignore new file mode 100644 index 000000000..796b96d1c --- /dev/null +++ b/source/com.google.android.material/material.extensions/extensions-aar/.gitignore @@ -0,0 +1 @@ +/build diff --git a/source/com.google.android.material/material.extensions/extensions-aar/build.gradle b/source/com.google.android.material/material.extensions/extensions-aar/build.gradle new file mode 100644 index 000000000..f964d0f5e --- /dev/null +++ b/source/com.google.android.material/material.extensions/extensions-aar/build.gradle @@ -0,0 +1,34 @@ +apply plugin: 'com.android.library' + +android { + compileSdkVersion 29 + buildToolsVersion "29.0.3" + + defaultConfig { + minSdkVersion 16 + targetSdkVersion 29 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + consumerProguardFiles 'consumer-rules.pro' + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + +} + +dependencies { + implementation fileTree(dir: 'libs', include: ['*.jar']) + + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'com.google.android.material:material:1.1.0' + testImplementation 'junit:junit:4.12' + androidTestImplementation 'androidx.test.ext:junit:1.1.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' +} diff --git a/source/com.google.android.material/material.extensions/extensions-aar/consumer-rules.pro b/source/com.google.android.material/material.extensions/extensions-aar/consumer-rules.pro new file mode 100644 index 000000000..e69de29bb diff --git a/source/com.google.android.material/material.extensions/extensions-aar/proguard-rules.pro b/source/com.google.android.material/material.extensions/extensions-aar/proguard-rules.pro new file mode 100644 index 000000000..f1b424510 --- /dev/null +++ b/source/com.google.android.material/material.extensions/extensions-aar/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile diff --git a/source/com.google.android.material/material.extensions/extensions-aar/src/androidTest/java/com/xamarin/google/android/material/extensions/ExampleInstrumentedTest.java b/source/com.google.android.material/material.extensions/extensions-aar/src/androidTest/java/com/xamarin/google/android/material/extensions/ExampleInstrumentedTest.java new file mode 100644 index 000000000..a232150ae --- /dev/null +++ b/source/com.google.android.material/material.extensions/extensions-aar/src/androidTest/java/com/xamarin/google/android/material/extensions/ExampleInstrumentedTest.java @@ -0,0 +1,27 @@ +package com.xamarin.google.android.material.extensions; + +import android.content.Context; + +import androidx.test.platform.app.InstrumentationRegistry; +import androidx.test.ext.junit.runners.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import static org.junit.Assert.*; + +/** + * Instrumented test, which will execute on an Android device. + * + * @see Testing documentation + */ +@RunWith(AndroidJUnit4.class) +public class ExampleInstrumentedTest { + @Test + public void useAppContext() { + // Context of the app under test. + Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); + + assertEquals("com.xamarin.google.android.material.extensions.test", appContext.getPackageName()); + } +} diff --git a/source/com.google.android.material/material.extensions/extensions-aar/src/main/AndroidManifest.xml b/source/com.google.android.material/material.extensions/extensions-aar/src/main/AndroidManifest.xml new file mode 100644 index 000000000..c27327a03 --- /dev/null +++ b/source/com.google.android.material/material.extensions/extensions-aar/src/main/AndroidManifest.xml @@ -0,0 +1,2 @@ + diff --git a/source/com.google.android.material/material.extensions/extensions-aar/src/main/java/com/xamarin/google/android/material/extensions/TabLayoutAppCompatActivity.java b/source/com.google.android.material/material.extensions/extensions-aar/src/main/java/com/xamarin/google/android/material/extensions/TabLayoutAppCompatActivity.java new file mode 100644 index 000000000..583f62a4b --- /dev/null +++ b/source/com.google.android.material/material.extensions/extensions-aar/src/main/java/com/xamarin/google/android/material/extensions/TabLayoutAppCompatActivity.java @@ -0,0 +1,9 @@ +package com.xamarin.google.android.material.extensions; + +public class TabLayoutAppCompatActivity extends androidx.appcompat.app.AppCompatActivity + implements com.google.android.material.tabs.TabLayout.OnTabSelectedListener +{ + public void onTabSelected(com.google.android.material.tabs.TabLayout.Tab tab) {} + public void onTabUnselected(com.google.android.material.tabs.TabLayout.Tab tab) {} + public void onTabReselected(com.google.android.material.tabs.TabLayout.Tab tab) {} +} \ No newline at end of file diff --git a/source/com.google.android.material/material.extensions/extensions-aar/src/test/java/com/xamarin/google/android/material/extensions/ExampleUnitTest.java b/source/com.google.android.material/material.extensions/extensions-aar/src/test/java/com/xamarin/google/android/material/extensions/ExampleUnitTest.java new file mode 100644 index 000000000..5e4c71af3 --- /dev/null +++ b/source/com.google.android.material/material.extensions/extensions-aar/src/test/java/com/xamarin/google/android/material/extensions/ExampleUnitTest.java @@ -0,0 +1,17 @@ +package com.xamarin.google.android.material.extensions; + +import org.junit.Test; + +import static org.junit.Assert.*; + +/** + * Example local unit test, which will execute on the development machine (host). + * + * @see Testing documentation + */ +public class ExampleUnitTest { + @Test + public void addition_isCorrect() { + assertEquals(4, 2 + 2); + } +} \ No newline at end of file diff --git a/source/com.google.android.material/material.extensions/gradle.properties b/source/com.google.android.material/material.extensions/gradle.properties new file mode 100644 index 000000000..199d16ede --- /dev/null +++ b/source/com.google.android.material/material.extensions/gradle.properties @@ -0,0 +1,20 @@ +# Project-wide Gradle settings. +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +org.gradle.jvmargs=-Xmx1536m +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true +# AndroidX package structure to make it clearer which packages are bundled with the +# Android operating system, and which are packaged with your app's APK +# https://developer.android.com/topic/libraries/support-library/androidx-rn +android.useAndroidX=true +# Automatically convert third-party libraries to use AndroidX +android.enableJetifier=true + diff --git a/source/com.google.android.material/material.extensions/gradle/wrapper/gradle-wrapper.jar b/source/com.google.android.material/material.extensions/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 000000000..f6b961fd5 Binary files /dev/null and b/source/com.google.android.material/material.extensions/gradle/wrapper/gradle-wrapper.jar differ diff --git a/source/com.google.android.material/material.extensions/gradle/wrapper/gradle-wrapper.properties b/source/com.google.android.material/material.extensions/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..c0caa30ba --- /dev/null +++ b/source/com.google.android.material/material.extensions/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Thu Jun 18 20:59:06 CEST 2020 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip diff --git a/source/com.google.android.material/material.extensions/gradlew b/source/com.google.android.material/material.extensions/gradlew new file mode 100644 index 000000000..cccdd3d51 --- /dev/null +++ b/source/com.google.android.material/material.extensions/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/source/com.google.android.material/material.extensions/gradlew.bat b/source/com.google.android.material/material.extensions/gradlew.bat new file mode 100644 index 000000000..f9553162f --- /dev/null +++ b/source/com.google.android.material/material.extensions/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/source/com.google.android.material/material.extensions/settings.gradle b/source/com.google.android.material/material.extensions/settings.gradle new file mode 100644 index 000000000..6a515fb17 --- /dev/null +++ b/source/com.google.android.material/material.extensions/settings.gradle @@ -0,0 +1,3 @@ +rootProject.name='App.Xamarin.Google.Android.Material.Extensions' +include ':app' +include ':extensions-aar' diff --git a/tests/AndroidXMigrationTests/Tests/DependenciesTests.cs b/tests/AndroidXMigrationTests/Tests/DependenciesTests.cs index a30592634..4df172d9f 100644 --- a/tests/AndroidXMigrationTests/Tests/DependenciesTests.cs +++ b/tests/AndroidXMigrationTests/Tests/DependenciesTests.cs @@ -137,7 +137,7 @@ public void FlattensNoDependenciesCorrectlyWhenExcludingTopLevel() var expected = new[] { "Xamarin.AndroidX.Migration", - //"Xamarin.AndroidX.MultiDex", + //"Xamarin.AndroidX.MultiDex", }; var flattened = tree.Flatten(ids, false);