diff --git a/.github/workflows/googleformatter.yml b/.github/workflows/googleformatter.yml new file mode 100644 index 00000000..edf26b70 --- /dev/null +++ b/.github/workflows/googleformatter.yml @@ -0,0 +1,19 @@ +name: Java-code Formatter + +on: + pull_request: + paths-ignore: + - '**.md' + - '**.gradle' + - '**.xml' + workflow_dispatch: + +jobs: + formatting: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: axel-op/googlejavaformat-action@v3.6.0 + with: + args: '--replace --aosp --skip-reflowing-long-strings' + commitMessage: "refactor: Format Java-code [skip ci]" diff --git a/app/build.gradle b/app/build.gradle index 47459fb4..84868e98 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,23 +1,19 @@ - plugins { id 'com.android.application' - } android { namespace 'nethical.digipaws' compileSdk 33 - + defaultConfig { applicationId "nethical.digipaws" minSdk 24 targetSdk 33 versionCode 1 versionName "1.0" - - vectorDrawables { - useSupportLibrary true - } + + vectorDrawables.useSupportLibrary true } buildTypes { @@ -34,20 +30,17 @@ android { buildFeatures { viewBinding true - } - } dependencies { - - - implementation "androidx.preference:preference:1.2.1" + implementation 'androidx.preference:preference:1.2.1' implementation 'androidx.appcompat:appcompat:1.3.1' - implementation 'com.google.android.material:material:1.4.0' - implementation 'com.google.code.gson:gson:2.8.8' - implementation 'com.squareup.okhttp3:okhttp:4.12.0' + implementation 'com.google.android.material:material:1.4.0' + implementation 'com.google.code.gson:gson:2.8.8' implementation 'com.google.android.gms:play-services-location:19.0.1' - implementation"org.osmdroid:osmdroid-android:6.1.18" + + implementation 'com.squareup.okhttp3:okhttp:4.12.0' + implementation 'org.osmdroid:osmdroid-android:6.1.18' } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3b78cbaa..144f966c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,28 +1,23 @@ - + + - - - - - + + + + + + - + + + + - - - - + + - - - + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - - - - - - + + - - - - - - + + + + + + + + - + + + + - - \ No newline at end of file + diff --git a/app/src/main/res/anim/fade_enter.xml b/app/src/main/res/anim/fade_enter.xml index 951feb40..b9225a17 100644 --- a/app/src/main/res/anim/fade_enter.xml +++ b/app/src/main/res/anim/fade_enter.xml @@ -3,4 +3,4 @@ android:duration="@android:integer/config_shortAnimTime" android:fromAlpha="0.0" android:interpolator="@android:anim/linear_interpolator" - android:toAlpha="1.0" /> \ No newline at end of file + android:toAlpha="1.0" /> diff --git a/app/src/main/res/anim/fade_exit.xml b/app/src/main/res/anim/fade_exit.xml index 019cb177..d817d0c3 100644 --- a/app/src/main/res/anim/fade_exit.xml +++ b/app/src/main/res/anim/fade_exit.xml @@ -3,4 +3,4 @@ android:duration="@android:integer/config_shortAnimTime" android:fromAlpha="1.0" android:interpolator="@android:anim/linear_interpolator" - android:toAlpha="0.0" /> \ No newline at end of file + android:toAlpha="0.0" /> diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml index 2b068d11..7706ab9e 100644 --- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -27,4 +27,4 @@ android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z" android:strokeWidth="1" android:strokeColor="#00000000" /> - \ No newline at end of file + diff --git a/app/src/main/res/layout/activity_launcher.xml b/app/src/main/res/layout/activity_launcher.xml index 67763bc3..89cb65a7 100644 --- a/app/src/main/res/layout/activity_launcher.xml +++ b/app/src/main/res/layout/activity_launcher.xml @@ -1,17 +1,16 @@ + + - - + android:clipToPadding="true" + android:fitsSystemWindows="true" /> - \ No newline at end of file + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 903156cc..84311afb 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,10 +1,5 @@ - - \ No newline at end of file + diff --git a/app/src/main/res/layout/fragment_launcher_apps.xml b/app/src/main/res/layout/fragment_launcher_apps.xml index 74104f4e..d68c0e8b 100644 --- a/app/src/main/res/layout/fragment_launcher_apps.xml +++ b/app/src/main/res/layout/fragment_launcher_apps.xml @@ -1,33 +1,32 @@ - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/app/src/main/res/layout/fragment_launcher_home.xml b/app/src/main/res/layout/fragment_launcher_home.xml index 4d587c1e..e5a59466 100644 --- a/app/src/main/res/layout/fragment_launcher_home.xml +++ b/app/src/main/res/layout/fragment_launcher_home.xml @@ -2,14 +2,14 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - android:fitsSystemWindows="true" > + android:fitsSystemWindows="true"> + android:orientation="vertical"> - - - - + android:background="@color/colorControlNormal" + android:padding="8dp"> + + - \ No newline at end of file + diff --git a/app/src/main/res/layout/fragment_location_quest.xml b/app/src/main/res/layout/fragment_location_quest.xml index dcdeae35..5d93aa28 100644 --- a/app/src/main/res/layout/fragment_location_quest.xml +++ b/app/src/main/res/layout/fragment_location_quest.xml @@ -1,11 +1,11 @@ + android:layout_height="match_parent"> - + android:padding="8dp"> - + + android:text="Take your phone out of this red zone to unlock device." /> +