compose: trim themes, attrs and gradle deps for compose-only UI
Drops the legacy AuroraTheme styles, custom attrs and now-unused styles_widget/styles_text overlays. Updates the dark/light themes, strings, arrays, dimens and colors to match what the Compose screens consume. Adds ic_logo_alt and tweaks the launcher/logo drawables. Trims gradle dependencies tied to the removed Fragment/Epoxy stack.
This commit is contained in:
@@ -19,51 +19,6 @@
|
||||
-->
|
||||
|
||||
<resources>
|
||||
<array name="auto_size_text_sizes">
|
||||
<item>12sp</item>
|
||||
<item>13sp</item>
|
||||
<item>14sp</item>
|
||||
<item>15sp</item>
|
||||
<item>16sp</item>
|
||||
<item>17sp</item>
|
||||
<item>18sp</item>
|
||||
<item>19sp</item>
|
||||
<item>20sp</item>
|
||||
</array>
|
||||
<array name="auto_size_text_sizes_large">
|
||||
<item>24sp</item>
|
||||
<item>25sp</item>
|
||||
<item>26sp</item>
|
||||
<item>27sp</item>
|
||||
<item>28sp</item>
|
||||
<item>29sp</item>
|
||||
<item>30sp</item>
|
||||
<item>31sp</item>
|
||||
<item>32sp</item>
|
||||
<item>33sp</item>
|
||||
<item>34sp</item>
|
||||
<item>35sp</item>
|
||||
<item>36sp</item>
|
||||
<item>37sp</item>
|
||||
<item>38sp</item>
|
||||
<item>39sp</item>
|
||||
<item>40sp</item>
|
||||
<item>41sp</item>
|
||||
<item>42sp</item>
|
||||
<item>43sp</item>
|
||||
<item>44sp</item>
|
||||
<item>45sp</item>
|
||||
<item>46sp</item>
|
||||
<item>47sp</item>
|
||||
<item>48sp</item>
|
||||
</array>
|
||||
|
||||
<string-array name="pref_updates_auto_values">
|
||||
<item>0</item>
|
||||
<item>1</item>
|
||||
<item>2</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="pref_updates_auto">
|
||||
<item>@string/pref_updates_auto_off</item>
|
||||
<item>@string/pref_updates_auto_notify</item>
|
||||
@@ -115,18 +70,18 @@
|
||||
<item>@string/about_libera_summary</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="pref_theme_style">
|
||||
<item>@string/pref_theme_style_system</item>
|
||||
<item>@string/pref_theme_style_light</item>
|
||||
<item>@string/pref_theme_style_dark</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="pref_default_tab">
|
||||
<item>@string/title_apps</item>
|
||||
<item>@string/title_games</item>
|
||||
<item>@string/title_updates</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="pref_default_tab_values">
|
||||
<item>0</item>
|
||||
<item>1</item>
|
||||
<item>2</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="filterRatingValues" translatable="false">
|
||||
<item>0</item>
|
||||
<item>1.0</item>
|
||||
@@ -174,10 +129,4 @@
|
||||
<item>80798000</item>
|
||||
<item>82201710</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="pref_vending_version_values" translatable="false">
|
||||
<item>0</item>
|
||||
<item>1</item>
|
||||
<item>2</item>
|
||||
</string-array>
|
||||
</resources>
|
||||
|
||||
@@ -1,45 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?><!--
|
||||
~ Aurora Store
|
||||
~ Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
|
||||
~
|
||||
~ Aurora Store is free software: you can redistribute it and/or modify
|
||||
~ it under the terms of the GNU General Public License as published by
|
||||
~ the Free Software Foundation, either version 2 of the License, or
|
||||
~ (at your option) any later version.
|
||||
~
|
||||
~ Aurora Store is distributed in the hope that it will be useful,
|
||||
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
~ GNU General Public License for more details.
|
||||
~
|
||||
~ You should have received a copy of the GNU General Public License
|
||||
~ along with Aurora Store. If not, see <http://www.gnu.org/licenses/>.
|
||||
~
|
||||
-->
|
||||
|
||||
<resources>
|
||||
<declare-styleable name="ActionHeaderLayout">
|
||||
<attr name="headerTitle" format="string" />
|
||||
<attr name="headerSubtitle" format="string" />
|
||||
</declare-styleable>
|
||||
|
||||
<declare-styleable name="StateButton">
|
||||
<attr name="btnStateText" format="string" />
|
||||
<attr name="btnStateIcon" format="reference" />
|
||||
</declare-styleable>
|
||||
|
||||
<declare-styleable name="AuroraProgressView">
|
||||
<attr name="minWidth" format="dimension" />
|
||||
<attr name="maxWidth" format="dimension" />
|
||||
<attr name="minHeight" format="dimension" />
|
||||
<attr name="maxHeight" format="dimension" />
|
||||
<attr name="indicatorName" format="string" />
|
||||
<attr name="indicatorColor" format="color" />
|
||||
</declare-styleable>
|
||||
|
||||
<declare-styleable name="DevInfoLayout">
|
||||
<attr name="txtTitle" format="string" />
|
||||
<attr name="txtSubtitle" format="string" />
|
||||
<attr name="imgIcon" format="reference" />
|
||||
</declare-styleable>
|
||||
</resources>
|
||||
@@ -21,9 +21,4 @@
|
||||
<!--Common Colors-->
|
||||
<color name="colorAccent">#6C63FF</color>
|
||||
<color name="ic_launcher_background">#6C63FF</color>
|
||||
|
||||
<!-- AppDetailsFragment | Dialog -->
|
||||
<color name="colorRed">#E4002B</color>
|
||||
<color name="colorOrange">#FF9933</color>
|
||||
<color name="colorGreen">#49A942</color>
|
||||
</resources>
|
||||
|
||||
@@ -42,6 +42,7 @@
|
||||
<dimen name="icon_size_large">72dp</dimen>
|
||||
<dimen name="icon_size_cluster">80dp</dimen>
|
||||
<dimen name="icon_size_avatar">108dp</dimen>
|
||||
<dimen name="icon_size_splash">192dp</dimen>
|
||||
|
||||
<!--Almost 16 : 9-->
|
||||
<dimen name="screenshot_height">192dp</dimen>
|
||||
@@ -71,4 +72,6 @@
|
||||
<dimen name="radius_medium">10dp</dimen>
|
||||
<dimen name="radius_normal">12dp</dimen>
|
||||
<dimen name="radius_large">16dp</dimen>
|
||||
|
||||
<dimen name="scroll_hint_padding">5dp</dimen>
|
||||
</resources>
|
||||
|
||||
@@ -236,14 +236,14 @@
|
||||
<string name="purchase_not_found">"App not found"</string>
|
||||
<string name="purchase_no_file">"Could not get files"</string>
|
||||
<string name="purchase_session_expired">"Session expired, re-login to obtain new session."</string>
|
||||
<string name="session_enjoy">Log in and enjoy.</string>
|
||||
<string name="session_good">Woah! All good.</string>
|
||||
<string name="session_init">Getting things ready…</string>
|
||||
<string name="session_login">Please log in to your Google Play account</string>
|
||||
<string name="session_login_failed_google">Could not log in via Google</string>
|
||||
<string name="session_scrapped">Last session scrapped</string>
|
||||
<string name="session_verifying">Verifying session</string>
|
||||
<string name="session_verifying_google">Verifying Google session</string>
|
||||
<string name="session_enjoy">"Log in and enjoy."</string>
|
||||
<string name="session_good">"All good."</string>
|
||||
<string name="session_init">"Getting things ready…"</string>
|
||||
<string name="session_login">"Please log in to your Google Play account"</string>
|
||||
<string name="session_login_failed_google">"Could not log in via Google"</string>
|
||||
<string name="session_scrapped">"Last session scrapped"</string>
|
||||
<string name="session_verifying">"Verifying session"</string>
|
||||
<string name="session_verifying_google">"Verifying Google session"</string>
|
||||
<string name="spoof_apply">"Make sure you re-login to apply the spoof"</string>
|
||||
<string name="insecure_anonymous_apply">"Make sure you re-login and restart app to apply changes."</string>
|
||||
<string name="tab_categories">"Categories"</string>
|
||||
@@ -342,6 +342,10 @@
|
||||
<string name="failed_generating_session">Failed to generate session, error code: <xliff:g id="status_code">%1$d</xliff:g></string>
|
||||
<string name="check_connectivity">Check internet connectivity</string>
|
||||
<string name="app_language">App language</string>
|
||||
<string name="pref_ui_theme">Theme</string>
|
||||
<string name="pref_theme_style_system">Follow system</string>
|
||||
<string name="pref_theme_style_light">Light</string>
|
||||
<string name="pref_theme_style_dark">Dark</string>
|
||||
<string name="pref_ui_layout">Layout</string>
|
||||
<string name="pref_ui_layout_tab">Select default tab</string>
|
||||
<string name="app_links_title">App links</string>
|
||||
@@ -560,4 +564,7 @@
|
||||
<!-- Misc -->
|
||||
<string name="loading">Loading in progress</string>
|
||||
<string name="page">Page <xliff:g id="number">%1$d</xliff:g></string>
|
||||
|
||||
<!-- Network Dialog -->
|
||||
<string name="action_check">"Check"</string>
|
||||
</resources>
|
||||
|
||||
@@ -1,126 +0,0 @@
|
||||
<!--
|
||||
~ Aurora Store
|
||||
~ Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
|
||||
~
|
||||
~ Aurora Store is free software: you can redistribute it and/or modify
|
||||
~ it under the terms of the GNU General Public License as published by
|
||||
~ the Free Software Foundation, either version 2 of the License, or
|
||||
~ (at your option) any later version.
|
||||
~
|
||||
~ Aurora Store is distributed in the hope that it will be useful,
|
||||
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
~ GNU General Public License for more details.
|
||||
~
|
||||
~ You should have received a copy of the GNU General Public License
|
||||
~ along with Aurora Store. If not, see <http://www.gnu.org/licenses/>.
|
||||
~
|
||||
-->
|
||||
|
||||
<resources>
|
||||
<!-- Title Styles -->
|
||||
<style name="AuroraTextStyle" parent="Widget.AppCompat.TextView">
|
||||
<item name="autoSizeTextType">uniform</item>
|
||||
<item name="autoSizeMinTextSize">12sp</item>
|
||||
<item name="autoSizeMaxTextSize">20sp</item>
|
||||
<item name="autoSizeStepGranularity">1sp</item>
|
||||
<item name="autoSizePresetSizes">@array/auto_size_text_sizes</item>
|
||||
</style>
|
||||
|
||||
<style name="AuroraTextStyle.Rating" parent="@style/AuroraTextStyle">
|
||||
<item name="autoSizeMinTextSize">24sp</item>
|
||||
<item name="autoSizeMaxTextSize">48sp</item>
|
||||
<item name="autoSizeStepGranularity">1sp</item>
|
||||
<item name="autoSizePresetSizes">@array/auto_size_text_sizes_large</item>
|
||||
<item name="android:textAppearance">@style/TextAppearance.Aurora.Title.Rating</item>
|
||||
</style>
|
||||
|
||||
<!-- Subtitle Styles -->
|
||||
<style name="AuroraTextStyle.Subtitle" parent="@style/AuroraTextStyle">
|
||||
<item name="autoSizeMaxTextSize">16sp</item>
|
||||
<item name="android:textAppearance">@style/TextAppearance.Aurora.SubTitle</item>
|
||||
</style>
|
||||
|
||||
<style name="AuroraTextStyle.Subtitle.Alt" parent="@style/AuroraTextStyle">
|
||||
<item name="autoSizeMaxTextSize">18sp</item>
|
||||
<item name="android:textAppearance">@style/TextAppearance.Aurora.SubTitle.Alt</item>
|
||||
</style>
|
||||
|
||||
<!-- Line Styles -->
|
||||
<style name="AuroraTextStyle.Line1" parent="@style/AuroraTextStyle">
|
||||
<item name="android:maxLines">1</item>
|
||||
<item name="android:ellipsize">end</item>
|
||||
<item name="android:textAppearance">@style/TextAppearance.Aurora.Line1</item>
|
||||
</style>
|
||||
|
||||
<style name="AuroraTextStyle.Line2" parent="@style/AuroraTextStyle.Line1">
|
||||
<item name="autoSizeMaxTextSize">12sp</item>
|
||||
<item name="android:textAppearance">@style/TextAppearance.Aurora.Line2</item>
|
||||
</style>
|
||||
|
||||
<style name="AuroraTextStyle.Line3" parent="@style/AuroraTextStyle.Line1">
|
||||
<item name="autoSizeMaxTextSize">10sp</item>
|
||||
<item name="android:textAppearance">@style/TextAppearance.Aurora.Line3</item>
|
||||
</style>
|
||||
|
||||
<!-- Title Appearances -->
|
||||
<style name="TextAppearance.Base" parent="TextAppearance.AppCompat.Medium">
|
||||
<item name="autoSizeTextType">uniform</item>
|
||||
<item name="autoSizeMinTextSize">12sp</item>
|
||||
<item name="autoSizeMaxTextSize">20sp</item>
|
||||
<item name="autoSizeStepGranularity">1sp</item>
|
||||
<item name="autoSizePresetSizes">@array/auto_size_text_sizes</item>
|
||||
|
||||
<item name="android:letterSpacing">0.05</item>
|
||||
<item name="android:maxLines">1</item>
|
||||
<item name="android:ellipsize">end</item>
|
||||
<item name="android:textColor">?android:attr/textColorPrimary</item>
|
||||
</style>
|
||||
|
||||
<style name="TextAppearance.Aurora.Title" parent="@style/TextAppearance.Base">
|
||||
<item name="android:textSize">20sp</item>
|
||||
</style>
|
||||
|
||||
<style name="TextAppearance.Aurora.Title.Primary" parent="@style/TextAppearance.Aurora.Title">
|
||||
<item name="android:textStyle">normal</item>
|
||||
<item name="android:textAllCaps">true</item>
|
||||
</style>
|
||||
|
||||
<style name="TextAppearance.Aurora.Title.Rating" parent="@style/TextAppearance.Aurora.Title.Primary">
|
||||
<item name="android:textSize">48sp</item>
|
||||
</style>
|
||||
|
||||
<!-- Subtitle Appearances -->
|
||||
<style name="TextAppearance.Aurora.SubTitle" parent="@style/TextAppearance.Aurora.Title">
|
||||
<item name="android:letterSpacing">0.025</item>
|
||||
<item name="android:textSize">16sp</item>
|
||||
</style>
|
||||
|
||||
<style name="TextAppearance.Aurora.SubTitle.Alt" parent="@style/TextAppearance.Aurora.Title">
|
||||
<item name="android:letterSpacing">0.005</item>
|
||||
<item name="android:textSize">18sp</item>
|
||||
</style>
|
||||
|
||||
<!-- Line Appearances -->
|
||||
<style name="TextAppearance.Aurora.Line1" parent="@style/TextAppearance.Base">
|
||||
<item name="android:ellipsize">end</item>
|
||||
<item name="android:maxLines">1</item>
|
||||
<item name="android:textSize">14sp</item>
|
||||
<item name="android:textColor">?android:attr/textColorPrimary</item>
|
||||
</style>
|
||||
|
||||
<style name="TextAppearance.Aurora.Line2" parent="@style/TextAppearance.Aurora.Line1">
|
||||
<item name="android:textSize">12sp</item>
|
||||
<item name="android:textColor">?android:attr/textColorSecondary</item>
|
||||
</style>
|
||||
|
||||
<style name="TextAppearance.Aurora.Line3" parent="@style/TextAppearance.Aurora.Line2">
|
||||
<item name="android:textSize">10sp</item>
|
||||
<item name="android:textColor">?android:attr/textColorTertiary</item>
|
||||
</style>
|
||||
|
||||
<!-- Tab Appearances -->
|
||||
<style name="TextAppearance.Aurora.Tab" parent="Widget.AppCompat.Light.ActionBar.TabText">
|
||||
<item name="android:textSize">12sp</item>
|
||||
</style>
|
||||
</resources>
|
||||
@@ -1,45 +0,0 @@
|
||||
<!--
|
||||
~ Aurora Store
|
||||
~ Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
|
||||
~
|
||||
~ Aurora Store is free software: you can redistribute it and/or modify
|
||||
~ it under the terms of the GNU General Public License as published by
|
||||
~ the Free Software Foundation, either version 2 of the License, or
|
||||
~ (at your option) any later version.
|
||||
~
|
||||
~ Aurora Store is distributed in the hope that it will be useful,
|
||||
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
~ GNU General Public License for more details.
|
||||
~
|
||||
~ You should have received a copy of the GNU General Public License
|
||||
~ along with Aurora Store. If not, see <http://www.gnu.org/licenses/>.
|
||||
~
|
||||
-->
|
||||
|
||||
<resources>
|
||||
|
||||
<style name="AuroraProgressView">
|
||||
<item name="minWidth">32dp</item>
|
||||
<item name="maxWidth">46dp</item>
|
||||
<item name="minHeight">36dp</item>
|
||||
<item name="maxHeight">36dp</item>
|
||||
<item name="indicatorName">BallPulseIndicator</item>
|
||||
</style>
|
||||
|
||||
<style name="AuroraProgressView.Large">
|
||||
<item name="minWidth">48dp</item>
|
||||
<item name="maxWidth">48dp</item>
|
||||
<item name="minHeight">56dp</item>
|
||||
<item name="maxHeight">56dp</item>
|
||||
<item name="indicatorName">BallPulseIndicator</item>
|
||||
</style>
|
||||
|
||||
<style name="AuroraProgressView.Small">
|
||||
<item name="minWidth">24dp</item>
|
||||
<item name="maxWidth">24dp</item>
|
||||
<item name="minHeight">24dp</item>
|
||||
<item name="maxHeight">24dp</item>
|
||||
<item name="indicatorName">BallPulseIndicator</item>
|
||||
</style>
|
||||
</resources>
|
||||
@@ -21,7 +21,6 @@
|
||||
|
||||
<style name="AppTheme" parent="Theme.Material3.DynamicColors.Light.NoActionBar">
|
||||
<item name="chipStyle">@style/Chip.Filter</item>
|
||||
<item name="preferenceTheme">@style/AppTheme.PreferenceThemeOverlay</item>
|
||||
<item name="bottomSheetStyle">@style/AppTheme.BottomSheetStyle</item>
|
||||
<item name="android:statusBarColor">@android:color/transparent</item>
|
||||
</style>
|
||||
@@ -38,26 +37,5 @@
|
||||
|
||||
<style name="AppTheme.BottomSheetStyle" parent="Widget.Material3.BottomSheet" />
|
||||
|
||||
<style name="AppTheme.PreferenceThemeOverlay" parent="@style/PreferenceThemeOverlay">
|
||||
<item name="android:layout">@layout/fragment_setting</item>
|
||||
<item name="switchPreferenceCompatStyle">@style/AppTheme.SwitchPreference</item>
|
||||
</style>
|
||||
|
||||
<style name="AppTheme.SwitchPreference" parent="@style/Preference.SwitchPreferenceCompat.Material">
|
||||
<item name="widgetLayout">@layout/preference_material_switch</item>
|
||||
</style>
|
||||
|
||||
<style name="Chip.Filter" parent="@style/Widget.Material3.Chip.Filter" />
|
||||
|
||||
<style name="Chip.TopChart" parent="@style/Widget.Material3.Chip.Filter">
|
||||
<item name="android:textAppearance">@style/TextAppearance.Aurora.Line1</item>
|
||||
<item name="chipStrokeColor">?attr/colorControlHighlight</item>
|
||||
</style>
|
||||
|
||||
<style name="Chip.Tag" parent="@style/Widget.Material3.Chip.Assist">
|
||||
<item name="android:clickable">false</item>
|
||||
<item name="android:textAppearance">@style/TextAppearance.Aurora.Line2</item>
|
||||
<item name="chipBackgroundColor">?attr/colorControlHighlight</item>
|
||||
<item name="chipStrokeWidth">0dp</item>
|
||||
</style>
|
||||
</resources>
|
||||
|
||||
Reference in New Issue
Block a user