Merge pull request #303 from mikeNG/code-style

Make code style consistent
2021-09-08 05:56:47 -03:00 · 2021-09-08 05:56:47 -03:00 · 0ed8e94e1d
commit 0ed8e94e1d
parent acc332b0fd b149195e7a
24 changed files with 46 additions and 26 deletions
--- a/.editorconfig
+++ b/.editorconfig
@ -1,4 +1,24 @@
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
 [*.{kt,kts}]
-indent_size=4
-insert_final_newline=true
-max_line_length=100
+indent_size = 4
+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
--- a/.github/workflows/client.yml
+++ b/.github/workflows/client.yml
@ -32,4 +32,4 @@ jobs:
          java-version: 11

      - name: Build
-        run: ./gradlew compileDebugAndroidTestSources check assemble ktlintCheck
+        run: ./gradlew compileDebugAndroidTestSources check assemble ktlintCheck
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@ -137,4 +137,4 @@
      </indentOptions>
    </codeStyleSettings>
  </code_scheme>
-</component>
+</component>
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ b/.idea/codeStyles/codeStyleConfig.xml
@ -2,4 +2,4 @@
  <state>
    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
  </state>
-</component>
+</component>
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@ -7,4 +7,4 @@
    <inspection_tool class="LongLine" enabled="true" level="ERROR" enabled_by_default="true" />
    <inspection_tool class="RedundantSemicolon" enabled="true" level="ERROR" enabled_by_default="true" />
  </profile>
-</component>
+</component>
--- a/.idea/runConfigurations.xml
+++ b/.idea/runConfigurations.xml
@ -10,4 +10,4 @@
      </set>
    </option>
  </component>
-</project>
+</project>
--- a/.idea/runConfigurations/Instrumentation_tests__app.xml
+++ b/.idea/runConfigurations/Instrumentation_tests__app.xml
@ -48,4 +48,4 @@
      <option name="Android.Gradle.BeforeRunTask" enabled="true" />
    </method>
  </configuration>
-</component>
+</component>
--- a/.idea/runConfigurations/Unit_tests__app.xml
+++ b/.idea/runConfigurations/Unit_tests__app.xml
@ -14,4 +14,4 @@
      <option name="Android.Gradle.BeforeRunTask" enabled="true" />
    </method>
  </configuration>
-</component>
+</component>
--- a/2
+++ b/2
@ -199,4 +199,4 @@
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
-   limitations under the License.
+   limitations under the License.
--- a/app/src/main/res/drawable/ic_cloud_error.xml
+++ b/app/src/main/res/drawable/ic_cloud_error.xml
@ -7,4 +7,4 @@
    <path
        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" />
-</vector>
+</vector>
--- a/app/src/main/res/drawable/ic_launcher_default.xml
+++ b/app/src/main/res/drawable/ic_launcher_default.xml
@ -2,4 +2,4 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
    <background android:drawable="@drawable/ic_launcher_default_background" />
    <foreground android:drawable="@drawable/ic_launcher_default_foreground" />
-</adaptive-icon>
+</adaptive-icon>
--- a/app/src/main/res/layout/activity_fragment_container.xml
+++ b/app/src/main/res/layout/activity_fragment_container.xml
@ -2,4 +2,4 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:id="@+id/fragment"
    android:layout_width="match_parent"
-    android:layout_height="match_parent" />
+    android:layout_height="match_parent" />
--- a/app/src/main/res/layout/activity_recovery_code.xml
+++ b/app/src/main/res/layout/activity_recovery_code.xml
@ -2,4 +2,4 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:id="@+id/fragment"
    android:layout_width="match_parent"
-    android:layout_height="match_parent" />
+    android:layout_height="match_parent" />
--- a/app/src/main/res/layout/fragment_recovery_code_input.xml
+++ b/app/src/main/res/layout/fragment_recovery_code_input.xml
@ -104,4 +104,4 @@

    </androidx.constraintlayout.widget.ConstraintLayout>

-</ScrollView>
+</ScrollView>
--- a/app/src/main/res/layout/fragment_recovery_code_output.xml
+++ b/app/src/main/res/layout/fragment_recovery_code_output.xml
@ -83,4 +83,4 @@
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/wordList" />

-</androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/layout/header_snapshots.xml
+++ b/app/src/main/res/layout/header_snapshots.xml
@ -30,4 +30,4 @@
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/imageView" />

-</androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/layout/list_item_recovery_code_output.xml
+++ b/app/src/main/res/layout/list_item_recovery_code_output.xml
@ -34,4 +34,4 @@
        app:layout_constraintTop_toTopOf="parent"
        tools:text="Test1CanBeLong" />

-</androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/mipmap-anydpi/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi/ic_launcher.xml
@ -2,4 +2,4 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
    <background android:drawable="@color/ic_launcher_background" />
    <foreground android:drawable="@mipmap/ic_launcher_foreground" />
-</adaptive-icon>
+</adaptive-icon>
--- a/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml
@ -2,4 +2,4 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
    <background android:drawable="@color/ic_launcher_background" />
    <foreground android:drawable="@mipmap/ic_launcher_foreground" />
-</adaptive-icon>
+</adaptive-icon>
--- a/app/src/main/res/values-night/bools.xml
+++ b/app/src/main/res/values-night/bools.xml
@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <bool name="isLight">false</bool>
-</resources>
+</resources>
--- a/app/src/main/res/values/bools.xml
+++ b/app/src/main/res/values/bools.xml
@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <bool name="isLight">true</bool>
-</resources>
+</resources>
--- a/app/src/main/res/values/ic_launcher_background.xml
+++ b/app/src/main/res/values/ic_launcher_background.xml
@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <color name="ic_launcher_background">#2199CB</color>
-</resources>
+</resources>
--- a/contactsbackup/.gitignore
+++ b/contactsbackup/.gitignore
@ -1 +1 @@
-/build
+/build
--- a/permissions_com.stevesoltys.seedvault.xml
+++ b/permissions_com.stevesoltys.seedvault.xml
@ -7,4 +7,4 @@
        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
        <permission name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
    </privapp-permissions>
-</permissions>
+</permissions>