Android
/
RecurveBowSight_V2
Слідкувати 1
В обрані 0
Форк 0
Код Проблеми 0 Запити на злиття 0 Релізи 0 Вікі Активність
Переглянути джерело

user guide riser

master
Flo Smilari 3 роки тому
джерело
cc2750bca8
коміт
a97d727c15
51 змінених файлів з 675 додано та 80 видалено
Розділений перегляд Показати статистику Diff
  1. BIN
      .gradle/7.3.3/checksums/checksums.lock
  2. BIN
      .gradle/7.3.3/checksums/md5-checksums.bin
  3. BIN
      .gradle/7.3.3/checksums/sha1-checksums.bin
  4. BIN
      .gradle/7.3.3/executionHistory/executionHistory.bin
  5. BIN
      .gradle/7.3.3/executionHistory/executionHistory.lock
  6. BIN
      .gradle/7.3.3/fileHashes/fileHashes.bin
  7. BIN
      .gradle/7.3.3/fileHashes/fileHashes.lock
  8. BIN
      .gradle/7.3.3/fileHashes/resourceHashesCache.bin
  9. BIN
      .gradle/buildOutputCleanup/buildOutputCleanup.lock
  10. BIN
      .gradle/buildOutputCleanup/outputFiles.bin
  11. 2
    2
      .idea/libraries/Gradle__androidx_activity_activity_1_5_1_aar.xml
  12. 1
    1
      .idea/libraries/Gradle__androidx_activity_activity_ktx_1_5_1_aar.xml
  13. 1
    1
      .idea/libraries/Gradle__androidx_annotation_annotation_experimental_1_1_0_aar.xml
  14. 2
    2
      .idea/libraries/Gradle__androidx_appcompat_appcompat_resources_1_5_0_aar.xml
  15. 2
    1
      .idea/libraries/Gradle__androidx_core_core_ktx_1_2_0_aar.xml
  16. 1
    1
      .idea/libraries/Gradle__androidx_core_core_ktx_1_8_0_aar.xml
  17. 1
    1
      .idea/libraries/Gradle__androidx_core_core_splashscreen_1_0_0_aar.xml
  18. 2
    1
      .idea/libraries/Gradle__androidx_databinding_viewbinding_7_2_2_aar.xml
  19. 1
    1
      .idea/libraries/Gradle__androidx_fragment_fragment_ktx_1_5_1_aar.xml
  20. 1
    1
      .idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_ktx_2_5_1_aar.xml
  21. 1
    1
      .idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_ktx_2_5_1_aar.xml
  22. 1
    1
      .idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_savedstate_2_5_1_aar.xml
  23. 1
    1
      .idea/libraries/Gradle__androidx_savedstate_savedstate_1_2_0_aar.xml
  24. 2
    1
      .idea/libraries/Gradle__androidx_test_core_1_4_0_aar.xml
  25. 2
    1
      .idea/libraries/Gradle__androidx_test_ext_junit_1_1_3_aar.xml
  26. 2
    1
      .idea/libraries/Gradle__androidx_test_services_storage_1_4_0_aar.xml
  27. 1
    1
      .idea/libraries/Gradle__androidx_viewpager2_viewpager2_1_0_0_aar.xml
  28. 16
    0
      .idea/libraries/Gradle__com_google_android_flexbox_flexbox_3_0_0_aar.xml
  29. 4
    1
      .idea/misc.xml
  30. 11
    10
      .idea/modules/app/RecurveBowSight.app.androidTest.iml
  31. 11
    10
      .idea/modules/app/RecurveBowSight.app.main.iml
  32. 11
    10
      .idea/modules/app/RecurveBowSight.app.unitTest.iml
  33. 52
    7
      .idea/workspace.xml
  34. 3
    1
      app/build.gradle
  35. 10
    0
      app/src/main/AndroidManifest.xml
  36. 6
    0
      app/src/main/java/ch/spherIC/recurvebowsight/RBSMainActivity.java
  37. 15
    0
      app/src/main/java/ch/spherIC/recurvebowsight/ui/userguide/UserGuideEquipmentActivity.java
  38. 46
    0
      app/src/main/java/ch/spherIC/recurvebowsight/ui/userguide/UserGuideRiserActivity.java
  39. 15
    0
      app/src/main/java/ch/spherIC/recurvebowsight/ui/userguide/UserGuideSightActivity.java
  40. 78
    9
      app/src/main/java/ch/spherIC/recurvebowsight/ui/userguide/UserguideFragment.java
  41. BIN
      app/src/main/res/drawable/userguide_params.png
  42. BIN
      app/src/main/res/drawable/userguide_params_2.png
  43. BIN
      app/src/main/res/drawable/userguide_riser.png
  44. BIN
      app/src/main/res/drawable/userguide_sight.png
  45. 9
    0
      app/src/main/res/layout/activity_user_guide_archerysetup.xml
  46. 195
    0
      app/src/main/res/layout/activity_user_guide_riser.xml
  47. 9
    0
      app/src/main/res/layout/activity_user_guide_sight.xml
  48. 2
    2
      app/src/main/res/layout/fragment_equipment_choose.xml
  49. 115
    11
      app/src/main/res/layout/fragment_userguide.xml
  50. 21
    0
      app/src/main/res/values-de/strings.xml
  51. 22
    0
      app/src/main/res/values/strings.xml

BIN
.gradle/7.3.3/checksums/checksums.lock Переглянути файл


BIN
.gradle/7.3.3/checksums/md5-checksums.bin Переглянути файл


BIN
.gradle/7.3.3/checksums/sha1-checksums.bin Переглянути файл


BIN
.gradle/7.3.3/executionHistory/executionHistory.bin Переглянути файл


BIN
.gradle/7.3.3/executionHistory/executionHistory.lock Переглянути файл


BIN
.gradle/7.3.3/fileHashes/fileHashes.bin Переглянути файл


BIN
.gradle/7.3.3/fileHashes/fileHashes.lock Переглянути файл


BIN
.gradle/7.3.3/fileHashes/resourceHashesCache.bin Переглянути файл


BIN
.gradle/buildOutputCleanup/buildOutputCleanup.lock Переглянути файл


BIN
.gradle/buildOutputCleanup/outputFiles.bin Переглянути файл


+ 2
- 2
.idea/libraries/Gradle__androidx_activity_activity_1_5_1_aar.xml Переглянути файл

@@ -4,9 +4,9 @@
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/68ebb38e13faf4391dab4addbfffac49/transformed/activity-1.5.1/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/68ebb38e13faf4391dab4addbfffac49/transformed/activity-1.5.1/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/68ebb38e13faf4391dab4addbfffac49/transformed/activity-1.5.1/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/68ebb38e13faf4391dab4addbfffac49/transformed/activity-1.5.1/AndroidManifest.xml" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/68ebb38e13faf4391dab4addbfffac49/transformed/activity-1.5.1/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/68ebb38e13faf4391dab4addbfffac49/transformed/activity-1.5.1/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>

+ 1
- 1
.idea/libraries/Gradle__androidx_activity_activity_ktx_1_5_1_aar.xml Переглянути файл

@@ -1,9 +1,9 @@
<component name="libraryTable">
<library name="Gradle: androidx.activity:activity-ktx:1.5.1@aar">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/cfafa4f5d6b37279801c0e9285eec886/transformed/activity-ktx-1.5.1/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/cfafa4f5d6b37279801c0e9285eec886/transformed/activity-ktx-1.5.1/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/cfafa4f5d6b37279801c0e9285eec886/transformed/activity-ktx-1.5.1/AndroidManifest.xml" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/cfafa4f5d6b37279801c0e9285eec886/transformed/activity-ktx-1.5.1/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>

