From b5a9b99bfefe990b2dc569d2e96d3501bc334d29 Mon Sep 17 00:00:00 2001
From: Prem Nirmal <prem.nirmal88@gmail.com>
Date: Wed, 20 Oct 2021 14:58:47 +0100
Subject: [PATCH] Tablet layout tweaks

---
 .../portfolio/search/SearchViewModel.kt       |  3 +-
 .../ticker/settings/SettingsFragment.kt       |  8 +-
 .../premnirmal/ticker/widget/StockWidget.kt   | 11 +--
 .../activity_paranormal.xml                   | 30 ------
 .../layout-sw600dp-land/activity_search.xml   | 16 ---
 .../res/layout-sw600dp-land/fragment_home.xml | 97 +++++++++++++++++++
 .../fragment_news_feed.xml                    | 94 ++++++++++++++++++
 .../layout-sw600dp-land/fragment_search.xml   | 69 +++++++++++++
 .../layout-sw600dp-land/fragment_widgets.xml  | 61 ++++++++++++
 app/src/main/res/layout/widget_5x1.xml        | 25 +++++
 app/src/main/res/values-night/colors.xml      |  6 +-
 app/src/main/res/values-sw600dp/booleans.xml  |  4 +
 app/src/main/res/values/booleans.xml          |  4 +
 app/version.properties                        |  4 +-
 14 files changed, 372 insertions(+), 60 deletions(-)
 delete mode 100644 app/src/main/res/layout-sw600dp-land/activity_paranormal.xml
 delete mode 100644 app/src/main/res/layout-sw600dp-land/activity_search.xml
 create mode 100644 app/src/main/res/layout-sw600dp-land/fragment_home.xml
 create mode 100644 app/src/main/res/layout-sw600dp-land/fragment_news_feed.xml
 create mode 100644 app/src/main/res/layout-sw600dp-land/fragment_search.xml
 create mode 100644 app/src/main/res/layout-sw600dp-land/fragment_widgets.xml
 create mode 100644 app/src/main/res/layout/widget_5x1.xml
 create mode 100644 app/src/main/res/values-sw600dp/booleans.xml
 create mode 100644 app/src/main/res/values/booleans.xml

diff --git a/app/src/main/kotlin/com/github/premnirmal/ticker/portfolio/search/SearchViewModel.kt b/app/src/main/kotlin/com/github/premnirmal/ticker/portfolio/search/SearchViewModel.kt
index b46c18fa..c009b5ae 100644
--- a/app/src/main/kotlin/com/github/premnirmal/ticker/portfolio/search/SearchViewModel.kt
+++ b/app/src/main/kotlin/com/github/premnirmal/ticker/portfolio/search/SearchViewModel.kt
@@ -20,7 +20,6 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.ensureActive
 import kotlinx.coroutines.launch
 import timber.log.Timber
