experiments in dharma

src/components/structures/LeftPanel.js

@@ -174,10 +174,12 @@ var LeftPanel = React.createClass({
     render: function() {
         const RoomList = sdk.getComponent('rooms.RoomList');
         const TagPanel = sdk.getComponent('structures.TagPanel');
+        const TopLeftMenu = sdk.getComponent('structures.TopLeftMenu');
         const BottomLeftMenu = sdk.getComponent('structures.BottomLeftMenu');
         const CallPreview = sdk.getComponent('voip.CallPreview');
 
-        let topBox;
+        let topBox = <TopLeftMenu collapsed={ this.props.collapsed }/>;
+/*
         if (this.context.matrixClient.isGuest()) {
             const LoginBox = sdk.getComponent('structures.LoginBox');
             topBox = <LoginBox collapsed={ this.props.collapsed }/>;
@@ -185,7 +187,7 @@ var LeftPanel = React.createClass({
             const SearchBox = sdk.getComponent('structures.SearchBox');
             topBox = <SearchBox collapsed={ this.props.collapsed } onSearch={ this.onSearch } />;
         }
-
+*/
         const classes = classNames(
             "mx_LeftPanel",
             {
@@ -216,10 +218,10 @@ var LeftPanel = React.createClass({
                         collapsed={this.props.collapsed}
                         searchFilter={this.state.searchFilter}
                         ConferenceHandler={VectorConferenceHandler} />
-                    <BottomLeftMenu collapsed={this.props.collapsed}/>
                 </aside>
             </div>
         );
+        // <BottomLeftMenu collapsed={this.props.collapsed}/>
     }
 });
 

src/components/structures/TopLeftMenu.js

@@ -0,0 +1,52 @@
+/*
+Copyright 2018 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import PropTypes from 'prop-types';
+import sdk from '../../index';
+import dis from '../../dispatcher';
+
+class TopLeftMenu extends React.Component {
+
+    static propTypes = {
+        collapsed: PropTypes.bool.isRequired,
+    };
+
+    static displayName = 'TopLeftMenu';
+
+    render() {
+        const BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
+        const avatarHeight = 28;
+        const name = "My stuff"
+
+        return (
+            <div className="mx_TopLeftMenu">
+                <BaseAvatar
+                    className="mx_TopLeftMenu_avatar"
+                    name={name}
+                    width={avatarHeight}
+                    height={avatarHeight}
+                />
+                <div className="mx_TopLeftMenu_name">
+                    { name }
+                </div>
+                <img className="mx_TopLeftMenu_chevron" src="img/topleft-chevron.svg" width="11" height="6"/>
+            </div>
+        );
+    }
+}
+
+module.exports = TopLeftMenu;

src/components/structures/UserSettings.js

@@ -123,6 +123,7 @@ const CRYPTO_SETTINGS = [
 const THEMES = [
     { label: _td('Light theme'), value: 'light' },
     { label: _td('Dark theme'), value: 'dark' },
+    { label: _td('2018 theme'), value: 'dharma' },
     { label: _td('Status.im theme'), value: 'status' },
 ];
 

src/components/views/elements/TagTile.js

@@ -146,7 +146,7 @@ export default React.createClass({
         const RoomTooltip = sdk.getComponent('rooms.RoomTooltip');
         const profile = this.state.profile || {};
         const name = profile.name || this.props.tag;
-        const avatarHeight = 35;
+        const avatarHeight = 40;
 
         const httpUrl = profile.avatarUrl ? this.context.matrixClient.mxcUrlToHttp(
             profile.avatarUrl, avatarHeight, avatarHeight, "crop",

src/components/views/rooms/AppsDrawer.js

@@ -248,6 +248,10 @@ module.exports = React.createClass({
                 />);
             });
 
+        if (apps.length == 0) {
+            return <div></div>;
+        }
+
         let addWidget;
         if (this.props.showApps &&
             this._canUserModify()

src/components/views/rooms/RoomHeader.js

@@ -302,11 +302,12 @@ module.exports = React.createClass({
         }
 
         let roomAvatar = null;
+        const avatarSize = 28;
         if (canSetRoomAvatar) {
             roomAvatar = (
                 <div className="mx_RoomHeader_avatarPicker">
                     <div onClick={this.onAvatarPickerClick}>
-                        <ChangeAvatar ref="changeAvatar" room={this.props.room} showUploadSection={false} width={48} height={48} />
+                        <ChangeAvatar ref="changeAvatar" room={this.props.room} showUploadSection={false} width={avatarSize} height={avatarSize} />
                     </div>
                     <div className="mx_RoomHeader_avatarPicker_edit">
                         <label htmlFor="avatarInput" ref="file_label">
@@ -327,7 +328,7 @@ module.exports = React.createClass({
             );
         } else if (this.props.room || (this.props.oobData && this.props.oobData.name)) {
             roomAvatar = (
-                <RoomAvatar room={this.props.room} width={48} height={48} oobData={this.props.oobData}
+                <RoomAvatar room={this.props.room} width={avatarSize} height={avatarSize} oobData={this.props.oobData}
                     viewAvatarOnClick={true} />
             );
         }

src/components/views/rooms/RoomTile.js

@@ -320,7 +320,7 @@ module.exports = React.createClass({
         return <AccessibleButton className={classes} tabIndex="0" onClick={this.onClick} onMouseEnter={this.onMouseEnter} onMouseLeave={this.onMouseLeave}>
             <div className={avatarClasses}>
                 <div className="mx_RoomTile_avatar_container">
-                    <RoomAvatar room={this.props.room} width={24} height={24} />
+                    <RoomAvatar room={this.props.room} width={32} height={32} />
                     { directMessageIndicator }
                 </div>
             </div>