Skip to content

Commit 42a723d

Browse files
authored
Merge pull request #8 from asus4/upgrade-android-plugin
Move project to root directory
2 parents 872513a + 963d68c commit 42a723d

75 files changed

Lines changed: 1344 additions & 654 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
1-
Library
2-
Temp
3-
*.csproj
4-
*.sln
5-
*.pidb
6-
*.userprefs
7-
*.unityproj### https://raw.github.com/github/gitignore/cdd9e946da421758c6f42c427c7bc65c8326155d/Unity.gitignore
1+
### https://raw.github.com/github/gitignore/cdd9e946da421758c6f42c427c7bc65c8326155d/Unity.gitignore
82

93
# This .gitignore file should be placed at the root of your Unity project directory
104
#

unity/NativeDialogPlugin/Assets/NativeDialogSample.cs renamed to Assets/NativeDialogSample.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ public class NativeDialogSample : MonoBehaviour
1010

1111
private void Start()
1212
{
13-
DialogManager.Instance.SetLabel(decideLabel, cancelLabel, closeLabel);
13+
DialogManager.SetLabel(decideLabel, cancelLabel, closeLabel);
1414
}
1515

1616
#region Invoked from Unity GUI
1717

1818
public void ShowSelectDialog()
1919
{
2020
const string message = "A simple select dialog";
21-
DialogManager.Instance.ShowSelectDialog(message, (bool result) =>
21+
DialogManager.ShowSelect(message, (bool result) =>
2222
{
2323
Debug.Log($"{result}: {message}");
2424
});
@@ -28,7 +28,7 @@ public void ShowSelectDialogWithTitle()
2828
{
2929
const string title = "A title";
3030
const string message = "A message for select dialog";
31-
DialogManager.Instance.ShowSelectDialog(title, message, (bool result) =>
31+
DialogManager.ShowSelect(title, message, (bool result) =>
3232
{
3333
Debug.Log($"{result}: {title} / {message}");
3434
});
@@ -37,7 +37,7 @@ public void ShowSelectDialogWithTitle()
3737
public void ShowSubmitDialog()
3838
{
3939
const string message = "A simple submit dialog";
40-
DialogManager.Instance.ShowSubmitDialog(message, (bool result) =>
40+
DialogManager.ShowSubmit(message, (bool result) =>
4141
{
4242
Debug.Log($"{result}: {message}");
4343
});
@@ -47,7 +47,7 @@ public void ShowSubmitDialogWithTitle()
4747
{
4848
const string title = "A title";
4949
const string message = "A message for submit dialog";
50-
DialogManager.Instance.ShowSubmitDialog(title, message, (bool result) =>
50+
DialogManager.ShowSubmit(title, message, (bool result) =>
5151
{
5252
Debug.Log($"{result}: {title} / {message}");
5353
});
@@ -56,7 +56,7 @@ public void ShowSubmitDialogWithTitle()
5656
public void ShowDialogWithAutoDissmiss()
5757
{
5858
const string message = "A dialog with auto dismiss";
59-
int id = DialogManager.Instance.ShowSelectDialog(message, (bool result) =>
59+
int id = DialogManager.ShowSelect(message, (bool result) =>
6060
{
6161
Debug.Log($"{result}: {message}");
6262
});
@@ -68,6 +68,6 @@ public void ShowDialogWithAutoDissmiss()
6868
private IEnumerator Dissmiss(int id, float time)
6969
{
7070
yield return new WaitForSeconds(time);
71-
DialogManager.Instance.DissmissDialog(id);
71+
DialogManager.Dissmiss(id);
7272
}
7373
}

unity/NativeDialogPlugin/Assets/NativeDialogSample.cs.meta renamed to Assets/NativeDialogSample.cs.meta

File renamed without changes.

unity/NativeDialogPlugin/Assets/NativeDialogSample.unity renamed to Assets/NativeDialogSample.unity

File renamed without changes.

unity/NativeDialogPlugin/Assets/NativeDialogSample.unity.meta renamed to Assets/NativeDialogSample.unity.meta

File renamed without changes.

unity/NativeDialogPlugin/Assets/NativeDialogSampleSettings.lighting renamed to Assets/NativeDialogSampleSettings.lighting

File renamed without changes.

unity/NativeDialogPlugin/Assets/NativeDialogSampleSettings.lighting.meta renamed to Assets/NativeDialogSampleSettings.lighting.meta

File renamed without changes.

NativeDialogPlugin.unitypackage

-16.8 KB
Binary file not shown.

unity/NativeDialogPlugin/Packages/com.github.asus4.nativedialog/Android.meta renamed to Packages/com.github.asus4.nativedialog/Android.meta

File renamed without changes.

android/UnityDialogPlugin/src/unity/plugins/dialog/DialogManager.java renamed to Packages/com.github.asus4.nativedialog/Android/DialogManager.java

File renamed without changes.

0 commit comments

Comments
 (0)