From b52fe8ea51fdd990f8bd7019f7b8c447b2c5742f Mon Sep 17 00:00:00 2001 From: Felix Prahl-Kamps Date: Wed, 24 Jul 2019 12:06:52 +0200 Subject: [PATCH] reformat code --- .idea/misc.xml | 2 +- _config.yml | 1 - app/src/main/AndroidManifest.xml | 27 +- .../mispbump/activities/LoginActivity.java | 2 + .../activities/PreferenceActivity.java | 2 + .../fragments/PreferencesFragment.java | 2 +- app/src/main/res/anim/fade_in.xml | 8 +- app/src/main/res/anim/fade_out.xml | 8 +- app/src/main/res/anim/push_up_in.xml | 17 +- app/src/main/res/anim/push_up_out.xml | 17 +- app/src/main/res/anim/scale_vertical.xml | 8 +- app/src/main/res/anim/slide_in_right.xml | 19 +- app/src/main/res/anim/slide_out_left.xml | 19 +- app/src/main/res/animator/rotation_cw.xml | 3 +- app/src/main/res/animator/slide_in_left.xml | 8 +- app/src/main/res/animator/slide_in_right.xml | 8 +- app/src/main/res/animator/slide_out_left.xml | 8 +- app/src/main/res/animator/slide_out_right.xml | 8 +- .../drawable-v24/ic_launcher_foreground.xml | 21 +- app/src/main/res/drawable/animated_sync.xml | 8 +- .../main/res/drawable/ic_account_circle.xml | 16 +- app/src/main/res/drawable/ic_add.xml | 16 +- .../main/res/drawable/ic_alternate_email.xml | 15 +- app/src/main/res/drawable/ic_arrow_back.xml | 13 +- .../main/res/drawable/ic_arrow_forward.xml | 13 +- app/src/main/res/drawable/ic_autorenew.xml | 13 +- app/src/main/res/drawable/ic_bank_note.xml | 21 +- .../main/res/drawable/ic_camera_border.xml | 18 +- app/src/main/res/drawable/ic_check.xml | 13 +- .../main/res/drawable/ic_check_outline.xml | 13 +- .../main/res/drawable/ic_circuit_board.xml | 15 +- app/src/main/res/drawable/ic_close.xml | 13 +- app/src/main/res/drawable/ic_cloud_upload.xml | 16 +- .../main/res/drawable/ic_code_black_24dp.xml | 16 +- .../main/res/drawable/ic_delete_forever.xml | 13 +- app/src/main/res/drawable/ic_description.xml | 16 +- app/src/main/res/drawable/ic_domain.xml | 16 +- app/src/main/res/drawable/ic_email.xml | 13 +- .../main/res/drawable/ic_error_outline.xml | 13 +- app/src/main/res/drawable/ic_eye.xml | 13 +- app/src/main/res/drawable/ic_file_copy.xml | 13 +- app/src/main/res/drawable/ic_help_outline.xml | 13 +- app/src/main/res/drawable/ic_info_outline.xml | 16 +- app/src/main/res/drawable/ic_key.xml | 13 +- .../res/drawable/ic_keyboard_arrow_up.xml | 16 +- app/src/main/res/drawable/ic_language.xml | 16 +- .../res/drawable/ic_launcher_background.xml | 265 +++++++++++++----- app/src/main/res/drawable/ic_link.xml | 13 +- app/src/main/res/drawable/ic_location.xml | 16 +- app/src/main/res/drawable/ic_more_vert.xml | 16 +- .../main/res/drawable/ic_open_in_browser.xml | 16 +- app/src/main/res/drawable/ic_pending.xml | 13 +- app/src/main/res/drawable/ic_person.xml | 13 +- app/src/main/res/drawable/ic_polka_dots.xml | 15 +- app/src/main/res/drawable/ic_qrcode.xml | 21 +- app/src/main/res/drawable/ic_qrcode_scan.xml | 21 +- app/src/main/res/drawable/ic_sector.xml | 16 +- app/src/main/res/drawable/ic_settings.xml | 16 +- .../main/res/drawable/ic_sync_black_24dp.xml | 12 +- .../main/res/drawable/ic_verified_user.xml | 13 +- app/src/main/res/drawable/ic_wiggle.xml | 17 +- app/src/main/res/drawable/rect_rounded.xml | 5 +- .../res/drawable/rect_rounded_inverse.xml | 12 +- .../main/res/drawable/rect_rounded_top.xml | 11 +- app/src/main/res/layout/activity_exchange.xml | 16 +- app/src/main/res/layout/activity_home.xml | 6 +- app/src/main/res/layout/activity_login.xml | 12 +- .../main/res/layout/activity_preference.xml | 13 +- app/src/main/res/layout/activity_profile.xml | 12 +- app/src/main/res/layout/activity_upload.xml | 10 +- app/src/main/res/layout/fragment_camera.xml | 2 +- .../res/layout/material_password_view.xml | 10 +- .../res/layout/material_preference_switch.xml | 6 +- .../res/layout/material_preference_text.xml | 8 +- .../res/layout/row_upload_information.xml | 8 +- .../main/res/layout/view_upload_action.xml | 8 +- app/src/main/res/menu/main_menu.xml | 14 +- app/src/main/res/menu/menu_login.xml | 11 +- app/src/main/res/menu/menu_profile.xml | 8 +- app/src/main/res/menu/menu_upload_info.xml | 11 +- .../res/mipmap-anydpi-v26/ic_launcher.xml | 5 +- .../mipmap-anydpi-v26/ic_launcher_round.xml | 5 +- app/src/main/res/values/attrs.xml | 4 +- app/src/main/res/values/styles.xml | 5 +- ...erences.xml => preference_screen_main.xml} | 11 +- .../lu/circl/mispbump/ExampleUnitTest.java | 6 +- 86 files changed, 851 insertions(+), 429 deletions(-) delete mode 100644 _config.yml rename app/src/main/res/xml/{app_preferences.xml => preference_screen_main.xml} (58%) diff --git a/.idea/misc.xml b/.idea/misc.xml index 93a9df2..da7759f 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -38,7 +38,7 @@ - + diff --git a/_config.yml b/_config.yml deleted file mode 100644 index 2f7efbe..0000000 --- a/_config.yml +++ /dev/null @@ -1 +0,0 @@ -theme: jekyll-theme-minimal \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 57b26e8..abd7c7c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,10 +1,11 @@ - - - + + - + - + + android:label="@string/login"/> + android:label="@string/app_name"/> + android:theme="@style/AppTheme.Translucent"/> + android:parentActivityName=".activities.HomeActivity"/> + android:parentActivityName=".activities.HomeActivity"/> + android:parentActivityName=".activities.HomeActivity"/> + android:theme="@style/AppTheme.Translucent"/> - \ No newline at end of file + diff --git a/app/src/main/java/lu/circl/mispbump/activities/LoginActivity.java b/app/src/main/java/lu/circl/mispbump/activities/LoginActivity.java index a627926..851e3c8 100644 --- a/app/src/main/java/lu/circl/mispbump/activities/LoginActivity.java +++ b/app/src/main/java/lu/circl/mispbump/activities/LoginActivity.java @@ -1,5 +1,6 @@ package lu.circl.mispbump.activities; + import android.content.Intent; import android.net.Uri; import android.os.Bundle; @@ -27,6 +28,7 @@ import lu.circl.mispbump.models.restModels.Organisation; import lu.circl.mispbump.models.restModels.Role; import lu.circl.mispbump.models.restModels.User; + public class LoginActivity extends AppCompatActivity { private PreferenceManager preferenceManager; diff --git a/app/src/main/java/lu/circl/mispbump/activities/PreferenceActivity.java b/app/src/main/java/lu/circl/mispbump/activities/PreferenceActivity.java index 601979d..1373533 100644 --- a/app/src/main/java/lu/circl/mispbump/activities/PreferenceActivity.java +++ b/app/src/main/java/lu/circl/mispbump/activities/PreferenceActivity.java @@ -1,5 +1,6 @@ package lu.circl.mispbump.activities; + import android.os.Bundle; import androidx.appcompat.app.AppCompatActivity; @@ -10,6 +11,7 @@ import androidx.fragment.app.FragmentTransaction; import lu.circl.mispbump.R; import lu.circl.mispbump.fragments.PreferencesFragment; + public class PreferenceActivity extends AppCompatActivity { @Override diff --git a/app/src/main/java/lu/circl/mispbump/fragments/PreferencesFragment.java b/app/src/main/java/lu/circl/mispbump/fragments/PreferencesFragment.java index bc76f9d..719733d 100644 --- a/app/src/main/java/lu/circl/mispbump/fragments/PreferencesFragment.java +++ b/app/src/main/java/lu/circl/mispbump/fragments/PreferencesFragment.java @@ -9,6 +9,6 @@ import lu.circl.mispbump.R; public class PreferencesFragment extends PreferenceFragmentCompat { @Override public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { - setPreferencesFromResource(R.xml.app_preferences, rootKey); + setPreferencesFromResource(R.xml.preference_screen_main, rootKey); } } diff --git a/app/src/main/res/anim/fade_in.xml b/app/src/main/res/anim/fade_in.xml index 271b405..c5be8dd 100644 --- a/app/src/main/res/anim/fade_in.xml +++ b/app/src/main/res/anim/fade_in.xml @@ -1,8 +1,10 @@ - + - \ No newline at end of file + android:duration="@android:integer/config_shortAnimTime" + /> + diff --git a/app/src/main/res/anim/fade_out.xml b/app/src/main/res/anim/fade_out.xml index b0caf35..5b4342c 100644 --- a/app/src/main/res/anim/fade_out.xml +++ b/app/src/main/res/anim/fade_out.xml @@ -1,8 +1,10 @@ - + - \ No newline at end of file + android:duration="@android:integer/config_shortAnimTime" + /> + diff --git a/app/src/main/res/anim/push_up_in.xml b/app/src/main/res/anim/push_up_in.xml index cc7bcec..d368e9e 100644 --- a/app/src/main/res/anim/push_up_in.xml +++ b/app/src/main/res/anim/push_up_in.xml @@ -1,5 +1,14 @@ - - - - \ No newline at end of file + + + + diff --git a/app/src/main/res/anim/push_up_out.xml b/app/src/main/res/anim/push_up_out.xml index 9153144..a2e5466 100644 --- a/app/src/main/res/anim/push_up_out.xml +++ b/app/src/main/res/anim/push_up_out.xml @@ -1,5 +1,14 @@ - - - - \ No newline at end of file + + + + diff --git a/app/src/main/res/anim/scale_vertical.xml b/app/src/main/res/anim/scale_vertical.xml index 3c3b766..4b4dd5e 100644 --- a/app/src/main/res/anim/scale_vertical.xml +++ b/app/src/main/res/anim/scale_vertical.xml @@ -1,5 +1,6 @@ - + + android:toYScale="1.0" + /> - \ No newline at end of file + diff --git a/app/src/main/res/anim/slide_in_right.xml b/app/src/main/res/anim/slide_in_right.xml index 6fb52a3..9d616b1 100644 --- a/app/src/main/res/anim/slide_in_right.xml +++ b/app/src/main/res/anim/slide_in_right.xml @@ -1,7 +1,14 @@ - - - - \ No newline at end of file + + + + diff --git a/app/src/main/res/anim/slide_out_left.xml b/app/src/main/res/anim/slide_out_left.xml index 020a1be..3199077 100644 --- a/app/src/main/res/anim/slide_out_left.xml +++ b/app/src/main/res/anim/slide_out_left.xml @@ -1,7 +1,14 @@ - - - - \ No newline at end of file + + + + diff --git a/app/src/main/res/animator/rotation_cw.xml b/app/src/main/res/animator/rotation_cw.xml index fdc9066..d720c41 100644 --- a/app/src/main/res/animator/rotation_cw.xml +++ b/app/src/main/res/animator/rotation_cw.xml @@ -7,4 +7,5 @@ android:propertyName="rotation" android:valueFrom="0" android:valueTo="-180" - android:valueType="floatType"/> \ No newline at end of file + android:valueType="floatType" + /> diff --git a/app/src/main/res/animator/slide_in_left.xml b/app/src/main/res/animator/slide_in_left.xml index ddc7c45..6faf6b9 100644 --- a/app/src/main/res/animator/slide_in_left.xml +++ b/app/src/main/res/animator/slide_in_left.xml @@ -1,5 +1,6 @@ - + + android:valueType="floatType" + /> - \ No newline at end of file + diff --git a/app/src/main/res/animator/slide_in_right.xml b/app/src/main/res/animator/slide_in_right.xml index 206720e..1c7568b 100644 --- a/app/src/main/res/animator/slide_in_right.xml +++ b/app/src/main/res/animator/slide_in_right.xml @@ -1,5 +1,6 @@ - + + android:valueType="floatType" + /> - \ No newline at end of file + diff --git a/app/src/main/res/animator/slide_out_left.xml b/app/src/main/res/animator/slide_out_left.xml index e3e2d1d..3f8ac73 100644 --- a/app/src/main/res/animator/slide_out_left.xml +++ b/app/src/main/res/animator/slide_out_left.xml @@ -1,11 +1,13 @@ - + + android:valueType="floatType" + /> - \ No newline at end of file + diff --git a/app/src/main/res/animator/slide_out_right.xml b/app/src/main/res/animator/slide_out_right.xml index 10d8add..7eacf62 100644 --- a/app/src/main/res/animator/slide_out_right.xml +++ b/app/src/main/res/animator/slide_out_right.xml @@ -1,11 +1,13 @@ - + + android:valueType="floatType" + /> - \ No newline at end of file + 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 c7bd21d..5463a1e 100644 --- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -1,27 +1,33 @@ - + android:viewportWidth="108" + > + android:strokeWidth="1" + > + android:type="linear" + > + android:offset="0.0" + /> + android:offset="1.0" + /> @@ -30,5 +36,6 @@ android:fillType="nonZero" android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z" android:strokeColor="#00000000" - android:strokeWidth="1" /> + android:strokeWidth="1" + /> diff --git a/app/src/main/res/drawable/animated_sync.xml b/app/src/main/res/drawable/animated_sync.xml index 575c7bb..b22d6a1 100644 --- a/app/src/main/res/drawable/animated_sync.xml +++ b/app/src/main/res/drawable/animated_sync.xml @@ -1,8 +1,10 @@ + android:drawable="@drawable/ic_sync_black_24dp" + > - \ No newline at end of file + android:animation="@animator/rotation_cw" + /> + diff --git a/app/src/main/res/drawable/ic_account_circle.xml b/app/src/main/res/drawable/ic_account_circle.xml index e14b3e0..275f96a 100644 --- a/app/src/main/res/drawable/ic_account_circle.xml +++ b/app/src/main/res/drawable/ic_account_circle.xml @@ -1,5 +1,13 @@ - - + + diff --git a/app/src/main/res/drawable/ic_add.xml b/app/src/main/res/drawable/ic_add.xml index e3979cd..5e5b727 100644 --- a/app/src/main/res/drawable/ic_add.xml +++ b/app/src/main/res/drawable/ic_add.xml @@ -1,5 +1,13 @@ - - + + diff --git a/app/src/main/res/drawable/ic_alternate_email.xml b/app/src/main/res/drawable/ic_alternate_email.xml index c026c3c..b95dae9 100644 --- a/app/src/main/res/drawable/ic_alternate_email.xml +++ b/app/src/main/res/drawable/ic_alternate_email.xml @@ -1,10 +1,13 @@ - - + android:viewportHeight="24" + > + diff --git a/app/src/main/res/drawable/ic_arrow_back.xml b/app/src/main/res/drawable/ic_arrow_back.xml index f8ad49c..bf57eb4 100644 --- a/app/src/main/res/drawable/ic_arrow_back.xml +++ b/app/src/main/res/drawable/ic_arrow_back.xml @@ -1,9 +1,12 @@ - - + android:viewportHeight="24" + > + diff --git a/app/src/main/res/drawable/ic_arrow_forward.xml b/app/src/main/res/drawable/ic_arrow_forward.xml index 42d364a..20688ab 100644 --- a/app/src/main/res/drawable/ic_arrow_forward.xml +++ b/app/src/main/res/drawable/ic_arrow_forward.xml @@ -1,9 +1,12 @@ - - + android:viewportHeight="24" + > + diff --git a/app/src/main/res/drawable/ic_autorenew.xml b/app/src/main/res/drawable/ic_autorenew.xml index 611d8d5..6effbf4 100644 --- a/app/src/main/res/drawable/ic_autorenew.xml +++ b/app/src/main/res/drawable/ic_autorenew.xml @@ -1,9 +1,12 @@ - - + android:viewportHeight="24" + > + diff --git a/app/src/main/res/drawable/ic_bank_note.xml b/app/src/main/res/drawable/ic_bank_note.xml index 61b826e..ae234dd 100644 --- a/app/src/main/res/drawable/ic_bank_note.xml +++ b/app/src/main/res/drawable/ic_bank_note.xml @@ -1,13 +1,16 @@ - - + android:viewportHeight="20" + > + diff --git a/app/src/main/res/drawable/ic_camera_border.xml b/app/src/main/res/drawable/ic_camera_border.xml index 440c1d2..dcf16a1 100644 --- a/app/src/main/res/drawable/ic_camera_border.xml +++ b/app/src/main/res/drawable/ic_camera_border.xml @@ -1,7 +1,17 @@ - - + + android:strokeAlpha="1" + android:strokeColor="#00000000" + android:strokeWidth="1" + /> diff --git a/app/src/main/res/drawable/ic_check.xml b/app/src/main/res/drawable/ic_check.xml index d04a04c..2f2dd04 100644 --- a/app/src/main/res/drawable/ic_check.xml +++ b/app/src/main/res/drawable/ic_check.xml @@ -1,9 +1,12 @@ - - + android:viewportHeight="24" + > + diff --git a/app/src/main/res/drawable/ic_check_outline.xml b/app/src/main/res/drawable/ic_check_outline.xml index 9e25fdc..ea37024 100644 --- a/app/src/main/res/drawable/ic_check_outline.xml +++ b/app/src/main/res/drawable/ic_check_outline.xml @@ -1,9 +1,12 @@ - - + android:viewportHeight="24" + > + diff --git a/app/src/main/res/drawable/ic_circuit_board.xml b/app/src/main/res/drawable/ic_circuit_board.xml index fb1d101..ad56788 100644 --- a/app/src/main/res/drawable/ic_circuit_board.xml +++ b/app/src/main/res/drawable/ic_circuit_board.xml @@ -1,10 +1,13 @@ - - + android:viewportHeight="304" + > + diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml index cbf794b..ab8f263 100644 --- a/app/src/main/res/drawable/ic_close.xml +++ b/app/src/main/res/drawable/ic_close.xml @@ -1,9 +1,12 @@ - - + android:viewportHeight="24" + > + diff --git a/app/src/main/res/drawable/ic_cloud_upload.xml b/app/src/main/res/drawable/ic_cloud_upload.xml index ca7e848..2a6754a 100644 --- a/app/src/main/res/drawable/ic_cloud_upload.xml +++ b/app/src/main/res/drawable/ic_cloud_upload.xml @@ -1,5 +1,13 @@ - - + + diff --git a/app/src/main/res/drawable/ic_code_black_24dp.xml b/app/src/main/res/drawable/ic_code_black_24dp.xml index 5817fac..8fe8c9e 100644 --- a/app/src/main/res/drawable/ic_code_black_24dp.xml +++ b/app/src/main/res/drawable/ic_code_black_24dp.xml @@ -1,5 +1,13 @@ - - + + diff --git a/app/src/main/res/drawable/ic_delete_forever.xml b/app/src/main/res/drawable/ic_delete_forever.xml index 4469a5e..cbf4477 100644 --- a/app/src/main/res/drawable/ic_delete_forever.xml +++ b/app/src/main/res/drawable/ic_delete_forever.xml @@ -1,9 +1,12 @@ - - + android:viewportHeight="24" + > + diff --git a/app/src/main/res/drawable/ic_description.xml b/app/src/main/res/drawable/ic_description.xml index 302bb4a..003fb89 100644 --- a/app/src/main/res/drawable/ic_description.xml +++ b/app/src/main/res/drawable/ic_description.xml @@ -1,5 +1,13 @@ - - + + diff --git a/app/src/main/res/drawable/ic_domain.xml b/app/src/main/res/drawable/ic_domain.xml index b7e6b25..4768ce2 100644 --- a/app/src/main/res/drawable/ic_domain.xml +++ b/app/src/main/res/drawable/ic_domain.xml @@ -1,5 +1,13 @@ - - + + diff --git a/app/src/main/res/drawable/ic_email.xml b/app/src/main/res/drawable/ic_email.xml index d386fca..d912e94 100644 --- a/app/src/main/res/drawable/ic_email.xml +++ b/app/src/main/res/drawable/ic_email.xml @@ -1,9 +1,12 @@ - - + android:viewportHeight="24" + > + diff --git a/app/src/main/res/drawable/ic_error_outline.xml b/app/src/main/res/drawable/ic_error_outline.xml index 622ae00..d43a2c5 100644 --- a/app/src/main/res/drawable/ic_error_outline.xml +++ b/app/src/main/res/drawable/ic_error_outline.xml @@ -1,9 +1,12 @@ - - + android:viewportHeight="24" + > + diff --git a/app/src/main/res/drawable/ic_eye.xml b/app/src/main/res/drawable/ic_eye.xml index 198d161..c7a20ac 100644 --- a/app/src/main/res/drawable/ic_eye.xml +++ b/app/src/main/res/drawable/ic_eye.xml @@ -1,9 +1,12 @@ - - + android:viewportHeight="24" + > + diff --git a/app/src/main/res/drawable/ic_file_copy.xml b/app/src/main/res/drawable/ic_file_copy.xml index 2eb397f..ee9211b 100644 --- a/app/src/main/res/drawable/ic_file_copy.xml +++ b/app/src/main/res/drawable/ic_file_copy.xml @@ -1,9 +1,12 @@ - - + android:viewportHeight="24" + > + diff --git a/app/src/main/res/drawable/ic_help_outline.xml b/app/src/main/res/drawable/ic_help_outline.xml index fc62825..09dc972 100644 --- a/app/src/main/res/drawable/ic_help_outline.xml +++ b/app/src/main/res/drawable/ic_help_outline.xml @@ -1,9 +1,12 @@ - - + android:viewportHeight="24" + > + diff --git a/app/src/main/res/drawable/ic_info_outline.xml b/app/src/main/res/drawable/ic_info_outline.xml index c3c23fd..a301686 100644 --- a/app/src/main/res/drawable/ic_info_outline.xml +++ b/app/src/main/res/drawable/ic_info_outline.xml @@ -1,5 +1,13 @@ - - + + diff --git a/app/src/main/res/drawable/ic_key.xml b/app/src/main/res/drawable/ic_key.xml index 7cd3b6b..634fa1a 100644 --- a/app/src/main/res/drawable/ic_key.xml +++ b/app/src/main/res/drawable/ic_key.xml @@ -1,9 +1,12 @@ - - + android:viewportHeight="24" + > + diff --git a/app/src/main/res/drawable/ic_keyboard_arrow_up.xml b/app/src/main/res/drawable/ic_keyboard_arrow_up.xml index bc01039..c1a819b 100644 --- a/app/src/main/res/drawable/ic_keyboard_arrow_up.xml +++ b/app/src/main/res/drawable/ic_keyboard_arrow_up.xml @@ -1,5 +1,13 @@ - - + + diff --git a/app/src/main/res/drawable/ic_language.xml b/app/src/main/res/drawable/ic_language.xml index 74bc279..2b426d5 100644 --- a/app/src/main/res/drawable/ic_language.xml +++ b/app/src/main/res/drawable/ic_language.xml @@ -1,5 +1,13 @@ - - + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml index 2408e30..c1533f7 100644 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -4,71 +4,202 @@ android:width="108dp" android:viewportHeight="108" android:viewportWidth="108" - xmlns:android="http://schemas.android.com/apk/res/android"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + xmlns:android="http://schemas.android.com/apk/res/android" + > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_link.xml b/app/src/main/res/drawable/ic_link.xml index 4f7a120..c858188 100644 --- a/app/src/main/res/drawable/ic_link.xml +++ b/app/src/main/res/drawable/ic_link.xml @@ -1,9 +1,12 @@ - - + android:viewportHeight="24" + > + diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml index 7ce2348..d2fe9f8 100644 --- a/app/src/main/res/drawable/ic_location.xml +++ b/app/src/main/res/drawable/ic_location.xml @@ -1,5 +1,13 @@ - - + + diff --git a/app/src/main/res/drawable/ic_more_vert.xml b/app/src/main/res/drawable/ic_more_vert.xml index c097d3e..f87dbbb 100644 --- a/app/src/main/res/drawable/ic_more_vert.xml +++ b/app/src/main/res/drawable/ic_more_vert.xml @@ -1,5 +1,13 @@ - - + + diff --git a/app/src/main/res/drawable/ic_open_in_browser.xml b/app/src/main/res/drawable/ic_open_in_browser.xml index 3fb9799..f29b527 100644 --- a/app/src/main/res/drawable/ic_open_in_browser.xml +++ b/app/src/main/res/drawable/ic_open_in_browser.xml @@ -1,5 +1,13 @@ - - + + diff --git a/app/src/main/res/drawable/ic_pending.xml b/app/src/main/res/drawable/ic_pending.xml index b7695ae..6aa97d2 100644 --- a/app/src/main/res/drawable/ic_pending.xml +++ b/app/src/main/res/drawable/ic_pending.xml @@ -1,9 +1,12 @@ - - + android:viewportHeight="24" + > + diff --git a/app/src/main/res/drawable/ic_person.xml b/app/src/main/res/drawable/ic_person.xml index f0aedfe..32a3fd9 100644 --- a/app/src/main/res/drawable/ic_person.xml +++ b/app/src/main/res/drawable/ic_person.xml @@ -1,9 +1,12 @@ - - + android:viewportHeight="24" + > + diff --git a/app/src/main/res/drawable/ic_polka_dots.xml b/app/src/main/res/drawable/ic_polka_dots.xml index 30d036f..617640a 100644 --- a/app/src/main/res/drawable/ic_polka_dots.xml +++ b/app/src/main/res/drawable/ic_polka_dots.xml @@ -1,13 +1,20 @@ - + + android:fillType="evenOdd" + /> + android:fillType="evenOdd" + /> diff --git a/app/src/main/res/drawable/ic_qrcode.xml b/app/src/main/res/drawable/ic_qrcode.xml index b1092e9..40bc97b 100644 --- a/app/src/main/res/drawable/ic_qrcode.xml +++ b/app/src/main/res/drawable/ic_qrcode.xml @@ -1,8 +1,13 @@ - - - - \ No newline at end of file + + + + diff --git a/app/src/main/res/drawable/ic_qrcode_scan.xml b/app/src/main/res/drawable/ic_qrcode_scan.xml index d740f75..5adc912 100644 --- a/app/src/main/res/drawable/ic_qrcode_scan.xml +++ b/app/src/main/res/drawable/ic_qrcode_scan.xml @@ -1,8 +1,13 @@ - - - - \ No newline at end of file + + + + diff --git a/app/src/main/res/drawable/ic_sector.xml b/app/src/main/res/drawable/ic_sector.xml index eb94181..83a6775 100644 --- a/app/src/main/res/drawable/ic_sector.xml +++ b/app/src/main/res/drawable/ic_sector.xml @@ -1,5 +1,13 @@ - - + + diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml index 1397d37..c2e1522 100644 --- a/app/src/main/res/drawable/ic_settings.xml +++ b/app/src/main/res/drawable/ic_settings.xml @@ -1,5 +1,13 @@ - - + + diff --git a/app/src/main/res/drawable/ic_sync_black_24dp.xml b/app/src/main/res/drawable/ic_sync_black_24dp.xml index dd197a6..1c6343c 100644 --- a/app/src/main/res/drawable/ic_sync_black_24dp.xml +++ b/app/src/main/res/drawable/ic_sync_black_24dp.xml @@ -1,18 +1,22 @@ - + android:viewportHeight="24" + > + android:pivotY="12" + > + android:pathData="M12,4L12,1L8,5l4,4L12,6c3.31,0 6,2.69 6,6 0,1.01 -0.25,1.97 -0.7,2.8l1.46,1.46C19.54,15.03 20,13.57 20,12c0,-4.42 -3.58,-8 -8,-8zM12,18c-3.31,0 -6,-2.69 -6,-6 0,-1.01 0.25,-1.97 0.7,-2.8L5.24,7.74C4.46,8.97 4,10.43 4,12c0,4.42 3.58,8 8,8v3l4,-4 -4,-4v3z" + /> diff --git a/app/src/main/res/drawable/ic_verified_user.xml b/app/src/main/res/drawable/ic_verified_user.xml index baa8aa7..750e538 100644 --- a/app/src/main/res/drawable/ic_verified_user.xml +++ b/app/src/main/res/drawable/ic_verified_user.xml @@ -1,9 +1,12 @@ - - + android:viewportHeight="24" + > + diff --git a/app/src/main/res/drawable/ic_wiggle.xml b/app/src/main/res/drawable/ic_wiggle.xml index 0e3e6fa..a7b695e 100644 --- a/app/src/main/res/drawable/ic_wiggle.xml +++ b/app/src/main/res/drawable/ic_wiggle.xml @@ -1,11 +1,14 @@ - - + android:viewportHeight="26" + > + diff --git a/app/src/main/res/drawable/rect_rounded.xml b/app/src/main/res/drawable/rect_rounded.xml index fc92cfa..71f61fb 100644 --- a/app/src/main/res/drawable/rect_rounded.xml +++ b/app/src/main/res/drawable/rect_rounded.xml @@ -1,5 +1,6 @@ - + - \ No newline at end of file + diff --git a/app/src/main/res/drawable/rect_rounded_inverse.xml b/app/src/main/res/drawable/rect_rounded_inverse.xml index b60c00b..e64a334 100644 --- a/app/src/main/res/drawable/rect_rounded_inverse.xml +++ b/app/src/main/res/drawable/rect_rounded_inverse.xml @@ -1,13 +1,17 @@ - + - - + + - \ No newline at end of file + diff --git a/app/src/main/res/drawable/rect_rounded_top.xml b/app/src/main/res/drawable/rect_rounded_top.xml index 7490f72..ec286f2 100644 --- a/app/src/main/res/drawable/rect_rounded_top.xml +++ b/app/src/main/res/drawable/rect_rounded_top.xml @@ -1,9 +1,10 @@ - - + + - \ No newline at end of file + android:topRightRadius="12dp" + /> + diff --git a/app/src/main/res/layout/activity_exchange.xml b/app/src/main/res/layout/activity_exchange.xml index 33317d7..56f4ebc 100644 --- a/app/src/main/res/layout/activity_exchange.xml +++ b/app/src/main/res/layout/activity_exchange.xml @@ -15,7 +15,7 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="parent"/> + app:layout_constraintTop_toBottomOf="@id/qrCode"/> + app:layout_constraintEnd_toEndOf="parent"/> + app:layout_constraintTop_toTopOf="parent"/> + app:srcCompat="@drawable/ic_arrow_back"/> + android:textColor="@color/white"/> + app:srcCompat="@drawable/ic_arrow_forward"/> - \ No newline at end of file + diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml index 07e44a6..413cc0f 100644 --- a/app/src/main/res/layout/activity_home.xml +++ b/app/src/main/res/layout/activity_home.xml @@ -15,14 +15,14 @@ android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" android:theme="@style/ToolbarTheme" - app:popupTheme="@style/PopupTheme" /> + app:popupTheme="@style/PopupTheme"/> + android:layout_height="match_parent"/> - \ No newline at end of file + diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 1c8c184..21852ba 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -54,7 +54,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:hint="@string/misp_server_url_hint" - android:inputType="textUri" /> + android:inputType="textUri"/> + android:inputType="textPassword"/> + app:layout_constraintTop_toBottomOf="@+id/login_progressbar"/> + app:layout_constraintTop_toBottomOf="@+id/login_automation_key"/> + app:layout_constraintGuide_percent="0.4"/> - \ No newline at end of file + diff --git a/app/src/main/res/layout/activity_preference.xml b/app/src/main/res/layout/activity_preference.xml index d54e641..f640fa4 100644 --- a/app/src/main/res/layout/activity_preference.xml +++ b/app/src/main/res/layout/activity_preference.xml @@ -2,8 +2,8 @@ + android:layout_width="match_parent" + android:layout_height="match_parent"> + app:popupTheme="@style/PopupTheme"/> - - \ No newline at end of file + android:layout_height="match_parent" + app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"/> + diff --git a/app/src/main/res/layout/activity_profile.xml b/app/src/main/res/layout/activity_profile.xml index b19dd5d..054fa6a 100644 --- a/app/src/main/res/layout/activity_profile.xml +++ b/app/src/main/res/layout/activity_profile.xml @@ -27,7 +27,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - tools:ignore="ContentDescription" /> + tools:ignore="ContentDescription"/> + tools:ignore="ContentDescription"/> + app:layout_constraintTop_toBottomOf="@+id/accountImage"/> + app:titleTextColor="@color/white"/> @@ -136,6 +136,6 @@ android:layout_margin="16dp" android:backgroundTint="@color/colorAccent" android:src="@drawable/ic_sync_black_24dp" - android:tint="@color/white" /> + android:tint="@color/white"/> - \ No newline at end of file + diff --git a/app/src/main/res/layout/activity_upload.xml b/app/src/main/res/layout/activity_upload.xml index 1575324..56efb79 100644 --- a/app/src/main/res/layout/activity_upload.xml +++ b/app/src/main/res/layout/activity_upload.xml @@ -48,7 +48,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintEnd_toEndOf="parent" - app:description="@string/upload_action_available" /> + app:description="@string/upload_action_available"/> + app:description="@string/upload_action_add_org"/> + app:description="@string/upload_action_add_user"/> + app:description="@string/upload_action_add_server"/> - \ No newline at end of file + diff --git a/app/src/main/res/layout/fragment_camera.xml b/app/src/main/res/layout/fragment_camera.xml index 572ae9e..a7404da 100644 --- a/app/src/main/res/layout/fragment_camera.xml +++ b/app/src/main/res/layout/fragment_camera.xml @@ -23,6 +23,6 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="parent"/> diff --git a/app/src/main/res/layout/material_password_view.xml b/app/src/main/res/layout/material_password_view.xml index af80626..3350692 100644 --- a/app/src/main/res/layout/material_password_view.xml +++ b/app/src/main/res/layout/material_password_view.xml @@ -22,7 +22,7 @@ android:tint="@color/colorIconDark" app:layout_constraintBottom_toBottomOf="@+id/material_password" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="parent"/> + app:layout_constraintTop_toTopOf="parent"/> + tools:text="Title"/> + tools:text="Subtitle"/> - \ No newline at end of file + diff --git a/app/src/main/res/layout/material_preference_switch.xml b/app/src/main/res/layout/material_preference_switch.xml index 7bd64ca..f72b5d7 100644 --- a/app/src/main/res/layout/material_preference_switch.xml +++ b/app/src/main/res/layout/material_preference_switch.xml @@ -25,7 +25,7 @@ app:layout_constraintEnd_toStartOf="@id/material_preference_switch" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - tools:text="Title" /> + tools:text="Title"/> + app:layout_constraintTop_toTopOf="@id/material_preference_title"/> - \ No newline at end of file + diff --git a/app/src/main/res/layout/material_preference_text.xml b/app/src/main/res/layout/material_preference_text.xml index 16d4d49..20a434a 100644 --- a/app/src/main/res/layout/material_preference_text.xml +++ b/app/src/main/res/layout/material_preference_text.xml @@ -23,7 +23,7 @@ app:layout_constraintBottom_toBottomOf="@+id/material_preference_subtitle" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@+id/material_preference_title" - tools:ignore="ContentDescription" /> + tools:ignore="ContentDescription"/> + app:layout_constraintTop_toTopOf="parent"/> + app:layout_constraintTop_toBottomOf="@+id/material_preference_title"/> - \ No newline at end of file + diff --git a/app/src/main/res/layout/row_upload_information.xml b/app/src/main/res/layout/row_upload_information.xml index 1afda2c..6c1b099 100644 --- a/app/src/main/res/layout/row_upload_information.xml +++ b/app/src/main/res/layout/row_upload_information.xml @@ -26,7 +26,7 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - app:srcCompat="@drawable/ic_error_outline" /> + app:srcCompat="@drawable/ic_error_outline"/> + tools:text="Organisation A"/> + tools:text="20.3.2019"/> - \ No newline at end of file + diff --git a/app/src/main/res/layout/view_upload_action.xml b/app/src/main/res/layout/view_upload_action.xml index 4bd69f7..5636654 100644 --- a/app/src/main/res/layout/view_upload_action.xml +++ b/app/src/main/res/layout/view_upload_action.xml @@ -16,7 +16,7 @@ android:src="@drawable/ic_error_outline" android:tint="@color/black" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="parent"/> + tools:text="Add Organisation"/> + tools:text="Organisation B added successfully"/> - \ No newline at end of file + diff --git a/app/src/main/res/menu/main_menu.xml b/app/src/main/res/menu/main_menu.xml index 3defc8b..aa257d7 100644 --- a/app/src/main/res/menu/main_menu.xml +++ b/app/src/main/res/menu/main_menu.xml @@ -1,16 +1,20 @@ - + + app:showAsAction="ifRoom" + /> - \ No newline at end of file + app:showAsAction="never" + /> + diff --git a/app/src/main/res/menu/menu_login.xml b/app/src/main/res/menu/menu_login.xml index 83ee6ad..a4188b3 100644 --- a/app/src/main/res/menu/menu_login.xml +++ b/app/src/main/res/menu/menu_login.xml @@ -1,11 +1,14 @@ - + + app:showAsAction="ifRoom" + /> - \ No newline at end of file + diff --git a/app/src/main/res/menu/menu_profile.xml b/app/src/main/res/menu/menu_profile.xml index 8388c42..4e37bc9 100644 --- a/app/src/main/res/menu/menu_profile.xml +++ b/app/src/main/res/menu/menu_profile.xml @@ -1,9 +1,11 @@ - + + android:title="Delete Profile" + /> - \ No newline at end of file + diff --git a/app/src/main/res/menu/menu_upload_info.xml b/app/src/main/res/menu/menu_upload_info.xml index 5ba86a6..624de6b 100644 --- a/app/src/main/res/menu/menu_upload_info.xml +++ b/app/src/main/res/menu/menu_upload_info.xml @@ -1,9 +1,12 @@ - + - \ No newline at end of file + app:showAsAction="never" + /> + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index bbd3e02..584c25e 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,5 +1,6 @@ - + - \ No newline at end of file + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index bbd3e02..584c25e 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,5 +1,6 @@ - + - \ No newline at end of file + diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index 26e9864..5e0218a 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -24,9 +24,9 @@ - + - \ No newline at end of file + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 320d19d..e15b812 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,4 +1,5 @@ + - diff --git a/app/src/main/res/xml/app_preferences.xml b/app/src/main/res/xml/preference_screen_main.xml similarity index 58% rename from app/src/main/res/xml/app_preferences.xml rename to app/src/main/res/xml/preference_screen_main.xml index ecce19f..351ea72 100644 --- a/app/src/main/res/xml/app_preferences.xml +++ b/app/src/main/res/xml/preference_screen_main.xml @@ -1,6 +1,8 @@ - + + app:icon="@drawable/ic_language" + /> - \ No newline at end of file + diff --git a/app/src/test/java/lu/circl/mispbump/ExampleUnitTest.java b/app/src/test/java/lu/circl/mispbump/ExampleUnitTest.java index ef7a9dd..9dbb454 100644 --- a/app/src/test/java/lu/circl/mispbump/ExampleUnitTest.java +++ b/app/src/test/java/lu/circl/mispbump/ExampleUnitTest.java @@ -1,8 +1,10 @@ package lu.circl.mispbump; + import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; + /** * Example local unit test, which will execute on the development machine (host). @@ -14,4 +16,4 @@ public class ExampleUnitTest { public void addition_isCorrect() { assertEquals(4, 2 + 2); } -} \ No newline at end of file +}