-import java.util.Locale
 import javax.inject.Inject
 
 class SearchViewModel : ViewModel() {
@@ -47,7 +46,7 @@ class SearchViewModel : ViewModel() {
       val suggestions = stocksApi.getSuggestions(query)
       if (suggestions.wasSuccessful) {
         val suggestionList = suggestions.data.toMutableList()
-        val querySuggestion = SuggestionNet(query.toUpperCase(Locale.getDefault()))
+        val querySuggestion = SuggestionNet(query.uppercase())
         if (!suggestionList.contains(querySuggestion)) {
           suggestionList.add(querySuggestion)
         }
diff --git a/app/src/main/kotlin/com/github/premnirmal/ticker/settings/SettingsFragment.kt b/app/src/main/kotlin/com/github/premnirmal/ticker/settings/SettingsFragment.kt
index cbf47b99..db2453a2 100644
--- a/app/src/main/kotlin/com/github/premnirmal/ticker/settings/SettingsFragment.kt
+++ b/app/src/main/kotlin/com/github/premnirmal/ticker/settings/SettingsFragment.kt
@@ -13,10 +13,12 @@ import android.content.pm.PackageManager
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
+import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup.MarginLayoutParams
 import android.widget.EditText
+import android.widget.FrameLayout
 import android.widget.TimePicker
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatDelegate
@@ -43,7 +45,7 @@ import com.github.premnirmal.ticker.showDialog
 import com.github.premnirmal.ticker.widget.WidgetDataProvider
 import com.github.premnirmal.tickerwidget.BuildConfig
 import com.github.premnirmal.tickerwidget.R
-import kotlinx.android.synthetic.main.fragment_settings.*
+import kotlinx.android.synthetic.main.fragment_settings.toolbar
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.threeten.bp.format.TextStyle.SHORT
@@ -99,6 +101,10 @@ class SettingsFragment : PreferenceFragmentCompat(), ChildFragment,
   ) {
     super.onViewCreated(view, savedInstanceState)
     (toolbar.layoutParams as MarginLayoutParams).topMargin = requireContext().getStatusBarHeight()
+    if (resources.getBoolean(R.bool.isTablet)) {
+      listView.layoutParams.width = resources.getDimensionPixelSize(R.dimen.tablet_width)
+      (listView.layoutParams as FrameLayout.LayoutParams).gravity = Gravity.CENTER_HORIZONTAL or Gravity.TOP
+    }
     listView.addItemDecoration(DividerItemDecoration(activity, DividerItemDecoration.VERTICAL))
     listView.isVerticalScrollBarEnabled = false
     setupSimplePreferencesScreen()
diff --git a/app/src/main/kotlin/com/github/premnirmal/ticker/widget/StockWidget.kt b/app/src/main/kotlin/com/github/premnirmal/ticker/widget/StockWidget.kt
index c0475050..3ebfcbfa 100644
--- a/app/src/main/kotlin/com/github/premnirmal/ticker/widget/StockWidget.kt
+++ b/app/src/main/kotlin/com/github/premnirmal/ticker/widget/StockWidget.kt
@@ -110,12 +110,11 @@ class StockWidget : AppWidgetProvider() {
     appWidgetId: Int
   ): RemoteViews = when {
       widgetDataProvider.dataForWidgetId(appWidgetId).widgetSizePref() == 1 -> RemoteViews(context.packageName, R.layout.widget_1x1)
-      min_width > 750 -> RemoteViews(context.packageName, R.layout.widget_4x1)
-      min_width > 500 -> RemoteViews(context.packageName, R.layout.widget_3x1)
-      min_width > 250 -> // 3x2
-        RemoteViews(context.packageName, R.layout.widget_2x1)
-      else -> // 2x1
-        RemoteViews(context.packageName, R.layout.widget_1x1)
+      min_width > 750 -> RemoteViews(context.packageName, R.layout.widget_5x1)
+      min_width > 550 -> RemoteViews(context.packageName, R.layout.widget_4x1)
+      min_width > 425 -> RemoteViews(context.packageName, R.layout.widget_3x1)
+      min_width > 150 -> RemoteViews(context.packageName, R.layout.widget_2x1)
+      else -> RemoteViews(context.packageName, R.layout.widget_1x1)
     }
 
   private fun getMinWidgetWidth(options: Bundle?): Int {
diff --git a/app/src/main/res/layout-sw600dp-land/activity_paranormal.xml b/app/src/main/res/layout-sw600dp-land/activity_paranormal.xml
deleted file mode 100644
index 104610d6..00000000
--- a/app/src/main/res/layout-sw600dp-land/activity_paranormal.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:background="@color/default_bg"
-    >
-
-  <FrameLayout
-      android:id="@+id/fragment_container"
-      android:layout_width="@dimen/tablet_width"
-      android:layout_height="match_parent"
-      android:layout_gravity="center_horizontal"
-      />
-
-  <com.google.android.material.bottomnavigation.BottomNavigationView
-      android:id="@+id/bottom_navigation"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_gravity="bottom"
-      android:background="@color/bottom_bar_bg"
-      app:elevation="4dp"
-      app:itemIconTint="@drawable/bottom_nav_icon_tint"
-      app:itemTextColor="@drawable/bottom_nav_icon_tint"
-      app:layout_behavior="com.github.premnirmal.ticker.ui.BottomNavigationBehavior"
-      app:menu="@menu/menu_bottom_nav"
-      />
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw600dp-land/activity_search.xml b/app/src/main/res/layout-sw600dp-land/activity_search.xml
deleted file mode 100644
index e4b24d49..00000000
--- a/app/src/main/res/layout-sw600dp-land/activity_search.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/default_bg"
-    android:orientation="vertical"
-    >
-
-  <FrameLayout
-      android:id="@+id/fragment_container"
-      android:layout_width="@dimen/tablet_width"
-      android:layout_gravity="center_horizontal"
-      android:layout_height="match_parent"
-      />
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw600dp-land/fragment_home.xml b/app/src/main/res/layout-sw600dp-land/fragment_home.xml
new file mode 100644
index 00000000..763dc8f2
--- /dev/null
+++ b/app/src/main/res/layout-sw600dp-land/fragment_home.xml
@@ -0,0 +1,97 @@
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/default_bg"
+    >
+
+  <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+      android:id="@+id/swipe_container"
+      android:layout_width="@dimen/tablet_width"
+      android:layout_height="match_parent"
+      android:layout_gravity="center_horizontal|top"
+      app:layout_behavior="@string/appbar_scrolling_view_behavior"
+      >
+    <androidx.viewpager2.widget.ViewPager2
+        android:id="@+id/view_pager"
+        android:layout_width="@dimen/tablet_width"
+        android:layout_height="match_parent"
+        android:padding="4dp"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"
+        />
+  </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+
+  <com.google.android.material.appbar.AppBarLayout
+      android:id="@+id/app_bar_layout"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+      >
+
+    <com.google.android.material.appbar.CollapsingToolbarLayout
+        android:id="@+id/collapsingToolbarLayout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_scrollFlags="scroll|exitUntilCollapsed"
+        app:contentScrim="@color/home_toolbar_scrim"
+        app:titleEnabled="false"
+        >
+
+      <ImageView
+          android:layout_width="match_parent"
+          android:layout_height="180dp"
+          android:scaleType="centerCrop"
+          android:src="@drawable/header_image"
+          app:layout_collapseMode="parallax"
+          />
+
+      <LinearLayout
+          android:layout_width="match_parent"
+          android:layout_height="180dp"
+          android:layout_gravity="bottom"
+          android:gravity="bottom"
+          android:orientation="vertical"
+          app:layout_collapseMode="none"
+          >
+
+        <TextView
+            android:id="@+id/subtitle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="5dp"
+            android:layout_marginLeft="@dimen/activity_horizontal_margin"
+            android:layout_marginStart="@dimen/activity_horizontal_margin"
+            android:gravity="start"
+            android:textColor="@color/text_1"
+            android:textSize="@dimen/text_size"
+            />
+
+        <com.google.android.material.tabs.TabLayout
+            android:id="@+id/tabs"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:tabBackground="@color/tab_background"
+            app:tabGravity="fill"
+            app:tabIndicatorColor="@color/color_accent"
+            app:tabIndicatorHeight="2dp"
+            app:tabMode="fixed"
+            app:tabSelectedTextColor="@color/tab_text_selected"
+            app:tabTextAppearance="@style/TabTextAppearence"
+            app:tabTextColor="@color/tab_text"
+            />
+      </LinearLayout>
+
+      <androidx.appcompat.widget.Toolbar
+          android:id="@+id/toolbar"
+          android:layout_width="match_parent"
+          android:layout_height="?attr/actionBarSize"
+          app:layout_collapseMode="pin"
+          app:title="@string/app_name"
+          app:titleTextAppearance="@style/ActionBarTitleText"
+          app:menu="@menu/menu_home"
+          />
+    </com.google.android.material.appbar.CollapsingToolbarLayout>
+
+  </com.google.android.material.appbar.AppBarLayout>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout-sw600dp-land/fragment_news_feed.xml b/app/src/main/res/layout-sw600dp-land/fragment_news_feed.xml
new file mode 100644
index 00000000..74ab07f1
--- /dev/null
+++ b/app/src/main/res/layout-sw600dp-land/fragment_news_feed.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/default_bg"
+    >
+
+  <com.google.android.material.appbar.AppBarLayout
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:background="@color/transparent"
+      android:elevation="0dp"
+      app:elevation="0dp"
+      >
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="10dp"
+        android:id="@+id/fake_status_bar"
+        android:background="@color/bg_toolbar"
+        />
+
+    <androidx.appcompat.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/bg_toolbar"
+        android:elevation="0dp"
+        app:elevation="0dp"
+        app:layout_scrollFlags="scroll|exitUntilCollapsed"
+        app:title="@string/news_feed"
+        app:titleTextAppearance="@style/ActionBarTitleText"
+        />
+  </com.google.android.material.appbar.AppBarLayout>
+
+  <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+      android:layout_width="@dimen/tablet_width"
+      android:layout_height="match_parent"
+      android:layout_gravity="center_horizontal|top"
+      android:id="@+id/swipe_container"
+      app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+    <ViewFlipper
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/view_flipper"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"
+        >
+
+      <ProgressBar
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_gravity="center"
+          android:layout_marginBottom="?actionBarSize"
+          />
+
+      <TextView
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_gravity="center"
+          android:gravity="center"
+          android:layout_marginBottom="?actionBarSize"
+          android:text="@string/error_fetching_news"
+          android:textColor="@color/color_accent"
+          android:textSize="@dimen/large_text"
+          style="@style/MediumTextView"
+          />
+
+      <TextView
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_gravity="center"
+          android:gravity="center"
+          android:layout_marginBottom="?actionBarSize"
+          android:text="@string/no_data"
+          android:textColor="@color/color_accent"
+          android:textSize="@dimen/large_text"
+          style="@style/MediumTextView"
+          />
+
+      <androidx.recyclerview.widget.RecyclerView
+          android:id="@+id/recycler_view"
+          android:layout_width="match_parent"
+          android:layout_height="match_parent"
+          android:paddingBottom="?actionBarSize"
+          android:clipToPadding="false"
+          android:scrollbars="none"
+          />
+    </ViewFlipper>
+
+  </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw600dp-land/fragment_search.xml b/app/src/main/res/layout-sw600dp-land/fragment_search.xml
new file mode 100644
index 00000000..80975f0d
--- /dev/null
+++ b/app/src/main/res/layout-sw600dp-land/fragment_search.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/default_bg"
+    android:layout_gravity="center_horizontal"
+    >
+
+  <com.google.android.material.appbar.AppBarLayout
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:background="@color/transparent"
+      android:elevation="0dp"
+      app:elevation="0dp"
+      >
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="10dp"
+        android:id="@+id/fake_status_bar"
+        android:background="@color/bg_toolbar"
+        />
+
+    <androidx.appcompat.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/bg_toolbar"
+        android:elevation="0dp"
+        app:elevation="0dp"
+        app:layout_scrollFlags="scroll|exitUntilCollapsed"
+        app:title="@string/action_search"
+        app:titleTextAppearance="@style/ActionBarTitleText"
+        />
+
+    <EditText
+        android:id="@+id/search_view"
+        android:layout_gravity="center_horizontal|top"
+        android:layout_width="@dimen/tablet_width"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="5dp"
+        android:layout_marginTop="@dimen/activity_vertical_margin"
+        android:layout_marginRight="5dp"
+        android:elevation="0dp"
+        android:hint="@string/enter_a_symbol"
+        android:imeOptions="actionDone"
+        android:inputType="textNoSuggestions|textCapCharacters"
+        android:lines="1"
+        android:maxLines="1"
+        android:paddingLeft="7dp"
+        android:paddingRight="7dp"
+        android:textAllCaps="true"
+        android:textSize="@dimen/large_text"
+        app:elevation="0dp"
+        app:layout_scrollFlags="enterAlways|snap"
+        />
+  </com.google.android.material.appbar.AppBarLayout>
+
+  <androidx.recyclerview.widget.RecyclerView
+      android:id="@+id/recycler_view"
+      android:layout_gravity="center_horizontal|top"
+      android:layout_width="@dimen/tablet_width"
+      android:layout_height="wrap_content"
+      android:scrollbars="none"
+      app:layout_behavior="@string/appbar_scrolling_view_behavior"
+      />
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw600dp-land/fragment_widgets.xml b/app/src/main/res/layout-sw600dp-land/fragment_widgets.xml
new file mode 100644
index 00000000..00bfe5a0
--- /dev/null
+++ b/app/src/main/res/layout-sw600dp-land/fragment_widgets.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:background="@color/default_bg"
+    >
+
+  <com.google.android.material.appbar.AppBarLayout
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:background="@color/bg_toolbar"
+      android:elevation="0dp"
+      app:elevation="0dp"
+      >
+    <androidx.appcompat.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/bg_toolbar"
+        android:elevation="0dp"
+        app:elevation="0dp"
+        app:title="@string/widgets"
+        app:titleTextAppearance="@style/ActionBarTitleText"
+        />
+  </com.google.android.material.appbar.AppBarLayout>
+
+  <LinearLayout
+      android:layout_gravity="center_horizontal"
+      android:layout_width="@dimen/tablet_width"
+      android:layout_height="wrap_content"
+      android:background="@color/default_bg"
+      android:orientation="vertical"
+      >
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/activity_vertical_margin"
+        android:layout_marginStart="@dimen/activity_vertical_margin"
+        android:layout_marginTop="@dimen/activity_vertical_margin"
+        android:gravity="center_vertical"
+        android:text="@string/select_widget"
+        android:textSize="@dimen/thin_title_text"
+        style="@style/ThinTitleTextView"
+        />
+    <Spinner
+        android:id="@+id/widget_selection_spinner"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        />
+  </LinearLayout>
+  <FrameLayout
+      android:id="@+id/child_fragment_container"
+      android:layout_gravity="center_horizontal"
+      android:layout_width="@dimen/tablet_width"
+      android:layout_height="match_parent"
+      android:scrollbars="none"
+      />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/widget_5x1.xml b/app/src/main/res/layout/widget_5x1.xml
new file mode 100644
index 00000000..e2ec5abf
--- /dev/null
+++ b/app/src/main/res/layout/widget_5x1.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/Widget.Container"
+    android:theme="@style/Theme.AppWidget.AppWidgetContainerParent"
+    android:id="@+id/widget_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    >
+
+  <include
+      layout="@layout/widget_header"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      />
+
+  <GridView
+      android:id="@+id/list"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:numColumns="5"
+      android:horizontalSpacing="4dp"
+      android:scrollbars="none"
+      />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 24a1819e..26507f89 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -9,8 +9,8 @@
   <color name="default_bg">#191919</color>
   <color name="color_splash">#191919</color>
   <color name="graph_bg">#000000</color>
-  <color name="color_statusbar">@color/color_primary</color>
-  <color name="bg_toolbar">@color/color_primary</color>
+  <color name="color_statusbar">@color/bg_toolbar</color>
+  <color name="bg_toolbar">#2f2f2f</color>
   <color name="divider">#aaaa</color>
   <color name="card_bg">#1d1d1d</color>
   <color name="card_shadow">#95000000</color>
@@ -20,7 +20,7 @@
   <color name="positive_green_dark">#009900</color>
   <color name="disabled_grey">#98545454</color>
   <color name="unselected_grey">#ffbdbdbd</color>
-  <color name="nav_bar_bg">@color/default_bg</color>
+  <color name="nav_bar_bg">@color/bg_toolbar</color>
   <color name="nav_bar_bg_2">@color/card_bg</color>
   <color name="bottom_bar_bg">@color/card_bg</color>
   <color name="actionbar_title_text">#ffffff</color>
diff --git a/app/src/main/res/values-sw600dp/booleans.xml b/app/src/main/res/values-sw600dp/booleans.xml
new file mode 100644
index 00000000..d3a0e92c
--- /dev/null
+++ b/app/src/main/res/values-sw600dp/booleans.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="isTablet">true</bool>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/booleans.xml b/app/src/main/res/values/booleans.xml
new file mode 100644
index 00000000..f855de6a
--- /dev/null
+++ b/app/src/main/res/values/booleans.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="isTablet">false</bool>
+</resources>
\ No newline at end of file
diff --git a/app/version.properties b/app/version.properties
index 1be1d4a8..409b661a 100644
--- a/app/version.properties
+++ b/app/version.properties
@@ -1,2 +1,2 @@
-versionName=3.9.755
-versionCode=300900755
\ No newline at end of file
+versionName=3.9.756
+versionCode=300900756
\ No newline at end of file