Develop to master for 5.2.5 release

.codecov.yml

@@ -0,0 +1,12 @@
+coverage:
+  status:
+    # master branch only
+    project:
+      default:
+        # Fail the status if coverage drops by >= 0.1%
+        threshold: 0.1
+    patch:
+      default:
+        target: 80%
+        # Only post a patch status to pull requests
+        only_pulls: true

.github/workflows/code-analysis.yml

@@ -14,14 +14,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v1
+        uses: actions/checkout@v2
       - name: Save Gradle Caches
         uses: actions/cache@v2
         with:
           path: ~/.gradle/caches/
-          key: gradle-caches-${{ runner.os }}
+          key: gradle-caches-${{ runner.os }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
           restore-keys: |
-            gradle-caches-${{ runner.os }}
+            gradle-caches-${{ runner.os }}-
       - name: Detekt
         run: ./gradlew detektAll
       - name: Stop Gradle
@@ -32,14 +32,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v1
+        uses: actions/checkout@v2
       - name: Save Gradle Caches
         uses: actions/cache@v2
         with:
           path: ~/.gradle/caches/
-          key: gradle-caches-${{ runner.os }}
+          key: gradle-caches-${{ runner.os }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
           restore-keys: |
-            gradle-caches-${{ runner.os }}
+            gradle-caches-${{ runner.os }}-
       - name: ktlint
         run: ./gradlew ktlintAll
       - name: Stop Gradle
@@ -49,14 +49,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v1
+        uses: actions/checkout@v2
       - name: Save Gradle Caches
         uses: actions/cache@v2
         with:
           path: ~/.gradle/caches/
-          key: gradle-caches-${{ runner.os }}
+          key: gradle-caches-${{ runner.os }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
           restore-keys: |
-            gradle-caches-${{ runner.os }}
+            gradle-caches-${{ runner.os }}-
       - name: CPD
         run: ./gradlew cpdAll
       - name: Stop Gradle

CHANGELOG.md

@@ -1,6 +1,12 @@
 Changelog
 =========
 
+## Version 5.2.5
+
+_2021-02-17_
+
+* Fix MaterialToolbar subtitle descender cutoff.
+
 ## Version 5.2.4
 
 _2021-02-11_

README.md

@@ -1,4 +1,4 @@
-![Download](https://img.shields.io/maven-central/v/com.infinum.dbinspector/dbinspector) ![Validate Gradle Wrapper](https://github.com/infinum/android_dbinspector/workflows/Validate%20Gradle%20Wrapper/badge.svg) ![Code analysis](https://github.com/infinum/android_dbinspector/workflows/Code%20analysis/badge.svg)
+![Download](https://img.shields.io/maven-central/v/com.infinum.dbinspector/dbinspector) ![Validate Gradle Wrapper](https://github.com/infinum/android_dbinspector/workflows/Validate%20Gradle%20Wrapper/badge.svg) ![Code analysis](https://github.com/infinum/android_dbinspector/workflows/Code%20analysis/badge.svg) [![CodeFactor](https://www.codefactor.io/repository/github/infinum/android_dbinspector/badge)](https://www.codefactor.io/repository/github/infinum/android_dbinspector) [![codecov](https://codecov.io/gh/infinum/android_dbinspector/branch/master/graph/badge.svg?token=LlJaXeahQC)](https://codecov.io/gh/infinum/android_dbinspector)
 
 ### <img align="left" src="logo.svg" width="48">
 # DbInspector
@@ -43,13 +43,13 @@ Then add the following dependencies in your app `build.gradle` or `build.gradle.
 
 **Groovy**
 ```groovy
-debugImplementation "com.infinum.dbinspector:dbinspector:5.2.4"
-releaseImplementation "com.infinum.dbinspector:dbinspector-no-op:5.2.4"
+debugImplementation "com.infinum.dbinspector:dbinspector:5.2.5"
+releaseImplementation "com.infinum.dbinspector:dbinspector-no-op:5.2.5"
 ```
 **KotlinDSL**
 ```kotlin
-debugImplementation("com.infinum.dbinspector:dbinspector:5.2.4")
-releaseImplementation("com.infinum.dbinspector:dbinspector-no-op:5.2.4")
+debugImplementation("com.infinum.dbinspector:dbinspector:5.2.5")
+releaseImplementation("com.infinum.dbinspector:dbinspector-no-op:5.2.5")
 ```
 
 ### Usage

build.gradle

@@ -1,20 +1,13 @@
 buildscript {
 
-    ext.buildConfig = [
-            "minSdk"    : 21,
-            "compileSdk": 30,
-            "targetSdk" : 30,
-
-            "buildTools": "30.0.3"
-    ]
-
+    apply from: "config.gradle"
     apply from: "maven.gradle"
     apply from: "dependencies.gradle"
 
     repositories {
         google()
         mavenCentral()
-        maven { url "https://plugins.gradle.org/m2/" }
+        gradlePluginPortal()
     }
     dependencies {
         classpath packages.gradle

buildSrc/build.gradle

@@ -0,0 +1,3 @@
+plugins {
+    id "groovy"
+}

config.gradle

@@ -0,0 +1,13 @@
+ext {
+    buildConfig = [
+            "minSdk"    : 21,
+            "compileSdk": 30,
+            "targetSdk" : 30,
+            "buildTools": "30.0.3"
+    ]
+    releaseConfig = [
+            "group"      : "com.infinum.dbinspector",
+            "version"    : "5.2.5",
+            "versionCode": 5 * 100 * 100 + 2 * 100 + 5
+    ]
+}

dbinspector-no-op/build.gradle

@@ -1,5 +1,7 @@
-apply plugin: "com.android.library"
-apply plugin: "kotlin-android"
+plugins {
+    id "com.android.library"
+    id "kotlin-android"
+}
 
 android {
     compileSdkVersion buildConfig.compileSdk
@@ -8,8 +10,8 @@ android {
     defaultConfig {
         minSdkVersion buildConfig.minSdk
         targetSdkVersion buildConfig.targetSdk
-        versionCode dbinspector.versionCode
-        versionName dbinspector.version
+        versionCode releaseConfig.versionCode
+        versionName releaseConfig.version
     }
 
     buildTypes {

dbinspector-no-op/publish.gradle

@@ -41,8 +41,8 @@ afterEvaluate {
         }
         publications {
             release(MavenPublication) {
-                groupId = dbinspector.group
-                version = dbinspector.version
+                groupId = releaseConfig.group
+                version = releaseConfig.version
 
                 artifactId = "dbinspector-no-op"
 

dbinspector/build.gradle

@@ -1,5 +1,8 @@
-apply plugin: "com.android.library"
-apply plugin: "kotlin-android"
+plugins {
+    id "com.android.library"
+    id "kotlin-android"
+}
+
 apply from: "protobuf.gradle"
 
 android {
@@ -9,8 +12,8 @@ android {
     defaultConfig {
         minSdkVersion buildConfig.minSdk
         targetSdkVersion buildConfig.targetSdk
-        versionCode dbinspector.versionCode
-        versionName dbinspector.version
+        versionCode releaseConfig.versionCode
+        versionName releaseConfig.version
     }
 
     buildTypes {

dbinspector/publish.gradle

@@ -41,8 +41,8 @@ afterEvaluate {
         }
         publications {
             release(MavenPublication) {
-                groupId = dbinspector.group
-                version = dbinspector.version
+                groupId = releaseConfig.group
+                version = releaseConfig.version
 
                 artifactId = "dbinspector"
 

dbinspector/src/main/res/layout-land/dbinspector_activity_edit.xml

@@ -13,7 +13,8 @@
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
+            android:layout_height="wrap_content"
+            android:minHeight="?attr/actionBarSize"
             app:menu="@menu/dbinspector_edit"
             app:navigationIcon="?attr/homeAsUpIndicator"
             app:title="@string/dbinspector_edit" />

dbinspector/src/main/res/layout/dbinspector_activity_content.xml

@@ -13,7 +13,8 @@
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
+            android:layout_height="wrap_content"
+            android:minHeight="?attr/actionBarSize"
             app:navigationIcon="?attr/homeAsUpIndicator" />
 
     </com.google.android.material.appbar.AppBarLayout>

dbinspector/src/main/res/layout/dbinspector_activity_databases.xml

@@ -14,7 +14,8 @@
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
+            android:layout_height="wrap_content"
+            android:minHeight="?attr/actionBarSize"
             app:menu="@menu/dbinspector_database"
             app:subtitle="@string/dbinspector_databases"
             app:title="@string/dbinspector_name" />

dbinspector/src/main/res/layout/dbinspector_activity_edit.xml

@@ -13,7 +13,8 @@
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
+            android:layout_height="wrap_content"
+            android:minHeight="?attr/actionBarSize"
             app:menu="@menu/dbinspector_edit"
             app:navigationIcon="?attr/homeAsUpIndicator"
             app:title="@string/dbinspector_edit" />

dbinspector/src/main/res/layout/dbinspector_activity_edit_database.xml

@@ -13,7 +13,8 @@
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
+            android:layout_height="wrap_content"
+            android:minHeight="?attr/actionBarSize"
             app:navigationIcon="?attr/homeAsUpIndicator"
             app:title="@string/dbinspector_edit" />
 

dbinspector/src/main/res/layout/dbinspector_activity_pragma.xml

@@ -15,7 +15,8 @@
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
+            android:layout_height="wrap_content"
+            android:minHeight="?attr/actionBarSize"
             app:menu="@menu/dbinspector_pragma"
             app:navigationIcon="?attr/homeAsUpIndicator"
             app:title="@string/dbinspector_pragma" />

dbinspector/src/main/res/layout/dbinspector_activity_schema.xml

@@ -15,7 +15,8 @@
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
+            android:layout_height="wrap_content"
+            android:minHeight="?attr/actionBarSize"
             app:menu="@menu/dbinspector_schema"
             app:navigationIcon="?attr/homeAsUpIndicator"
             app:title="@string/dbinspector_schema" />

dbinspector/src/main/res/layout/dbinspector_activity_settings.xml

@@ -14,7 +14,8 @@
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
+            android:layout_height="wrap_content"
+            android:minHeight="?attr/actionBarSize"
             app:navigationIcon="?attr/homeAsUpIndicator"
             app:subtitle="@string/dbinspector_action_settings"
             app:title="@string/dbinspector_name" />

dependencies.gradle

@@ -1,9 +1,3 @@
-ext.dbinspector = [
-        "group"      : "com.infinum.dbinspector",
-        "version"    : "5.2.4",
-        "versionCode": 5 * 100 * 100 + 2 * 100 + 4
-]
-
 ext.versions = [
         "dbinspector"       : "5.2.4",
         "gradle"            : '4.1.2',

sample/build.gradle

@@ -1,16 +1,19 @@
-apply plugin: "com.android.application"
-apply plugin: "kotlin-android"
+plugins {
+    id "com.android.application"
+    id "kotlin-android"
+}
 
 android {
     compileSdkVersion buildConfig.compileSdk
     buildToolsVersion buildConfig.buildTools
 
     defaultConfig {
+        applicationId releaseConfig.group
+        applicationIdSuffix ".sample"
         minSdkVersion buildConfig.minSdk
         targetSdkVersion buildConfig.targetSdk
-        versionCode dbinspector.versionCode
-        versionName dbinspector.version
-        applicationId "com.infinum.dbinspector.sample"
+        versionCode releaseConfig.versionCode
+        versionName releaseConfig.version
     }
 
     signingConfigs {