Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
YDL-Component-Medical
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
杨凯
YDL-Component-Medical
Commits
6fac90b6
Commit
6fac90b6
authored
2 years ago
by
范玉宾
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
UI WalkThrough part2
parent
2a3883ed
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
60 additions
and
31 deletions
+60
-31
config.gradle
config.gradle
+2
-2
home_muse_view.xml
m-home/src/ydl/res/layout/home_muse_view.xml
+2
-0
build.gradle
m-muse/build.gradle
+4
-0
MeditationTimeOffActivity.kt
m-muse/src/main/java/com/yidianling/muse/activity/MeditationTimeOffActivity.kt
+18
-12
PlayMeditationActivity.kt
m-muse/src/main/java/com/yidianling/muse/activity/PlayMeditationActivity.kt
+6
-8
bg_meditation_play_float.xml
m-muse/src/main/res/drawable/bg_meditation_play_float.xml
+1
-1
bg_play_meditation_float_view.xml
m-muse/src/main/res/drawable/bg_play_meditation_float_view.xml
+2
-1
shape_bg_solid_282e3f_r_top_20.xml
m-muse/src/main/res/drawable/shape_bg_solid_282e3f_r_top_20.xml
+1
-1
activity_play_meditation.xml
m-muse/src/main/res/layout/activity_play_meditation.xml
+5
-5
activity_play_meditation_time_off.xml
m-muse/src/main/res/layout/activity_play_meditation_time_off.xml
+7
-1
layout_meditation_play_float_view.xml
m-muse/src/main/res/layout/layout_meditation_play_float_view.xml
+7
-0
styles.xml
m-muse/src/main/res/values/styles.xml
+5
-0
No files found.
config.gradle
View file @
6fac90b6
...
...
@@ -14,7 +14,7 @@ ext {
"m-dynamic"
:
"0.0.7.73"
,
"m-article"
:
"0.0.0.10"
,
"m-muse"
:
"0.0.28.5
4
"
,
"m-muse"
:
"0.0.28.5
5
"
,
"m-tests"
:
"0.0.24.18"
,
"m-course"
:
"0.0.43.37"
,
...
...
@@ -99,7 +99,7 @@ ext {
"m-dynamic"
:
"0.0.7.73"
,
"m-article"
:
"0.0.0.8"
,
"m-muse"
:
"0.0.28.5
4
"
,
"m-muse"
:
"0.0.28.5
5
"
,
"m-tests"
:
"0.0.24.18"
,
"m-course"
:
"0.0.43.37"
,
//-------------- 业务模块 API 层 --------------
...
...
This diff is collapsed.
Click to expand it.
m-home/src/ydl/res/layout/home_muse_view.xml
View file @
6fac90b6
...
...
@@ -76,6 +76,8 @@
android:layout_height=
"40dp"
app:tabTextColor=
"#88FFFFFF"
app:tabSelectedTextColor=
"#FFFFFF"
app:tabBackground=
"@color/transparent"
app:tabRippleColor=
"@color/transparent"
style=
"@style/MeditationTabLayoutStyle"
/>
<View
...
...
This diff is collapsed.
Click to expand it.
m-muse/build.gradle
View file @
6fac90b6
...
...
@@ -23,6 +23,9 @@ android {
testInstrumentationRunner
'androidx.test.runner.AndroidJUnitRunner'
flavorDimensions
"versionCode"
renderscriptTargetApi
19
renderscriptSupportModeEnabled
true
}
lintOptions
{
...
...
@@ -60,6 +63,7 @@ dependencies {
implementation
'com.github.weidongjian:androidWheelView:1.0.0'
implementation
'com.github.feeeei:CircleSeekbar:v1.1.2'
implementation
'com.github.mmin18:realtimeblurview:1.2.1'
// implementation 'jp.wasabeef:blurry:4.0.1'
// solve build problem
// cannot access 'androidx.lifecycle.hasdefaultviewmodelproviderfactory'
...
...
This diff is collapsed.
Click to expand it.
m-muse/src/main/java/com/yidianling/muse/activity/MeditationTimeOffActivity.kt
View file @
6fac90b6
...
...
@@ -5,34 +5,40 @@ import android.graphics.Color
import
android.os.Bundle
import
android.os.Handler
import
com.blankj.utilcode.util.SPUtils
import
com.bumptech.glide.Glide
import
com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
import
com.bumptech.glide.request.RequestOptions
import
com.ydl.ydlcommon.base.BaseActivity
import
com.ydl.ydlcommon.utils.StatusBarUtils
import
com.ydl.ydlcommon.utils.remind.ToastHelper
import
com.yidianling.muse.R
import
jp.wasabeef.glide.transformations.BitmapTransformation
import
jp.wasabeef.glide.transformations.BlurTransformation
import
kotlinx.android.synthetic.main.activity_play_meditation_time_off.*
import
kotlinx.android.synthetic.main.activity_play_meditation_time_off.iv_close
class
MeditationTimeOffActivity
:
BaseActivity
()
{
private
lateinit
var
mBGImageUrl
:
String
override
fun
onCreate
(
savedInstanceState
:
Bundle
?)
{
StatusBarUtils
.
setTransparentForImageView
(
this
,
null
)
StatusBarUtils
.
statusBarLightMode
(
this
)
super
.
onCreate
(
savedInstanceState
)
mBGImageUrl
=
intent
?.
getStringExtra
(
"BG_IMAGE_URL"
)
?:
""
initView
()
}
private
fun
initView
()
{
// Handler().postDelayed({
// Blurry.with(this)
// .radius(25)
// .sampling(1)
// .color(Color.parseColor("#FF173F5D"))
// .async()
// .capture(iv_bg)
// .into(iv_bg)
// },300)
val
options
=
RequestOptions
.
bitmapTransform
(
BlurTransformation
(
25
,
1
))
Glide
.
with
(
this
)
.
load
(
mBGImageUrl
)
.
transition
(
DrawableTransitionOptions
.
withCrossFade
())
.
apply
(
options
)
.
into
(
iv_bg
)
iv_close
?.
setOnClickListener
{
finish
()
}
...
...
@@ -99,7 +105,7 @@ class MeditationTimeOffActivity : BaseActivity() {
}
override
fun
initDataAndEvent
()
{
StatusBarUtils
.
set
WindowStatusBarColor
(
this
,
R
.
color
.
platform_main_theme
)
StatusBarUtils
.
set
Transparent
(
this
)
}
override
fun
layoutResId
():
Int
{
...
...
This diff is collapsed.
Click to expand it.
m-muse/src/main/java/com/yidianling/muse/activity/PlayMeditationActivity.kt
View file @
6fac90b6
...
...
@@ -451,10 +451,9 @@ class PlayMeditationActivity : BaseActivity() {
mBuried
?:
""
,
""
)
startActivityForResult
(
Intent
(
this
,
MeditationTimeOffActivity
::
class
.
java
),
request_code
)
val
intent
=
Intent
(
this
,
MeditationTimeOffActivity
::
class
.
java
)
intent
.
putExtra
(
"BG_IMAGE_URL"
,
mMediaCoverUrl
)
startActivityForResult
(
intent
,
request_code
)
}
ll_pure_music_time_off
.
setOnClickListener
{
...
...
@@ -466,10 +465,9 @@ class PlayMeditationActivity : BaseActivity() {
mBuried
?:
""
,
""
)
startActivityForResult
(
Intent
(
this
,
MeditationTimeOffActivity
::
class
.
java
),
request_code
)
val
intent
=
Intent
(
this
,
MeditationTimeOffActivity
::
class
.
java
)
intent
.
putExtra
(
"BG_IMAGE_URL"
,
mMediaCoverUrl
)
startActivityForResult
(
intent
,
request_code
)
}
exo_play
.
setOnClickListener
{
...
...
This diff is collapsed.
Click to expand it.
m-muse/src/main/res/drawable/bg_meditation_play_float.xml
View file @
6fac90b6
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<corners
android:radius=
"
4
dp"
/>
<corners
android:radius=
"
12
dp"
/>
<solid
android:color=
"#99000000"
/>
...
...
This diff is collapsed.
Click to expand it.
m-muse/src/main/res/drawable/bg_play_meditation_float_view.xml
View file @
6fac90b6
...
...
@@ -2,7 +2,7 @@
<shape
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:shape=
"rectangle"
>
<corners
android:radius=
"
4
dp"
/>
<corners
android:radius=
"
12
dp"
/>
<solid
android:color=
"#33E0E0E0"
/>
</shape>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
m-muse/src/main/res/drawable/shape_bg_solid_282e3f_r_top_20.xml
View file @
6fac90b6
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<solid
android:color=
"#
282E3
F"
/>
<solid
android:color=
"#
FFFFF
F"
/>
<corners
android:topLeftRadius=
"@dimen/platform_dp_20"
android:topRightRadius=
"@dimen/platform_dp_20"
/>
...
...
This diff is collapsed.
Click to expand it.
m-muse/src/main/res/layout/activity_play_meditation.xml
View file @
6fac90b6
...
...
@@ -9,17 +9,17 @@
android:background=
"#B3000000"
>
<View
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:background=
"#CC282E3F"
/>
<ImageView
android:id=
"@+id/iv_bg"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:scaleType=
"centerCrop"
/>
<View
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:background=
"#CC282E3F"
/>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width=
"match_parent"
...
...
This diff is collapsed.
Click to expand it.
m-muse/src/main/res/layout/activity_play_meditation_time_off.xml
View file @
6fac90b6
...
...
@@ -3,13 +3,19 @@
xmlns:app=
"http://schemas.android.com/apk/res-auto"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:background=
"#B3000000"
android:id=
"@+id/root_layout"
>
<ImageView
android:id=
"@+id/iv_bg"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:background=
"#FF173F5D"
/>
android:scaleType=
"centerCrop"
/>
<View
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:background=
"#CC282E3F"
/>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width=
"match_parent"
...
...
This diff is collapsed.
Click to expand it.
m-muse/src/main/res/layout/layout_meditation_play_float_view.xml
View file @
6fac90b6
...
...
@@ -97,4 +97,10 @@
</androidx.constraintlayout.widget.ConstraintLayout>
<com.github.mmin18.widget.RealtimeBlurView
android:layout_width=
"match_parent"
android:layout_height=
"56dp"
app:realtimeBlurRadius=
"10dp"
app:realtimeOverlayColor=
"#880000"
/>
</FrameLayout>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
m-muse/src/main/res/values/styles.xml
View file @
6fac90b6
...
...
@@ -43,4 +43,8 @@
</style>
</resources>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment