mirror of
https://github.com/Corewala/Buran
synced 2024-12-22 07:42:43 +00:00
Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
da4375b832
5 changed files with 9 additions and 22 deletions
4
.gitignore
vendored
4
.gitignore
vendored
|
@ -1,4 +1,6 @@
|
||||||
.gradle
|
.gradle
|
||||||
.idea
|
.idea
|
||||||
build
|
build
|
||||||
release
|
release
|
||||||
|
local.properties
|
||||||
|
app/local.properties
|
|
@ -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
|
|
|
@ -1,6 +1,6 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<androidx.appcompat.widget.AppCompatTextView
|
<androidx.appcompat.widget.AppCompatTextView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
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:id="@+id/gemtext_quote_textview"
|
||||||
android:textSize="@dimen/default_text_size"
|
android:textSize="@dimen/default_text_size"
|
||||||
android:textColor="@color/stroke"
|
android:textColor="@color/stroke"
|
||||||
|
@ -15,4 +15,4 @@
|
||||||
android:textIsSelectable="true"
|
android:textIsSelectable="true"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:lineHeight="@dimen/default_line_height"/>
|
app:lineHeight="@dimen/default_line_height" />
|
|
@ -1,6 +1,6 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<androidx.appcompat.widget.AppCompatTextView
|
<androidx.appcompat.widget.AppCompatTextView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
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:id="@+id/gemtext_text_textview"
|
||||||
android:textSize="@dimen/default_text_size"
|
android:textSize="@dimen/default_text_size"
|
||||||
android:layout_marginLeft="@dimen/screen_margin"
|
android:layout_marginLeft="@dimen/screen_margin"
|
||||||
|
@ -9,4 +9,4 @@
|
||||||
android:textIsSelectable="true"
|
android:textIsSelectable="true"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:lineHeight="@dimen/default_line_height"/>
|
app:lineHeight="@dimen/default_line_height" />
|
|
@ -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
|
|
Loading…
Reference in a new issue