Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
M
Magisk
Project
Project
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
Administrator
Magisk
Commits
cb2a1e57
Commit
cb2a1e57
authored
Oct 04, 2019
by
Viktor De Pasquale
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added text switchers for descriptions
parent
1396faf4
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
54 additions
and
7 deletions
+54
-7
HomeViewModel.kt
.../java/com/topjohnwu/magisk/redesign/home/HomeViewModel.kt
+4
-0
DataBindingAdapters.kt
...in/java/com/topjohnwu/magisk/utils/DataBindingAdapters.kt
+20
-0
switcher_bottom_up.xml
app/src/main/res/anim/switcher_bottom_up.xml
+10
-0
switcher_center_up.xml
app/src/main/res/anim/switcher_center_up.xml
+10
-0
fragment_home_md2.xml
app/src/main/res/layout/fragment_home_md2.xml
+5
-7
swicher_caption_variant.xml
app/src/main/res/layout/swicher_caption_variant.xml
+5
-0
No files found.
app/src/main/java/com/topjohnwu/magisk/redesign/home/HomeViewModel.kt
View file @
cb2a1e57
package
com.topjohnwu.magisk.redesign.home
import
com.skoumal.teanity.util.KObservableField
import
com.topjohnwu.magisk.redesign.compat.CompatViewModel
class
HomeViewModel
:
CompatViewModel
()
{
val
stateTextMagisk
=
KObservableField
(
"is up to date"
)
val
stateTextManager
=
KObservableField
(
"is up to date"
)
fun
onDeletePressed
()
{}
}
\ No newline at end of file
app/src/main/java/com/topjohnwu/magisk/utils/DataBindingAdapters.kt
View file @
cb2a1e57
package
com.topjohnwu.magisk.utils
import
android.view.View
import
android.widget.TextSwitcher
import
android.widget.TextView
import
android.widget.ViewSwitcher
import
androidx.annotation.ColorInt
import
androidx.annotation.DrawableRes
import
androidx.appcompat.widget.AppCompatImageView
...
...
@@ -246,3 +248,21 @@ fun View.setOnSelectClickListener(listener: View.OnClickListener, resetTime: Lon
}
}
}
@BindingAdapter
(
"textCaptionVariant"
)
fun
TextSwitcher
.
setTextBinding
(
text
:
CharSequence
)
{
tag
as
?
ViewSwitcher
.
ViewFactory
?:
ViewSwitcher
.
ViewFactory
{
View
.
inflate
(
context
,
R
.
layout
.
swicher_caption_variant
,
null
)
}.
also
{
tag
=
it
setFactory
(
it
)
setInAnimation
(
context
,
R
.
anim
.
switcher_bottom_up
)
setOutAnimation
(
context
,
R
.
anim
.
switcher_center_up
)
}
val
currentText
=
(
currentView
as
?
TextView
)
?.
text
if
(
currentText
!=
text
)
{
setText
(
text
)
}
}
\ No newline at end of file
app/src/main/res/anim/switcher_bottom_up.xml
0 → 100644
View file @
cb2a1e57
<?xml version="1.0" encoding="utf-8"?>
<set
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:duration=
"@android:integer/config_shortAnimTime"
>
<translate
android:fromYDelta=
"100%"
android:toYDelta=
"0%"
/>
<alpha
android:fromAlpha=
"0"
android:toAlpha=
"1"
/>
</set>
\ No newline at end of file
app/src/main/res/anim/switcher_center_up.xml
0 → 100644
View file @
cb2a1e57
<?xml version="1.0" encoding="utf-8"?>
<set
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:duration=
"@android:integer/config_shortAnimTime"
>
<translate
android:fromYDelta=
"0%"
android:toYDelta=
"-100%"
/>
<alpha
android:fromAlpha=
"1"
android:toAlpha=
"0"
/>
</set>
\ No newline at end of file
app/src/main/res/layout/fragment_home_md2.xml
View file @
cb2a1e57
...
...
@@ -41,7 +41,7 @@
style=
"?styleIconPrimary"
onSelectClick=
"@{() -> viewModel.onDeletePressed()}"
onSelectReset=
"@{10000L}"
android:padding=
"@dimen/l_
50
"
android:padding=
"@dimen/l_
25
"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
app:srcCompat=
"@drawable/ic_magisk_delete"
...
...
@@ -60,12 +60,11 @@
app:layout_constraintTop_toTopOf=
"parent"
app:layout_constraintVertical_chainStyle=
"packed"
/>
<
androidx.appcompat.widget.AppCompatTextView
<
TextSwitcher
android:id=
"@+id/status1"
textCaptionVariant=
"@{viewModel.stateTextMagisk}"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:text=
"is up to date"
android:textAppearance=
"?appearanceTextCaptionVariant"
app:layout_constraintBottom_toBottomOf=
"@+id/icon1"
app:layout_constraintEnd_toEndOf=
"@+id/title1"
app:layout_constraintStart_toStartOf=
"@+id/title1"
...
...
@@ -135,12 +134,11 @@
app:layout_constraintTop_toTopOf=
"parent"
app:layout_constraintVertical_chainStyle=
"packed"
/>
<
androidx.appcompat.widget.AppCompatTextView
<
TextSwitcher
android:id=
"@+id/status2"
textCaptionVariant=
"@{viewModel.stateTextManager}"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:text=
"has update available!"
android:textAppearance=
"?appearanceTextCaptionVariant"
app:layout_constraintBottom_toBottomOf=
"@+id/icon2"
app:layout_constraintEnd_toEndOf=
"@+id/title2"
app:layout_constraintStart_toStartOf=
"@+id/title2"
...
...
app/src/main/res/layout/swicher_caption_variant.xml
0 → 100644
View file @
cb2a1e57
<?xml version="1.0" encoding="utf-8"?>
<androidx.appcompat.widget.AppCompatTextView
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:textAppearance=
"?appearanceTextCaptionVariant"
/>
\ No newline at end of file
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