Skip to content

Commit

Permalink
Decreases font size on main screen, #36
Browse files Browse the repository at this point in the history
  • Loading branch information
@dieechtenilente
dieechtenilente committed Nov 16, 2018
1 parent 4fcf5b7 commit 6cd3631
Show file tree
Hide file tree
Showing 4 changed files with 67 additions and 37 deletions.
9 changes: 5 additions & 4 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,16 @@ apply plugin: 'com.android.application'

android {
compileSdkVersion 27
buildToolsVersion '27.0.3'
buildToolsVersion '28.0.3'


defaultConfig {
applicationId "de.klaushackner.alkomat3000"
versionCode 9
versionName "1.9"
targetSdkVersion 25
versionCode 10
versionName "2"
targetSdkVersion 27
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
minSdkVersion 19
}
buildTypes {
release {
Expand Down
2 changes: 0 additions & 2 deletions app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="de.klaushackner.breathalyzer">

<uses-sdk android:minSdkVersion="19" />

<uses-permission android:name="android.permission.INTERNET" />

<application
Expand Down
76 changes: 52 additions & 24 deletions app/src/main/res/layout/activity_main.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,92 +23,119 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/name"
android:textSize="24sp" />
android:textSize="18sp" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/age"
android:textSize="24sp" />
android:textSize="18sp" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/height"
android:textSize="24sp" />
android:textSize="18sp" />

</LinearLayout>

<view
class="android.support.v4.widget.Space"
android:layout_width="25dp"
android:layout_height="wrap_content"
android:textSize="18sp" />

<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">

<TextView
android:id="@+id/name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/weight"
android:textSize="24sp" />
android:text="@string/no_information"
android:textSize="18sp" />

<TextView
android:id="@+id/age"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/sex"
android:textSize="24sp" />
android:text="@string/no_information"
android:textSize="18sp" />

<TextView
android:id="@+id/height"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/bac"
android:textSize="24sp" />
android:text="@string/no_information"
android:textSize="18sp" />

</LinearLayout>

<view
class="android.support.v4.widget.Space"
android:layout_width="25dp"
android:layout_height="wrap_content"
android:textSize="24sp" />
android:textSize="18sp" />

<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">

<TextView
android:id="@+id/name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/no_information"
android:textSize="24sp" />
android:text="@string/weight"
android:textSize="18sp" />

<TextView
android:id="@+id/age"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/no_information"
android:textSize="24sp" />
android:text="@string/sex"
android:textSize="18sp" />

<TextView
android:id="@+id/height"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/no_information"
android:textSize="24sp" />
android:text="@string/bac"
android:textSize="18sp" />

</LinearLayout>

<view
class="android.support.v4.widget.Space"
android:layout_width="25dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textSize="18sp" />

<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">

<TextView
android:id="@+id/weight"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/no_information"
android:textSize="24sp" />
android:textSize="18sp" />

<TextView
android:id="@+id/sex"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/no_information"
android:textSize="24sp" />
android:textSize="18sp" />

<TextView
android:id="@+id/bac"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/no_information"
android:textSize="24sp" />
android:textSize="18sp" />
</LinearLayout>

</LinearLayout>
Expand All @@ -129,7 +156,7 @@
android:layout_height="fill_parent"
android:gravity="center|start"
android:text="@string/consumed_drinks"
android:textSize="18sp" />
android:textSize="16sp" />

<Space
android:layout_width="0dp"
Expand All @@ -148,7 +175,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:elevation="0dp"
android:text="@string/add_drink_button" />
android:text="@string/add_drink_button"
android:textSize="12sp" />

</LinearLayout>

Expand Down
17 changes: 10 additions & 7 deletions app/src/main/res/layout/items_drink.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/no_information"
android:textSize="20sp" />
android:textSize="18sp" />

<TableLayout
android:layout_width="match_parent"
Expand All @@ -42,13 +42,14 @@
android:paddingStart="20dp">

<TextView
android:id="@+id/alcoholLevel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="@string/bacNoChar"
android:textAlignment="center"
android:textSize="20sp" />
android:textSize="18sp" />

<TextView
android:id="@+id/bac"
Expand All @@ -58,7 +59,7 @@
android:gravity="center"
android:text="@string/no_information"
android:textAlignment="center"
android:textSize="20sp" />
android:textSize="18sp" />
</LinearLayout>

<LinearLayout
Expand All @@ -69,12 +70,13 @@
android:paddingStart="20dp">

<TextView
android:id="@+id/elap"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/time_ago"
android:textAlignment="center"
android:textSize="20sp" />
android:textSize="18sp" />

<TextView
android:id="@+id/takingTime"
Expand All @@ -83,7 +85,7 @@
android:gravity="center"
android:text="@string/no_information"
android:textAlignment="center"
android:textSize="20sp" />
android:textSize="18sp" />

</LinearLayout>

Expand All @@ -95,12 +97,13 @@
android:paddingStart="20dp">

<TextView
android:id="@+id/left"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/time_left"
android:textAlignment="center"
android:textSize="20sp" />
android:textSize="18sp" />

<TextView
android:id="@+id/expireTime"
Expand All @@ -109,7 +112,7 @@
android:gravity="center"
android:text="@string/no_information"
android:textAlignment="center"
android:textSize="20sp" />
android:textSize="18sp" />
</LinearLayout>

</TableRow>
Expand Down

0 comments on commit 6cd3631

Please sign in to comment.