From 2deba4fc437eb701783baecfee17073a933be53f Mon Sep 17 00:00:00 2001
From: Gaurav Patel <gaurav@techreceptives.com>
Date: Thu, 6 May 2021 13:26:44 +0530
Subject: [PATCH] [FIX] mobile device js issue and default value for apps and
 chatter position

---
 addons/web_flectra/models/res_company.py      |  2 +-
 addons/web_flectra/models/res_users.py        |  2 +-
 .../static/src/js/web_responsive.js           | 33 -------------------
 .../static/src/scss/web_responsive.scss       | 17 ++++++++++
 4 files changed, 19 insertions(+), 35 deletions(-)

diff --git a/addons/web_flectra/models/res_company.py b/addons/web_flectra/models/res_company.py
index 9188797945..442fe938cb 100644
--- a/addons/web_flectra/models/res_company.py
+++ b/addons/web_flectra/models/res_company.py
@@ -16,7 +16,7 @@ class ResCompany(models.Model):
 
     theme_menu_style = fields.Selection([
         ('sidemenu', 'Side Menu'),
-        ('apps', 'Top Menu')], string="Menu Style", default="sidemenu")
+        ('apps', 'Top Menu')], string="Menu Style", default="apps")
     theme_font_name = fields.Selection([
         ('Rubik', 'Rubik'),
         ('sans-serif', 'sans-serif'),
diff --git a/addons/web_flectra/models/res_users.py b/addons/web_flectra/models/res_users.py
index 8c2900cd6d..9d89254241 100644
--- a/addons/web_flectra/models/res_users.py
+++ b/addons/web_flectra/models/res_users.py
@@ -13,7 +13,7 @@ class ResUsers(models.Model):
     chatter_position = fields.Selection(
         [("bottom", "Bottom"), ("sided", "Sided")],
         string="Chatter Position",
-        default="sided",
+        default="bottom",
     )
     dark_mode = fields.Boolean(default=False)
 
diff --git a/addons/web_flectra/static/src/js/web_responsive.js b/addons/web_flectra/static/src/js/web_responsive.js
index 1c2c6a4af6..df807e5784 100644
--- a/addons/web_flectra/static/src/js/web_responsive.js
+++ b/addons/web_flectra/static/src/js/web_responsive.js
@@ -19,7 +19,6 @@ flectra.define("web_responsive", function (require) {
     const {useState, useContext} = owl.hooks;
     const SearchPanel = require("web/static/src/js/views/search_panel.js");
     const ListRenderer = require("web.ListRenderer");
-    const DocumentViewer = require("mail.DocumentViewer");
 
     function closeAppDrawer() {
         _.defer(function () {
@@ -346,38 +345,6 @@ flectra.define("web_responsive", function (require) {
     });
 
 
-    DocumentViewer.include({
-        events: _.extend(
-            _.omit(DocumentViewer.prototype.events, ["keydown", "keyup"]),
-            {
-                "click .o_maximize_btn": "_onClickMaximize",
-                "click .o_minimize_btn": "_onClickMinimize",
-                "shown.bs.modal": "_onShownModal",
-            }
-        ),
-
-        start: function () {
-            core.bus.on("keydown", this, this._onKeydown);
-            core.bus.on("keyup", this, this._onKeyUp);
-            return this._super.apply(this, arguments);
-        },
-
-        destroy: function () {
-            core.bus.off("keydown", this, this._onKeydown);
-            core.bus.off("keyup", this, this._onKeyUp);
-            this._super.apply(this, arguments);
-        },
-
-        _onShownModal: function () {
-            $(document).off("focusin.modal");
-        },
-        _onClickMaximize: function () {
-            this.$el.removeClass("o_responsive_document_viewer");
-        },
-        _onClickMinimize: function () {
-            this.$el.addClass("o_responsive_document_viewer");
-        },
-    });
     return {
         deviceContext: deviceContext,
     };
diff --git a/addons/web_flectra/static/src/scss/web_responsive.scss b/addons/web_flectra/static/src/scss/web_responsive.scss
index 7b1cf989e6..6a63a9a4a3 100644
--- a/addons/web_flectra/static/src/scss/web_responsive.scss
+++ b/addons/web_flectra/static/src/scss/web_responsive.scss
@@ -754,4 +754,21 @@ html .o_web_client .o_action_manager .o_action {
 }
 .o_statusbar_buttons > button{
     min-height: 30px !important;
+}
+
+
+@media only screen
+and (min-device-width : 768px)
+and (max-device-width : 1024px){
+    .o_control_panel .o_cp_bottom .o_cp_bottom_right{
+        width: auto;
+    }
+}
+
+@media (min-width: 320px) and (max-width: 480px) {
+
+    .o_base_settings .o_setting_container{
+        display: block;
+    }
+
 }
\ No newline at end of file