+ 1
- 1
.idea/libraries/Gradle__androidx_annotation_annotation_experimental_1_1_0_aar.xml Переглянути файл

@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: androidx.annotation:annotation-experimental:1.1.0@aar">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/cdcb8e50109b2c2b9e961e9ab007ca34/transformed/annotation-experimental-1.1.0/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/cdcb8e50109b2c2b9e961e9ab007ca34/transformed/annotation-experimental-1.1.0/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/cdcb8e50109b2c2b9e961e9ab007ca34/transformed/annotation-experimental-1.1.0/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/cdcb8e50109b2c2b9e961e9ab007ca34/transformed/annotation-experimental-1.1.0/AndroidManifest.xml" />
</CLASSES>
<JAVADOC />

+ 2
- 2
.idea/libraries/Gradle__androidx_appcompat_appcompat_resources_1_5_0_aar.xml Переглянути файл

@@ -1,9 +1,9 @@
<component name="libraryTable">
<library name="Gradle: androidx.appcompat:appcompat-resources:1.5.0@aar">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/633b1da6171761b2f79f2ef4f1d088d6/transformed/appcompat-resources-1.5.0/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/633b1da6171761b2f79f2ef4f1d088d6/transformed/appcompat-resources-1.5.0/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/633b1da6171761b2f79f2ef4f1d088d6/transformed/appcompat-resources-1.5.0/AndroidManifest.xml" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/633b1da6171761b2f79f2ef4f1d088d6/transformed/appcompat-resources-1.5.0/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/633b1da6171761b2f79f2ef4f1d088d6/transformed/appcompat-resources-1.5.0/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>

+ 2
- 1
.idea/libraries/Gradle__androidx_core_core_ktx_1_2_0_aar.xml Переглянути файл

@@ -1,9 +1,10 @@
<component name="libraryTable">
<library name="Gradle: androidx.core:core-ktx:1.2.0@aar">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/796c5ebb1b55db67e8fd605ccf3029fb/transformed/core-ktx-1.2.0/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/796c5ebb1b55db67e8fd605ccf3029fb/transformed/core-ktx-1.2.0/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/b28dc03becabb3e547e2153b61bfb60b/transformed/jetified-core-ktx-1.2.0/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/796c5ebb1b55db67e8fd605ccf3029fb/transformed/core-ktx-1.2.0/AndroidManifest.xml" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/796c5ebb1b55db67e8fd605ccf3029fb/transformed/core-ktx-1.2.0/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>

+ 1
- 1
.idea/libraries/Gradle__androidx_core_core_ktx_1_8_0_aar.xml Переглянути файл

@@ -2,8 +2,8 @@
<library name="Gradle: androidx.core:core-ktx:1.8.0@aar">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/2b2b5456559756e14c347eea3439ad58/transformed/core-ktx-1.8.0/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/2b2b5456559756e14c347eea3439ad58/transformed/core-ktx-1.8.0/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/2b2b5456559756e14c347eea3439ad58/transformed/core-ktx-1.8.0/AndroidManifest.xml" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/2b2b5456559756e14c347eea3439ad58/transformed/core-ktx-1.8.0/res" />
</CLASSES>
<JAVADOC />
<SOURCES>

+ 1
- 1
.idea/libraries/Gradle__androidx_core_core_splashscreen_1_0_0_aar.xml Переглянути файл

@@ -2,8 +2,8 @@
<library name="Gradle: androidx.core:core-splashscreen:1.0.0@aar">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/2ff78b3d055d2552fe3fb7aef1d2a28e/transformed/core-splashscreen-1.0.0/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/2ff78b3d055d2552fe3fb7aef1d2a28e/transformed/core-splashscreen-1.0.0/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/2ff78b3d055d2552fe3fb7aef1d2a28e/transformed/core-splashscreen-1.0.0/AndroidManifest.xml" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/2ff78b3d055d2552fe3fb7aef1d2a28e/transformed/core-splashscreen-1.0.0/res" />
</CLASSES>
<JAVADOC />
<SOURCES>

+ 2
- 1
.idea/libraries/Gradle__androidx_databinding_viewbinding_7_2_2_aar.xml Переглянути файл

@@ -1,9 +1,10 @@
<component name="libraryTable">
<library name="Gradle: androidx.databinding:viewbinding:7.2.2@aar">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/7c89c8a34c2ecc728308042ac673d46f/transformed/viewbinding-7.2.2/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/7c89c8a34c2ecc728308042ac673d46f/transformed/viewbinding-7.2.2/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/4ed54c3b0d5f6a28b1839c425b3f7c29/transformed/jetified-viewbinding-7.2.2/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/7c89c8a34c2ecc728308042ac673d46f/transformed/viewbinding-7.2.2/AndroidManifest.xml" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/7c89c8a34c2ecc728308042ac673d46f/transformed/viewbinding-7.2.2/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>

+ 1
- 1
.idea/libraries/Gradle__androidx_fragment_fragment_ktx_1_5_1_aar.xml Переглянути файл

@@ -1,9 +1,9 @@
<component name="libraryTable">
<library name="Gradle: androidx.fragment:fragment-ktx:1.5.1@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/9b97d955ff9b0817df995083824e6a1b/transformed/fragment-ktx-1.5.1/AndroidManifest.xml" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/9b97d955ff9b0817df995083824e6a1b/transformed/fragment-ktx-1.5.1/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/9b97d955ff9b0817df995083824e6a1b/transformed/fragment-ktx-1.5.1/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/9b97d955ff9b0817df995083824e6a1b/transformed/fragment-ktx-1.5.1/AndroidManifest.xml" />
</CLASSES>
<JAVADOC />
<SOURCES>

+ 1
- 1
.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_ktx_2_5_1_aar.xml Переглянути файл

@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: androidx.lifecycle:lifecycle-runtime-ktx:2.5.1@aar">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/988910848b1b5147332cf257e9fec7c3/transformed/lifecycle-runtime-ktx-2.5.1/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/988910848b1b5147332cf257e9fec7c3/transformed/lifecycle-runtime-ktx-2.5.1/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/988910848b1b5147332cf257e9fec7c3/transformed/lifecycle-runtime-ktx-2.5.1/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/988910848b1b5147332cf257e9fec7c3/transformed/lifecycle-runtime-ktx-2.5.1/AndroidManifest.xml" />
</CLASSES>
<JAVADOC />

+ 1
- 1
.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_ktx_2_5_1_aar.xml Переглянути файл

@@ -1,9 +1,9 @@
<component name="libraryTable">
<library name="Gradle: androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1@aar">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/51b9bd2beaeaddde3df90fa57a8a3a3d/transformed/lifecycle-viewmodel-ktx-2.5.1/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/51b9bd2beaeaddde3df90fa57a8a3a3d/transformed/lifecycle-viewmodel-ktx-2.5.1/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/51b9bd2beaeaddde3df90fa57a8a3a3d/transformed/lifecycle-viewmodel-ktx-2.5.1/AndroidManifest.xml" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/51b9bd2beaeaddde3df90fa57a8a3a3d/transformed/lifecycle-viewmodel-ktx-2.5.1/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>

+ 1
- 1
.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_savedstate_2_5_1_aar.xml Переглянути файл

@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: androidx.lifecycle:lifecycle-viewmodel-savedstate:2.5.1@aar">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/8aa4d154a755d3bc4c243974543ce682/transformed/lifecycle-viewmodel-savedstate-2.5.1/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/8aa4d154a755d3bc4c243974543ce682/transformed/lifecycle-viewmodel-savedstate-2.5.1/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/8aa4d154a755d3bc4c243974543ce682/transformed/lifecycle-viewmodel-savedstate-2.5.1/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/8aa4d154a755d3bc4c243974543ce682/transformed/lifecycle-viewmodel-savedstate-2.5.1/AndroidManifest.xml" />
</CLASSES>
<JAVADOC />

