Skip to content
Snippets Groups Projects
Commit 2c57ee4c authored by George Muresan's avatar George Muresan
Browse files

Merge branches 'master' and 'withoutbit' of...

Merge branches 'master' and 'withoutbit' of https://github.com/georgemuresan/Internship into withoutbit

# Conflicts:
#	.idea/caches/build_file_checksums.ser
#	app/src/main/res/layout/activity_first_page_consent.xml
parent ac541bf5
No related branches found
No related tags found
No related merge requests found
...@@ -5,7 +5,7 @@ android { ...@@ -5,7 +5,7 @@ android {
buildToolsVersion '27.0.3' buildToolsVersion '27.0.3'
defaultConfig { defaultConfig {
applicationId "com.example.admin.sleepbetter" applicationId "com.example.admin.sleepbetter"
minSdkVersion 16 minSdkVersion 18
targetSdkVersion 27 targetSdkVersion 27
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
......
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
android:focusable="false" android:focusable="false"
android:focusableInTouchMode="false" android:focusableInTouchMode="false"
android:hint="@string/some_explanation_about_the_input" android:hint="@string/some_explanation_about_the_input"
android:inputType="textPersonName" android:inputType="textMultiLine"
android:singleLine="false" android:singleLine="false"
android:text="@string/nightTerrorUsually" android:text="@string/nightTerrorUsually"
android:textSize="12sp" android:textSize="12sp"
......
...@@ -190,7 +190,7 @@ ...@@ -190,7 +190,7 @@
android:focusableInTouchMode="false" android:focusableInTouchMode="false"
android:hint="@string/some_explanation_about_the_input" android:hint="@string/some_explanation_about_the_input"
android:singleLine="false" android:singleLine="false"
android:inputType="textPersonName" android:inputType="textMultiLine"
android:text="@string/offnightTerrorUsually" android:text="@string/offnightTerrorUsually"
android:textSize="12sp" android:textSize="12sp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment