From 9038f49d40377abc0277f380c446c2557a79ea4c Mon Sep 17 00:00:00 2001 From: strooonger <109571086+rudmannn@users.noreply.github.com> Date: Sat, 6 Aug 2022 22:42:08 +0800 Subject: [PATCH 1/2] fix android:lineHeight --- app/src/main/res/layout/gemtext_quote.xml | 6 +++--- app/src/main/res/layout/gemtext_text.xml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/res/layout/gemtext_quote.xml b/app/src/main/res/layout/gemtext_quote.xml index 64b56b2..ee8fe50 100644 --- a/app/src/main/res/layout/gemtext_quote.xml +++ b/app/src/main/res/layout/gemtext_quote.xml @@ -1,6 +1,6 @@ - \ No newline at end of file + app:lineHeight="@dimen/default_line_height" /> \ No newline at end of file diff --git a/app/src/main/res/layout/gemtext_text.xml b/app/src/main/res/layout/gemtext_text.xml index cae3ef9..900ec0b 100644 --- a/app/src/main/res/layout/gemtext_text.xml +++ b/app/src/main/res/layout/gemtext_text.xml @@ -1,6 +1,6 @@ - \ No newline at end of file + app:lineHeight="@dimen/default_line_height" /> \ No newline at end of file From 2bd546d7ed5f757812436c6a21c573bdc8a725f4 Mon Sep 17 00:00:00 2001 From: Ariel Costas Date: Thu, 1 Sep 2022 15:01:48 +0200 Subject: [PATCH 2/2] Delete local.properties,which shouldn't be on VCS Signed-off-by: Ariel Costas --- .gitignore | 4 +++- app/local.properties | 4 ---- local.properties | 11 ----------- 3 files changed, 3 insertions(+), 16 deletions(-) delete mode 100644 app/local.properties delete mode 100644 local.properties diff --git a/.gitignore b/.gitignore index 2a5294e..6244aed 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,6 @@ .gradle .idea build -release \ No newline at end of file +release +local.properties +app/local.properties \ No newline at end of file diff --git a/app/local.properties b/app/local.properties deleted file mode 100644 index cf738a7..0000000 --- a/app/local.properties +++ /dev/null @@ -1,4 +0,0 @@ -sdk.dir=/home/vagrant/android-sdk -sdk-location=/home/vagrant/android-sdk -ndk.dir=/home/vagrant/android-ndk/r12b -ndk-location=/home/vagrant/android-ndk/r12b diff --git a/local.properties b/local.properties deleted file mode 100644 index 5190a35..0000000 --- a/local.properties +++ /dev/null @@ -1,11 +0,0 @@ -## This file must *NOT* be checked into Version Control Systems, -# as it contains information specific to your local configuration. -# -# Location of the SDK. This is only used by Gradle. -# For customization when using a Version Control System, please read the -# header note. -#Mon Nov 29 22:38:09 EST 2021 -sdk.dir=/home/corewala/.android_sdk -sdk-location=/home/vagrant/android-sdk -ndk.dir=/home/vagrant/android-ndk/r12b -ndk-location=/home/vagrant/android-ndk/r12b