TIMOB-8821: BlackBerry: Implement UI.Label

apidoc/Titanium/UI/Label.yml

@@ -71,6 +71,7 @@ properties:
     summary: Key identifying a string from the locale file to use for the label text. 
     description: Only one of `text` or `textid` should be specified.
     type: String
+    platforms: [android,iphone,ipad,mobileweb]
   - name: wordWrap
     summary: Enable or disable word wrapping in the label.
     type: Boolean

blackberry/tibb/NativeAbstractTextControlObject.cpp

@@ -0,0 +1,149 @@
+/**
+ * Appcelerator Titanium Mobile
+ * Copyright (c) 2009-2012 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Apache Public License
+ * Please see the LICENSE included with this distribution for details.
+ */
+
+#include "NativeAbstractTextControlObject.h"
+#include <bb/cascades/controls/abstracttextcontrol.h>
+#include <bb/cascades/controls/textalignment.h>
+#include <qt4/QtCore/qmap.h>
+#include <qt4/QtCore/qstring.h>
+
+NativeAbstractTextControlObject::NativeAbstractTextControlObject()
+{
+    textControl_ = NULL;
+}
+
+NativeAbstractTextControlObject::~NativeAbstractTextControlObject()
+{
+}
+
+bb::cascades::AbstractTextControl* NativeAbstractTextControlObject::getTextControl() const
+{
+    return textControl_;
+}
+
+void NativeAbstractTextControlObject::setTextControl(bb::cascades::AbstractTextControl* textControl)
+{
+    textControl_ = textControl;
+    setControl((bb::cascades::Control*)textControl_);
+}
+
+int NativeAbstractTextControlObject::setText(TiObject* obj)
+{
+    QString str;
+    int error = NativeControlObject::getString(obj, str);
+    if (error != NATIVE_ERROR_OK)
+    {
+        return error;
+    }
+    textControl_->setText(str);
+    return NATIVE_ERROR_OK;
+}
+
+int NativeAbstractTextControlObject::setColor(TiObject* obj)
+{
+    float r;
+    float g;
+    float b;
+    float a;
+
+    int error = NativeControlObject::getColorComponents(obj, &r, &g, &b, &a);
+    if (error != NATIVE_ERROR_OK)
+    {
+        return error;
+    }
+    bb::cascades::Color cscolor = bb::cascades::Color::fromRGBA(r, g, b, a);
+    textControl_->textStyle()->setColor(cscolor);
+    return NATIVE_ERROR_OK;
+}
+
+int NativeAbstractTextControlObject::setTextAlign(TiObject* obj)
+{
+    int value;
+    int error = NativeControlObject::getInteger(obj, &value);
+    if (error != NATIVE_ERROR_OK)
+    {
+        return error;
+    }
+
+    switch (value)
+    {
+    case 0: // TEXT_ALIGNMENT_LEFT
+        textControl_->textStyle()->setAlignment(bb::cascades::TextAlignment::ForceLeft);
+        break;
+    case 1: // TEXT_ALIGNMENT_CENTER
+        textControl_->textStyle()->setAlignment(bb::cascades::TextAlignment::Center);
+        break;
+    case 2: // TEXT_ALIGNMENT_RIGHT
+        textControl_->textStyle()->setAlignment(bb::cascades::TextAlignment::ForceRight);
+        break;
+    default:
+        textControl_->textStyle()->setAlignment(bb::cascades::TextAlignment::Default);
+        break;
+    }
+
+    return NATIVE_ERROR_OK;
+}
+
+int NativeAbstractTextControlObject::setFont(TiObject* obj)
+{
+    QMap<QString, QString> font;
+    int error = NativeControlObject::getFontObject(obj, font);
+    if (error != NATIVE_ERROR_OK)
+    {
+        return error;
+    }
+
+    QMap<QString, QString>::const_iterator it = font.begin();
+    for (; it != font.end(); ++it)
+    {
+        if (it.key().compare("fontFamily") == 0)
+        {
+            textControl_->textStyle()->setFontFamily(it.value());
+        }
+        else if (it.key().compare("fontSize") == 0)
+        {
+            bool bSucceed;
+            float size = it.value().toFloat(&bSucceed);
+            if (bSucceed)
+            {
+                textControl_->textStyle()->setSize(size);
+            }
+        }
+        else if (it.key().compare("fontStyle") == 0)
+        {
+            if (it.value().compare("normal") == 0)
+            {
+                textControl_->textStyle()->setFontStyle(bb::cascades::FontStyle::Normal);
+            }
+            else if (it.value().compare("italic") == 0)
+            {
+                textControl_->textStyle()->setFontStyle(bb::cascades::FontStyle::Italic);
+            }
+            else
+            {
+                textControl_->textStyle()->setFontStyle(bb::cascades::FontStyle::Default);
+            }
+        }
+        else if (it.key().compare("fontWeight") == 0)
+        {
+            if (it.value().compare("normal") == 0)
+            {
+                textControl_->textStyle()->setFontWeight(bb::cascades::FontWeight::Normal);
+            }
+            else if (it.value().compare("bold") == 0)
+            {
+                textControl_->textStyle()->setFontWeight(bb::cascades::FontWeight::Bold);
+            }
+            else
+            {
+                textControl_->textStyle()->setFontWeight(bb::cascades::FontWeight::Default);
+            }
+        }
+    }
+
+    return NATIVE_ERROR_OK;
+}

