Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Assets/NativeDialogSample.cs
Original file line number Diff line number Diff line change
Expand Up @@ -53,21 +53,21 @@ public void ShowSubmitDialogWithTitle()
});
}

public void ShowDialogWithAutoDissmiss()
public void ShowDialogWithAutoDismiss()
{
const string message = "A dialog with auto dismiss";
int id = DialogManager.ShowSelect(message, (bool result) =>
{
Debug.Log($"{result}: {message}");
});
StartCoroutine(Dissmiss(id, 3f));
StartCoroutine(Dismiss(id, 3f));
}

#endregion // Invoked from Unity GUI

private IEnumerator Dissmiss(int id, float time)
private IEnumerator Dismiss(int id, float time)
{
yield return new WaitForSeconds(time);
DialogManager.Dissmiss(id);
DialogManager.Dismiss(id);
}
}
6 changes: 3 additions & 3 deletions Assets/NativeDialogSample.unity
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ GameObject:
- component: {fileID: 364165590}
- component: {fileID: 364165589}
m_Layer: 5
m_Name: Button - ShowDialogWithAutoDissmiss
m_Name: Button - ShowDialogWithAutoDismiss
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Expand Down Expand Up @@ -309,7 +309,7 @@ MonoBehaviour:
m_Calls:
- m_Target: {fileID: 1045089954}
m_TargetAssemblyTypeName: NativeDialogSample, Assembly-CSharp
m_MethodName: ShowDialogWithAutoDissmiss
m_MethodName: ShowDialogWithAutoDismiss
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
Expand Down Expand Up @@ -427,7 +427,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Dialog with Auto Dissmiss
m_Text: Dialog with Auto Dismiss
--- !u!222 &440667844
CanvasRenderer:
m_ObjectHideFlags: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ public void onClick(DialogInterface dialog, int which) {
return id;
}

public void dissmissDialog(int id) {
public void dismissDialog(int id) {
AlertDialog dialog = _dialogs.get(id);
if(dialog == null) {
return;
Expand Down Expand Up @@ -241,8 +241,8 @@ public static int ShowSubmitTitleDialog(String title, String msg) {
return DialogManager.getInstance().showSubmitDialog(title, msg);
}

public static void DissmissDialog(int id) {
DialogManager.getInstance().dissmissDialog(id);
public static void DismissDialog(int id) {
DialogManager.getInstance().dismissDialog(id);
}

public static void SetLabel(String decide, String cancel, String close) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,9 @@ public static int ShowSubmit(string title, string message, Action<bool> del)
return id;
}

public static void Dissmiss(int id)
public static void Dismiss(int id)
{
Instance.dialog.Dissmiss(id);
Instance.dialog.Dismiss(id);

var callbacks = Instance.callbacks;
if (callbacks.ContainsKey(id))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ public int ShowSubmit(string title, string message)
return cls.CallStatic<int>("ShowSubmitTitleDialog", title, message);
}

public void Dissmiss(int id)
public void Dismiss(int id)
{
cls.CallStatic("DissmissDialog", id);
cls.CallStatic("DismissDialog", id);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ public int ShowSubmit(string title, string message)
return _showSubmitTitleDialog(title, message);
}

public void Dissmiss(int id)
public void Dismiss(int id)
{
_dissmissDialog(id);
_dismissDialog(id);
}


Expand All @@ -50,7 +50,7 @@ public void Dissmiss(int id)
[DllImport("__Internal")]
private static extern int _showSubmitTitleDialog(string title, string msg);
[DllImport("__Internal")]
private static extern void _dissmissDialog(int id);
private static extern void _dismissDialog(int id);
[DllImport("__Internal")]
private static extern void _setLabel(string decide, string cancel, string close);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ public int ShowSubmit(string title, string message)
return newID;
}

public void Dissmiss(int id)
public void Dismiss(int id)
{
Debug.Log($"Dissmiss: {id}");
Debug.Log($"Dismiss: {id}");
}

private void ExecuteMockCallback(int id)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ internal interface IDialog : System.IDisposable
int ShowSelect(string title, string message);
int ShowSubmit(string message);
int ShowSubmit(string title, string message);
void Dissmiss(int id);
void Dismiss(int id);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
- (int) showSelectDialog:(NSString *)title message:(NSString*)msg;
- (int) showSubmitDialog:(NSString *)msg;
- (int) showSubmitDialog:(NSString *)title message:(NSString*)msg;
- (void) dissmissDialog:(int) theID;
- (void) dismissDialog:(int) theID;
- (void) setLabelTitleWithDecide:(NSString*)decide cancel:(NSString*)cancel close:(NSString*) close;
@end
6 changes: 3 additions & 3 deletions Packages/com.github.asus4.nativedialog/iOS/UNDialogManager.mm
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ int _showSubmitTitleDialog(const char *title, const char *msg) {
message:[NSString stringWithUTF8String:msg]];
}

void _dissmissDialog(const int theID){
[[UNDialogManager sharedManager] dissmissDialog:theID];
void _dismissDialog(const int theID){
[[UNDialogManager sharedManager] dismissDialog:theID];
}

void _setLabel(const char *decide, const char *cancel, const char *close) {
Expand Down Expand Up @@ -100,7 +100,7 @@ - (int) showSubmitDialog:(NSString *)title message:(NSString*)msg {
return _id;
}

- (void) dissmissDialog:(int)theID {
- (void) dismissDialog:(int)theID {
UIAlertView *alert = alerts[[NSNumber numberWithInt:theID]];
[alert dismissWithClickedButtonIndex:0 animated:YES];
[alerts removeObjectForKey:[NSNumber numberWithInt:theID]];
Expand Down