Merge remote-tracking branch 'origin/master'

Corewala · Nov 10, 2022 · da4375b · da4375b
2 parents 9f4d1c8 + 0df1501
commit da4375b
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 22 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,6 @@
 .gradle
 .idea
 build
-release
+release
+local.properties
+app/local.properties
diff --git a/app/local.properties b/app/local.properties
diff --git a/app/src/main/res/layout/gemtext_quote.xml b/app/src/main/res/layout/gemtext_quote.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.appcompat.widget.AppCompatTextView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.appcompat.widget.AppCompatTextView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/gemtext_quote_textview"
     android:textSize="@dimen/default_text_size"
     android:textColor="@color/stroke"
@@ -15,4 +15,4 @@
     android:textIsSelectable="true"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:lineHeight="@dimen/default_line_height"/>
+    app:lineHeight="@dimen/default_line_height" />
diff --git a/app/src/main/res/layout/gemtext_text.xml b/app/src/main/res/layout/gemtext_text.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.appcompat.widget.AppCompatTextView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.appcompat.widget.AppCompatTextView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/gemtext_text_textview"
     android:textSize="@dimen/default_text_size"
     android:layout_marginLeft="@dimen/screen_margin"
@@ -9,4 +9,4 @@
     android:textIsSelectable="true"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:lineHeight="@dimen/default_line_height"/>
+    app:lineHeight="@dimen/default_line_height" />
diff --git a/local.properties b/local.properties