Skip to content

Commit

Permalink
fix: fix some issues
Browse files Browse the repository at this point in the history
  • Loading branch information
hansemannn committed Dec 26, 2019
1 parent 9fed6de commit 1da36a9
Show file tree
Hide file tree
Showing 7 changed files with 46 additions and 8 deletions.
39 changes: 39 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
.DS_Store
tmp
bin
build

*/*/modules
*/*/modules*
.apt_generated
build.properties
.svn
*.pyc
*~.nib/
*.pbxuser
*.perspective
*.perspectivev3
xcuserdata
*.xcuserstate
*.xcuserdata*

.idea/
libs/

android/clean
android/ant_clean
android/.classpath
android/.settings
android/dist/
android/launch-*
android/example/
nbproject
/metadata.json
/ios/metadata.json

android/java-sources.txt
android/build.properties
android/.project
android/platform/README.md
/ios/dist
/android/.gradle
Binary file modified android/src/.DS_Store
Binary file not shown.
Binary file modified android/src/ti/.DS_Store
Binary file not shown.
5 changes: 2 additions & 3 deletions android/src/ti/tooltip/TitaniumTooltipModule.java
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ public void show(final KrollDict params) {
.onDisplay(new ViewTooltip.ListenerDisplay() {
@Override
public void onDisplay(View view) {
Log.i("", "** onDisplay **");
// if (params.containsKeyAndNotNull(Defaults.CALLBACK_ON_SHOW)) {
// if (params.get(Defaults.CALLBACK_ON_SHOW) instanceof KrollFunction) {
// onShow = (KrollFunction) params.get(Defaults.CALLBACK_ON_SHOW);
Expand All @@ -84,8 +83,8 @@ public void onDisplay(View view) {
.onHide(new ViewTooltip.ListenerHide() {
@Override
public void onHide(View view) {
Log.i("", "** onHide **");
}

}
})
.show();
}
Expand Down
6 changes: 3 additions & 3 deletions ios/Classes/TiTooltipModule.swift
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class TiTooltipModule: TiModule {
guard let containerProxy = params["container"] as? TiViewProxy else { return }
guard let boundsProxy = params["sourceView"] as? TiViewProxy else { return }

let bubbleColor = params["bubbleColor"];
let backgroundColor = params["backgroundColor"];
let textColor = params["textColor"];
let direction = params["direction"] as? Int ?? 0
let bounce = params["bounce"] as? Float ?? 0.0
Expand All @@ -54,8 +54,8 @@ class TiTooltipModule: TiModule {
popTip.textColor = TiUtils.colorValue(textColor)!.color
}

if let bubbleColor = bubbleColor {
popTip.bubbleColor = TiUtils.colorValue(bubbleColor)!.color
if let backgroundColor = backgroundColor {
popTip.bubbleColor = TiUtils.colorValue(backgroundColor)!.color
}

if bounce > 0 {
Expand Down
Binary file not shown.
4 changes: 2 additions & 2 deletions ios/titanium.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
// OF YOUR TITANIUM SDK YOU'RE BUILDING FOR
//
//
TITANIUM_SDK_VERSION = 8.2.0.GA
TITANIUM_SDK_VERSION = 8.3.0.GA

//
// THESE SHOULD BE OK GENERALLY AS-IS
//
TITANIUM_SDK = /Users/hans/Library/Application Support/Titanium/mobilesdk/osx/$(TITANIUM_SDK_VERSION)
TITANIUM_SDK = /Users/$(USER)/Library/Application Support/Titanium/mobilesdk/osx/$(TITANIUM_SDK_VERSION)
HEADER_SEARCH_PATHS = $(inherited) "$(TITANIUM_SDK)"
FRAMEWORK_SEARCH_PATHS = $(inherited) "$(TITANIUM_SDK)/iphone/Frameworks"

0 comments on commit 1da36a9

Please sign in to comment.