mirror of
https://codeberg.org/gitnex/GitNex
synced 2024-12-23 17:15:49 +01:00
ade7b797f1
Minor performance improvements. Merge branch 'master' of https://codeberg.org/gitnex/GitNex into issue-reactions Improving color of selected elements. First, fully working implementation of reactions. Merge branch 'master' of https://codeberg.org/gitnex/GitNex into issue-reactions Conflicts: app/src/main/res/layout/bottom_sheet_issue_comments.xml app/src/main/res/layout/list_issue_comments.xml (Hopefully) fixing merge issues. Merge branch 'master' of https://codeberg.org/gitnex/GitNex into issue-reactions Conflicts: app/src/main/java/org/mian/gitnex/interfaces/ApiInterface.java app/src/main/res/layout/activity_issue_detail.xml app/src/main/res/layout/bottom_sheet_issue_comments.xml app/src/main/res/layout/bottom_sheet_single_issue.xml app/src/main/res/values/colors.xml Moving reactions below time frame on comments. Merge branch 'master' into layout-reactions Add IssueReactions Merge remote-tracking branch 'origin/layout-reactions' into layout-reactions Merge branch 'master' of https://gitea.com/gitnex/GitNex into layout-reactions Merge branch 'master' into layout-reactions Applying to pulls and issues. Merge branch 'master' of https://gitea.com/gitnex/GitNex into layout-reactions Providing external layouts. Some improvements. Adding comment emote indications. Adding circle around emotes. Adding some padding. First tests. Co-authored-by: opyale <opyale@noreply.gitea.io> Co-authored-by: 6543 <6543@obermui.de> Co-authored-by: 6543 <6543@noreply.gitea.io> Reviewed-on: https://codeberg.org/gitnex/GitNex/pulls/557 Reviewed-by: M M Arif <mmarif@noreply.codeberg.org>
183 lines
6.7 KiB
XML
183 lines
6.7 KiB
XML
<component name="ProjectCodeStyleConfiguration">
|
|
<code_scheme name="Project" version="173">
|
|
<JavaCodeStyleSettings>
|
|
<option name="IMPORT_LAYOUT_TABLE">
|
|
<value>
|
|
<package name="android" withSubpackages="true" static="false" />
|
|
<package name="androidx" withSubpackages="true" static="false" />
|
|
<package name="com" withSubpackages="true" static="false" />
|
|
<package name="junit" withSubpackages="true" static="false" />
|
|
<package name="net" withSubpackages="true" static="false" />
|
|
<package name="org" withSubpackages="true" static="false" />
|
|
<package name="java" withSubpackages="true" static="false" />
|
|
<package name="javax" withSubpackages="true" static="false" />
|
|
<package name="" withSubpackages="true" static="false" />
|
|
<package name="" withSubpackages="true" static="true" />
|
|
</value>
|
|
</option>
|
|
</JavaCodeStyleSettings>
|
|
<JetCodeStyleSettings>
|
|
<option name="PACKAGES_TO_USE_STAR_IMPORTS">
|
|
<value>
|
|
<package name="java.util" alias="false" withSubpackages="false" />
|
|
<package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
|
|
<package name="io.ktor" alias="false" withSubpackages="true" />
|
|
</value>
|
|
</option>
|
|
<option name="PACKAGES_IMPORT_LAYOUT">
|
|
<value>
|
|
<package name="" alias="false" withSubpackages="true" />
|
|
<package name="java" alias="false" withSubpackages="true" />
|
|
<package name="javax" alias="false" withSubpackages="true" />
|
|
<package name="kotlin" alias="false" withSubpackages="true" />
|
|
<package name="" alias="true" withSubpackages="true" />
|
|
</value>
|
|
</option>
|
|
</JetCodeStyleSettings>
|
|
<codeStyleSettings language="JAVA">
|
|
<option name="RIGHT_MARGIN" value="220" />
|
|
<option name="KEEP_LINE_BREAKS" value="false" />
|
|
<option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
|
|
<option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
|
|
<option name="BLANK_LINES_BEFORE_METHOD_BODY" value="1" />
|
|
<option name="BLANK_LINES_AROUND_FIELD_IN_INTERFACE" value="1" />
|
|
<option name="BLANK_LINES_AFTER_CLASS_HEADER" value="1" />
|
|
<option name="BLANK_LINES_AFTER_ANONYMOUS_CLASS_HEADER" value="1" />
|
|
<option name="BLANK_LINES_BEFORE_CLASS_END" value="1" />
|
|
<option name="ELSE_ON_NEW_LINE" value="true" />
|
|
<option name="CATCH_ON_NEW_LINE" value="true" />
|
|
<option name="FINALLY_ON_NEW_LINE" value="true" />
|
|
<option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
|
|
<option name="SPACE_BEFORE_IF_PARENTHESES" value="false" />
|
|
<option name="SPACE_BEFORE_WHILE_PARENTHESES" value="false" />
|
|
<option name="SPACE_BEFORE_FOR_PARENTHESES" value="false" />
|
|
<option name="SPACE_BEFORE_TRY_PARENTHESES" value="false" />
|
|
<option name="SPACE_BEFORE_CATCH_PARENTHESES" value="false" />
|
|
<option name="SPACE_BEFORE_SWITCH_PARENTHESES" value="false" />
|
|
<option name="SPACE_BEFORE_SYNCHRONIZED_PARENTHESES" value="false" />
|
|
<option name="CALL_PARAMETERS_WRAP" value="1" />
|
|
<option name="METHOD_PARAMETERS_WRAP" value="1" />
|
|
<option name="THROWS_LIST_WRAP" value="1" />
|
|
<option name="METHOD_CALL_CHAIN_WRAP" value="1" />
|
|
<option name="TERNARY_OPERATION_WRAP" value="1" />
|
|
<option name="ARRAY_INITIALIZER_WRAP" value="1" />
|
|
<option name="IF_BRACE_FORCE" value="3" />
|
|
<indentOptions>
|
|
<option name="USE_TAB_CHARACTER" value="true" />
|
|
<option name="SMART_TABS" value="true" />
|
|
</indentOptions>
|
|
</codeStyleSettings>
|
|
<codeStyleSettings language="XML">
|
|
<indentOptions>
|
|
<option name="CONTINUATION_INDENT_SIZE" value="4" />
|
|
</indentOptions>
|
|
<arrangement>
|
|
<rules>
|
|
<section>
|
|
<rule>
|
|
<match>
|
|
<AND>
|
|
<NAME>xmlns:android</NAME>
|
|
<XML_ATTRIBUTE />
|
|
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
|
</AND>
|
|
</match>
|
|
</rule>
|
|
</section>
|
|
<section>
|
|
<rule>
|
|
<match>
|
|
<AND>
|
|
<NAME>xmlns:.*</NAME>
|
|
<XML_ATTRIBUTE />
|
|
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
|
</AND>
|
|
</match>
|
|
<order>BY_NAME</order>
|
|
</rule>
|
|
</section>
|
|
<section>
|
|
<rule>
|
|
<match>
|
|
<AND>
|
|
<NAME>.*:id</NAME>
|
|
<XML_ATTRIBUTE />
|
|
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
|
</AND>
|
|
</match>
|
|
</rule>
|
|
</section>
|
|
<section>
|
|
<rule>
|
|
<match>
|
|
<AND>
|
|
<NAME>.*:name</NAME>
|
|
<XML_ATTRIBUTE />
|
|
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
|
</AND>
|
|
</match>
|
|
</rule>
|
|
</section>
|
|
<section>
|
|
<rule>
|
|
<match>
|
|
<AND>
|
|
<NAME>name</NAME>
|
|
<XML_ATTRIBUTE />
|
|
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
|
</AND>
|
|
</match>
|
|
</rule>
|
|
</section>
|
|
<section>
|
|
<rule>
|
|
<match>
|
|
<AND>
|
|
<NAME>style</NAME>
|
|
<XML_ATTRIBUTE />
|
|
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
|
</AND>
|
|
</match>
|
|
</rule>
|
|
</section>
|
|
<section>
|
|
<rule>
|
|
<match>
|
|
<AND>
|
|
<NAME>.*</NAME>
|
|
<XML_ATTRIBUTE />
|
|
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
|
</AND>
|
|
</match>
|
|
<order>BY_NAME</order>
|
|
</rule>
|
|
</section>
|
|
<section>
|
|
<rule>
|
|
<match>
|
|
<AND>
|
|
<NAME>.*</NAME>
|
|
<XML_ATTRIBUTE />
|
|
<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>
|
|
<XML_ATTRIBUTE />
|
|
<XML_NAMESPACE>.*</XML_NAMESPACE>
|
|
</AND>
|
|
</match>
|
|
<order>BY_NAME</order>
|
|
</rule>
|
|
</section>
|
|
</rules>
|
|
</arrangement>
|
|
</codeStyleSettings>
|
|
</code_scheme>
|
|
</component> |