blackberry/tibb/NativeAbstractTextControlObject.h

@@ -0,0 +1,47 @@
+/**
+ * Appcelerator Titanium Mobile
+ * Copyright (c) 2009-2012 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Apache Public License
+ * Please see the LICENSE included with this distribution for details.
+ */
+
+#ifndef NATIVEABSTRACTTEXTCONTROLOBJECT_H_
+#define NATIVEABSTRACTTEXTCONTROLOBJECT_H_
+
+#include "NativeControlObject.h"
+
+//forward declaration
+namespace bb
+{
+namespace cascades
+{
+class AbstractTextControl;
+}
+}
+
+/*
+ * NativeAbstractTextControlObject
+ *
+ * UI: Abstract Text Control
+ */
+
+class NativeAbstractTextControlObject : public NativeControlObject
+{
+public:
+    virtual int setText(TiObject* obj);
+    virtual int setFont(TiObject* obj);
+    virtual int setColor(TiObject* obj);
+    virtual int setTextAlign(TiObject* obj);
+
+protected:
+    explicit NativeAbstractTextControlObject();
+    virtual ~NativeAbstractTextControlObject();
+    virtual bb::cascades::AbstractTextControl* getTextControl() const;
+    virtual void setTextControl(bb::cascades::AbstractTextControl* textControl);
+
+private:
+    bb::cascades::AbstractTextControl* textControl_;
+};
+
+
+#endif /* NATIVEABSTRACTTEXTCONTROLOBJECT_H_ */

blackberry/tibb/NativeControlObject.cpp

@@ -158,6 +158,12 @@ int NativeControlObject::setImage(TiObject* obj)
     return NATIVE_ERROR_NOTSUPPORTED;
 }
 
+PROP_SETTER(setFont)
+int NativeControlObject::setFont(TiObject* obj)
+{
+    return NATIVE_ERROR_NOTSUPPORTED;
+}
+
 // PROP_SETTING_FUNCTION resolves the static name of the function, e.g.,
 // PROP_SETTING_FUNCTION(setBackgroundColor) resolves to "prop_setBackgroundColor"
 
@@ -195,7 +201,7 @@ static vector<NATIVE_PROPSET_CALLBACK> initFunctionMap()
     vect[N_PROP_COLOR]                             = PROP_SETTING_FUNCTION(setColor);
     vect[N_PROP_ELLIPSIZE]                         = NULL;
     vect[N_PROP_FOCUSABLE]                         = NULL;
-    vect[N_PROP_FONT]                              = NULL;
+    vect[N_PROP_FONT]                              = PROP_SETTING_FUNCTION(setFont);
     vect[N_PROP_HEIGHT]                            = NULL;
     vect[N_PROP_HIGHLIGHTED_COLOR]                 = NULL;
     vect[N_PROP_HINT_TEXT]                         = NULL;
@@ -337,3 +343,30 @@ int NativeControlObject::getStringArray(TiObject* obj, QVector<QString>& value)
     }
     return NATIVE_ERROR_OK;
 }
