mirror of
https://github.com/commons-app/apps-android-commons.git
synced 2025-10-27 04:43:54 +01:00
7336881705
* Localisation updates from https://translatewiki.net. * Fixes #4357 After switching to different account, contributions screen shows pictures of previous account (#4421) * Update UploadMediaDetailFragment.java * Update LoginActivity.java Clear CompositeDisposable after logging in successfully. It may help solve the problem of saving the contribution to the previous account * Revert "Update UploadMediaDetailFragment.java" This reverts commitb1b4257f20. Co-authored-by: Obsidian_zero <1198474846@qq.com> * Remove unnecessary whitespace from a message (#4439) * Merge v3.0.1 into master (#4446) * Versioning and changelog for v3.0.0 (#4152) * Versioning for v3.0.0 * Update changelog.md * Handled migration 8-9-10 in BookmarksLocationDao (#4154) * #Fixes #4141 - Handled migrations for BookmarkLocationsDao from 8-9-10 * #Fixes #4141 - Handled migrations for BookmarkLocationsDao from 8-9-10 * Fixes #4179 (#4180) * Handled null pointer exception in MainActivity->ContributionsFragment#backButtonClicked() * Updated >ContributionsFragment#backButtonClicked() to handle back press properly * Fixes #4179 (#4181) * Handled possible null check on MediaDetails in BookmarkListRootFragment#backPressed() * Cherrypick for hotfix3.1 (#4205) * Fixes #4159 On Explore Tab, All Available Options on toolbar in media detail view are only targeting the first media in the list. Fixes #4159 On Explore Tab, All Available Options on toolbar in media detail view are only targeting the first media in the list. * fixed bug: App crashes on viewing review in Review Fragment #4132 (#4146) * fixed bug:app crashes on viewing review in Review Fragment #4135 * Fixed the issue with back button in contribution tab. (#4177) Co-authored-by: Pratham2305 <Pratham2305@users.noreply.github.com> * Fixed the issue with back navigation button on toolbar in explore tab. (#4175) * Fix (#4148) Issues on theme change * fixed themeChange crashes * fixed comments * Overlooked the title bar Co-authored-by: Pratham Pahariya <54663429+Pratham2305@users.noreply.github.com> Co-authored-by: Shabir Ahmad <56585337+shabar-shab@users.noreply.github.com> Co-authored-by: Pratham2305 <Pratham2305@users.noreply.github.com> Co-authored-by: Aditya-Srivastav <54016427+4D17Y4@users.noreply.github.com> * Fixes #4173 (#4396) * Fix #4147 Pre-fill desc in Nearby uploads with Wikidata item's label + description (#4390) * Update query to fetch descriptions * Make description added to NearbyResultItem * Make string operations to display description and label in a combined way * Fix reviews, remove long description from list and swap label and description texts * Fix repeated information issue * Fix double information issue * fix style issues * Remove douplicated information * Changes made (#4354) * Remove nonexistent method * Fix #4283 IllegalStateException (#4440) * Fix #4283 IllegalStateException * Fix flickering issue * Versioning for v3.0.1 * Update changelog.md Co-authored-by: Ashish <ashishkumar468@gmail.com> Co-authored-by: neslihanturan <tur.neslihan@gmail.com> Co-authored-by: Pratham Pahariya <54663429+Pratham2305@users.noreply.github.com> Co-authored-by: Shabir Ahmad <56585337+shabar-shab@users.noreply.github.com> Co-authored-by: Pratham2305 <Pratham2305@users.noreply.github.com> Co-authored-by: Aditya-Srivastav <54016427+4D17Y4@users.noreply.github.com> Co-authored-by: Madhur Gupta <30932899+madhurgupta10@users.noreply.github.com> Co-authored-by: Vinayak Aggarwal <56196007+vinayak0505@users.noreply.github.com> * Localisation updates from https://translatewiki.net. * Added a feature for editing coordinates (#4418) * not * Place Picker added * Pick location and API call linked * minor warnings resolved * Code conventions followed * issue fixed * Wikitext edited properly * minor modification * Location Picker added * Bottom sheet removed * Location picker fully implemented * credit added * credit added * issues fixed * issues fixed * minor issue fixed * Some build issues occured merging release v3.0 are fixed. One paranthesis issue is solved, a method about UploadService is removed, since we don't use it anymore. (#4451) * Localisation updates from https://translatewiki.net. * Fixes 4344 - Duplicate Uploads (#4442) * Fixes 4344 - Update the retention policy of the Work Manager to ExistingWorkPolicy.APPEND_OR_REPLACE- which would append the new work to the end of existing one. This helps remove the while loop in UploadWorker which was meant to handle the cases where a new worker would be created for retries. The while loop seemed to have race conditions uploading duplicate entries. * Update states to IN_PROGRESS before uploads are processed * Fixes #3694 Pre-select places as depictions (#4452) * WikidataEditService: stop automatically adding WikidataPlace as a depiction When the user initiates the upload process from Nearby and also manually adds the place as a depiction, the depiction is added twice. Since this behavior is invisible to the user, it is being removed in preparation for auto-selecting the place as a depiction on the DepictsFragment screen. * DepictsFragment: auto-select place as a depiction Pass the Place reference from UploadActivity to DepictsFragment and select the corresponding DepictedItem. Using the place id, retrieve the corresponding Entity to create and select a DepictedItem. * UploadRepository: use Place from UploadItem to obtain a DepictedItem Instead of passing a Place object from UploadActivity to DepictsFragment and then passing the Place object up the chain to obtain and select a DepictedItem, retrieve the Place object directly within UploadRepository * DepictsFragment: select Place depiction when fragment becomes visible * UploadDepictsAdapter: make adapter aware of selection state Update selection state when recycled list items are automatically selected, preventing automatically selected items from appearing as unselected until they are forced to re-bind (i.e. after scrolling) * DepictsFragment: pre-select place depictions for all UploadItems If several images are selected and set to different places, pre-select all place depictions to reinforce the intended upload workflow philosophy (i.e. all images in a set are intended to be from/of the same place). See discussion in commons-app/apps-android-commons#3694 * DepictsFragment: scroll to the top every time list is updated * Typo fixes (#4461) * Fixed typo on class documentation of TextUtils * corrected comma placement in documentation * Fixed typos in comments * fix-issue-4424 (#4445) Co-authored-by: Pratham2305 <Pratham2305@users.noreply.github.com> * fix edit categories ui (#4414) Co-authored-by: Pratham2305 <Pratham2305@users.noreply.github.com> * Fix doom version issue (#4463) * Update db version * DBOpenHelper version update * fix :Back Pressed Event not work in Explore tab when user not login (#4404) * fix :Back Pressed Event not work in Explore tab * minor changes * fix :Upload count or number of contribution does not get updated when media is successful uploaded (#4399) * * fix:Number of Contributions not updated * Add javadocs * minor changes * made minor changes * String was nonsense and untranslatible, fixed (#4466) * Ability to show captions and descriptions in all entered languages (#4355) * implement Ability to show captions and descriptions in all entered languages *Add Javadoc * handle Back event of fragment(mediaDetailFragment) * fix minor bugs * add internationalization * revert previous changes * fix visibility bug * resolve conflict * Fixes #4437 - Changed indentation on files with 2 spaces to 4 spaces (#4462) * Edited Project.xml to make indent size 4 * Changed files with 2 space indentation to use 4 space indentation * Edited Project.xml to make indent size 4 * changed files with 2 space indent to 4 space indent * fix :Back Pressed Event not work in Explore tab when user not login (#4404) * fix :Back Pressed Event not work in Explore tab * minor changes * fix :Upload count or number of contribution does not get updated when media is successful uploaded (#4399) * * fix:Number of Contributions not updated * Add javadocs * minor changes * made minor changes * String was nonsense and untranslatible, fixed (#4466) * Ability to show captions and descriptions in all entered languages (#4355) * implement Ability to show captions and descriptions in all entered languages *Add Javadoc * handle Back event of fragment(mediaDetailFragment) * fix minor bugs * add internationalization * revert previous changes * fix visibility bug * resolve conflict Co-authored-by: Prince kushwaha <65972015+Prince-kushwaha@users.noreply.github.com> Co-authored-by: neslihanturan <tur.neslihan@gmail.com> * Use more understandable strings (#4470) * Fix #3792 Missing Column Issue (#4468) * Fix Missing Column Issue * Fix tests * Add UploadCategoriesFragment Unit Tests (#4473) * Panorama (#4467) * panoramic images fixed * made requested changes * Minor refactoring Co-authored-by: Aditya Srivastava <iamaditya2009@gmail.com> * Localisation updates from https://translatewiki.net. * Main activity title is sometimes "Contributions", sometimes "Commons" (#4472) Fixes #4438 Replace == with equals() in onRestoreInstanceState * Localisation updates from https://translatewiki.net. * caption and description copyable (#4481) * Removed next button in quiz (#4382) * issues resolved * modification done * warning fixed * issues resolved * Button added * don't know function added * Button added * modification done * modification done * Localisation updates from https://translatewiki.net. * Added option to show and modify location while uploading (#4475) * initial commit * Everything done * minor modification * minor modification * Issues fixed * minor modifications * issue fixed * Issues fixed * Tutorial removed from log out state (#4479) * tutorial removed from log out state * Issue removed * Update changelog.md * Versioning for v3.0.2 * Fix #4482 (#4484) * Fix crash when image resolution is very high (#4483) * Localisation updates from https://translatewiki.net. * Add Contributions Fragment Unit Tests (#4490) * Fix Tests Errors (#4491) * Add UploadMediaDetailFragment Unit Tests (#4492) * Localisation updates from https://translatewiki.net. * Localisation updates from https://translatewiki.net. * Localisation updates from https://translatewiki.net. * Initialised xmls, made folder and image item. * xmls done * xmls completed * removed unwanted attribute * Created models, adapters and view models (#4441) * created models, adapters and view models * Added Image Fragment * back button linked * Documentation and refractor * spaces * Butterknife annotation * DiffUtil * Added Examples * Extended Custom selector From Base Activity * made view model injectable * [GSOC] Added Image Fetch (#4449) * Added basic Fetch * added permission request * Folder count rectified * Loaded thumbnail * disabled overlay * Added sha1 function * Documented the code * [GSoC] Image Selection (#4457) * Localisation updates from https://translatewiki.net. * Fixes #4357 After switching to different account, contributions screen shows pictures of previous account (#4421) * Update UploadMediaDetailFragment.java * Update LoginActivity.java Clear CompositeDisposable after logging in successfully. It may help solve the problem of saving the contribution to the previous account * Revert "Update UploadMediaDetailFragment.java" This reverts commitb1b4257f20. Co-authored-by: Obsidian_zero <1198474846@qq.com> * Remove unnecessary whitespace from a message (#4439) * Merge v3.0.1 into master (#4446) * Versioning and changelog for v3.0.0 (#4152) * Versioning for v3.0.0 * Update changelog.md * Handled migration 8-9-10 in BookmarksLocationDao (#4154) * #Fixes #4141 - Handled migrations for BookmarkLocationsDao from 8-9-10 * #Fixes #4141 - Handled migrations for BookmarkLocationsDao from 8-9-10 * Fixes #4179 (#4180) * Handled null pointer exception in MainActivity->ContributionsFragment#backButtonClicked() * Updated >ContributionsFragment#backButtonClicked() to handle back press properly * Fixes #4179 (#4181) * Handled possible null check on MediaDetails in BookmarkListRootFragment#backPressed() * Cherrypick for hotfix3.1 (#4205) * Fixes #4159 On Explore Tab, All Available Options on toolbar in media detail view are only targeting the first media in the list. Fixes #4159 On Explore Tab, All Available Options on toolbar in media detail view are only targeting the first media in the list. * fixed bug: App crashes on viewing review in Review Fragment #4132 (#4146) * fixed bug:app crashes on viewing review in Review Fragment #4135 * Fixed the issue with back button in contribution tab. (#4177) Co-authored-by: Pratham2305 <Pratham2305@users.noreply.github.com> * Fixed the issue with back navigation button on toolbar in explore tab. (#4175) * Fix (#4148) Issues on theme change * fixed themeChange crashes * fixed comments * Overlooked the title bar Co-authored-by: Pratham Pahariya <54663429+Pratham2305@users.noreply.github.com> Co-authored-by: Shabir Ahmad <56585337+shabar-shab@users.noreply.github.com> Co-authored-by: Pratham2305 <Pratham2305@users.noreply.github.com> Co-authored-by: Aditya-Srivastav <54016427+4D17Y4@users.noreply.github.com> * Fixes #4173 (#4396) * Fix #4147 Pre-fill desc in Nearby uploads with Wikidata item's label + description (#4390) * Update query to fetch descriptions * Make description added to NearbyResultItem * Make string operations to display description and label in a combined way * Fix reviews, remove long description from list and swap label and description texts * Fix repeated information issue * Fix double information issue * fix style issues * Remove douplicated information * Changes made (#4354) * Remove nonexistent method * Fix #4283 IllegalStateException (#4440) * Fix #4283 IllegalStateException * Fix flickering issue * Versioning for v3.0.1 * Update changelog.md Co-authored-by: Ashish <ashishkumar468@gmail.com> Co-authored-by: neslihanturan <tur.neslihan@gmail.com> Co-authored-by: Pratham Pahariya <54663429+Pratham2305@users.noreply.github.com> Co-authored-by: Shabir Ahmad <56585337+shabar-shab@users.noreply.github.com> Co-authored-by: Pratham2305 <Pratham2305@users.noreply.github.com> Co-authored-by: Aditya-Srivastav <54016427+4D17Y4@users.noreply.github.com> Co-authored-by: Madhur Gupta <30932899+madhurgupta10@users.noreply.github.com> Co-authored-by: Vinayak Aggarwal <56196007+vinayak0505@users.noreply.github.com> * Localisation updates from https://translatewiki.net. * Added basic Fetch * added permission request * Folder count rectified * Loaded thumbnail * disabled overlay * Added sha1 function * Documented the code * Added a feature for editing coordinates (#4418) * not * Place Picker added * Pick location and API call linked * minor warnings resolved * Code conventions followed * issue fixed * Wikitext edited properly * minor modification * Location Picker added * Bottom sheet removed * Location picker fully implemented * credit added * credit added * issues fixed * issues fixed * minor issue fixed * Some build issues occured merging release v3.0 are fixed. One paranthesis issue is solved, a method about UploadService is removed, since we don't use it anymore. (#4451) * Localisation updates from https://translatewiki.net. * Fixes 4344 - Duplicate Uploads (#4442) * Fixes 4344 - Update the retention policy of the Work Manager to ExistingWorkPolicy.APPEND_OR_REPLACE- which would append the new work to the end of existing one. This helps remove the while loop in UploadWorker which was meant to handle the cases where a new worker would be created for retries. The while loop seemed to have race conditions uploading duplicate entries. * Update states to IN_PROGRESS before uploads are processed * Image selection added * Forwarded activity result to upload wizard * Initialised xmls, made folder and image item. * xmls done * xmls completed * removed unwanted attribute * Created models, adapters and view models (#4441) * created models, adapters and view models * Added Image Fragment * back button linked * Documentation and refractor * spaces * Butterknife annotation * DiffUtil * Added Examples * Extended Custom selector From Base Activity * made view model injectable * Added basic Fetch * added permission request * Folder count rectified * Loaded thumbnail * disabled overlay * Added sha1 function * Documented the code * Image selection added * Forwarded activity result to upload wizard * [GSOC] Added Image Fetch (#4449) * Added basic Fetch * added permission request * Folder count rectified * Loaded thumbnail * disabled overlay * Added sha1 function * Documented the code * fixed merge errors * Documented the remaining function Co-authored-by: translatewiki.net <l10n-bot@translatewiki.net> Co-authored-by: obsidian-zero <63155026+obsidian-zero@users.noreply.github.com> Co-authored-by: Obsidian_zero <1198474846@qq.com> Co-authored-by: Amir E. Aharoni <amir.aharoni@mail.huji.ac.il> Co-authored-by: Josephine Lim <josephinelim86@gmail.com> Co-authored-by: Ashish <ashishkumar468@gmail.com> Co-authored-by: neslihanturan <tur.neslihan@gmail.com> Co-authored-by: Pratham Pahariya <54663429+Pratham2305@users.noreply.github.com> Co-authored-by: Shabir Ahmad <56585337+shabar-shab@users.noreply.github.com> Co-authored-by: Pratham2305 <Pratham2305@users.noreply.github.com> Co-authored-by: Madhur Gupta <30932899+madhurgupta10@users.noreply.github.com> Co-authored-by: Vinayak Aggarwal <56196007+vinayak0505@users.noreply.github.com> Co-authored-by: Ayan Sarkar <71203077+Ayan-10@users.noreply.github.com> * [GSoC] Show uploaded images differently. (#4464) * uploaded images shown differently * Loaded images before query * Handled exceptions, Made ImageLoader injectable, Document and clean code * [GSoC] Added Uploaded status table in room database. (#4476) * added Uploaded status table in room database * Added unique property, minor refractoring * Database intigrated * Database integrated * Handled result null exception * Exceptions handled and refractored * Introduced constants * moved to sealed class * No database insert on network error * queried original image * documented the code * Updated uploaded status on upload success * Image Helper test (#4485) * [GSoC] Adapter Tests (#4488) * Added FolderAdapterTest * Image Adapter Test * merge fix * rebase fix Co-authored-by: translatewiki.net <l10n-bot@translatewiki.net> Co-authored-by: obsidian-zero <63155026+obsidian-zero@users.noreply.github.com> Co-authored-by: Obsidian_zero <1198474846@qq.com> Co-authored-by: Amir E. Aharoni <amir.aharoni@mail.huji.ac.il> Co-authored-by: Josephine Lim <josephinelim86@gmail.com> Co-authored-by: Ashish <ashishkumar468@gmail.com> Co-authored-by: neslihanturan <tur.neslihan@gmail.com> Co-authored-by: Pratham Pahariya <54663429+Pratham2305@users.noreply.github.com> Co-authored-by: Shabir Ahmad <56585337+shabar-shab@users.noreply.github.com> Co-authored-by: Pratham2305 <Pratham2305@users.noreply.github.com> Co-authored-by: Madhur Gupta <30932899+madhurgupta10@users.noreply.github.com> Co-authored-by: Vinayak Aggarwal <56196007+vinayak0505@users.noreply.github.com> Co-authored-by: Ayan Sarkar <71203077+Ayan-10@users.noreply.github.com> Co-authored-by: Brigham Byerly <6891883+byerlyb20@users.noreply.github.com> Co-authored-by: Jamie Brown <jamiejbrown521@gmail.com> Co-authored-by: Prince kushwaha <65972015+Prince-kushwaha@users.noreply.github.com> Co-authored-by: Nicolas Raoul <nicolas.raoul@gmail.com> Co-authored-by: Ashar <asharalikhan200@gmail.com>
327 lines
No EOL
13 KiB
XML
327 lines
No EOL
13 KiB
XML
<component name="ProjectCodeStyleConfiguration">
|
|
<code_scheme name="Project" version="173">
|
|
<option name="OTHER_INDENT_OPTIONS">
|
|
<value>
|
|
<option name="INDENT_SIZE" value="2" />
|
|
<option name="CONTINUATION_INDENT_SIZE" value="4" />
|
|
<option name="TAB_SIZE" value="2" />
|
|
</value>
|
|
</option>
|
|
<JSCodeStyleSettings>
|
|
<option name="INDENT_CHAINED_CALLS" value="false" />
|
|
</JSCodeStyleSettings>
|
|
<JavaCodeStyleSettings>
|
|
<option name="INSERT_INNER_CLASS_IMPORTS" value="true" />
|
|
<option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
|
|
<option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
|
|
<option name="IMPORT_LAYOUT_TABLE">
|
|
<value>
|
|
<package name="" withSubpackages="true" static="true" />
|
|
<emptyLine />
|
|
<package name="" withSubpackages="true" static="false" />
|
|
</value>
|
|
</option>
|
|
</JavaCodeStyleSettings>
|
|
<JetCodeStyleSettings>
|
|
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
|
|
</JetCodeStyleSettings>
|
|
<Objective-C>
|
|
<option name="INDENT_NAMESPACE_MEMBERS" value="0" />
|
|
<option name="INDENT_C_STRUCT_MEMBERS" value="2" />
|
|
<option name="INDENT_CLASS_MEMBERS" value="2" />
|
|
<option name="INDENT_VISIBILITY_KEYWORDS" value="1" />
|
|
<option name="INDENT_INSIDE_CODE_BLOCK" value="2" />
|
|
<option name="KEEP_STRUCTURES_IN_ONE_LINE" value="true" />
|
|
<option name="FUNCTION_PARAMETERS_WRAP" value="5" />
|
|
<option name="FUNCTION_CALL_ARGUMENTS_WRAP" value="5" />
|
|
<option name="TEMPLATE_CALL_ARGUMENTS_WRAP" value="5" />
|
|
<option name="TEMPLATE_CALL_ARGUMENTS_ALIGN_MULTILINE" value="true" />
|
|
<option name="ALIGN_INIT_LIST_IN_COLUMNS" value="false" />
|
|
<option name="SPACE_BEFORE_SUPERCLASS_COLON" value="false" />
|
|
</Objective-C>
|
|
<Objective-C-extensions>
|
|
<extensions>
|
|
<pair source="cc" header="h" fileNamingConvention="NONE" />
|
|
<pair source="c" header="h" fileNamingConvention="NONE" />
|
|
</extensions>
|
|
</Objective-C-extensions>
|
|
<Python>
|
|
<option name="USE_CONTINUATION_INDENT_FOR_ARGUMENTS" value="true" />
|
|
</Python>
|
|
<TypeScriptCodeStyleSettings>
|
|
<option name="INDENT_CHAINED_CALLS" value="false" />
|
|
</TypeScriptCodeStyleSettings>
|
|
<XML>
|
|
<option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
|
|
</XML>
|
|
<codeStyleSettings language="CSS">
|
|
<indentOptions>
|
|
<option name="INDENT_SIZE" value="2" />
|
|
<option name="CONTINUATION_INDENT_SIZE" value="4" />
|
|
<option name="TAB_SIZE" value="2" />
|
|
</indentOptions>
|
|
</codeStyleSettings>
|
|
<codeStyleSettings language="ECMA Script Level 4">
|
|
<option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
|
|
<option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
|
|
<option name="ALIGN_MULTILINE_FOR" value="false" />
|
|
<option name="CALL_PARAMETERS_WRAP" value="1" />
|
|
<option name="METHOD_PARAMETERS_WRAP" value="1" />
|
|
<option name="EXTENDS_LIST_WRAP" value="1" />
|
|
<option name="BINARY_OPERATION_WRAP" value="1" />
|
|
<option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
|
|
<option name="TERNARY_OPERATION_WRAP" value="1" />
|
|
<option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
|
|
<option name="FOR_STATEMENT_WRAP" value="1" />
|
|
<option name="ARRAY_INITIALIZER_WRAP" value="1" />
|
|
<option name="IF_BRACE_FORCE" value="3" />
|
|
<option name="DOWHILE_BRACE_FORCE" value="3" />
|
|
<option name="WHILE_BRACE_FORCE" value="3" />
|
|
<option name="FOR_BRACE_FORCE" value="3" />
|
|
<option name="PARENT_SETTINGS_INSTALLED" value="true" />
|
|
</codeStyleSettings>
|
|
<codeStyleSettings language="HTML">
|
|
<indentOptions>
|
|
<option name="INDENT_SIZE" value="2" />
|
|
<option name="CONTINUATION_INDENT_SIZE" value="4" />
|
|
<option name="TAB_SIZE" value="2" />
|
|
</indentOptions>
|
|
</codeStyleSettings>
|
|
<codeStyleSettings language="JAVA">
|
|
<option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
|
|
<option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
|
|
<option name="BLANK_LINES_AFTER_CLASS_HEADER" value="1" />
|
|
<option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
|
|
<option name="ALIGN_MULTILINE_RESOURCES" value="false" />
|
|
<option name="ALIGN_MULTILINE_FOR" value="false" />
|
|
<option name="CALL_PARAMETERS_WRAP" value="1" />
|
|
<option name="METHOD_PARAMETERS_WRAP" value="1" />
|
|
<option name="EXTENDS_LIST_WRAP" value="1" />
|
|
<option name="THROWS_KEYWORD_WRAP" value="1" />
|
|
<option name="METHOD_CALL_CHAIN_WRAP" value="1" />
|
|
<option name="BINARY_OPERATION_WRAP" value="1" />
|
|
<option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
|
|
<option name="TERNARY_OPERATION_WRAP" value="1" />
|
|
<option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
|
|
<option name="FOR_STATEMENT_WRAP" value="1" />
|
|
<option name="ARRAY_INITIALIZER_WRAP" value="1" />
|
|
<option name="WRAP_COMMENTS" value="true" />
|
|
<option name="IF_BRACE_FORCE" value="3" />
|
|
<option name="DOWHILE_BRACE_FORCE" value="3" />
|
|
<option name="WHILE_BRACE_FORCE" value="3" />
|
|
<option name="FOR_BRACE_FORCE" value="3" />
|
|
<indentOptions>
|
|
<option name="CONTINUATION_INDENT_SIZE" value="4" />
|
|
<option name="TAB_SIZE" value="2" />
|
|
</indentOptions>
|
|
</codeStyleSettings>
|
|
<codeStyleSettings language="JSON">
|
|
<indentOptions>
|
|
<option name="CONTINUATION_INDENT_SIZE" value="4" />
|
|
<option name="TAB_SIZE" value="2" />
|
|
</indentOptions>
|
|
</codeStyleSettings>
|
|
<codeStyleSettings language="JavaScript">
|
|
<option name="RIGHT_MARGIN" value="80" />
|
|
<option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
|
|
<option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
|
|
<option name="ALIGN_MULTILINE_FOR" value="false" />
|
|
<option name="CALL_PARAMETERS_WRAP" value="1" />
|
|
<option name="METHOD_PARAMETERS_WRAP" value="1" />
|
|
<option name="BINARY_OPERATION_WRAP" value="1" />
|
|
<option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
|
|
<option name="TERNARY_OPERATION_WRAP" value="1" />
|
|
<option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
|
|
<option name="FOR_STATEMENT_WRAP" value="1" />
|
|
<option name="ARRAY_INITIALIZER_WRAP" value="1" />
|
|
<option name="IF_BRACE_FORCE" value="3" />
|
|
<option name="DOWHILE_BRACE_FORCE" value="3" />
|
|
<option name="WHILE_BRACE_FORCE" value="3" />
|
|
<option name="FOR_BRACE_FORCE" value="3" />
|
|
<option name="PARENT_SETTINGS_INSTALLED" value="true" />
|
|
<indentOptions>
|
|
<option name="INDENT_SIZE" value="2" />
|
|
<option name="TAB_SIZE" value="2" />
|
|
</indentOptions>
|
|
</codeStyleSettings>
|
|
<codeStyleSettings language="ObjectiveC">
|
|
<option name="RIGHT_MARGIN" value="80" />
|
|
<option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="1" />
|
|
<option name="BLANK_LINES_BEFORE_IMPORTS" value="0" />
|
|
<option name="BLANK_LINES_AFTER_IMPORTS" value="0" />
|
|
<option name="BLANK_LINES_AROUND_CLASS" value="0" />
|
|
<option name="BLANK_LINES_AROUND_METHOD" value="0" />
|
|
<option name="BLANK_LINES_AROUND_METHOD_IN_INTERFACE" value="0" />
|
|
<option name="ALIGN_MULTILINE_BINARY_OPERATION" value="false" />
|
|
<option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
|
|
<option name="FOR_STATEMENT_WRAP" value="1" />
|
|
<option name="ASSIGNMENT_WRAP" value="1" />
|
|
<indentOptions>
|
|
<option name="INDENT_SIZE" value="2" />
|
|
<option name="CONTINUATION_INDENT_SIZE" value="4" />
|
|
</indentOptions>
|
|
</codeStyleSettings>
|
|
<codeStyleSettings language="PROTO">
|
|
<option name="RIGHT_MARGIN" value="80" />
|
|
<indentOptions>
|
|
<option name="INDENT_SIZE" value="2" />
|
|
<option name="CONTINUATION_INDENT_SIZE" value="2" />
|
|
<option name="TAB_SIZE" value="2" />
|
|
</indentOptions>
|
|
</codeStyleSettings>
|
|
<codeStyleSettings language="Python">
|
|
<option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
|
|
<option name="RIGHT_MARGIN" value="80" />
|
|
<option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
|
|
<option name="PARENT_SETTINGS_INSTALLED" value="true" />
|
|
<indentOptions>
|
|
<option name="INDENT_SIZE" value="2" />
|
|
<option name="CONTINUATION_INDENT_SIZE" value="4" />
|
|
<option name="TAB_SIZE" value="2" />
|
|
</indentOptions>
|
|
</codeStyleSettings>
|
|
<codeStyleSettings language="SASS">
|
|
<indentOptions>
|
|
<option name="CONTINUATION_INDENT_SIZE" value="4" />
|
|
<option name="TAB_SIZE" value="2" />
|
|
</indentOptions>
|
|
</codeStyleSettings>
|
|
<codeStyleSettings language="SCSS">
|
|
<indentOptions>
|
|
<option name="CONTINUATION_INDENT_SIZE" value="4" />
|
|
<option name="TAB_SIZE" value="2" />
|
|
</indentOptions>
|
|
</codeStyleSettings>
|
|
<codeStyleSettings language="TypeScript">
|
|
<indentOptions>
|
|
<option name="INDENT_SIZE" value="2" />
|
|
<option name="TAB_SIZE" value="2" />
|
|
</indentOptions>
|
|
</codeStyleSettings>
|
|
<codeStyleSettings language="XML">
|
|
<indentOptions>
|
|
<option name="INDENT_SIZE" value="2" />
|
|
<option name="CONTINUATION_INDENT_SIZE" value="2" />
|
|
<option name="TAB_SIZE" value="2" />
|
|
</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>
|
|
<codeStyleSettings language="kotlin">
|
|
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
|
|
</codeStyleSettings>
|
|
<codeStyleSettings language="protobuf">
|
|
<option name="RIGHT_MARGIN" value="80" />
|
|
<indentOptions>
|
|
<option name="INDENT_SIZE" value="2" />
|
|
<option name="CONTINUATION_INDENT_SIZE" value="2" />
|
|
<option name="TAB_SIZE" value="2" />
|
|
</indentOptions>
|
|
</codeStyleSettings>
|
|
</code_scheme>
|
|
</component> |