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,153 @@
+/**
+ * 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 <QMap>
+#include <QString>
+
+static const char* FONT_FAMILY         = "fontFamily";
+static const char* FONT_SIZE           = "fontSize";
+static const char* FONT_STYLE          = "fontStyle";
+static const char* FONT_STYLE_NORMAL   = "normal";
+static const char* FONT_STYLE_ITALIC   = "italic";
+static const char* FONT_WEIGHT         = "fontWeight";
+static const char* FONT_WEIGHT_NORMAL  = "normal";
+static const char* FONT_WEIGHT_BOLD    = "bold";
+
+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 TEXT_ALIGNMENT_LEFT:
+        textControl_->textStyle()->setAlignment(bb::cascades::TextAlignment::ForceLeft);
+        break;
+    case TEXT_ALIGNMENT_CENTER:
+        textControl_->textStyle()->setAlignment(bb::cascades::TextAlignment::Center);
+        break;
+    case TEXT_ALIGNMENT_RIGHT:
+        textControl_->textStyle()->setAlignment(bb::cascades::TextAlignment::ForceRight);
+        break;
+    default:
+        qDebug() << "Unknown value recieved: " << value;
+        break;
+    }
+
+    return NATIVE_ERROR_OK;
+}
+
+int NativeAbstractTextControlObject::setFont(TiObject* obj)
+{
+    QMap<QString, QString> font;
+    int error = NativeControlObject::getMapObject(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(FONT_FAMILY) == 0)
+        {
+            textControl_->textStyle()->setFontFamily(it.value());
+        }
+        else if (it.key().compare(FONT_SIZE) == 0)
+        {
+            bool bSucceeded;
+            float size = it.value().toFloat(&bSucceeded);
+            if (bSucceeded)
+            {
+                textControl_->textStyle()->setSize(size);
+            }
+        }
+        else if (it.key().compare(FONT_STYLE) == 0)
+        {
+            if (it.value().compare(FONT_STYLE_NORMAL) == 0)
+            {
+                textControl_->textStyle()->setFontStyle(bb::cascades::FontStyle::Normal);
+            }
+            else if (it.value().compare(FONT_STYLE_ITALIC) == 0)
+            {
+                textControl_->textStyle()->setFontStyle(bb::cascades::FontStyle::Italic);
+            }
+        }
+        else if (it.key().compare(FONT_WEIGHT) == 0)
+        {
+            if (it.value().compare(FONT_WEIGHT_NORMAL) == 0)
+            {
+                textControl_->textStyle()->setFontWeight(bb::cascades::FontWeight::Normal);
+            }
+            else if (it.value().compare(FONT_WEIGHT_BOLD) == 0)
+            {
+                textControl_->textStyle()->setFontWeight(bb::cascades::FontWeight::Bold);
+            }
+        }
+        else
+        {
+            qDebug() << "Unknown key:value recieved: " << qPrintable(it.key()) << ":" << qPrintable(it.value());
+        }
+    }
+
+    return NATIVE_ERROR_OK;
+}

blackberry/tibb/NativeAbstractTextControlObject.h

@@ -0,0 +1,58 @@
+/**
+ * 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;
+}
+}
+
+// Text alignment constants
+enum N_TEXT_ALIGNMENT
+{
+    TEXT_ALIGNMENT_LEFT,
+    TEXT_ALIGNMENT_CENTER,
+    TEXT_ALIGNMENT_RIGHT
+};
+
+/*
+ * 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:
+    // Disable copy ctor & assignment operator
+    NativeAbstractTextControlObject(const NativeAbstractTextControlObject& textControl);
+    NativeAbstractTextControlObject& operator=(const NativeAbstractTextControlObject& textControl);
+    bb::cascades::AbstractTextControl* textControl_;
+};
+
+
+#endif /* NATIVEABSTRACTTEXTCONTROLOBJECT_H_ */

blackberry/tibb/NativeControlObject.cpp

