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
14e49f3c
Commit
14e49f3c
authored
Oct 02, 2019
by
Viktor De Pasquale
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added redesign base
... also basic switching to redesign was added, haha
parent
cc8f1adc
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
560 additions
and
474 deletions
+560
-474
AndroidManifest.xml
app/src/main/AndroidManifest.xml
+4
-0
i.java
app/src/main/java/a/i.java
+7
-0
ClassMap.kt
app/src/main/java/com/topjohnwu/magisk/ClassMap.kt
+4
-1
Config.kt
app/src/main/java/com/topjohnwu/magisk/Config.kt
+2
-0
ViewModelsModule.kt
...src/main/java/com/topjohnwu/magisk/di/ViewModelsModule.kt
+5
-0
Navigation.kt
.../java/com/topjohnwu/magisk/model/navigation/Navigation.kt
+18
-1
MainActivity.kt
...c/main/java/com/topjohnwu/magisk/redesign/MainActivity.kt
+13
-0
MainViewModel.kt
.../main/java/com/topjohnwu/magisk/redesign/MainViewModel.kt
+5
-0
SplashActivity.kt
app/src/main/java/com/topjohnwu/magisk/ui/SplashActivity.kt
+2
-4
SettingsFragment.kt
...java/com/topjohnwu/magisk/ui/settings/SettingsFragment.kt
+19
-17
activity_main_md2.xml
app/src/main/res/layout/activity_main_md2.xml
+450
-0
test.xml
app/src/main/res/layout/test.xml
+0
-434
styles_md2.xml
app/src/main/res/values/styles_md2.xml
+18
-16
app_settings.xml
app/src/main/res/xml/app_settings.xml
+13
-1
No files found.
app/src/main/AndroidManifest.xml
View file @
14e49f3c
...
...
@@ -22,6 +22,10 @@
android:name=
"a.b"
android:configChanges=
"orientation|screenSize"
android:exported=
"true"
/>
<activity
android:name=
"a.i"
android:exported=
"true"
android:theme=
"@style/Foundation.Default"
/>
<activity
android:name=
"a.c"
android:configChanges=
"orientation|screenSize"
...
...
app/src/main/java/a/i.java
0 → 100644
View file @
14e49f3c
package
a
;
import
com.topjohnwu.magisk.redesign.MainActivity
;
public
class
i
extends
MainActivity
{
/* stub */
}
app/src/main/java/com/topjohnwu/magisk/ClassMap.kt
View file @
14e49f3c
...
...
@@ -7,6 +7,7 @@ import com.topjohnwu.magisk.ui.MainActivity
import
com.topjohnwu.magisk.ui.SplashActivity
import
com.topjohnwu.magisk.ui.flash.FlashActivity
import
com.topjohnwu.magisk.ui.surequest.SuRequestActivity
import
com.topjohnwu.magisk.redesign.MainActivity
as
RedesignActivity
object
ClassMap
{
private
val
map
=
mapOf
(
...
...
@@ -17,7 +18,9 @@ object ClassMap {
UpdateCheckService
::
class
.
java
to
a
.
g
::
class
.
java
,
GeneralReceiver
::
class
.
java
to
a
.
h
::
class
.
java
,
DownloadService
::
class
.
java
to
a
.
j
::
class
.
java
,
SuRequestActivity
::
class
.
java
to
a
.
m
::
class
.
java
SuRequestActivity
::
class
.
java
to
a
.
m
::
class
.
java
,
//redesign
RedesignActivity
::
class
.
java
to
a
.
i
::
class
.
java
)
operator
fun
<
T
:
Class
<*
>
>
get
(
c
:
Class
<
*
>):
T
{
...
...
app/src/main/java/com/topjohnwu/magisk/Config.kt
View file @
14e49f3c
...
...
@@ -48,6 +48,7 @@ object Config : PreferenceModel, DBConfig {
const
val
REPO_ORDER
=
"repo_order"
const
val
SHOW_SYSTEM_APP
=
"show_system"
const
val
DOWNLOAD_PATH
=
"download_path"
const
val
REDESIGN
=
"redesign"
// system state
const
val
MAGISKHIDE
=
"magiskhide"
...
...
@@ -108,6 +109,7 @@ object Config : PreferenceModel, DBConfig {
var
suNotification
by
preferenceStrInt
(
Key
.
SU_NOTIFICATION
,
Value
.
NOTIFICATION_TOAST
)
var
updateChannel
by
preferenceStrInt
(
Key
.
UPDATE_CHANNEL
,
defaultChannel
)
var
redesign
by
preference
(
Key
.
REDESIGN
,
false
)
var
darkTheme
by
preference
(
Key
.
DARK_THEME
,
true
)
var
suReAuth
by
preference
(
Key
.
SU_REAUTH
,
false
)
var
checkUpdate
by
preference
(
Key
.
CHECK_UPDATES
,
true
)
...
...
app/src/main/java/com/topjohnwu/magisk/di/ViewModelsModule.kt
View file @
14e49f3c
...
...
@@ -11,6 +11,7 @@ import com.topjohnwu.magisk.ui.superuser.SuperuserViewModel
import
com.topjohnwu.magisk.ui.surequest.SuRequestViewModel
import
org.koin.androidx.viewmodel.dsl.viewModel
import
org.koin.dsl.module
import
com.topjohnwu.magisk.redesign.MainViewModel
as
RedesignViewModel
val
viewModelModules
=
module
{
...
...
@@ -24,4 +25,8 @@ val viewModelModules = module {
FlashViewModel
(
action
,
file
,
additional
,
get
())
}
viewModel
{
SuRequestViewModel
(
get
(),
get
(),
get
(
SUTimeout
),
get
())
}
// redesign
viewModel
{
RedesignViewModel
()
}
}
app/src/main/java/com/topjohnwu/magisk/model/navigation/Navigation.kt
View file @
14e49f3c
package
com.topjohnwu.magisk.model.navigation
import
android.content.Context
import
android.content.Intent
import
com.topjohnwu.magisk.ClassMap
import
com.topjohnwu.magisk.Config
import
com.topjohnwu.magisk.Const
import
com.topjohnwu.magisk.ui.MainActivity
import
com.topjohnwu.magisk.ui.hide.MagiskHideFragment
import
com.topjohnwu.magisk.ui.home.HomeFragment
import
com.topjohnwu.magisk.ui.log.LogFragment
...
...
@@ -7,7 +13,7 @@ import com.topjohnwu.magisk.ui.module.ModulesFragment
import
com.topjohnwu.magisk.ui.module.ReposFragment
import
com.topjohnwu.magisk.ui.settings.SettingsFragment
import
com.topjohnwu.magisk.ui.superuser.SuperuserFragment
import
com.topjohnwu.magisk.redesign.MainActivity
as
RedesignActivity
object
Navigation
{
...
...
@@ -50,6 +56,17 @@ object Navigation {
else
->
home
()
}
// redesign starts here
fun
start
(
launchIntent
:
Intent
,
context
:
Context
)
{
val
destination
=
when
{
Config
.
redesign
->
RedesignActivity
::
class
.
java
else
->
MainActivity
::
class
.
java
}
val
intent
=
Intent
(
context
,
ClassMap
[
destination
])
intent
.
putExtra
(
Const
.
Key
.
OPEN_SECTION
,
launchIntent
.
getStringExtra
(
Const
.
Key
.
OPEN_SECTION
))
context
.
startActivity
(
intent
)
}
object
Main
{
const
val
OPEN_NAV
=
1
...
...
app/src/main/java/com/topjohnwu/magisk/redesign/MainActivity.kt
0 → 100644
View file @
14e49f3c
package
com.topjohnwu.magisk.redesign
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.databinding.ActivityMainMd2Binding
import
com.topjohnwu.magisk.ui.base.MagiskActivity
import
org.koin.androidx.viewmodel.ext.android.viewModel
open
class
MainActivity
:
MagiskActivity
<
MainViewModel
,
ActivityMainMd2Binding
>()
{
override
val
layoutRes
=
R
.
layout
.
activity_main_md2
override
val
viewModel
by
viewModel
<
MainViewModel
>()
}
\ No newline at end of file
app/src/main/java/com/topjohnwu/magisk/redesign/MainViewModel.kt
0 → 100644
View file @
14e49f3c
package
com.topjohnwu.magisk.redesign
import
com.topjohnwu.magisk.ui.base.MagiskViewModel
class
MainViewModel
:
MagiskViewModel
()
\ No newline at end of file
app/src/main/java/com/topjohnwu/magisk/ui/SplashActivity.kt
View file @
14e49f3c
package
com.topjohnwu.magisk.ui
import
android.content.Intent
import
android.os.Bundle
import
android.text.TextUtils
import
androidx.appcompat.app.AlertDialog
import
androidx.appcompat.app.AppCompatActivity
import
com.topjohnwu.magisk.*
import
com.topjohnwu.magisk.model.navigation.Navigation
import
com.topjohnwu.magisk.utils.Utils
import
com.topjohnwu.magisk.view.Notifications
import
com.topjohnwu.magisk.view.Shortcuts
...
...
@@ -56,10 +56,8 @@ open class SplashActivity : AppCompatActivity() {
// Setup shortcuts
Shortcuts
.
setup
(
this
)
val
intent
=
Intent
(
this
,
ClassMap
[
MainActivity
::
class
.
java
])
intent
.
putExtra
(
Const
.
Key
.
OPEN_SECTION
,
getIntent
().
getStringExtra
(
Const
.
Key
.
OPEN_SECTION
))
DONE
=
true
startActivity
(
intent
)
Navigation
.
start
(
intent
,
this
)
finish
()
}
...
...
app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsFragment.kt
View file @
14e49f3c
...
...
@@ -57,6 +57,8 @@ class SettingsFragment : BasePreferenceFragment() {
preferenceManager
.
setStorageDeviceProtected
()
setPreferencesFromResource
(
R
.
xml
.
app_settings
,
rootKey
)
findPreference
<
PreferenceCategory
>(
"redesign_cat"
)
?.
isVisible
=
BuildConfig
.
DEBUG
updateChannel
=
findPreference
(
Config
.
Key
.
UPDATE_CHANNEL
)
!!
rootConfig
=
findPreference
(
Config
.
Key
.
ROOT_ACCESS
)
!!
autoRes
=
findPreference
(
Config
.
Key
.
SU_AUTO_RESPONSE
)
!!
...
...
@@ -227,26 +229,26 @@ class SettingsFragment : BasePreferenceFragment() {
private
fun
setLocalePreference
(
lp
:
ListPreference
)
{
lp
.
isEnabled
=
false
availableLocales
.
map
{
val
names
=
mutableListOf
<
String
>()
val
values
=
mutableListOf
<
String
>()
names
.
add
(
LocaleManager
.
getString
(
defaultLocale
,
R
.
string
.
system_default
)
)
values
.
add
(
""
)
val
names
=
mutableListOf
<
String
>()
val
values
=
mutableListOf
<
String
>()
it
.
forEach
{
locale
->
names
.
add
(
locale
.
getDisplayName
(
locale
)
)
values
.
add
(
locale
.
toLangTag
()
)
}
names
.
add
(
LocaleManager
.
getString
(
defaultLocale
,
R
.
string
.
system_default
)
)
values
.
add
(
""
)
Pair
(
names
.
toTypedArray
(),
values
.
toTypedArray
())
}.
subscribeK
{
(
names
,
values
)
->
lp
.
isEnabled
=
true
lp
.
entries
=
names
lp
.
entryValues
=
values
lp
.
summary
=
currentLocale
.
getDisplayName
(
currentLocale
)
it
.
forEach
{
locale
->
names
.
add
(
locale
.
getDisplayName
(
locale
))
values
.
add
(
locale
.
toLangTag
())
}
Pair
(
names
.
toTypedArray
(),
values
.
toTypedArray
())
}.
subscribeK
{
(
names
,
values
)
->
lp
.
isEnabled
=
true
lp
.
entries
=
names
lp
.
entryValues
=
values
lp
.
summary
=
currentLocale
.
getDisplayName
(
currentLocale
)
}
}
private
fun
setSummary
(
key
:
String
)
{
...
...
app/src/main/res/layout/activity_main_md2.xml
0 → 100644
View file @
14e49f3c
<?xml version="1.0" encoding="utf-8"?>
<layout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:tools=
"http://schemas.android.com/tools"
>
<data>
<variable
name=
"viewModel"
type=
"com.topjohnwu.magisk.redesign.MainViewModel"
/>
</data>
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:orientation=
"vertical"
>
<com.google.android.material.appbar.AppBarLayout
style=
"?styleAppbar"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"?colorSurfaceVariant"
>
<com.google.android.material.appbar.MaterialToolbar
android:id=
"@+id/home_toolbar"
style=
"?styleToolbar"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@android:color/transparent"
app:contentInsetStartWithNavigation=
"0dp"
app:layout_constraintBottom_toBottomOf=
"parent"
tools:paddingTop=
"24dp"
>
<FrameLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:paddingBottom=
"@dimen/l1"
>
<androidx.appcompat.widget.AppCompatTextView
style=
"?styleToolbarTitle"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:gravity=
"center"
android:text=
"Home"
/>
<View
android:layout_width=
"50dp"
android:layout_height=
"5dp"
android:layout_gravity=
"center|bottom"
android:background=
"@drawable/bg_accent"
/>
</FrameLayout>
</com.google.android.material.appbar.MaterialToolbar>
</com.google.android.material.appbar.AppBarLayout>
<androidx.core.widget.NestedScrollView
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:clipToPadding=
"false"
android:padding=
"@dimen/l1"
android:visibility=
"gone"
app:layout_behavior=
"com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:orientation=
"vertical"
>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:paddingTop=
"@dimen/l1"
>
<androidx.constraintlayout.widget.ConstraintLayout
android:id=
"@+id/home_magisk_wrapper"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
app:layout_constraintEnd_toStartOf=
"@+id/home_manager_wrapper"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
>
<androidx.appcompat.widget.AppCompatImageView
android:id=
"@+id/icon1"
android:layout_width=
"48dp"
android:layout_height=
"48dp"
android:alpha=
".2"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
tools:src=
"@tools:sample/avatars"
/>
<androidx.appcompat.widget.AppCompatImageView
style=
"?styleIconError"
app:layout_constraintBottom_toBottomOf=
"@+id/icon1"
app:layout_constraintEnd_toEndOf=
"@+id/icon1"
app:layout_constraintStart_toStartOf=
"@+id/icon1"
app:layout_constraintTop_toTopOf=
"@+id/icon1"
app:srcCompat=
"@drawable/ic_delete_md2"
/>
<androidx.appcompat.widget.AppCompatTextView
android:id=
"@+id/title1"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"@dimen/l1"
android:text=
"Magisk"
android:textAppearance=
"?appearanceTextTitleNormal"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toEndOf=
"@+id/icon1"
app:layout_constraintTop_toTopOf=
"parent"
/>
<androidx.appcompat.widget.AppCompatTextView
android:id=
"@+id/status1"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:text=
"is up to date"
android:textAppearance=
"?appearanceTextCaptionVariant"
app:layout_constraintEnd_toEndOf=
"@+id/title1"
app:layout_constraintStart_toStartOf=
"@+id/title1"
app:layout_constraintTop_toBottomOf=
"@+id/title1"
/>
<FrameLayout
android:id=
"@+id/button_container1"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/l1"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@+id/status1"
>
<com.google.android.material.button.MaterialButton
style=
"?styleButtonDefault"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:text=
"@string/update"
app:icon=
"@drawable/ic_update_md2"
app:iconGravity=
"textEnd"
app:iconPadding=
"@dimen/l_50"
app:iconSize=
"18dp"
tools:visibility=
"gone"
/>
<com.google.android.material.button.MaterialButton
style=
"?styleButtonText"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:text=
"@string/install"
app:icon=
"@drawable/ic_install"
app:iconGravity=
"textEnd"
app:iconPadding=
"@dimen/l_50"
app:iconSize=
"18dp"
/>
</FrameLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:id=
"@+id/home_manager_wrapper"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"@dimen/l1"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toEndOf=
"@+id/home_magisk_wrapper"
app:layout_constraintTop_toTopOf=
"parent"
>
<androidx.appcompat.widget.AppCompatImageView
android:id=
"@+id/icon2"
android:layout_width=
"48dp"
android:layout_height=
"48dp"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
tools:src=
"@tools:sample/avatars"
/>
<androidx.appcompat.widget.AppCompatTextView
android:id=
"@+id/title2"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"@dimen/l1"
android:text=
"Manager"
android:textAppearance=
"?appearanceTextTitleNormal"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toEndOf=
"@+id/icon2"
app:layout_constraintTop_toTopOf=
"parent"
/>
<androidx.appcompat.widget.AppCompatTextView
android:id=
"@+id/status2"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:text=
"has update available!"
android:textAppearance=
"?appearanceTextCaptionVariant"
app:layout_constraintEnd_toEndOf=
"@+id/title2"
app:layout_constraintStart_toStartOf=
"@+id/title2"
app:layout_constraintTop_toBottomOf=
"@+id/title2"
/>
<FrameLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/l1"
app:layout_constraintTop_toBottomOf=
"@+id/status2"
>
<com.google.android.material.button.MaterialButton
style=
"?styleButtonDefault"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:text=
"@string/update"
app:icon=
"@drawable/ic_update_md2"
app:iconGravity=
"textEnd"
app:iconPadding=
"@dimen/l_50"
app:iconSize=
"18dp"
/>
<com.google.android.material.button.MaterialButton
style=
"?styleButtonText"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:text=
"@string/install"
app:icon=
"@drawable/ic_install"
app:iconGravity=
"textEnd"
app:iconPadding=
"@dimen/l_50"
app:iconSize=
"18dp"
tools:visibility=
"gone"
/>
</FrameLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<View
android:layout_width=
"match_parent"
android:layout_height=
"1dp"
android:layout_marginTop=
"@dimen/l2"
android:layout_marginBottom=
"@dimen/l2"
android:background=
"?colorSurfaceVariant"
/>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
>
<androidx.appcompat.widget.AppCompatImageView
android:id=
"@+id/support_icon_john"
style=
"?styleIconNormal"
android:padding=
"0dp"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
app:tint=
"@null"
tools:src=
"@tools:sample/avatars"
/>
<com.google.android.material.card.MaterialCardView
style=
"?styleCardNormal"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"@dimen/l1"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toEndOf=
"@+id/support_icon_john"
app:layout_constraintTop_toTopOf=
"parent"
>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:orientation=
"vertical"
android:padding=
"@dimen/l1"
>
<androidx.appcompat.widget.AppCompatTextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:fontFamily=
"sans-serif-black"
android:textAppearance=
"?appearanceTextCaptionNormal"
android:textStyle=
"bold"
tools:text=
"\@topjohnwu"
/>
<androidx.recyclerview.widget.RecyclerView
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:clipToPadding=
"false"
android:fadingEdgeLength=
"@dimen/l1"
android:orientation=
"horizontal"
android:paddingTop=
"@dimen/l1"
android:requiresFadingEdge=
"horizontal"
app:layoutManager=
"androidx.recyclerview.widget.LinearLayoutManager"
tools:listitem=
"@layout/item_developer"
/>
</LinearLayout>
</com.google.android.material.card.MaterialCardView>
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/l1"
tools:visibility=
"gone"
>
<androidx.appcompat.widget.AppCompatImageView
android:id=
"@+id/support_icon_dia"
style=
"?styleIconNormal"
android:padding=
"0dp"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
app:tint=
"@null"
tools:src=
"@tools:sample/avatars"
/>
<com.google.android.material.card.MaterialCardView
style=
"?styleCardNormal"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginEnd=
"@dimen/l1"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintEnd_toStartOf=
"@+id/support_icon_dia"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:orientation=
"vertical"
android:padding=
"@dimen/l1"
>
<androidx.appcompat.widget.AppCompatTextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"end"
android:fontFamily=
"sans-serif-black"
android:textAppearance=
"?appearanceTextCaptionNormal"
android:textStyle=
"bold"
tools:text=
"\@diareuse"
/>
<androidx.recyclerview.widget.RecyclerView
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:clipToPadding=
"false"
android:fadingEdgeLength=
"@dimen/l1"
android:orientation=
"horizontal"
android:paddingTop=
"@dimen/l1"
android:requiresFadingEdge=
"horizontal"
app:layoutManager=
"androidx.recyclerview.widget.LinearLayoutManager"
app:reverseLayout=
"true"
tools:listitem=
"@layout/item_developer"
/>
</LinearLayout>
</com.google.android.material.card.MaterialCardView>
</androidx.constraintlayout.widget.ConstraintLayout>
<View
android:layout_width=
"match_parent"
android:layout_height=
"1dp"
android:layout_marginTop=
"@dimen/l1"
android:layout_marginBottom=
"@dimen/l1"
android:background=
"?colorSurfaceVariant"
/>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
>
<androidx.appcompat.widget.AppCompatImageView
android:id=
"@+id/support_icon_common"
style=
"?styleIconNormal"
android:padding=
"0dp"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
app:tint=
"@null"
tools:src=
"@tools:sample/avatars"
/>
<com.google.android.material.card.MaterialCardView
style=
"?styleCardNormal"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"@dimen/l1"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toEndOf=
"@+id/support_icon_common"
app:layout_constraintTop_toTopOf=
"parent"
>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:orientation=
"vertical"
android:padding=
"@dimen/l1"
>
<androidx.appcompat.widget.AppCompatTextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:fontFamily=
"sans-serif-black"
android:textAppearance=
"?appearanceTextCaptionNormal"
android:textStyle=
"bold"
tools:text=
"Project links"
/>
<androidx.recyclerview.widget.RecyclerView
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:clipToPadding=
"false"
android:fadingEdgeLength=
"@dimen/l1"
android:orientation=
"horizontal"
android:paddingTop=
"@dimen/l1"
android:requiresFadingEdge=
"horizontal"
app:layoutManager=
"androidx.recyclerview.widget.LinearLayoutManager"
tools:listitem=
"@layout/item_developer"
/>
</LinearLayout>
</com.google.android.material.card.MaterialCardView>
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
<com.google.android.material.bottomappbar.BottomAppBar
android:id=
"@+id/home_bottom_bar"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_gravity=
"bottom"
android:background=
"?colorSurface"
app:backgroundTint=
"?colorSurface"
app:contentInsetEnd=
"0dp"
app:contentInsetStart=
"0dp"
app:fabCradleMargin=
"@dimen/l_50"
tools:paddingBottom=
"48dp"
>
<com.google.android.material.bottomnavigation.BottomNavigationView
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@android:color/transparent"
app:elevation=
"0dp"
app:itemIconTint=
"@color/color_menu_tint"
app:itemTextAppearanceActive=
"@style/AppearanceFoundation.Tiny.Bold"
app:itemTextAppearanceInactive=
"@style/AppearanceFoundation.Tiny.Bold"
app:itemTextColor=
"@color/color_menu_tint"
app:labelVisibilityMode=
"unlabeled"
app:menu=
"@menu/menu_bottom_nav"
/>
</com.google.android.material.bottomappbar.BottomAppBar>
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
app:fabSize=
"normal"
app:layout_anchor=
"@+id/home_bottom_bar"
app:srcCompat=
"@drawable/ic_superuser"
/>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
</layout>
app/src/main/res/layout/test.xml
deleted
100644 → 0
View file @
cc8f1adc
<?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:tools=
"http://schemas.android.com/tools"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:orientation=
"vertical"
>
<com.google.android.material.appbar.AppBarLayout
style=
"?styleAppbar"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"?colorSurfaceVariant"
>
<com.google.android.material.appbar.MaterialToolbar
android:id=
"@+id/home_toolbar"
style=
"?styleToolbar"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@android:color/transparent"
app:contentInsetStartWithNavigation=
"0dp"
app:layout_constraintBottom_toBottomOf=
"parent"
tools:paddingTop=
"24dp"
>
<FrameLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:paddingBottom=
"@dimen/l1"
>
<androidx.appcompat.widget.AppCompatTextView
style=
"?styleToolbarTitle"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:gravity=
"center"
tools:text=
"Home"
/>
<View
android:layout_width=
"50dp"
android:layout_height=
"5dp"
android:layout_gravity=
"center|bottom"
android:background=
"@drawable/bg_accent"
/>
</FrameLayout>
</com.google.android.material.appbar.MaterialToolbar>
</com.google.android.material.appbar.AppBarLayout>
<androidx.core.widget.NestedScrollView
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:clipToPadding=
"false"
android:padding=
"@dimen/l1"
app:layout_behavior=
"com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:orientation=
"vertical"
>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:paddingTop=
"@dimen/l1"
>
<androidx.constraintlayout.widget.ConstraintLayout
android:id=
"@+id/home_magisk_wrapper"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
app:layout_constraintEnd_toStartOf=
"@+id/home_manager_wrapper"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
>
<androidx.appcompat.widget.AppCompatImageView
android:id=
"@+id/icon1"
android:layout_width=
"48dp"
android:layout_height=
"48dp"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
tools:src=
"@tools:sample/avatars"
/>
<androidx.appcompat.widget.AppCompatTextView
android:id=
"@+id/title1"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"@dimen/l1"
android:text=
"Magisk"
android:textAppearance=
"?appearanceTextTitleNormal"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toEndOf=
"@+id/icon1"
app:layout_constraintTop_toTopOf=
"parent"
/>
<androidx.appcompat.widget.AppCompatTextView
android:id=
"@+id/status1"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:text=
"is up to date"
android:textAppearance=
"?appearanceTextCaptionVariant"
app:layout_constraintEnd_toEndOf=
"@+id/title1"
app:layout_constraintStart_toStartOf=
"@+id/title1"
app:layout_constraintTop_toBottomOf=
"@+id/title1"
/>
<FrameLayout
android:id=
"@+id/button_container1"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/l1"
android:layout_marginEnd=
"@dimen/l_50"
app:layout_constraintEnd_toStartOf=
"@+id/delete1"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@+id/status1"
>
<com.google.android.material.button.MaterialButton
style=
"?styleButtonDefault"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:text=
"@string/update"
app:icon=
"@drawable/ic_update_md2"
app:iconGravity=
"textEnd"
app:iconPadding=
"@dimen/l_50"
app:iconSize=
"18dp"
tools:visibility=
"gone"
/>
<com.google.android.material.button.MaterialButton
style=
"?styleButtonText"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:text=
"@string/install"
app:icon=
"@drawable/ic_install"
app:iconGravity=
"textEnd"
app:iconPadding=
"@dimen/l_50"
app:iconSize=
"18dp"
/>
</FrameLayout>
<androidx.appcompat.widget.AppCompatImageView
android:id=
"@+id/delete1"
style=
"?styleIconError"
app:layout_constraintBottom_toBottomOf=
"@+id/button_container1"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintTop_toTopOf=
"@+id/button_container1"
app:srcCompat=
"@drawable/ic_delete_md2"
/>
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:id=
"@+id/home_manager_wrapper"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"@dimen/l1"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toEndOf=
"@+id/home_magisk_wrapper"
app:layout_constraintTop_toTopOf=
"parent"
>
<androidx.appcompat.widget.AppCompatImageView
android:id=
"@+id/icon1"
android:layout_width=
"48dp"
android:layout_height=
"48dp"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
tools:src=
"@tools:sample/avatars"
/>
<androidx.appcompat.widget.AppCompatTextView
android:id=
"@+id/title1"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"@dimen/l1"
android:text=
"Manager"
android:textAppearance=
"?appearanceTextTitleNormal"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toEndOf=
"@+id/icon1"
app:layout_constraintTop_toTopOf=
"parent"
/>
<androidx.appcompat.widget.AppCompatTextView
android:id=
"@+id/status1"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:text=
"has update available!"
android:textAppearance=
"?appearanceTextCaptionVariant"
app:layout_constraintEnd_toEndOf=
"@+id/title1"
app:layout_constraintStart_toStartOf=
"@+id/title1"
app:layout_constraintTop_toBottomOf=
"@+id/title1"
/>
<FrameLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/l1"
app:layout_constraintTop_toBottomOf=
"@+id/status1"
>
<com.google.android.material.button.MaterialButton
style=
"?styleButtonDefault"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:text=
"@string/update"
app:icon=
"@drawable/ic_update_md2"
app:iconGravity=
"textEnd"
app:iconPadding=
"@dimen/l_50"
app:iconSize=
"18dp"
/>
<com.google.android.material.button.MaterialButton
style=
"?styleButtonText"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:text=
"@string/install"
app:icon=
"@drawable/ic_install"
app:iconGravity=
"textEnd"
app:iconPadding=
"@dimen/l_50"
app:iconSize=
"18dp"
tools:visibility=
"gone"
/>
</FrameLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<View
android:layout_width=
"match_parent"
android:layout_height=
"1dp"
android:layout_marginTop=
"@dimen/l2"
android:layout_marginBottom=
"@dimen/l2"
android:background=
"?colorSurfaceVariant"
/>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
>
<androidx.appcompat.widget.AppCompatImageView
android:id=
"@+id/support_icon"
style=
"?styleIconNormal"
android:padding=
"0dp"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
app:tint=
"@null"
tools:src=
"@tools:sample/avatars"
/>
<com.google.android.material.card.MaterialCardView
style=
"?styleCardNormal"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"@dimen/l1"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toEndOf=
"@+id/support_icon"
app:layout_constraintTop_toTopOf=
"parent"
>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:orientation=
"vertical"
android:padding=
"@dimen/l1"
>
<androidx.appcompat.widget.AppCompatTextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:fontFamily=
"sans-serif-black"
android:textAppearance=
"?appearanceTextCaptionNormal"
android:textStyle=
"bold"
tools:text=
"\@topjohnwu"
/>
<androidx.recyclerview.widget.RecyclerView
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:clipToPadding=
"false"
android:fadingEdgeLength=
"@dimen/l1"
android:orientation=
"horizontal"
android:paddingTop=
"@dimen/l1"
android:requiresFadingEdge=
"horizontal"
app:layoutManager=
"androidx.recyclerview.widget.LinearLayoutManager"
tools:listitem=
"@layout/item_developer"
/>
</LinearLayout>
</com.google.android.material.card.MaterialCardView>
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/l1"
tools:visibility=
"gone"
>
<androidx.appcompat.widget.AppCompatImageView
android:id=
"@+id/support_icon"
style=
"?styleIconNormal"
android:padding=
"0dp"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
app:tint=
"@null"
tools:src=
"@tools:sample/avatars"
/>
<com.google.android.material.card.MaterialCardView
style=
"?styleCardNormal"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginEnd=
"@dimen/l1"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintEnd_toStartOf=
"@+id/support_icon"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:orientation=
"vertical"
android:padding=
"@dimen/l1"
>
<androidx.appcompat.widget.AppCompatTextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"end"
android:fontFamily=
"sans-serif-black"
android:textAppearance=
"?appearanceTextCaptionNormal"
android:textStyle=
"bold"
tools:text=
"\@diareuse"
/>
<androidx.recyclerview.widget.RecyclerView
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:clipToPadding=
"false"
android:fadingEdgeLength=
"@dimen/l1"
android:orientation=
"horizontal"
android:paddingTop=
"@dimen/l1"
android:requiresFadingEdge=
"horizontal"
app:layoutManager=
"androidx.recyclerview.widget.LinearLayoutManager"
app:reverseLayout=
"true"
tools:listitem=
"@layout/item_developer"
/>
</LinearLayout>
</com.google.android.material.card.MaterialCardView>
</androidx.constraintlayout.widget.ConstraintLayout>
<View
android:layout_width=
"match_parent"
android:layout_height=
"1dp"
android:layout_marginTop=
"@dimen/l1"
android:layout_marginBottom=
"@dimen/l1"
android:background=
"?colorSurfaceVariant"
/>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
>
<androidx.appcompat.widget.AppCompatImageView
android:id=
"@+id/support_icon"
style=
"?styleIconNormal"
android:padding=
"0dp"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
app:tint=
"@null"
tools:src=
"@tools:sample/avatars"
/>
<com.google.android.material.card.MaterialCardView
style=
"?styleCardNormal"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"@dimen/l1"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toEndOf=
"@+id/support_icon"
app:layout_constraintTop_toTopOf=
"parent"
>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:orientation=
"vertical"
android:padding=
"@dimen/l1"
>
<androidx.appcompat.widget.AppCompatTextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:fontFamily=
"sans-serif-black"
android:textAppearance=
"?appearanceTextCaptionNormal"
android:textStyle=
"bold"
tools:text=
"Project links"
/>
<androidx.recyclerview.widget.RecyclerView
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:clipToPadding=
"false"
android:fadingEdgeLength=
"@dimen/l1"
android:orientation=
"horizontal"
android:paddingTop=
"@dimen/l1"
android:requiresFadingEdge=
"horizontal"
app:layoutManager=
"androidx.recyclerview.widget.LinearLayoutManager"
tools:listitem=
"@layout/item_developer"
/>
</LinearLayout>
</com.google.android.material.card.MaterialCardView>
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
<com.google.android.material.bottomappbar.BottomAppBar
android:id=
"@+id/home_bottom_bar"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_gravity=
"bottom"
android:paddingBottom=
"48dp"
app:contentInsetEnd=
"0dp"
app:contentInsetStart=
"0dp"
app:fabCradleMargin=
"@dimen/l_50"
>
<com.google.android.material.bottomnavigation.BottomNavigationView
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@android:color/transparent"
app:itemIconTint=
"@color/color_menu_tint"
app:itemTextAppearanceActive=
"@style/AppearanceFoundation.Tiny.Bold"
app:itemTextAppearanceInactive=
"@style/AppearanceFoundation.Tiny.Bold"
app:itemTextColor=
"@color/color_menu_tint"
app:labelVisibilityMode=
"unlabeled"
app:menu=
"@menu/menu_bottom_nav"
/>
</com.google.android.material.bottomappbar.BottomAppBar>
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
app:fabSize=
"normal"
app:layout_anchor=
"@+id/home_bottom_bar"
app:srcCompat=
"@drawable/ic_superuser"
/>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
app/src/main/res/values/styles_md2.xml
View file @
14e49f3c
...
...
@@ -45,33 +45,35 @@
<!--///-->
<item
name=
"appearanceTextDisplayNormal"
>
@style/AppearanceFoundation.Display
<
/>
<item
name=
"appearanceTextDisplayVariant"
>
@style/AppearanceFoundation.Display.Variant
<
/>
<item
name=
"appearanceTextDisplayOnPrimary"
>
@style/AppearanceFoundation.Display.OnPrimary
<
/>
<item
name=
"appearanceTextDisplayNormal"
>
@style/AppearanceFoundation.Display
</item>
<item
name=
"appearanceTextDisplayVariant"
>
@style/AppearanceFoundation.Display.Variant
</item>
<item
name=
"appearanceTextDisplayOnPrimary"
>
@style/AppearanceFoundation.Display.OnPrimary
</item>
<item
name=
"appearanceTextDisplayOnPrimaryVariant"
>
@style/AppearanceFoundation.Display.OnPrimary.Variant
<
/>
</
item
>
<item
name=
"appearanceTextTitleNormal"
>
@style/AppearanceFoundation.Title
<
/>
<item
name=
"appearanceTextTitleVariant"
>
@style/AppearanceFoundation.Title.Variant
<
/>
<item
name=
"appearanceTextTitleOnPrimary"
>
@style/AppearanceFoundation.Title.OnPrimary
<
/>
<item
name=
"appearanceTextTitleNormal"
>
@style/AppearanceFoundation.Title
</
item
>
<item
name=
"appearanceTextTitleVariant"
>
@style/AppearanceFoundation.Title.Variant
</
item
>
<item
name=
"appearanceTextTitleOnPrimary"
>
@style/AppearanceFoundation.Title.OnPrimary
</
item
>
<item
name=
"appearanceTextTitleOnPrimaryVariant"
>
@style/AppearanceFoundation.Title.OnPrimary.Variant
<
/>
</
item
>
<item
name=
"appearanceTextBodyNormal"
>
@style/AppearanceFoundation.Body
<
/>
<item
name=
"appearanceTextBodyVariant"
>
@style/AppearanceFoundation.Body.Variant
<
/>
<item
name=
"appearanceTextBodyOnPrimary"
>
@style/AppearanceFoundation.Body.OnPrimary
<
/>
<item
name=
"appearanceTextBodyNormal"
>
@style/AppearanceFoundation.Body
</
item
>
<item
name=
"appearanceTextBodyVariant"
>
@style/AppearanceFoundation.Body.Variant
</
item
>
<item
name=
"appearanceTextBodyOnPrimary"
>
@style/AppearanceFoundation.Body.OnPrimary
</
item
>
<item
name=
"appearanceTextBodyOnPrimaryVariant"
>
@style/AppearanceFoundation.Body.OnPrimary.Variant
<
/>
</
item
>
<item
name=
"appearanceTextCaptionNormal"
>
@style/AppearanceFoundation.Caption
<
/>
<item
name=
"appearanceTextCaptionVariant"
>
@style/AppearanceFoundation.Caption.Variant
<
/>
<item
name=
"appearanceTextCaptionOnPrimary"
>
@style/AppearanceFoundation.Caption.OnPrimary
<
/>
<item
name=
"appearanceTextCaptionNormal"
>
@style/AppearanceFoundation.Caption
</item>
<item
name=
"appearanceTextCaptionVariant"
>
@style/AppearanceFoundation.Caption.Variant
</item>
<item
name=
"appearanceTextCaptionOnPrimary"
>
@style/AppearanceFoundation.Caption.OnPrimary
</item>
<item
name=
"appearanceTextCaptionOnPrimaryVariant"
>
@style/AppearanceFoundation.Caption.OnPrimary.Variant
<
/>
</
item
>
</style>
<style
name=
"Foundation.Default"
parent=
"Foundation.Base"
>
...
...
app/src/main/res/xml/app_settings.xml
View file @
14e49f3c
<androidx.preference.PreferenceScreen
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<androidx.preference.PreferenceScreen
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
>
<PreferenceCategory
android:key=
"general"
android:title=
"@string/settings_general_category"
>
...
...
@@ -131,4 +132,15 @@
</PreferenceCategory>
<PreferenceCategory
android:key=
"redesign_cat"
app:title=
"Redesign"
>
<SwitchPreferenceCompat
android:defaultValue=
"false"
android:key=
"redesign"
app:title=
"Enable Redesign"
/>
</PreferenceCategory>
</androidx.preference.PreferenceScreen>
\ 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