Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#94 / Realtime BlurView 반영 #129

Merged
merged 2 commits into from
Dec 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 0 additions & 17 deletions .idea/deploymentTargetDropDown.xml

This file was deleted.

3 changes: 3 additions & 0 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -130,4 +130,7 @@ dependencies {
//OSS Licenses Gradle Plugin
implementation 'com.google.android.gms:play-services-oss-licenses:17.0.1'

// Realtime BlurView
implementation 'com.github.mmin18:realtimeblurview:master-SNAPSHOT'

Comment on lines +133 to +135

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

굳 ~

}
8 changes: 0 additions & 8 deletions app/src/main/res/drawable/bg_score_board.xml

This file was deleted.

28 changes: 16 additions & 12 deletions app/src/main/res/layout/activity_home.xml
Original file line number Diff line number Diff line change
Expand Up @@ -57,30 +57,32 @@

</androidx.constraintlayout.widget.ConstraintLayout>

<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/iv_score_board"
<androidx.cardview.widget.CardView
android:id="@+id/cv_score_board"
android:layout_width="0dp"
android:layout_height="0dp"
android:elevation="4dp"
android:scaleType="centerCrop"
android:src="@drawable/score_board"
android:translationZ="2dp"
app:cardBackgroundColor="@android:color/transparent"
app:cardCornerRadius="20dp"
app:layout_constraintBottom_toBottomOf="@id/cl_score_board"
app:layout_constraintEnd_toEndOf="@id/cl_score_board"
app:layout_constraintStart_toStartOf="@id/cl_score_board"
app:layout_constraintTop_toTopOf="@id/cl_score_board"
app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.App.CornerRadius20dp" />
app:layout_constraintTop_toTopOf="@id/cl_score_board">

<com.github.mmin18.widget.RealtimeBlurView
android:layout_width="match_parent"
android:layout_height="match_parent"
app:realtimeBlurRadius="28dp"
app:realtimeOverlayColor="#30FFFFFF" />

</androidx.cardview.widget.CardView>

<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_score_board"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:layout_marginVertical="20dp"
android:background="@null"
android:elevation="8dp"
android:paddingVertical="20dp"
android:translationZ="10dp"
android:elevation="32dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/cl_home_header">
Expand All @@ -91,6 +93,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:paddingTop="20dp"
android:text="@string/home_couple_score"
android:textColor="@color/Gray_000"
app:layout_constraintStart_toStartOf="parent"
Expand Down Expand Up @@ -143,6 +146,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:paddingBottom="20dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/ll_game_history">
Expand Down
4 changes: 3 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ buildscript {
gradlePluginPortal()
google()
mavenCentral()
maven { url 'https://jitpack.io' }
}
ext {
hiltVersion = "2.44"
Expand All @@ -21,4 +22,5 @@ plugins {
id 'com.android.library' version '8.0.2' apply false
id 'org.jetbrains.kotlin.android' version '1.8.20' apply false
id 'com.google.android.libraries.mapsplatform.secrets-gradle-plugin' version '2.0.1' apply false
}
}

3 changes: 3 additions & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ dependencyResolutionManagement {
google()
mavenCentral()
maven { url 'https://devrepo.kakao.com/nexus/content/groups/public/' }
maven {
url = uri('https://jitpack.io')
}
}
}
rootProject.name = "UNI-AOS"
Expand Down
Loading