@@ -158,6 +158,40 @@ int NativeControlObject::setImage(TiObject* obj)
     return NATIVE_ERROR_NOTSUPPORTED;
 }
 
+PROP_SETTER(setFont)
+int NativeControlObject::setFont(TiObject* obj)
+{
+    return NATIVE_ERROR_NOTSUPPORTED;
+}
+
+PROP_SETTER(setWidth)
+int NativeControlObject::setWidth(TiObject* obj)
+{
+    float width = 0;
+    int error = NativeControlObject::getFloat(obj, &width);
+    if (!N_SUCCEEDED(error))
+    {
+        return error;
+    }
+    control_->setMinWidth(width);
+    control_->setMaxWidth(width);
+    return NATIVE_ERROR_OK;
+}
+
+PROP_SETTER(setHeight)
+int NativeControlObject::setHeight(TiObject* obj)
+{
+    float height = 0;
+    int error = NativeControlObject::getFloat(obj, &height);
+    if (!N_SUCCEEDED(error))
+    {
+        return error;
+    }
+    control_->setMinHeight(height);
+    control_->setMaxHeight(height);
+    return NATIVE_ERROR_OK;
+}
+
 // PROP_SETTING_FUNCTION resolves the static name of the function, e.g.,
 // PROP_SETTING_FUNCTION(setBackgroundColor) resolves to "prop_setBackgroundColor"
 
@@ -195,8 +229,8 @@ 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_HEIGHT]                            = NULL;
+    vect[N_PROP_FONT]                              = PROP_SETTING_FUNCTION(setFont);
+    vect[N_PROP_HEIGHT]                            = PROP_SETTING_FUNCTION(setHeight);
     vect[N_PROP_HIGHLIGHTED_COLOR]                 = NULL;
     vect[N_PROP_HINT_TEXT]                         = NULL;
     vect[N_PROP_HTML]                              = NULL;
@@ -225,7 +259,7 @@ static vector<NATIVE_PROPSET_CALLBACK> initFunctionMap()
     vect[N_PROP_TRANSFORM]                         = NULL;
     vect[N_PROP_VALUE]                             = PROP_SETTING_FUNCTION(setValue);
     vect[N_PROP_VISIBLE]                           = PROP_SETTING_FUNCTION(setVisible);
-    vect[N_PROP_WIDTH]                             = NULL;
+    vect[N_PROP_WIDTH]                             = PROP_SETTING_FUNCTION(setWidth);
     vect[N_PROP_WORD_WRAP]                         = NULL;
     vect[N_PROP_ZINDEX]                            = NULL;
     return vect;
@@ -337,3 +371,28 @@ int NativeControlObject::getStringArray(TiObject* obj, QVector<QString>& value)
     }
     return NATIVE_ERROR_OK;
 }
+
+int NativeControlObject::getMapObject(TiObject* obj, QMap<QString, QString>& props)
+{
+    Handle<Value> v8value = obj->getValue();
+    if (v8value.IsEmpty() || !v8value->IsObject())
+    {
+        return NATIVE_ERROR_INVALID_ARG;
+    }
+    Handle<Object> object = Handle<Object>::Cast(v8value);
+    Handle<Array> keys = object->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 = object->Get(key)->ToString();
+        v8::String::Utf8Value valueStr(value);
+        QString strKey = QString::fromUtf8(*keyStr);
+        QString strValue = QString::fromUtf8(*valueStr);
+
+        props.insert(strKey, strValue);
+    }
+
+    return NATIVE_ERROR_OK;
+}

blackberry/tibb/NativeControlObject.h

@@ -39,12 +39,16 @@ class NativeControlObject : public NativeObject
     virtual int setOptions(TiObject* obj);
     virtual int setSelectedIndex(TiObject* obj);
     virtual int setImage(TiObject* obj);
+    virtual int setFont(TiObject* obj);
+    virtual int setWidth(TiObject* obj);
+    virtual int setHeight(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 getMapObject(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;
 }