+ 1
- 1
.idea/libraries/Gradle__androidx_savedstate_savedstate_1_2_0_aar.xml Переглянути файл

@@ -1,9 +1,9 @@
<component name="libraryTable">
<library name="Gradle: androidx.savedstate:savedstate:1.2.0@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/2051c9bdb0f5e6abe40d8c0e3c4f2a94/transformed/savedstate-1.2.0/AndroidManifest.xml" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/2051c9bdb0f5e6abe40d8c0e3c4f2a94/transformed/savedstate-1.2.0/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/2051c9bdb0f5e6abe40d8c0e3c4f2a94/transformed/savedstate-1.2.0/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/2051c9bdb0f5e6abe40d8c0e3c4f2a94/transformed/savedstate-1.2.0/AndroidManifest.xml" />
</CLASSES>
<JAVADOC />
<SOURCES>

+ 2
- 1
.idea/libraries/Gradle__androidx_test_core_1_4_0_aar.xml Переглянути файл

@@ -1,8 +1,9 @@
<component name="libraryTable">
<library name="Gradle: androidx.test:core:1.4.0@aar">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/619e03051e812b9e6784a4e86cfc5b4e/transformed/core-1.4.0/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/619e03051e812b9e6784a4e86cfc5b4e/transformed/core-1.4.0/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/50c068eed43b74429aede7f5337506d3/transformed/jetified-core-1.4.0/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/619e03051e812b9e6784a4e86cfc5b4e/transformed/core-1.4.0/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/619e03051e812b9e6784a4e86cfc5b4e/transformed/core-1.4.0/AndroidManifest.xml" />
</CLASSES>
<JAVADOC>

+ 2
- 1
.idea/libraries/Gradle__androidx_test_ext_junit_1_1_3_aar.xml Переглянути файл

@@ -1,9 +1,10 @@
<component name="libraryTable">
<library name="Gradle: androidx.test.ext:junit:1.1.3@aar">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/3aed41255439a386e857f43e2ce8f1a6/transformed/junit-1.1.3/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/3aed41255439a386e857f43e2ce8f1a6/transformed/junit-1.1.3/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/a64e46522b1581755062cfd145781473/transformed/jetified-junit-1.1.3/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/3aed41255439a386e857f43e2ce8f1a6/transformed/junit-1.1.3/AndroidManifest.xml" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/3aed41255439a386e857f43e2ce8f1a6/transformed/junit-1.1.3/jars/classes.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.test.ext/junit/1.1.3/f138cf897cc1e024dd714073df04f2425d845104/junit-1.1.3-javadoc.jar!/" />

+ 2
- 1
.idea/libraries/Gradle__androidx_test_services_storage_1_4_0_aar.xml Переглянути файл

@@ -1,8 +1,9 @@
<component name="libraryTable">
<library name="Gradle: androidx.test.services:storage:1.4.0@aar">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/a929c2f44e058e42a92c83878f4e9412/transformed/storage-1.4.0/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/a929c2f44e058e42a92c83878f4e9412/transformed/storage-1.4.0/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/1e28b3b29691cef44da9b7592468f9b2/transformed/jetified-storage-1.4.0/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/a929c2f44e058e42a92c83878f4e9412/transformed/storage-1.4.0/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/a929c2f44e058e42a92c83878f4e9412/transformed/storage-1.4.0/AndroidManifest.xml" />
</CLASSES>
<JAVADOC />

+ 1
- 1
.idea/libraries/Gradle__androidx_viewpager2_viewpager2_1_0_0_aar.xml Переглянути файл

@@ -4,8 +4,8 @@
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/96e7554634152527609a0a2a210aa86b/transformed/viewpager2-1.0.0/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/96e7554634152527609a0a2a210aa86b/transformed/viewpager2-1.0.0/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/96e7554634152527609a0a2a210aa86b/transformed/viewpager2-1.0.0/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/96e7554634152527609a0a2a210aa86b/transformed/viewpager2-1.0.0/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/96e7554634152527609a0a2a210aa86b/transformed/viewpager2-1.0.0/AndroidManifest.xml" />
</CLASSES>
<JAVADOC />

+ 16
- 0
.idea/libraries/Gradle__com_google_android_flexbox_flexbox_3_0_0_aar.xml Переглянути файл

@@ -0,0 +1,16 @@
<component name="libraryTable">
<library name="Gradle: com.google.android.flexbox:flexbox:3.0.0@aar">
<ANNOTATIONS>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/b6e4d53df61cb7f0b69f53458694afca/transformed/flexbox-3.0.0/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/b6e4d53df61cb7f0b69f53458694afca/transformed/flexbox-3.0.0/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/b6e4d53df61cb7f0b69f53458694afca/transformed/flexbox-3.0.0/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/b6e4d53df61cb7f0b69f53458694afca/transformed/flexbox-3.0.0/AndroidManifest.xml" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.android.flexbox/flexbox/3.0.0/ab0cfea1daeb94f54c8f0b4f5d1e34882d97e37b/flexbox-3.0.0-sources.jar!/" />
</SOURCES>
</library>
</component>

+ 4
- 1
.idea/misc.xml Переглянути файл

@@ -12,6 +12,7 @@
<entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/drawable/ic_baseline_swipe_right_24.xml" value="0.264" />
<entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/drawable/ic_calcsight_parameter.xml" value="0.264" />
<entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/drawable/ic_calcsight_trajectory.xml" value="0.264" />
<entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/drawable/ic_cfg_riser.xml" value="0.352" />
<entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/drawable/ic_icon_calculate.xml" value="0.25" />
<entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/drawable/ic_icon_delete.xml" value="0.25" />
<entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/drawable/ic_launcher.xml" value="0.25" />
@@ -31,6 +32,7 @@
<entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/drawable/ic_outline_handshake_24.xml" value="0.2675" />
<entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/drawable/ic_outline_thumb_up_24.xml" value="0.2675" />
<entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/drawable/ic_spheric_logo.xml" value="0.2825" />
<entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/drawable/imageview_background.xml" value="0.2455" />
<entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/drawable/rbs_anim_splash_logo.xml" value="0.25" />
<entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/drawable/side_nav_bar.xml" value="0.285" />
<entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/layout/activity_default_settings.xml" value="0.25" />
@@ -38,6 +40,7 @@
<entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/layout/activity_main.xml" value="0.28072916666666664" />
<entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/layout/activity_riser_configuration.xml" value="0.2" />
<entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/layout/activity_sight_configuration.xml" value="0.1994535519125683" />
<entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/layout/activity_user_guide_riser.xml" value="0.2" />
<entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/layout/app_bar_main.xml" value="0.15" />
<entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/layout/content_main.xml" value="0.14" />
<entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/layout/fragment_about.xml" value="0.22" />
@@ -53,7 +56,7 @@
<entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/layout/fragment_gallery.xml" value="0.1480978260869565" />
<entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/layout/fragment_home.xml" value="0.14855072463768115" />
<entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/layout/fragment_slideshow.xml" value="0.1480978260869565" />
<entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/layout/fragment_userguide.xml" value="0.15812841530054644" />
<entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/layout/fragment_userguide.xml" value="0.25" />
<entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/layout/nav_header_main.xml" value="0.18715277777777778" />
<entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/layout/simple_spinner_line.xml" value="0.16319444444444445" />
<entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/layout/switch_item.xml" value="0.1" />

+ 11
- 10
.idea/modules/app/RecurveBowSight.app.androidTest.iml Переглянути файл

