avior/Neo-Store
1
0
Fork 0
mirror of https://github.com/Aviortheking/Neo-Store.git synced 2025-04-23 11:22:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update: styles.xml reformatted

Browse Source 
Improve: No Overscroll Animation
Improve: Use new colorAccent Attr (styles.xml)
This commit is contained in:
LooKeR 2021-11-17 00:32:23 +05:30
parent 0fd8e3b8b7
commit b41715a2f0
7 changed files with 49 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/kotlin/com/looker/droidify/screen/ProductAdapter.kt
View File

@ -100,11 +100,11 @@ class ProductAdapter(private val callbacks: Callbacks, private val columns: Int)
private enum class SectionType(val titleResId: Int, val colorAttrResId: Int) { private enum class SectionType(val titleResId: Int, val colorAttrResId: Int) {
ANTI_FEATURES(R.string.anti_features, R.attr.colorError), ANTI_FEATURES(R.string.anti_features, R.attr.colorError),
CHANGES(R.string.changes, android.R.attr.colorAccent), CHANGES(R.string.changes, R.attr.colorAccent),
LINKS(R.string.links, android.R.attr.colorAccent), LINKS(R.string.links, R.attr.colorAccent),
DONATE(R.string.donate, android.R.attr.colorAccent), DONATE(R.string.donate, R.attr.colorAccent),
PERMISSIONS(R.string.permissions, android.R.attr.colorAccent), PERMISSIONS(R.string.permissions, R.attr.colorAccent),
VERSIONS(R.string.versions, android.R.attr.colorAccent) VERSIONS(R.string.versions, R.attr.colorAccent)
} }
internal enum class ExpandType { internal enum class ExpandType {

2
src/main/kotlin/com/looker/droidify/screen/SettingsFragment.kt
View File

@ -209,7 +209,7 @@ class SettingsFragment : ScreenFragment() {
val text = MaterialTextView(context) val text = MaterialTextView(context)
text.typeface = TypefaceExtra.medium text.typeface = TypefaceExtra.medium
text.setTextSizeScaled(14) text.setTextSizeScaled(14)
text.setTextColor(text.context.getColorFromAttr(android.R.attr.colorAccent)) text.setTextColor(text.context.getColorFromAttr(R.attr.colorAccent))
text.text = title text.text = title
resources.sizeScaled(16).let { text.setPadding(it, it, it, 0) } resources.sizeScaled(16).let { text.setPadding(it, it, it, 0) }
addView( addView(

7
src/main/kotlin/com/looker/droidify/service/DownloadService.kt
View File

@ -216,10 +216,7 @@ class DownloadService : ConnectionService<DownloadService.Binder>() {
.Builder(this, Common.NOTIFICATION_CHANNEL_DOWNLOADING) .Builder(this, Common.NOTIFICATION_CHANNEL_DOWNLOADING)
.setAutoCancel(true) .setAutoCancel(true)
.setSmallIcon(android.R.drawable.stat_sys_warning) .setSmallIcon(android.R.drawable.stat_sys_warning)
.setColor( .setColor(getColorFromAttr(R.attr.colorAccent).defaultColor)
ContextThemeWrapper(this, R.style.Theme_Main_Light)
.getColorFromAttr(android.R.attr.colorAccent).defaultColor
)
.setContentIntent( .setContentIntent(
PendingIntent.getBroadcast( PendingIntent.getBroadcast(
this, this,
@ -282,7 +279,7 @@ class DownloadService : ConnectionService<DownloadService.Binder>() {
.Builder(this, Common.NOTIFICATION_CHANNEL_DOWNLOADING) .Builder(this, Common.NOTIFICATION_CHANNEL_DOWNLOADING)
.setAutoCancel(true) .setAutoCancel(true)
.setSmallIcon(android.R.drawable.stat_sys_download_done) .setSmallIcon(android.R.drawable.stat_sys_download_done)
.setColor(getColorFromAttr(android.R.attr.colorAccent).defaultColor) .setColor(getColorFromAttr(R.attr.colorAccent).defaultColor)
.setContentIntent(installIntent(task)) .setContentIntent(installIntent(task))
.setContentTitle(getString(R.string.downloaded_FORMAT, task.name)) .setContentTitle(getString(R.string.downloaded_FORMAT, task.name))
.setContentText(getString(R.string.tap_to_install_DESC)) .setContentText(getString(R.string.tap_to_install_DESC))

2
src/main/kotlin/com/looker/droidify/ui/appsList/AppListAdapter.kt
View File

@ -170,7 +170,7 @@ class AppListAdapter(private val onClick: (ProductItem) -> Unit) :
null null
).apply { ).apply {
color = color =
holder.status.context.getColorFromAttr(android.R.attr.colorAccent) holder.status.context.getColorFromAttr(R.attr.colorAccent)
cornerRadius = holder.status.resources.sizeScaled(2).toFloat() cornerRadius = holder.status.resources.sizeScaled(2).toFloat()
} }
} }

2
src/main/kotlin/com/looker/droidify/utility/Utils.kt
View File

@ -38,7 +38,7 @@ object Utils {
val progressIcon: Drawable = val progressIcon: Drawable =
createDefaultApplicationIcon(context, android.R.attr.textColorSecondary) createDefaultApplicationIcon(context, android.R.attr.textColorSecondary)
val defaultIcon: Drawable = val defaultIcon: Drawable =
createDefaultApplicationIcon(context, android.R.attr.colorAccent) createDefaultApplicationIcon(context, R.attr.colorAccent)
return Pair(progressIcon, defaultIcon) return Pair(progressIcon, defaultIcon)
} }

4
src/main/res/layout/item_app_info_x.xml
View File

@ -259,7 +259,7 @@
android:layout_weight="1" android:layout_weight="1"
android:singleLine="true" android:singleLine="true"
android:text="@string/screenshots" android:text="@string/screenshots"
android:textColor="?android:colorAccent" /> android:textColor="?attr/colorAccent" />
<com.google.android.material.imageview.ShapeableImageView <com.google.android.material.imageview.ShapeableImageView
android:id="@+id/screenshots_section_icon" android:id="@+id/screenshots_section_icon"
@ -267,7 +267,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:scaleType="center" android:scaleType="center"
android:src="@drawable/ic_arrow_down" android:src="@drawable/ic_arrow_down"
android:tint="?android:colorAccent" android:tint="?attr/colorAccent"
tools:ignore="ContentDescription" /> tools:ignore="ContentDescription" />
</androidx.appcompat.widget.LinearLayoutCompat> </androidx.appcompat.widget.LinearLayoutCompat>

66
src/main/res/values/styles.xml
View File

@ -13,26 +13,29 @@
<item name="colorOnSurface">@color/black</item> <item name="colorOnSurface">@color/black</item>
<item name="android:colorBackground">@color/white</item> <item name="android:colorBackground">@color/white</item>
<item name="colorOnBackground">@color/grey_dark</item> <item name="colorOnBackground">@color/grey_dark</item>
<item name="android:colorAccent">@color/accent_light</item> <item name="colorAccent">@color/accent_light</item>
<item name="colorError">@color/error_light</item> <item name="colorError">@color/error_light</item>
<item name="colorOutline">@color/green75</item> <item name="colorOutline">@color/green75</item>
<item name="colorControlActivated">@color/green300</item> <item name="colorControlActivated">@color/green300</item>
<item name="android:textColor">@color/black</item> <item name="android:textColor">@color/black</item>
<item name="android:textColorPrimary">@color/green900</item> <item name="android:textColorPrimary">@color/green900</item>
<item name="android:textColorSecondary">@color/grey_light</item> <item name="android:textColorSecondary">@color/grey_light</item>
<item name="android:fastScrollThumbDrawable">@drawable/scrollbar_thumb</item> <item name="android:overScrollMode">never</item>
<item name="android:fastScrollTrackDrawable">@drawable/scrollbar_track</item>
<item name="android:windowLightStatusBar" tools:targetApi="m">true</item>
<item name="switchStyle">@style/Theme.Switch</item>
<item name="materialAlertDialogTheme">@style/Theme.Alert</item>
<item name="tabStyle">@style/Theme.Tab</item>
<item name="textInputStyle">@style/Theme.EditText</item>
<item name="android:statusBarColor">@color/green50</item> <item name="android:statusBarColor">@color/green50</item>
<item name="android:navigationBarColor">@android:color/transparent</item> <item name="android:navigationBarColor">@android:color/transparent</item>
<item name="appBarLayoutStyle">@style/Theme.AppBarLayout</item> <item name="android:windowLightStatusBar" tools:targetApi="m">true</item>
<item name="collapsingToolbarLayoutLargeStyle">@style/Theme.CollapsingToolbar</item>
<item name="android:fastScrollThumbDrawable">@drawable/scrollbar_thumb</item>
<item name="android:fastScrollTrackDrawable">@drawable/scrollbar_track</item>
<item name="tabStyle">@style/Theme.Tab</item>
<item name="switchStyle">@style/Theme.Switch</item>
<item name="toolbarStyle">@style/Theme.Toolbar</item> <item name="toolbarStyle">@style/Theme.Toolbar</item>
<item name="textInputStyle">@style/Theme.EditText</item>
<item name="materialAlertDialogTheme">@style/Theme.Alert</item>
<item name="appBarLayoutStyle">@style/Theme.AppBarLayout</item>
<item name="materialCardViewFilledStyle">@style/Theme.Card</item> <item name="materialCardViewFilledStyle">@style/Theme.Card</item>
<item name="collapsingToolbarLayoutLargeStyle">@style/Theme.CollapsingToolbar</item>
</style> </style>
<style name="Theme.Main.Dark" parent="Theme.Material3.Dark.NoActionBar"> <style name="Theme.Main.Dark" parent="Theme.Material3.Dark.NoActionBar">
@ -43,25 +46,28 @@
<item name="colorOnSurface">@color/green50</item> <item name="colorOnSurface">@color/green50</item>
<item name="android:colorBackground">@color/black</item> <item name="android:colorBackground">@color/black</item>
<item name="colorOnBackground">@color/green200</item> <item name="colorOnBackground">@color/green200</item>
<item name="android:colorAccent">@color/accent_dark</item> <item name="colorAccent">@color/accent_dark</item>
<item name="colorError">@color/error_dark</item> <item name="colorError">@color/error_dark</item>
<item name="colorOutline">@color/green50</item> <item name="colorOutline">@color/green50</item>
<item name="colorControlActivated">@color/green200</item> <item name="colorControlActivated">@color/green200</item>
<item name="android:textColor">@color/white</item> <item name="android:textColor">@color/white</item>
<item name="android:textColorPrimary">@color/green200</item> <item name="android:textColorPrimary">@color/green200</item>
<item name="android:textColorSecondary">@color/darker_white</item> <item name="android:textColorSecondary">@color/darker_white</item>
<item name="android:fastScrollThumbDrawable">@drawable/scrollbar_thumb</item> <item name="android:overScrollMode">never</item>
<item name="android:fastScrollTrackDrawable">@drawable/scrollbar_track</item>
<item name="switchStyle">@style/Theme.Switch</item>
<item name="materialAlertDialogTheme">@style/Theme.Alert</item>
<item name="tabStyle">@style/Theme.Tab</item>
<item name="textInputStyle">@style/Theme.EditText</item>
<item name="android:statusBarColor">@color/grey_dark</item> <item name="android:statusBarColor">@color/grey_dark</item>
<item name="android:navigationBarColor">@android:color/transparent</item> <item name="android:navigationBarColor">@android:color/transparent</item>
<item name="appBarLayoutStyle">@style/Theme.AppBarLayout</item>
<item name="collapsingToolbarLayoutLargeStyle">@style/Theme.CollapsingToolbar</item> <item name="android:fastScrollThumbDrawable">@drawable/scrollbar_thumb</item>
<item name="android:fastScrollTrackDrawable">@drawable/scrollbar_track</item>
<item name="tabStyle">@style/Theme.Tab</item>
<item name="switchStyle">@style/Theme.Switch</item>
<item name="toolbarStyle">@style/Theme.Toolbar</item> <item name="toolbarStyle">@style/Theme.Toolbar</item>
<item name="textInputStyle">@style/Theme.EditText</item>
<item name="materialAlertDialogTheme">@style/Theme.Alert</item>
<item name="appBarLayoutStyle">@style/Theme.AppBarLayout</item>
<item name="materialCardViewFilledStyle">@style/Theme.Card</item> <item name="materialCardViewFilledStyle">@style/Theme.Card</item>
<item name="collapsingToolbarLayoutLargeStyle">@style/Theme.CollapsingToolbar</item>
</style> </style>
<style name="Theme.Main.Amoled" parent="Theme.Material3.Dark.NoActionBar"> <style name="Theme.Main.Amoled" parent="Theme.Material3.Dark.NoActionBar">
@ -72,26 +78,28 @@
<item name="colorOnSurface">@color/green50</item> <item name="colorOnSurface">@color/green50</item>
<item name="android:colorBackground">@color/pitch_black</item> <item name="android:colorBackground">@color/pitch_black</item>
<item name="colorOnBackground">@color/green50</item> <item name="colorOnBackground">@color/green50</item>
<item name="android:colorAccent">@color/accent_dark</item> <item name="colorAccent">@color/accent_dark</item>
<item name="colorError">@color/error_dark</item> <item name="colorError">@color/error_dark</item>
<item name="colorOutline">@color/green50</item> <item name="colorOutline">@color/green50</item>
<item name="colorControlActivated">@color/green100</item> <item name="colorControlActivated">@color/green100</item>
<item name="colorControlNormal">@color/green300</item>
<item name="android:textColor">@color/white</item> <item name="android:textColor">@color/white</item>
<item name="android:textColorPrimary">@color/green100</item> <item name="android:textColorPrimary">@color/green100</item>
<item name="android:textColorSecondary">@color/darker_white</item> <item name="android:textColorSecondary">@color/darker_white</item>
<item name="android:fastScrollThumbDrawable">@drawable/scrollbar_thumb</item> <item name="android:overScrollMode">never</item>
<item name="android:fastScrollTrackDrawable">@drawable/scrollbar_track</item>
<item name="switchStyle">@style/Theme.Switch</item>
<item name="materialAlertDialogTheme">@style/Theme.Alert</item>
<item name="tabStyle">@style/Theme.Tab</item>
<item name="textInputStyle">@style/Theme.EditText</item>
<item name="android:statusBarColor">@color/black</item> <item name="android:statusBarColor">@color/black</item>
<item name="android:navigationBarColor">@android:color/transparent</item> <item name="android:navigationBarColor">@android:color/transparent</item>
<item name="appBarLayoutStyle">@style/Theme.AppBarLayout</item>
<item name="collapsingToolbarLayoutLargeStyle">@style/Theme.CollapsingToolbar</item> <item name="android:fastScrollThumbDrawable">@drawable/scrollbar_thumb</item>
<item name="android:fastScrollTrackDrawable">@drawable/scrollbar_track</item>
<item name="tabStyle">@style/Theme.Tab</item>
<item name="switchStyle">@style/Theme.Switch</item>
<item name="toolbarStyle">@style/Theme.Toolbar</item> <item name="toolbarStyle">@style/Theme.Toolbar</item>
<item name="textInputStyle">@style/Theme.EditText</item>
<item name="materialAlertDialogTheme">@style/Theme.Alert</item>
<item name="appBarLayoutStyle">@style/Theme.AppBarLayout</item>
<item name="materialCardViewFilledStyle">@style/Theme.Card</item> <item name="materialCardViewFilledStyle">@style/Theme.Card</item>
<item name="collapsingToolbarLayoutLargeStyle">@style/Theme.CollapsingToolbar</item>
</style> </style>
<style name="Theme.AppBarLayout" parent="Widget.Material3.AppBarLayout"> <style name="Theme.AppBarLayout" parent="Widget.Material3.AppBarLayout">