2019-09-18 22:29:09 +02:00
|
|
|
<component name="ProjectCodeStyleConfiguration">
|
|
|
|
<code_scheme name="Project" version="173">
|
[UI] Upgrade to Material 3 design, refactor some core elements (#201)
* Material 3 theme and color support, filled cards
* Change drawer header, dark bottombar color
* Replace MaterialComponents with Material3
* wielki powrót pr m3 do szkolnego (nie czytajcie tego kodu)
* fix M3 UI code & upgrade kotlin
* update dependencies
* fix missing Intent receiver flags for Tiramisu+
* fix kapt errors related to SelectiveDAO + migrate BuildConfig
* adapt code to updated dependencies + align lessons (based by szkolny-eu/szkolny-android#196)
* fix: no query filtering
* fix: duplicated items in about card
* fix: "Back button opens drawer" (redundant super call)
* fix: too small heading in agenda dialog
* adapt notes fragment to MD3
* add lock layout function (szkolny-eu/szkolny-android#199)
* hide classroom heading when no classroom is specified
* add support for grade column codes
* grades: join code and category together
* add cosmetic ui changes + fix build issues
* fix proguard rules (attempt 1)
* add new Retrofit2 rules
* add new ProGuard rules + fix QR scanning
* fix agenda view crash when building release variant
* improve LessonDetailsDialog
* remove duplicated string extension
* set separate app ID & icon for debug version
* remove unneeded import statement
* fix collapsing toolbar title when doing back gesture
* remove useless dependencies
* fix UI issues on old Android versions
* fix missing color resources + cleanup dependencies
* fix release building issue
* fix release building issue & remove ripple from NavView
* move version badge to the top bar
* Revert changes introduced by rebase
* Update NavLib from sadorowo/NavLib
* Revert "add lock layout function (szkolny-eu/szkolny-android#199)"
This reverts commit 2fd7038d0c0b43f2d39333d2e556bde066cd28b6.
* Revert "add support for grade column codes"
* Revert unnecessary code changes, part 1
* Lower minSdk to 19
* Revert unnecessary code changes, part 2
* Add new application logo
* Restore bottom bar support in NavLib, revert unnecessary changes
* Use new IconicsMaterialButton in MessageFragment
* Migrate NavView to view binding
* Support IconButton in IconicsMaterialButton
* Cleanup NavLib w600dp styles
* Remove NavLib text styles
* Refactor all application themes, update styles in layouts
* Move enums and config entry to .data, fix app crashing
* Rename non-theme styles to AppStyle
* Restructure app config classes, move config to .data
* Add Theme enum and UiManager, support basic theme changing
* Actually support basic theme changing
* Serialize enum as string, fix config migration, bring back DebugDb
* Fix changing themes, apply night mode in App
* Fix resolving ColorStateList attributes, add LabPlaygroundFragment
* add Iconics methods into ProGuard rules
* Replace home card icon buttons, remove unused icons
* Update gradle properties
* Update build.gradle
* Remove unnecessary dependencies
* Remove playstore icon
* Apply fixes after review
---------
Co-authored-by: Adam Kasprzycki <66315787+santoni0@users.noreply.github.com>
Co-authored-by: Kuba Szczodrzyński <kuba@szczodrzynski.pl>
2024-06-30 16:12:07 +02:00
|
|
|
<AndroidXmlCodeStyleSettings>
|
|
|
|
<option name="LAYOUT_SETTINGS">
|
|
|
|
<value>
|
|
|
|
<option name="INSERT_LINE_BREAK_BEFORE_NAMESPACE_DECLARATION" value="true" />
|
|
|
|
</value>
|
|
|
|
</option>
|
|
|
|
<option name="MANIFEST_SETTINGS">
|
|
|
|
<value>
|
|
|
|
<option name="INSERT_LINE_BREAK_BEFORE_NAMESPACE_DECLARATION" value="true" />
|
|
|
|
</value>
|
|
|
|
</option>
|
|
|
|
<option name="OTHER_SETTINGS">
|
|
|
|
<value>
|
|
|
|
<option name="INSERT_LINE_BREAK_BEFORE_NAMESPACE_DECLARATION" value="true" />
|
|
|
|
</value>
|
|
|
|
</option>
|
|
|
|
</AndroidXmlCodeStyleSettings>
|
2021-02-17 14:42:08 +01:00
|
|
|
<JetCodeStyleSettings>
|
2021-10-09 22:48:41 +02:00
|
|
|
<option name="ALLOW_TRAILING_COMMA" value="true" />
|
2021-02-17 14:42:08 +01:00
|
|
|
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
|
|
|
|
</JetCodeStyleSettings>
|
2022-10-21 23:59:53 +02:00
|
|
|
<codeStyleSettings language="JSON">
|
|
|
|
<indentOptions>
|
|
|
|
<option name="INDENT_SIZE" value="4" />
|
|
|
|
<option name="USE_TAB_CHARACTER" value="true" />
|
|
|
|
<option name="SMART_TABS" value="true" />
|
|
|
|
</indentOptions>
|
|
|
|
</codeStyleSettings>
|
2019-09-18 22:29:09 +02:00
|
|
|
<codeStyleSettings language="XML">
|
2021-02-17 14:42:08 +01:00
|
|
|
<option name="FORCE_REARRANGE_MODE" value="1" />
|
2019-09-18 22:29:09 +02:00
|
|
|
<indentOptions>
|
|
|
|
<option name="CONTINUATION_INDENT_SIZE" value="4" />
|
|
|
|
</indentOptions>
|
|
|
|
<arrangement>
|
|
|
|
<rules>
|
|
|
|
<section>
|
|
|
|
<rule>
|
|
|
|
<match>
|
|
|
|
<AND>
|
|
|
|
<NAME>xmlns:android</NAME>
|
2021-04-12 14:27:51 +02:00
|
|
|
<XML_ATTRIBUTE />
|
2019-09-18 22:29:09 +02:00
|
|
|
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
|
|
|
</AND>
|
|
|
|
</match>
|
|
|
|
</rule>
|
|
|
|
</section>
|
|
|
|
<section>
|
|
|
|
<rule>
|
|
|
|
<match>
|
|
|
|
<AND>
|
|
|
|
<NAME>xmlns:.*</NAME>
|
2021-04-12 14:27:51 +02:00
|
|
|
<XML_ATTRIBUTE />
|
2019-09-18 22:29:09 +02:00
|
|
|
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
|
|
|
</AND>
|
|
|
|
</match>
|
|
|
|
<order>BY_NAME</order>
|
|
|
|
</rule>
|
|
|
|
</section>
|
|
|
|
<section>
|
|
|
|
<rule>
|
|
|
|
<match>
|
|
|
|
<AND>
|
|
|
|
<NAME>.*:id</NAME>
|
2021-04-12 14:27:51 +02:00
|
|
|
<XML_ATTRIBUTE />
|
2019-09-18 22:29:09 +02:00
|
|
|
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
|
|
|
</AND>
|
|
|
|
</match>
|
|
|
|
</rule>
|
|
|
|
</section>
|
|
|
|
<section>
|
|
|
|
<rule>
|
|
|
|
<match>
|
|
|
|
<AND>
|
|
|
|
<NAME>.*:name</NAME>
|
2021-04-12 14:27:51 +02:00
|
|
|
<XML_ATTRIBUTE />
|
2019-09-18 22:29:09 +02:00
|
|
|
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
|
|
|
</AND>
|
|
|
|
</match>
|
|
|
|
</rule>
|
|
|
|
</section>
|
|
|
|
<section>
|
|
|
|
<rule>
|
|
|
|
<match>
|
|
|
|
<AND>
|
|
|
|
<NAME>name</NAME>
|
2021-04-12 14:27:51 +02:00
|
|
|
<XML_ATTRIBUTE />
|
2019-09-18 22:29:09 +02:00
|
|
|
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
|
|
|
</AND>
|
|
|
|
</match>
|
|
|
|
</rule>
|
|
|
|
</section>
|
|
|
|
<section>
|
|
|
|
<rule>
|
|
|
|
<match>
|
|
|
|
<AND>
|
|
|
|
<NAME>style</NAME>
|
2021-04-12 14:27:51 +02:00
|
|
|
<XML_ATTRIBUTE />
|
2019-09-18 22:29:09 +02:00
|
|
|
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
|
|
|
</AND>
|
|
|
|
</match>
|
|
|
|
</rule>
|
|
|
|
</section>
|
|
|
|
<section>
|
|
|
|
<rule>
|
|
|
|
<match>
|
|
|
|
<AND>
|
|
|
|
<NAME>.*</NAME>
|
2021-04-12 14:27:51 +02:00
|
|
|
<XML_ATTRIBUTE />
|
2019-09-18 22:29:09 +02:00
|
|
|
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
|
|
|
</AND>
|
|
|
|
</match>
|
|
|
|
<order>BY_NAME</order>
|
|
|
|
</rule>
|
|
|
|
</section>
|
|
|
|
<section>
|
|
|
|
<rule>
|
|
|
|
<match>
|
|
|
|
<AND>
|
|
|
|
<NAME>.*</NAME>
|
2021-04-12 14:27:51 +02:00
|
|
|
<XML_ATTRIBUTE />
|
2019-09-18 22:29:09 +02:00
|
|
|
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
|
|
|
</AND>
|
|
|
|
</match>
|
|
|
|
<order>ANDROID_ATTRIBUTE_ORDER</order>
|
|
|
|
</rule>
|
|
|
|
</section>
|
|
|
|
<section>
|
|
|
|
<rule>
|
|
|
|
<match>
|
|
|
|
<AND>
|
|
|
|
<NAME>.*</NAME>
|
2021-04-12 14:27:51 +02:00
|
|
|
<XML_ATTRIBUTE />
|
2019-09-18 22:29:09 +02:00
|
|
|
<XML_NAMESPACE>.*</XML_NAMESPACE>
|
|
|
|
</AND>
|
|
|
|
</match>
|
|
|
|
<order>BY_NAME</order>
|
|
|
|
</rule>
|
|
|
|
</section>
|
|
|
|
</rules>
|
|
|
|
</arrangement>
|
|
|
|
</codeStyleSettings>
|
2021-02-17 14:42:08 +01:00
|
|
|
<codeStyleSettings language="kotlin">
|
|
|
|
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
|
2024-07-04 22:14:52 +02:00
|
|
|
<option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
|
[UI] Upgrade to Material 3 design, refactor some core elements (#201)
* Material 3 theme and color support, filled cards
* Change drawer header, dark bottombar color
* Replace MaterialComponents with Material3
* wielki powrót pr m3 do szkolnego (nie czytajcie tego kodu)
* fix M3 UI code & upgrade kotlin
* update dependencies
* fix missing Intent receiver flags for Tiramisu+
* fix kapt errors related to SelectiveDAO + migrate BuildConfig
* adapt code to updated dependencies + align lessons (based by szkolny-eu/szkolny-android#196)
* fix: no query filtering
* fix: duplicated items in about card
* fix: "Back button opens drawer" (redundant super call)
* fix: too small heading in agenda dialog
* adapt notes fragment to MD3
* add lock layout function (szkolny-eu/szkolny-android#199)
* hide classroom heading when no classroom is specified
* add support for grade column codes
* grades: join code and category together
* add cosmetic ui changes + fix build issues
* fix proguard rules (attempt 1)
* add new Retrofit2 rules
* add new ProGuard rules + fix QR scanning
* fix agenda view crash when building release variant
* improve LessonDetailsDialog
* remove duplicated string extension
* set separate app ID & icon for debug version
* remove unneeded import statement
* fix collapsing toolbar title when doing back gesture
* remove useless dependencies
* fix UI issues on old Android versions
* fix missing color resources + cleanup dependencies
* fix release building issue
* fix release building issue & remove ripple from NavView
* move version badge to the top bar
* Revert changes introduced by rebase
* Update NavLib from sadorowo/NavLib
* Revert "add lock layout function (szkolny-eu/szkolny-android#199)"
This reverts commit 2fd7038d0c0b43f2d39333d2e556bde066cd28b6.
* Revert "add support for grade column codes"
* Revert unnecessary code changes, part 1
* Lower minSdk to 19
* Revert unnecessary code changes, part 2
* Add new application logo
* Restore bottom bar support in NavLib, revert unnecessary changes
* Use new IconicsMaterialButton in MessageFragment
* Migrate NavView to view binding
* Support IconButton in IconicsMaterialButton
* Cleanup NavLib w600dp styles
* Remove NavLib text styles
* Refactor all application themes, update styles in layouts
* Move enums and config entry to .data, fix app crashing
* Rename non-theme styles to AppStyle
* Restructure app config classes, move config to .data
* Add Theme enum and UiManager, support basic theme changing
* Actually support basic theme changing
* Serialize enum as string, fix config migration, bring back DebugDb
* Fix changing themes, apply night mode in App
* Fix resolving ColorStateList attributes, add LabPlaygroundFragment
* add Iconics methods into ProGuard rules
* Replace home card icon buttons, remove unused icons
* Update gradle properties
* Update build.gradle
* Remove unnecessary dependencies
* Remove playstore icon
* Apply fixes after review
---------
Co-authored-by: Adam Kasprzycki <66315787+santoni0@users.noreply.github.com>
Co-authored-by: Kuba Szczodrzyński <kuba@szczodrzynski.pl>
2024-06-30 16:12:07 +02:00
|
|
|
<option name="PARAMETER_ANNOTATION_WRAP" value="2" />
|
|
|
|
<option name="ENUM_CONSTANTS_WRAP" value="2" />
|
2021-02-17 14:42:08 +01:00
|
|
|
</codeStyleSettings>
|
2019-09-18 22:29:09 +02:00
|
|
|
</code_scheme>
|
|
|
|
</component>
|