@@ -87,18 +87,8 @@
<orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.5.1@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-runtime:2.1.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: com.google.android.material:material:1.6.1@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.cardview:cardview:1.0.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.coordinatorlayout:coordinatorlayout:1.1.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.constraintlayout:constraintlayout:2.1.4@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.dynamicanimation:dynamicanimation:1.0.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.legacy:legacy-support-core-utils:1.0.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.documentfile:documentfile:1.0.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.localbroadcastmanager:localbroadcastmanager:1.0.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.print:print:1.0.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.recyclerview:recyclerview:1.2.1@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.transition:transition:1.2.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.viewpager2:viewpager2:1.0.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata-ktx:2.5.1@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata-core-ktx:2.5.1@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1@aar" level="project" />
@@ -111,12 +101,23 @@
<orderEntry type="library" scope="TEST" name="Gradle: androidx.navigation:navigation-common:2.5.1@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.slidingpanelayout:slidingpanelayout:1.2.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.navigation:navigation-ui:2.5.1@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: com.google.android.material:material:1.6.1@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.coordinatorlayout:coordinatorlayout:1.1.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.dynamicanimation:dynamicanimation:1.0.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.legacy:legacy-support-core-utils:1.0.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.documentfile:documentfile:1.0.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.localbroadcastmanager:localbroadcastmanager:1.0.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.print:print:1.0.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.recyclerview:recyclerview:1.2.1@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.transition:transition:1.2.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.viewpager2:viewpager2:1.0.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.legacy:legacy-support-v4:1.0.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.media:media:1.0.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.legacy:legacy-support-core-ui:1.0.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.swiperefreshlayout:swiperefreshlayout:1.0.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.asynclayoutinflater:asynclayoutinflater:1.0.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core-splashscreen:1.0.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: com.google.android.flexbox:flexbox:3.0.0@aar" level="project" />
</component>
<component name="TestModuleProperties" production-module="RecurveBowSight.app.main" />
</module>

+ 11
- 10
.idea/modules/app/RecurveBowSight.app.main.iml Переглянути файл

@@ -82,18 +82,8 @@
<orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.5.1@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.arch.core:core-runtime:2.1.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: com.google.android.material:material:1.6.1@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.cardview:cardview:1.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.coordinatorlayout:coordinatorlayout:1.1.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.constraintlayout:constraintlayout:2.1.4@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.dynamicanimation:dynamicanimation:1.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-utils:1.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.documentfile:documentfile:1.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.localbroadcastmanager:localbroadcastmanager:1.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.print:print:1.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.recyclerview:recyclerview:1.2.1@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.transition:transition:1.4.1@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.viewpager2:viewpager2:1.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-ktx:2.5.1@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-core-ktx:2.5.1@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1@aar" level="project" />
@@ -106,11 +96,22 @@
<orderEntry type="library" name="Gradle: androidx.navigation:navigation-common:2.5.1@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.slidingpanelayout:slidingpanelayout:1.2.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.navigation:navigation-ui:2.5.1@aar" level="project" />
<orderEntry type="library" name="Gradle: com.google.android.material:material:1.6.1@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.coordinatorlayout:coordinatorlayout:1.1.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.dynamicanimation:dynamicanimation:1.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-utils:1.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.documentfile:documentfile:1.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.localbroadcastmanager:localbroadcastmanager:1.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.print:print:1.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.recyclerview:recyclerview:1.2.1@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.transition:transition:1.4.1@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.viewpager2:viewpager2:1.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-v4:1.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.media:media:1.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-ui:1.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.swiperefreshlayout:swiperefreshlayout:1.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.asynclayoutinflater:asynclayoutinflater:1.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.core:core-splashscreen:1.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: com.google.android.flexbox:flexbox:3.0.0@aar" level="project" />
</component>
</module>

+ 11
- 10
.idea/modules/app/RecurveBowSight.app.unitTest.iml Переглянути файл

@@ -70,18 +70,8 @@
<orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.5.1@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-runtime:2.1.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: com.google.android.material:material:1.6.1@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.cardview:cardview:1.0.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.coordinatorlayout:coordinatorlayout:1.1.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.constraintlayout:constraintlayout:2.1.4@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.dynamicanimation:dynamicanimation:1.0.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.legacy:legacy-support-core-utils:1.0.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.documentfile:documentfile:1.0.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.localbroadcastmanager:localbroadcastmanager:1.0.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.print:print:1.0.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.recyclerview:recyclerview:1.2.1@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.transition:transition:1.4.1@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.viewpager2:viewpager2:1.0.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata-ktx:2.5.1@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata-core-ktx:2.5.1@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1@aar" level="project" />
@@ -94,12 +84,23 @@
<orderEntry type="library" scope="TEST" name="Gradle: androidx.navigation:navigation-common:2.5.1@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.slidingpanelayout:slidingpanelayout:1.2.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.navigation:navigation-ui:2.5.1@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: com.google.android.material:material:1.6.1@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.coordinatorlayout:coordinatorlayout:1.1.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.dynamicanimation:dynamicanimation:1.0.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.legacy:legacy-support-core-utils:1.0.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.documentfile:documentfile:1.0.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.localbroadcastmanager:localbroadcastmanager:1.0.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.print:print:1.0.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.recyclerview:recyclerview:1.2.1@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.transition:transition:1.4.1@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.viewpager2:viewpager2:1.0.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.legacy:legacy-support-v4:1.0.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.media:media:1.0.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.legacy:legacy-support-core-ui:1.0.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.swiperefreshlayout:swiperefreshlayout:1.0.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.asynclayoutinflater:asynclayoutinflater:1.0.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core-splashscreen:1.0.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: com.google.android.flexbox:flexbox:3.0.0@aar" level="project" />
</component>
<component name="TestModuleProperties" production-module="RecurveBowSight.app.main" />
</module>

+ 52
- 7
.idea/workspace.xml Переглянути файл

