From 81c606a0896f2b2570eaa7e2c5ee1e3091b67d37 Mon Sep 17 00:00:00 2001 From: b1urrrr Date: Thu, 4 May 2023 10:00:48 +0900 Subject: [PATCH] =?UTF-8?q?[MOD/#6]=20Material=20Design=20Typography=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 6 +-- app/src/main/res/layout/activity_login.xml | 25 +++++------ app/src/main/res/layout/activity_main.xml | 6 ++- app/src/main/res/layout/activity_signup.xml | 33 +++++++-------- app/src/main/res/layout/fragment_gallery.xml | 3 +- app/src/main/res/layout/fragment_profile.xml | 7 +++- app/src/main/res/layout/fragment_search.xml | 3 +- app/src/main/res/layout/header_home_repo.xml | 3 +- app/src/main/res/layout/item_home_repo.xml | 4 +- app/src/main/res/values-night-v31/themes.xml | 10 ++++- app/src/main/res/values-night/themes.xml | 10 ++++- app/src/main/res/values-v31/themes.xml | 10 ++++- app/src/main/res/values/colors.xml | 6 --- app/src/main/res/values/styles.xml | 44 ++++++++++++++++++++ app/src/main/res/values/themes.xml | 10 ++++- build.gradle | 4 +- gradle.properties | 4 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 18 files changed, 129 insertions(+), 61 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 324f4b3..2b486bb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -29,11 +29,11 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_11 - targetCompatibility JavaVersion.VERSION_11 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = '11' + jvmTarget = '17' } buildFeatures { viewBinding true diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 53aa1da..391125a 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -23,9 +23,8 @@ android:layout_height="wrap_content" android:layout_marginTop="50dp" android:text="@string/login_welcome_msg" + android:textAppearance="?textAppearanceDisplayMedium" android:textColor="?colorOnBackground" - android:textSize="24sp" - android:textStyle="bold" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -36,9 +35,8 @@ android:layout_height="wrap_content" android:layout_marginTop="50dp" android:text="@string/login_id_label" + android:textAppearance="?textAppearanceHeadlineMedium" android:textColor="?colorOnBackground" - android:textSize="18sp" - android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tv_login_welcome_msg" /> @@ -50,8 +48,9 @@ android:hint="@string/login_id_hint" android:imeOptions="actionNext" android:inputType="text" - android:paddingVertical="12dp" + android:paddingVertical="16dp" android:text="@={vm.id}" + android:textAppearance="?textAppearanceBodyLarge" app:layout_constraintTop_toBottomOf="@id/tv_login_id_label" /> @@ -70,14 +68,15 @@ android:id="@+id/et_login_pwd" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="2dp" + android:layout_marginTop="8dp" android:hint="@string/login_pwd_hint" android:imeOptions="actionDone" android:inputType="textPassword" - android:paddingVertical="12dp" + android:paddingVertical="16dp" android:text="@={vm.pwd}" + android:textAppearance="?textAppearanceBodyLarge" app:layout_constraintTop_toBottomOf="@id/tv_login_pwd_label" - tools:layout_editor_absoluteX="40dp" /> + tools:layout_editor_absoluteX="-58dp" />