mobi/seedvault
1
0
Fork 0
Code Pull requests Activity

Merge pull request #303 from mikeNG/code-style

Browse source 
Make code style consistent
This commit is contained in:
Torsten Grote 2021-09-08 05:56:47 -03:00 • committed by GitHub
commit 0ed8e94e1d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
24 changed files with 46 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
.editorconfig
View file

@ -1,4 +1,24 @@
[*]
charset = utf-8
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
[*.{kt,kts}] [*.{kt,kts}]
indent_size=4 indent_size = 4
insert_final_newline=true max_line_length = 100
max_line_length=100
[app/src/main/res/values-*/strings.xml]
insert_final_newline = unset
trim_trailing_whitespace = unset
[*.md]
trim_trailing_whitespace = false
[gradlew.bat]
charset = latin1
end_of_line = crlf
insert_final_newline = false
[.editorconfig]
ij_editorconfig_spaces_around_assignment_operators = true

2
.github/workflows/client.yml vendored
View file

@ -32,4 +32,4 @@ jobs:
java-version: 11 java-version: 11
- name: Build - name: Build
run: ./gradlew compileDebugAndroidTestSources check assemble ktlintCheck run: ./gradlew compileDebugAndroidTestSources check assemble ktlintCheck

2
.idea/codeStyles/Project.xml generated
View file

@ -137,4 +137,4 @@
</indentOptions> </indentOptions>
</codeStyleSettings> </codeStyleSettings>
</code_scheme> </code_scheme>
</component> </component>

2
.idea/codeStyles/codeStyleConfig.xml generated
View file

@ -2,4 +2,4 @@
<state> <state>
<option name="USE_PER_PROJECT_SETTINGS" value="true" /> <option name="USE_PER_PROJECT_SETTINGS" value="true" />
</state> </state>
</component> </component>

2
.idea/inspectionProfiles/Project_Default.xml generated
View file

@ -7,4 +7,4 @@
<inspection_tool class="LongLine" enabled="true" level="ERROR" enabled_by_default="true" /> <inspection_tool class="LongLine" enabled="true" level="ERROR" enabled_by_default="true" />
<inspection_tool class="RedundantSemicolon" enabled="true" level="ERROR" enabled_by_default="true" /> <inspection_tool class="RedundantSemicolon" enabled="true" level="ERROR" enabled_by_default="true" />
</profile> </profile>
</component> </component>

2
.idea/runConfigurations.xml generated
View file

@ -10,4 +10,4 @@
</set> </set>
</option> </option>
</component> </component>
</project> </project>

2
.idea/runConfigurations/Instrumentation_tests__app.xml generated
View file

@ -48,4 +48,4 @@
<option name="Android.Gradle.BeforeRunTask" enabled="true" /> <option name="Android.Gradle.BeforeRunTask" enabled="true" />
</method> </method>
</configuration> </configuration>
</component> </component>

2
.idea/runConfigurations/Unit_tests__app.xml generated
View file

@ -14,4 +14,4 @@
<option name="Android.Gradle.BeforeRunTask" enabled="true" /> <option name="Android.Gradle.BeforeRunTask" enabled="true" />
</method> </method>
</configuration> </configuration>
</component> </component>

2
LICENSE
View file

@ -199,4 +199,4 @@
distributed under the License is distributed on an "AS IS" BASIS, distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.

2
app/src/main/res/drawable/ic_cloud_error.xml
View file

@ -7,4 +7,4 @@
<path <path
android:fillColor="#FF000000" android:fillColor="#FF000000"
android:pathData="M19,20H6C2.71,20 0,17.29 0,14C0,10.9 2.34,8.36 5.35,8.03C6.6,5.64 9.11,4 12,4C15.64,4 18.67,6.59 19.35,10.03C21.95,10.22 24,12.36 24,15C24,17.74 21.74,20 19,20M11,15V17H13V15H11M11,13H13V8H11V13Z" /> android:pathData="M19,20H6C2.71,20 0,17.29 0,14C0,10.9 2.34,8.36 5.35,8.03C6.6,5.64 9.11,4 12,4C15.64,4 18.67,6.59 19.35,10.03C21.95,10.22 24,12.36 24,15C24,17.74 21.74,20 19,20M11,15V17H13V15H11M11,13H13V8H11V13Z" />
</vector> </vector>

2
app/src/main/res/drawable/ic_launcher_default.xml
View file

@ -2,4 +2,4 @@
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_default_background" /> <background android:drawable="@drawable/ic_launcher_default_background" />
<foreground android:drawable="@drawable/ic_launcher_default_foreground" /> <foreground android:drawable="@drawable/ic_launcher_default_foreground" />
</adaptive-icon> </adaptive-icon>

2
app/src/main/res/layout/activity_fragment_container.xml
View file

@ -2,4 +2,4 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/fragment" android:id="@+id/fragment"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" /> android:layout_height="match_parent" />

2
app/src/main/res/layout/activity_recovery_code.xml
View file

@ -2,4 +2,4 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/fragment" android:id="@+id/fragment"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" /> android:layout_height="match_parent" />

2
app/src/main/res/layout/fragment_recovery_code_input.xml
View file

@ -104,4 +104,4 @@
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView> </ScrollView>

2
app/src/main/res/layout/fragment_recovery_code_output.xml
View file

@ -83,4 +83,4 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/wordList" /> app:layout_constraintTop_toBottomOf="@+id/wordList" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

2
app/src/main/res/layout/header_snapshots.xml
View file

@ -30,4 +30,4 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imageView" /> app:layout_constraintTop_toBottomOf="@+id/imageView" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

2
app/src/main/res/layout/list_item_recovery_code_output.xml
View file

@ -34,4 +34,4 @@
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
tools:text="Test1CanBeLong" /> tools:text="Test1CanBeLong" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

2
app/src/main/res/mipmap-anydpi/ic_launcher.xml
View file

@ -2,4 +2,4 @@
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background" /> <background android:drawable="@color/ic_launcher_background" />
<foreground android:drawable="@mipmap/ic_launcher_foreground" /> <foreground android:drawable="@mipmap/ic_launcher_foreground" />
</adaptive-icon> </adaptive-icon>

2
app/src/main/res/mipmap-anydpi/ic_launcher_round.xml
View file

@ -2,4 +2,4 @@
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background" /> <background android:drawable="@color/ic_launcher_background" />
<foreground android:drawable="@mipmap/ic_launcher_foreground" /> <foreground android:drawable="@mipmap/ic_launcher_foreground" />
</adaptive-icon> </adaptive-icon>

2
app/src/main/res/values-night/bools.xml
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<bool name="isLight">false</bool> <bool name="isLight">false</bool>
</resources> </resources>

2
app/src/main/res/values/bools.xml
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<bool name="isLight">true</bool> <bool name="isLight">true</bool>
</resources> </resources>

2
app/src/main/res/values/ic_launcher_background.xml
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<color name="ic_launcher_background">#2199CB</color> <color name="ic_launcher_background">#2199CB</color>
</resources> </resources>

2
contactsbackup/.gitignore vendored
View file

@ -1 +1 @@
/build /build

2
permissions_com.stevesoltys.seedvault.xml
View file

@ -7,4 +7,4 @@
<permission name="android.permission.WRITE_SECURE_SETTINGS"/> <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
<permission name="android.permission.MANAGE_EXTERNAL_STORAGE"/> <permission name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
</privapp-permissions> </privapp-permissions>
</permissions> </permissions>