@@ -21,18 +21,44 @@
</component>
<component name="ChangeListManager">
<list default="true" id="41369230-c648-4299-baf3-de5f13bcb18c" name="Changes" comment="">
<change beforePath="$PROJECT_DIR$/.gradle/7.3.3/checksums/checksums.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/7.3.3/checksums/checksums.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/7.3.3/checksums/md5-checksums.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/7.3.3/checksums/md5-checksums.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/7.3.3/checksums/sha1-checksums.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/7.3.3/checksums/sha1-checksums.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/7.3.3/executionHistory/executionHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/7.3.3/executionHistory/executionHistory.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/7.3.3/executionHistory/executionHistory.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/7.3.3/executionHistory/executionHistory.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/7.3.3/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/7.3.3/fileHashes/fileHashes.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/7.3.3/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/7.3.3/fileHashes/fileHashes.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/7.3.3/fileHashes/resourceHashesCache.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/7.3.3/fileHashes/resourceHashesCache.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__androidx_activity_activity_1_5_1_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__androidx_activity_activity_1_5_1_aar.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__androidx_activity_activity_ktx_1_5_1_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__androidx_activity_activity_ktx_1_5_1_aar.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__androidx_annotation_annotation_experimental_1_1_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__androidx_annotation_annotation_experimental_1_1_0_aar.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__androidx_appcompat_appcompat_resources_1_5_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__androidx_appcompat_appcompat_resources_1_5_0_aar.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__androidx_core_core_ktx_1_2_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__androidx_core_core_ktx_1_2_0_aar.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__androidx_core_core_ktx_1_8_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__androidx_core_core_ktx_1_8_0_aar.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__androidx_core_core_splashscreen_1_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__androidx_core_core_splashscreen_1_0_0_aar.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__androidx_databinding_viewbinding_7_2_2_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__androidx_databinding_viewbinding_7_2_2_aar.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__androidx_fragment_fragment_ktx_1_5_1_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__androidx_fragment_fragment_ktx_1_5_1_aar.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_ktx_2_5_1_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_ktx_2_5_1_aar.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_ktx_2_5_1_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_ktx_2_5_1_aar.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_savedstate_2_5_1_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_savedstate_2_5_1_aar.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__androidx_savedstate_savedstate_1_2_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__androidx_savedstate_savedstate_1_2_0_aar.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__androidx_test_core_1_4_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__androidx_test_core_1_4_0_aar.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__androidx_test_ext_junit_1_1_3_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__androidx_test_ext_junit_1_1_3_aar.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__androidx_test_services_storage_1_4_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__androidx_test_services_storage_1_4_0_aar.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__androidx_viewpager2_viewpager2_1_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__androidx_viewpager2_viewpager2_1_0_0_aar.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/modules/app/RecurveBowSight.app.androidTest.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules/app/RecurveBowSight.app.androidTest.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/modules/app/RecurveBowSight.app.main.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules/app/RecurveBowSight.app.main.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/modules/app/RecurveBowSight.app.unitTest.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules/app/RecurveBowSight.app.unitTest.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/ch/spherIC/recurvebowsight/ui/about/AboutFragment.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/ch/spherIC/recurvebowsight/ui/about/AboutFragment.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/ch/spherIC/recurvebowsight/ui/about/AboutViewModel.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_about.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_about.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/ch/spherIC/recurvebowsight/RBSMainActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/ch/spherIC/recurvebowsight/RBSMainActivity.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/ch/spherIC/recurvebowsight/ui/userguide/UserguideFragment.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/ch/spherIC/recurvebowsight/ui/userguide/UserguideFragment.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_equipment_choose.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_equipment_choose.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_userguide.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_userguide.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/values-de/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values-de/strings.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" afterDir="false" />
</list>
@@ -50,10 +76,10 @@
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
<list>
<option value="resourceFile" />
<option value="layoutResourceFile" />
<option value="Class" />
<option value="valueResourceFile" />
<option value="resourceFile" />
</list>
</option>
</component>
@@ -91,6 +117,8 @@
<property name="android-custom-viewC:/Users/FSmilari/.gradle/caches/modules-2/files-2.1/androidx.recyclerview/recyclerview/1.2.1/f0f93e67af3f7417bdd560d5142f6dec4fe629c3/recyclerview-1.2.1-sources.jar!/androidx/recyclerview/widget/RecyclerView.java_SELECTED" value="RecyclerView" />
<property name="android-custom-viewC:/Users/FSmilari/.gradle/caches/modules-2/files-2.1/androidx.viewpager2/viewpager2/1.0.0/3c3569044e6969f1ee5c3aa03b08e6717a2d782f/viewpager2-1.0.0-sources.jar!/androidx/viewpager2/widget/ViewPager2.java_SELECTED" value="ViewPager2" />
<property name="android-custom-viewC:/Users/FSmilari/.gradle/caches/modules-2/files-2.1/androidx.viewpager2/viewpager2/1.0.0/3c3569044e6969f1ee5c3aa03b08e6717a2d782f/viewpager2-1.0.0-sources.jar!/androidx/viewpager2/widget/ViewPager2.java_ViewPager2_DIMENSIONS" value="1080&#10;1920" />
<property name="android-custom-viewC:/Users/FSmilari/.gradle/caches/modules-2/files-2.1/com.google.android.flexbox/flexbox/3.0.0/ab0cfea1daeb94f54c8f0b4f5d1e34882d97e37b/flexbox-3.0.0-sources.jar!/com/google/android/flexbox/FlexboxLayout.java_FlexboxLayout_DIMENSIONS" value="1080&#10;1920" />
<property name="android-custom-viewC:/Users/FSmilari/.gradle/caches/modules-2/files-2.1/com.google.android.flexbox/flexbox/3.0.0/ab0cfea1daeb94f54c8f0b4f5d1e34882d97e37b/flexbox-3.0.0-sources.jar!/com/google/android/flexbox/FlexboxLayout.java_SELECTED" value="FlexboxLayout" />
<property name="android-custom-viewC:/Users/FSmilari/.gradle/caches/modules-2/files-2.1/com.google.android.material/material/1.6.1/d4d703885d24c61bc0ec39a9a705969e41d773ef/material-1.6.1-sources.jar!/com/google/android/material/textfield/TextInputLayout.java_SELECTED" value="TextInputLayout" />
<property name="android-custom-viewC:/Users/FSmilari/.gradle/caches/modules-2/files-2.1/com.google.android.material/material/1.6.1/d4d703885d24c61bc0ec39a9a705969e41d773ef/material-1.6.1-sources.jar!/com/google/android/material/textfield/TextInputLayout.java_TextInputLayout_DIMENSIONS" value="1080&#10;1920" />
<property name="android-custom-viewC:/Users/FSmilari/.gradle/caches/modules-2/files-2.1/com.google.android.material/material/1.6.1/d4d703885d24c61bc0ec39a9a705969e41d773ef/material-1.6.1-sources.jar!/com/google/android/material/textview/MaterialTextView.java_MaterialTextView_DIMENSIONS" value="1080&#10;1920" />
@@ -146,6 +174,9 @@
<key name="android.template.-1206743600">
<recent name="ch.spherIC.recurvebowsight.ui.configuration" />
</key>
<key name="android.template.1587630541">
<recent name="ch.spherIC.recurvebowsight.ui.userguide" />
</key>
<key name="MoveFile.RECENT_KEYS">
<recent name="Z:\Work\Java Projects\Android\RecurveBowSight\V2\app\src\main\res\drawable" />
<recent name="Z:\Work\Java Projects\Android\RecurveBowSight\V2\app\src\main\res\anim" />
@@ -294,7 +325,7 @@
</line-breakpoint>
<line-breakpoint enabled="true" suspend="THREAD" type="java-line">
<url>file://$PROJECT_DIR$/app/src/main/java/ch/spherIC/recurvebowsight/RBSMainActivity.java</url>
<line>70</line>
<line>76</line>
<option name="timeStamp" value="125" />
</line-breakpoint>
<line-breakpoint enabled="true" suspend="THREAD" type="java-line">
@@ -302,13 +333,27 @@
<line>78</line>
<option name="timeStamp" value="127" />
</line-breakpoint>
<line-breakpoint enabled="true" suspend="THREAD" type="java-line">
<url>file://$PROJECT_DIR$/app/src/main/java/ch/spherIC/recurvebowsight/ui/userguide/UserguideFragment.java</url>
<line>42</line>
<option name="timeStamp" value="130" />
</line-breakpoint>
<line-breakpoint enabled="true" suspend="THREAD" type="java-line">
<url>file://$PROJECT_DIR$/app/src/main/java/ch/spherIC/recurvebowsight/ui/userguide/UserguideFragment.java</url>
<line>66</line>
<option name="timeStamp" value="131" />
</line-breakpoint>
<line-breakpoint enabled="true" suspend="THREAD" type="java-line">
<url>file://$PROJECT_DIR$/app/src/main/java/ch/spherIC/recurvebowsight/ui/userguide/UserguideFragment.java</url>
<line>72</line>
<option name="timeStamp" value="132" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
<watches-manager>
<configuration name="app">
<watch expression="this" />
<watch expression="item.getTitle()" language="JAVA" />
<watch expression="sharedPreferences.getFloat(DEFAULT_SETTING_AIRTEMP, 0.0f)" language="JAVA" />
<watch expression="v.getLayoutParams()" language="JAVA" />
</configuration>
</watches-manager>
</component>

+ 3
- 1
app/build.gradle Переглянути файл

