Merge pull request #7 from Amerlander/master

Amerlander · web-flow · commit dd0bcff4e93d · 2022-03-16T21:14:38.000+01:00
Fix #6
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "cc.calliope.mini"
         minSdkVersion 18
         targetSdkVersion 30
-        versionCode 11
-        versionName "1.1.1"
+        versionCode 12
+        versionName "1.1.2"
         resConfigs "de", "en"
         vectorDrawables.useSupportLibrary = true
     }
diff --git a/app/debug/app-debug.apk b/app/debug/app-debug.apk
diff --git a/app/debug/output-metadata.json b/app/debug/output-metadata.json
@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 11,
-      "versionName": "1.1.1",
+      "versionCode": 12,
+      "versionName": "1.1.2",
       "outputFile": "app-debug.apk"
     }
   ],
diff --git a/app/release/app-release.aab b/app/release/app-release.aab
diff --git a/app/release/app-release.apk b/app/release/app-release.apk
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 11,
-      "versionName": "1.1.1",
+      "versionCode": 12,
+      "versionName": "1.1.2",
       "outputFile": "app-release.apk"
     }
   ],
diff --git a/app/src/main/res/layout-land/activity_main.xml b/app/src/main/res/layout-land/activity_main.xml
@@ -44,8 +44,7 @@
         android:background="#00000000"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/divider" />
+        app:layout_constraintStart_toStartOf="parent" />
 
     <include
         android:id="@+id/include"
diff --git a/app/src/main/res/layout-land/activity_select_editor.xml b/app/src/main/res/layout-land/activity_select_editor.xml
@@ -49,8 +49,7 @@
         android:background="#00000000"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/divider" />
+        app:layout_constraintStart_toStartOf="parent" />
 
 
     <include
diff --git a/app/src/main/res/layout/device_item.xml b/app/src/main/res/layout/device_item.xml
@@ -46,7 +46,6 @@
 			android:layout_marginStart="16dp"
 			android:layout_marginTop="16dp"
 			android:layout_toLeftOf="@+id/rssi"
-			android:layout_toRightOf="@id/pattern"
 			android:ellipsize="end"
 			android:singleLine="true"
 			android:textColor="@color/background"
@@ -66,7 +65,6 @@
 			android:layout_marginBottom="8dp"
 			android:layout_marginTop="8dp"
 			android:layout_toLeftOf="@+id/rssi"
-			android:layout_toRightOf="@id/pattern"
 			android:textSize="12sp"
 			app:fontFamily="@font/roboto_mono"
 			android:textColor="@color/background"
