Skip to content

Commit

Permalink
Merge branch 'master' into dabritch-forms-issues
Browse files Browse the repository at this point in the history
  • Loading branch information
davidbritch committed Sep 27, 2019
2 parents 878b153 + fc689c1 commit 8c9b792
Show file tree
Hide file tree
Showing 82 changed files with 838 additions and 1,239 deletions.
5 changes: 4 additions & 1 deletion .openpublishing.publish.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,8 @@
"pdf": {
"template_folder": "_themes.pdf"
}
},
"docs_build_engine": {
"name": "docfx_v3"
}
}
}
272 changes: 142 additions & 130 deletions .openpublishing.redirection.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions contributing-guidelines/template.md
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ When the UID contains the special characters \` or \#, the UID value needs to be
- bulleted
- list

##### Unordered list with an embedded list
#### Unordered list with an embedded list

- This
- bulleted
Expand Down Expand Up @@ -207,7 +207,7 @@ You can use a [Markdown table generator tool](http://www.tablesgenerator.com/mar

Use three backticks (\`\`\`) + a language ID to apply language-specific color coding to a code block. Here is the entire list of [GFM language IDs](https://github.com/jmm/gfm-lang-ids/wiki/GitHub-Flavored-Markdown-(GFM)-language-IDs).

##### C♯
#### C♯

```c#
using System;
Expand Down
2 changes: 1 addition & 1 deletion docs/TOC.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# [Xamarin Documentation](index.md)
# [Xamarin Documentation](index.yml)
## [Android](android/index.yml)
## [iOS](ios/index.yml)
## [Mac](mac/index.yml)
Expand Down
2 changes: 2 additions & 0 deletions docs/android/app-fundamentals/android-api-levels.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ Existing apps will be required to target API level 26 or higher
beginning in November 2018. For more information, see
[Improving app security and performance on Google Play for years to come](https://android-developers.googleblog.com/2017/12/improving-app-security-and-performance.html).

<!-- markdownlint-disable MD001 -->

# [Visual Studio](#tab/windows)

Normally, all three Xamarin.Android API levels are set to the same
Expand Down
2 changes: 2 additions & 0 deletions docs/android/app-fundamentals/permissions.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ Permissions are added to the **AndroidManifest.xml** with the `uses-permission`
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
```

<!-- markdownlint-disable MD001 -->

# [Visual Studio](#tab/windows)

It is possible to declare the permissions using the tool support built into Visual Studio:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ pixelated.

Supported screen sixes are declared in the **Properites/AndroidManifest.xml** file of the solution:

<!-- markdownlint-disable MD001 -->

# [Visual Studio](#tab/windows)

[![Android Manifest](resources-for-varying-screens-images/01-android-manifest-sml.w1581.png)](resources-for-varying-screens-images/01-android-manifest.w1581.png#lightbox)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ you specified a package name for the FCM-enabled app. This package name
also serves as the [*application ID*](./firebase-cloud-messaging.md#fcm-in-action-app-id) that is associated with the [API
key](firebase-cloud-messaging.md#fcm-in-action-api-key). Configure the app to use this package name:

<!-- markdownlint-disable MD001 -->

# [Visual Studio](#tab/windows)

1. Open the properties for the **FCMClient** project.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@ The core functionality of `RegistrationIntentService` resides in the
`OnHandleIntent` method. Let's walk through this code to see how
it registers our app with GCM.

##### Request a Registration Token
#### Request a Registration Token

`OnHandleIntent` first calls Google's
[InstanceID.GetToken](https://developers.google.com/android/reference/com/google/android/gms/iid/InstanceID.html#getToken&#40;java.lang.String,%20java.lang.String&#41;)
Expand Down Expand Up @@ -454,7 +454,7 @@ catch (Exception e)
Log.Debug ...
```

##### Forward the Registration Token to the App Server
#### Forward the Registration Token to the App Server

If we get a registration token (that is, no exception was thrown), we
call `SendRegistrationToAppServer` to associate the user's registration
Expand All @@ -477,7 +477,7 @@ server. If this boolean is false, `SendRegistrationToAppServer` sends
the token to the app server &ndash; otherwise, the token was already
sent to the app server in a previous call.

##### Subscribe to the Notification Topic
#### Subscribe to the Notification Topic

Next, we call our `Subscribe` method to indicate to GCM that
we want to subscribe to a notification topic. In `Subscribe`, we
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,8 @@ application.

### Publishing to Google Play

<!-- markdownlint-disable MD001 -->

# [Visual Studio](#tab/windows)

Xamarin Android 7.0 introduces an integrated workflow for publishing
Expand Down
2 changes: 2 additions & 0 deletions docs/android/deploy-test/release-prep/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ allow an Android application to be published without one. The `Icon`
property of the `Application` attribute is used to specify the
application icon for a Xamarin.Android project.

<!-- markdownlint-disable MD001 -->

# [Visual Studio](#tab/windows)

In Visual Studio 2017 and later, specify the application icon through
Expand Down
2 changes: 2 additions & 0 deletions docs/android/deploy-test/release-prep/proguard.md
Original file line number Diff line number Diff line change
Expand Up @@ -392,6 +392,8 @@ wrong encoding. ProGuard cannot handle _byte order mark_ (BOM) which
may be present in text files. If a BOM is present, then ProGuard will
exit with the above error.

<!-- markdownlint-disable MD001 -->

# [Visual Studio](#tab/windows)

To prevent this problem, edit the custom configuration file from a text
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -513,6 +513,8 @@ The following sections explain how to diagnose and work around problems
that may occur when using the Android Device Manager to configure
virtual devices.

<!-- markdownlint-disable MD001 -->

# [Visual Studio](#tab/windows)

### Android SDK in Non-Standard Location
Expand Down
4 changes: 2 additions & 2 deletions docs/android/platform/android-10.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@ To create a project with Xamarin.Android 10.0, you must first use the Android SD
1. Start the SDK Manager. In Visual Studio, click **Tools > Android > Android SDK Manager.** In Visual Studio for Mac, click **Tools > SDK Manager.**
2. In the lower right-hand corner, click the gear icon and select **Repository > Google (Unsupported):**

![Android SDK Manager Repository Selection](~/android/platform/android-10-images/sdkrepository.png)
![Android SDK Manager Repository Selection](~/android/platform/android-10-images/sdkrepository.png)

3. Install the **Android 10 SDK Platform** packages, which are listed as **Android SDK Platform 29** in the **Platforms** tab (for more information about using the SDK Manager, see [Android SDK setup](https://docs.microsoft.com/en-us/xamarin/android/get-started/installation/android-sdk)):

![Android SDK Manager Platform Tab](~/android/platform/android-10-images/sdkplatforms.png)
![Android SDK Manager Platform Tab](~/android/platform/android-10-images/sdkplatforms.png)

### Create a Xamarin.Android project

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ Typically, this means you will have to determine the SHA-1 fingerprint
for the debug keystore, and then the SHA-1 fingerprint for the keystore
that is used to sign your application for release.

<!-- markdownlint-disable MD001 -->

# [Visual Studio](#tab/windows)

By default the keystore that is used to sign debug versions of a
Expand Down
2 changes: 2 additions & 0 deletions docs/android/platform/oreo.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ Each of these steps is explained in the following sections:

To add Android Oreo support to Visual Studio, do the following:

<!-- markdownlint-disable MD001 -->

# [Visual Studio](#tab/windows)

- For Visual Studio 2019, use the [SDK Manager](~/android/get-started/installation/android-sdk.md) to install API level 26.0 or later.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ how to modify widgets interactively on the **Design Surface** or
by using the Designer's **Properties** pane. Finally, you'll see how
the design looks when the app runs on a device or emulator.

<!-- markdownlint-disable MD001 -->

# [Visual Studio](#tab/windows)

### Creating a new project
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ and

<a name="recycling" />

### How View Recycling Works
## How View Recycling Works

`RecyclerView` does not allocate an item view for every item in
your data source. Instead, it allocates only the number of item views
Expand Down Expand Up @@ -133,7 +133,7 @@ holder uses `FindViewById` to get references to the views inside the
inflated item-layout file. These references are used to load new data
into the views every time the layout is recycled to show new data.

### The Layout Manager
## The Layout Manager

The layout manager is responsible for positioning items in the
`RecyclerView` display; it determines the presentation type (a list
Expand Down Expand Up @@ -171,7 +171,7 @@ predefined layout manager by default.
For more information about the layout manager, see the
[RecyclerView.LayoutManager class reference](https://developer.android.com/reference/android/support/v7/widget/RecyclerView.LayoutManager.html).

### The View Holder
## The View Holder

The view holder is a class that you define for caching view
references. The adapter uses these view references to bind each view to
Expand All @@ -189,7 +189,7 @@ A detailed example of a `ViewHolder` implementation is presented in
For more information about `RecyclerView.ViewHolder`, see the
[RecyclerView.ViewHolder class reference](https://developer.android.com/reference/android/support/v7/widget/RecyclerView.ViewHolder.html).

### The Adapter
## The Adapter

Most of the "heavy-lifting" of the `RecyclerView` integration code
takes place in the adapter. `RecyclerView` requires that you provide
Expand Down Expand Up @@ -227,9 +227,9 @@ When you implement an adapter, you must override the following
- **`ItemCount`** &ndash; Returns the number of items in the data source.

The layout manager calls these methods while it is positioning items
within the `RecyclerView`.
within the `RecyclerView`.

### Notifying RecyclerView of Data Changes
## Notifying RecyclerView of Data Changes

`RecyclerView` does not automatically update its display when the
contents of its data source changes; the adapter must notify
Expand Down
2 changes: 2 additions & 0 deletions docs/android/wear/get-started/hello-wear.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ Follow these steps to create your first Xamarin.Android Wear app:

Create a new **Android Wear Application**:

<!-- markdownlint-disable MD001 -->

# [Visual Studio](#tab/windows)

[![Creating a new Android Wear Application in the New Project dialog](hello-wear-images/vs/new-solution-sml.w157.png)](hello-wear-images/vs/new-solution.w157.png#lightbox)
Expand Down
2 changes: 0 additions & 2 deletions docs/cross-platform/TOC.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
- name: Requirements
displayName: System requirements
href: get-started/requirements.md
- name: What is Xamarin?
href: get-started/introduction-to-mobile-development.md
- name: Mobile software development lifecycle
href: get-started/introduction-to-mobile-sdlc.md
- name: Walkthrough building a cross-platform app
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,7 @@ The resulting applications look like this on each platform:

<a name="iOS" />

#### iOS
### iOS

The application uses iOS-standard user interface design, such as the
‘add’ button being positioned in the navigation bar and using the built-in **plus (+)** icon. It also uses the default
Expand All @@ -586,7 +586,7 @@ The application uses iOS-standard user interface design, such as the

<a name="Android" />

#### Android
### Android

The Android app uses built-in controls including the built-in layout for rows
that require a ‘tick’ displayed. The hardware/system back behavior is
Expand All @@ -596,7 +596,7 @@ supported in addition to an on-screen back button.

<a name="Windows_Phone" />

#### Windows Phone
### Windows Phone

The Windows Phone app uses the standard layout, populating the app bar at the bottom
of the screen instead of a nav bar at the top.
Expand Down
2 changes: 1 addition & 1 deletion docs/cross-platform/app-fundamentals/localization.md
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ Use specific strings for each state to provide a better user experience:

```csharp
"You have no messages."
"You have 1 messages."
"You have 1 message."
"You have 2 messages."
"You have {0} messages."
```
Expand Down
2 changes: 1 addition & 1 deletion docs/cross-platform/cpp/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ It will be these wrapper functions that are used on the [Xamarin](https://visual
## Wrapping the native library (Stage 2)
This stage requires the [precompiled libraries](https://github.com/xamarin/mobcat/tree/master/samples/cpp_with_xamarin/Sample/Artefacts) described in the [previous section](##creating-the-native-libraries-stage-1).
This stage requires the [precompiled libraries](https://github.com/xamarin/mobcat/tree/master/samples/cpp_with_xamarin/Sample/Artefacts) described in the [previous section](#creating-the-native-libraries-stage-1).
### Creating the Visual Studio solution
Expand Down
Binary file not shown.
Binary file not shown.

This file was deleted.

Loading

0 comments on commit 8c9b792

Please sign in to comment.