@@ -36,7 +36,7 @@ android {

dependencies {
implementation 'androidx.appcompat:appcompat:1.5.0'
implementation 'com.google.android.material:material:1.6.1'
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.5.1'
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'
@@ -45,6 +45,8 @@ dependencies {
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.recyclerview:recyclerview:1.2.1'
implementation 'androidx.core:core-splashscreen:1.0.0'
implementation 'com.google.android.material:material:1.6.1'
implementation 'com.google.android.flexbox:flexbox:3.0.0'
implementation files('libs\\achartengine-1.1.0.jar')
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'

+ 10
- 0
app/src/main/AndroidManifest.xml Переглянути файл

@@ -13,6 +13,15 @@
android:supportsRtl="true"
android:theme="@style/Theme.RecurveBowSight"
tools:targetApi="31">
<activity
android:name=".ui.userguide.UserGuideEquipmentActivity"
android:exported="false" />
<activity
android:name=".ui.userguide.UserGuideSightActivity"
android:exported="false" />
<activity
android:name=".ui.userguide.UserGuideRiserActivity"
android:exported="false" />
<activity
android:name=".ui.configuration.DefaultSettingsActivity"
android:exported="false" />
@@ -28,6 +37,7 @@
<activity
android:name=".RBSMainActivity"
android:exported="true"
android:configChanges="orientation|screenSize"
android:theme="@style/Theme.RecurveBowSight.Starting">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

+ 6
- 0
app/src/main/java/ch/spherIC/recurvebowsight/RBSMainActivity.java Переглянути файл

@@ -4,6 +4,7 @@
package ch.spherIC.recurvebowsight;

import android.content.Intent;
import android.content.res.Configuration;
import android.os.Bundle;
import android.view.Menu;
import android.view.MenuItem;
@@ -54,6 +55,11 @@ public class RBSMainActivity extends AppCompatActivity {
RBSDatabaseHelper.getInstance().initializeDB();
}

@Override
public void onConfigurationChanged(@NonNull Configuration newConfig) {
super.onConfigurationChanged(newConfig);
}

@Override
public boolean onCreateOptionsMenu(Menu menu) {
// Inflate the menu; this adds items to the action bar if it is present.

+ 15
- 0
app/src/main/java/ch/spherIC/recurvebowsight/ui/userguide/UserGuideEquipmentActivity.java Переглянути файл

@@ -0,0 +1,15 @@
package ch.spherIC.recurvebowsight.ui.userguide;

import android.os.Bundle;

import androidx.appcompat.app.AppCompatActivity;
import ch.spherIC.recurvebowsight.R;

public class UserGuideEquipmentActivity extends AppCompatActivity {

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_user_guide_archerysetup);
}
}

+ 46
- 0
app/src/main/java/ch/spherIC/recurvebowsight/ui/userguide/UserGuideRiserActivity.java Переглянути файл

@@ -0,0 +1,46 @@
package ch.spherIC.recurvebowsight.ui.userguide;

import android.os.Bundle;
import android.view.MenuItem;
import android.widget.TextView;

import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
import ch.spherIC.recurvebowsight.R;
import ch.spherIC.recurvebowsight.databinding.ActivityUserGuideRiserBinding;

public class UserGuideRiserActivity extends AppCompatActivity {


private ActivityUserGuideRiserBinding binding;

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_user_guide_riser);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
getSupportActionBar().setTitle(R.string.menu_userguide);

this.binding = ActivityUserGuideRiserBinding.bind(findViewById(R.id.activity_ug_riser));

TextView vvisV = findViewById(R.id.ugRiserVvisV);
TextView vvisH = findViewById(R.id.ugRiserVvisH);
TextView btnScrewHoles = findViewById(R.id.ugScrewHolesButton);
TextView sightScrewHoles = findViewById(R.id.ugScrewHolesSight);

vvisV.setText("1. " + vvisV.getText());
vvisH.setText("2. " + vvisH.getText());
btnScrewHoles.setText("3. " + btnScrewHoles.getText());
sightScrewHoles.setText("4. " + sightScrewHoles.getText());
}

@Override
public boolean onOptionsItemSelected(@NonNull MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home:
this.finish();
return true;
}
return super.onOptionsItemSelected(item);
}
}

+ 15
- 0
app/src/main/java/ch/spherIC/recurvebowsight/ui/userguide/UserGuideSightActivity.java Переглянути файл

@@ -0,0 +1,15 @@
package ch.spherIC.recurvebowsight.ui.userguide;

import android.os.Bundle;

import androidx.appcompat.app.AppCompatActivity;
import ch.spherIC.recurvebowsight.R;

public class UserGuideSightActivity extends AppCompatActivity {

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_user_guide_sight);
}
}

+ 78
- 9
app/src/main/java/ch/spherIC/recurvebowsight/ui/userguide/UserguideFragment.java Переглянути файл

@@ -1,36 +1,105 @@
package ch.spherIC.recurvebowsight.ui.userguide;

import android.content.Intent;
import android.content.res.Configuration;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;

import com.google.android.flexbox.FlexDirection;
import com.google.android.flexbox.FlexboxLayout;

import org.jetbrains.annotations.NotNull;

import androidx.annotation.NonNull;
import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.fragment.app.Fragment;
import androidx.lifecycle.ViewModelProvider;
import ch.spherIC.recurvebowsight.R;
import ch.spherIC.recurvebowsight.databinding.FragmentUserguideBinding;
import ch.spherIC.recurvebowsight.utilities.UnitConverter;

public class UserguideFragment extends Fragment {

private FragmentUserguideBinding binding;
private View root;

public View onCreateView(@NonNull LayoutInflater inflater,
ViewGroup container, Bundle savedInstanceState) {
UserguideViewModel slideshowViewModel =
new ViewModelProvider(this).get(UserguideViewModel.class);
public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
UserguideViewModel slideshowViewModel = new ViewModelProvider(this).get(UserguideViewModel.class);
this.binding = FragmentUserguideBinding.inflate(inflater, container, false);
this.root = this.binding.getRoot();

binding = FragmentUserguideBinding.inflate(inflater, container, false);
View root = binding.getRoot();
attachTouchListener(root, R.id.card_view_ug_riser);
attachTouchListener(root, R.id.card_view_ug_sight);
attachTouchListener(root, R.id.card_view_ug_as);

final TextView textView = binding.textSlideshow;
slideshowViewModel.getText().observe(getViewLifecycleOwner(), textView::setText);
return root;
}

@Override
public void onConfigurationChanged(@NotNull Configuration newConfig) {
super.onConfigurationChanged(newConfig);

FlexboxLayout flexboxLayout = root.findViewById(R.id.flexboxlayout_userguide);
ConstraintLayout.LayoutParams layoutParams = (ConstraintLayout.LayoutParams) flexboxLayout.getLayoutParams();

if (newConfig.orientation == Configuration.ORIENTATION_PORTRAIT) {
layoutParams.width = ConstraintLayout.LayoutParams.WRAP_CONTENT;
layoutParams.height = ConstraintLayout.LayoutParams.MATCH_PARENT;
flexboxLayout.setFlexDirection(FlexDirection.COLUMN);
} else if (newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE) {
layoutParams.width = ConstraintLayout.LayoutParams.MATCH_PARENT;
layoutParams.height = ConstraintLayout.LayoutParams.WRAP_CONTENT;
flexboxLayout.setFlexDirection(FlexDirection.ROW);
}
flexboxLayout.requestLayout();
}

@Override
public void onDestroyView() {
super.onDestroyView();
binding = null;
}

private void attachTouchListener(View root, int cardViewId) {
View setupCardView = root.findViewById(cardViewId);
if (setupCardView != null) {
setupCardView.setOnTouchListener(new View.OnTouchListener() {

@Override
public boolean onTouch(View v, MotionEvent event) {
float alpha = 1.0f;
int layoutWidth = UnitConverter.dpToPxH(150);
int layoutHeigth = UnitConverter.dpToPxV(150);
if (event.getAction() == MotionEvent.ACTION_DOWN) {
alpha = 0.5f;
layoutWidth = UnitConverter.dpToPxH(142);
layoutHeigth = UnitConverter.dpToPxV(142);
}
v.setAlpha(alpha);

FlexboxLayout.LayoutParams layoutParams = (FlexboxLayout.LayoutParams) v.getLayoutParams();
layoutParams.width = layoutWidth;
layoutParams.height = layoutHeigth;
v.requestLayout();

if (event.getAction() == MotionEvent.ACTION_UP) {
if (v.getId() == R.id.card_view_ug_riser) {
Intent userGuideRiserIntent = new Intent(v.getContext(), UserGuideRiserActivity.class);
startActivity(userGuideRiserIntent);
/* } else if (v.getId() == R.id.card_view_sight_border) {
Intent sightConfigurationIntent = new Intent(v.getContext(), SightConfigurationActivity.class);
startActivity(sightConfigurationIntent);
} else if (v.getId() == R.id.card_view_equipment_border) {
Intent equipmentConfigurationIntent = new Intent(v.getContext(), ArcherySetupConfigurationActivity.class);
startActivity(equipmentConfigurationIntent)*/
}
}
return true;
}
});
}
}
}