+
+int NativeControlObject::getFontObject(TiObject* obj, QMap<QString, QString>& props)
+{
+    Handle<Value> v8value = obj->getValue();
+    if (v8value.IsEmpty() || !v8value->IsObject())
+    {
+        return NATIVE_ERROR_INVALID_ARG;
+    }
+    Handle<Array> array = Handle<Array>::Cast(v8value);
+    Handle<Array> keys = array->GetPropertyNames();
+
+    for (unsigned int i = 0; i < keys->Length(); i++)
+    {
+        v8::Handle<v8::String> key = keys->Get(v8::Integer::New(i))->ToString();
+        v8::String::Utf8Value keyStr(key);
+        v8::Handle<v8::String> value = array->Get(key)->ToString();
+        v8::String::Utf8Value valueStr(value);
+        const char* cstrKey = *keyStr;
+        QString strKey = cstrKey;
+        const char* cstrValue = *valueStr;
+        QString strValue = cstrValue;
+
+        props.insert(strKey, strValue);
+    }
+
+    return NATIVE_ERROR_OK;
+}

blackberry/tibb/NativeControlObject.h

@@ -39,12 +39,14 @@ class NativeControlObject : public NativeObject
     virtual int setOptions(TiObject* obj);
     virtual int setSelectedIndex(TiObject* obj);
     virtual int setImage(TiObject* obj);
+    virtual int setFont(TiObject* obj);
     static int getColorComponents(TiObject* obj, float* r, float* g, float* b, float* a);
     static int getBoolean(TiObject* obj, bool* value);
     static int getString(TiObject* obj, QString& str);
     static int getFloat(TiObject* obj, float* value);
     static int getInteger(TiObject* obj, int* value);
     static int getStringArray(TiObject* obj, QVector<QString>& value);
+    static int getFontObject(TiObject* obj, QMap<QString, QString>& props);
 protected:
     NativeControlObject();
     virtual ~NativeControlObject();

blackberry/tibb/NativeLabelObject.cpp

@@ -29,47 +29,10 @@ int NativeLabelObject::getObjectType() const
     return N_TYPE_LABEL;
 }
 
-int NativeLabelObject::setText(TiObject* obj)
-{
-    QString str;
-    int error = NativeControlObject::getString(obj, str);
-    if (error != NATIVE_ERROR_OK)
-    {
-        return error;
-    }
-    label_->setText(str);
-    return NATIVE_ERROR_OK;
-}
-
-int NativeLabelObject::setColor(TiObject* obj)
-{
-    float r;
-    float g;
-    float b;
-    float a;
-
-    int error = NativeControlObject::getColorComponents(obj, &r, &g, &b, &a);
-    if (error != NATIVE_ERROR_OK)
-    {
-        return error;
-    }
-    bb::cascades::Color cscolor = bb::cascades::Color::fromRGBA(r, g, b, a);
-    // TODO: setTextColor is not yet supported by Cascades. When it becomes
-    // available, un-comment out the next line.
-    //label_->setTextColor(cscolor);
-    return NATIVE_ERROR_OK;
-}
-
-int NativeLabelObject::setTextAlign(TiObject* obj)
-{
-    // TODO: finish
-    return NATIVE_ERROR_OK;
-}
-
 int NativeLabelObject::initialize(TiEventContainerFactory*)
 {
     label_ = bb::cascades::Label::create();
-    setControl(label_);
+    setTextControl(label_);
     // TODO: Set label layout here
     return NATIVE_ERROR_OK;
 }

blackberry/tibb/NativeLabelObject.h

@@ -8,7 +8,7 @@
 #ifndef NATIVELABELOBJECT_H_
 #define NATIVELABELOBJECT_H_
 
-#include "NativeControlObject.h"
+#include "NativeAbstractTextControlObject.h"
 #include <bb/cascades/Label>
 
 /*
@@ -17,14 +17,11 @@
  * UI: Label control
  */
 
-class NativeLabelObject : public NativeControlObject
+class NativeLabelObject : public NativeAbstractTextControlObject
 {
 public:
     static NativeLabelObject* createLabel();
     virtual int getObjectType() const;
-    virtual int setText(TiObject* obj);
-    virtual int setColor(TiObject* obj);
-    virtual int setTextAlign(TiObject* obj);
     virtual int initialize(TiEventContainerFactory* containerFactory);
     virtual NAHANDLE getNativeHandle() const;
 

blackberry/tibb/TiUIBase.cpp

@@ -99,6 +99,11 @@ const static TiProperty g_tiProperties[] =
     {
         "image", TI_PROP_PERMISSION_READ | TI_PROP_PERMISSION_WRITE,
         N_PROP_IMAGE
+    },
+
+    {
+        "font", TI_PROP_PERMISSION_READ | TI_PROP_PERMISSION_WRITE,
+        N_PROP_FONT
     }
 };