BIN
app/src/main/res/drawable/userguide_params.png Переглянути файл


BIN
app/src/main/res/drawable/userguide_params_2.png Переглянути файл


BIN
app/src/main/res/drawable/userguide_riser.png Переглянути файл


BIN
app/src/main/res/drawable/userguide_sight.png Переглянути файл


+ 9
- 0
app/src/main/res/layout/activity_user_guide_archerysetup.xml Переглянути файл

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".ui.userguide.UserGuideEquipmentActivity">

</androidx.constraintlayout.widget.ConstraintLayout>

+ 195
- 0
app/src/main/res/layout/activity_user_guide_riser.xml Переглянути файл

@@ -0,0 +1,195 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/activity_ug_riser"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:contentDescription="@string/action_settings"
tools:context=".ui.userguide.UserGuideRiserActivity">

<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">

<ImageView
android:id="@+id/riserImageView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="16dp"
android:contentDescription="@string/rcRiserLbl"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.496"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/userguide_riser" />

<TextView
android:id="@+id/ugRiserVvisV"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:ems="10"
android:inputType="textPersonName"
android:text="@string/scVvisVLbl"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/riserImageView" />

<TextView
android:id="@+id/ugRiserVvisH"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:inputType="none"
android:text="@string/scVvisHLbl"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ugRiserVvisV" />

<TextView
android:id="@+id/ugRiserVvisH_Desc"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp"
android:layout_marginTop="2dp"
android:inputType="textMultiLine"
android:text="@string/ug_UserguideRiserParams_Add1"
android:textSize="16sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ugRiserVvisH" />

<TextView
android:id="@+id/ugScrewHolesButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:ems="10"
android:inputType="textPersonName"
android:text="@string/ug_UserguideRiserParams_Add2"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ugRiserVvisH_Desc" />

<TextView
android:id="@+id/ugScrewHolesSight"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:inputType="none"
android:text="@string/ug_UserguideRiserParams_Add3"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ugScrewHolesButton" />

<TextView
android:id="@+id/ugRiserBtnNew"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:inputType="none"
android:text="Button Neu"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ugScrewHolesSight" />

<TextView
android:id="@+id/ugRiserBtnNew_Desc"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp"
android:layout_marginTop="2dp"
android:inputType="textMultiLine"
android:text="@string/caption_Userguide_New"
android:textSize="16sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ugRiserBtnNew" />

<TextView
android:id="@+id/ugRiserBtnSave"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:inputType="none"
android:text="Button Speichern"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ugRiserBtnNew_Desc" />

<TextView
android:id="@+id/ugRiserBtnSave_Desc"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp"
android:layout_marginTop="2dp"
android:inputType="textMultiLine"
android:text="@string/caption_Userguide_Save"
android:textSize="16sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ugRiserBtnSave" />

<TextView
android:id="@+id/ugRiserBtnDelete"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:inputType="none"
android:text="Button Speichern"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ugRiserBtnSave_Desc" />

<TextView
android:id="@+id/ugRiserBtnDelete_Desc"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp"
android:layout_marginTop="2dp"
android:inputType="textMultiLine"
android:text="@string/caption_Userguide_Delete"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ugRiserBtnDelete" />

</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>

+ 9
- 0
app/src/main/res/layout/activity_user_guide_sight.xml Переглянути файл

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".ui.userguide.UserGuideSightActivity">

</androidx.constraintlayout.widget.ConstraintLayout>

+ 2
- 2
app/src/main/res/layout/fragment_equipment_choose.xml Переглянути файл

@@ -13,7 +13,7 @@
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:backgroundTint="#54AAD1"
android:backgroundTint="@color/purple_700"
app:cardCornerRadius="20dp"
app:cardElevation="10dp"
app:layout_constraintBottom_toBottomOf="parent"
@@ -33,7 +33,7 @@
android:layout_marginEnd="4dp"
android:layout_marginStart="4dp"
android:layout_marginTop="4dp"
app:cardBackgroundColor="#74CBF3"
app:cardBackgroundColor="#00b4e4"
app:cardCornerRadius="16dp"
app:cardElevation="0dp"
app:layout_constraintBottom_toBottomOf="parent"

+ 115
- 11
app/src/main/res/layout/fragment_userguide.xml Переглянути файл

@@ -2,21 +2,125 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/fragment_userguide"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:flexDirection="row"
app:justifyContent="space_around"
tools:context=".ui.userguide.UserguideFragment">

<TextView
android:id="@+id/text_slideshow"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:textAlignment="center"
android:textSize="20sp"
<com.google.android.flexbox.FlexboxLayout
android:id="@+id/flexboxlayout_userguide"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginBottom="32dp"
android:layout_marginEnd="32dp"
android:layout_marginStart="32dp"
android:layout_marginTop="32dp"
app:flexDirection="column"
app:justifyContent="space_around"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
app:layout_constraintTop_toTopOf="parent">


<androidx.cardview.widget.CardView
android:id="@+id/card_view_ug_riser"
android:layout_width="150dp"
android:layout_height="150dp"
android:background="@android:drawable/btn_default"
android:clickable="true"
android:hapticFeedbackEnabled="true"
app:cardBackgroundColor="#00b4e4"
app:cardCornerRadius="16dp"
app:cardElevation="10dp"
app:contentPadding="8dp"
tools:ignore="SpeakableTextPresentCheck"
tools:layout_editor_absoluteY="51dp">

<ImageView
android:id="@+id/imgRiserUG"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:src="@drawable/ic_cfg_riser" />

<TextView
android:id="@+id/textRiserUG"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/rcRiserLbl"
android:textColor="@color/white"
android:textSize="16sp"
android:textStyle="bold" />
</androidx.cardview.widget.CardView>

<androidx.cardview.widget.CardView
android:id="@+id/card_view_ug_sight"
android:layout_width="150dp"
android:layout_height="150dp"
android:background="@android:drawable/btn_default"
android:clickable="true"
android:hapticFeedbackEnabled="true"
app:cardBackgroundColor="#00b4e4"
app:cardCornerRadius="16dp"
app:cardElevation="10dp"
app:contentPadding="8dp"
app:layout_constraintEnd_toEndOf="@+id/flow"
app:layout_constraintStart_toStartOf="@+id/flow"
tools:ignore="SpeakableTextPresentCheck"
tools:layout_editor_absoluteY="264dp">

<ImageView
android:id="@+id/imgSightUG"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:src="@drawable/ic_menu_calcsight" />

<TextView
android:id="@+id/textSightUG"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/rcSightLbl"
android:textColor="@color/white"
android:textSize="16sp"
android:textStyle="bold" />

</androidx.cardview.widget.CardView>

<androidx.cardview.widget.CardView
android:id="@+id/card_view_ug_as"
android:layout_width="150dp"
android:layout_height="150dp"
android:background="@android:drawable/btn_default"
android:clickable="true"
android:hapticFeedbackEnabled="true"
app:cardBackgroundColor="#00b4e4"
app:cardCornerRadius="16dp"
app:cardElevation="10dp"
app:contentPadding="8dp"
app:layout_constraintBottom_toBottomOf="@+id/flow"
app:layout_constraintEnd_toEndOf="@+id/flow"
app:layout_constraintStart_toStartOf="@+id/flow"
tools:ignore="SpeakableTextPresentCheck">

<ImageView
android:id="@+id/imgAsUG"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:src="@drawable/ic_menu_equipment" />

<TextView
android:id="@+id/textAsUG"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/menu_equipment"
android:textColor="@color/white"
android:textSize="16sp"
android:textStyle="bold" />

</androidx.cardview.widget.CardView>

</com.google.android.flexbox.FlexboxLayout>

</androidx.constraintlayout.widget.ConstraintLayout>

+ 21
- 0
app/src/main/res/values-de/strings.xml Переглянути файл

@@ -54,6 +54,10 @@
<string name="caption_MainCfg_Sight_SubText">Hier klicken um ein Visier zu Editieren, zu Löschen oder Einzufügen</string>
<string name="caption_MainCfg_ArcerySetup_MainText">Ausrüstung</string>
<string name="caption_MainCfg_ArcerySetup_SubText">Hier klicken um eine Ausrüstung zu Editieren, zu Löschen oder Einzufügen</string>
<string name="caption_Userguide_New">Erstellt eine neue, leere Konfiguration</string>
<string name="caption_Userguide_Save">Speichert eine neue oder geänderte Konfiguration</string>
<string name="caption_Userguide_Delete">Löscht eine Konfiguration nach Bestätigung</string>
<string name="rcTitleRiserConfig">Konfiguration Griffstück</string>
<string name="rcRiserLbl">Griffstück</string>
@@ -121,5 +125,22 @@
<string name="about_DevelopedBy_Mail">Mail an: merlin868@hotmail.com\</string>
<string name="about_DevelopedBy_Translated">Übersetzt von spherIC (F. Smilari)</string>
<string name="ug_UserguideParams_Add1">Die einzelnen Punkte der Flugbahnkurve werden im eingestellten Intervall berechnet. Ein kleinerer Intervall führt zu einer genaueren Flugbahn, hat aber zur Folge, dass die Berechnung länger dauert.</string>
<string name="ug_UserguideParams_Add2">Dieser Wert bestimmt wie genau der resultierende Höhenunterschied zwischen Bogen und Ziel berechnet wird. Ein kleinerer Wert führt zu einer genaueren Flugbahn, hat aber zur Folge, dass die Berechnung länger dauert.</string>
<string name="ug_UserguideRiserParams_Add1">Dieser Wert is negativ falls die Schraubenlöcher der Visiermontage näher an der Sehne sind als die Button-Schraubenlöcher (3), andernfalls positiv.</string>
<string name="ug_UserguideRiserParams_Add2">Schraubenlöcher Button</string>
<string name="ug_UserguideRiserParams_Add3">Schraubenlöcher Visiermontage</string>
<string name="ug_UserguideSightParams_Add1">Dieser Wert is negativ falls die Fixierschraube näher an der Sehne ist als die Schraubenlöcher der Visiermontage, andernfalls positiv.</string>
<string name="ug_UserguideSightParams_Add2">Einstellbare Abstände von der Fixierschraube bis zum Pin, getrennt durch Kommas.</string>
<string name="ug_UserguideASParams_Add1">%1$s:\nWählen Sie eine Ausrüstung zum Editieren</string>
<string name="ug_UserguideASParams_Add2">%1$s:\nDie Bezeichnung der Ausrüstung. Geben Sie hier eine Bezeichnung ein wenn Sie eine neue Ausrüstung erstellen</string>
<string name="ug_UserguideASParams_Add3">%1$s:\nWählen Sie ein Griffstück aus der Liste der verfügbaren aus</string>
<string name="ug_UserguideASParams_Add4">%1$s:\nWählen Sie ein Visier aus der Liste der verfügbaren aus</string>
<string name="ug_UserguideASParams_Add5">%1$s, %2$s:\nStandardwerte für die Berechnung</string>
<string name="ug_UserguideASParams_Add6">%1$s:\nWert auf der vertikalen Skala bei welchem die Mittelachse des Visierschlittens befestigt ist (siehe auch Benutzeranleitung Visier)</string>
<string name="ug_UserguideASParams_Add7">%1$s:\nStandardwert der horizontalen Stellung des Visierschlittens</string>
</resources>

+ 22
- 0
app/src/main/res/values/strings.xml Переглянути файл

@@ -54,6 +54,9 @@
<string name="caption_MainCfg_Sight_SubText">Tab to edit, delete or insert a sight</string>
<string name="caption_MainCfg_ArcerySetup_MainText">Equipment</string>
<string name="caption_MainCfg_ArcerySetup_SubText">Tab to edit, delete or insert a equipment setup</string>
<string name="caption_Userguide_New">Creates a empty, new configuration</string>
<string name="caption_Userguide_Save">Saves a new or edited configuration</string>
<string name="caption_Userguide_Delete">Deletes a configuration after confirmation</string>

<string name="rcTitleRiserConfig">Riser Configuration</string>
<string name="rcRiserLbl">Riser</string>
@@ -121,4 +124,23 @@
<string name="about_DevelopedBy_Mail">Mail to: merlin868@hotmail.com\</string>
<string name="about_DevelopedBy_Translated">nTranslated by spherIC (F. Smilari)</string>

<string name="ug_UserguideParams_Add1">The single points of the ballistic trajectory are calculated with this time interval to eachn other. A lower value will result in a more accurate ballistic trajectory but also slows down the calculation time.</string>
<string name="ug_UserguideParams_Add2">This value determines the calculation precision of the difference between bow and target. A lower value will result in a more accurate ballistic trajectory but also slows down the calculation time.</string>

<string name="ug_UserguideRiserParams_Add1">This value is negative if the sight mount screw holes are closer to the bow string than the button screw holes (3), otherwise positive.</string>
<string name="ug_UserguideRiserParams_Add2">Button screw holes</string>
<string name="ug_UserguideRiserParams_Add3">Sight mount screw holes</string>

<string name="ug_UserguideSightParams_Add1">This value is negative if the fixing screw is closer to the bow string than the sight mount screw holes, otherwise positive.</string>
<string name="ug_UserguideSightParams_Add2">Settable distances from the fixing screw to the pin, comma separated.</string>

<string name="ug_UserguideASParams_Add1">%1$s:\nChoose an equipment to edit</string>
<string name="ug_UserguideASParams_Add2">%1$s:\nThe label of the eqipment. Type a name if you are configuring a new one</string>
<string name="ug_UserguideASParams_Add3">%1$s:\nSelect a riser from the list of available risers</string>
<string name="ug_UserguideASParams_Add4">%1$s:\nSelect a sight from the list of available sights</string>
<string name="ug_UserguideASParams_Add5">%1$s, %2$s:\nDefault values for calculation</string>
<string name="ug_UserguideASParams_Add6">%1$s:\nValue of the vertical sight scale where it is fixed according to the middle axis of the horizontal sliding carriage (see also sight user guide)</string>
<string name="ug_UserguideASParams_Add7">%1$s:\nDefault value of the horizontal setting of the sight</string>


</resources>

Писати Попередній перегляд
Завантаження…
Відмінити
Зберегти