Flo Smilari преди 3 години
родител
ревизия
7c01114cb1
променени са 23 файла, в които са добавени 764 реда и са изтрити 81 реда
  1. Двоични данни
      .gradle/7.3.3/executionHistory/executionHistory.bin
  2. Двоични данни
      .gradle/7.3.3/executionHistory/executionHistory.lock
  3. Двоични данни
      .gradle/7.3.3/fileHashes/fileHashes.bin
  4. Двоични данни
      .gradle/7.3.3/fileHashes/fileHashes.lock
  5. Двоични данни
      .gradle/7.3.3/fileHashes/resourceHashesCache.bin
  6. Двоични данни
      .gradle/buildOutputCleanup/buildOutputCleanup.lock
  7. 4
    0
      .idea/misc.xml
  8. 34
    29
      .idea/workspace.xml
  9. 2
    3
      app/src/main/AndroidManifest.xml
  10. 11
    6
      app/src/main/java/ch/spherIC/recurvebowsight/RBSMainActivity.java
  11. 16
    0
      app/src/main/java/ch/spherIC/recurvebowsight/ui/configuration/ArcherySetupConfigurationActivity.java
  12. 15
    0
      app/src/main/java/ch/spherIC/recurvebowsight/ui/configuration/RiserConfigurationActivity.java
  13. 15
    0
      app/src/main/java/ch/spherIC/recurvebowsight/ui/configuration/SightConfigurationActivity.java
  14. 34
    0
      app/src/main/java/ch/spherIC/recurvebowsight/ui/userguide/UserGuideArcherySetupActivity.java
  15. 0
    15
      app/src/main/java/ch/spherIC/recurvebowsight/ui/userguide/UserGuideEquipmentActivity.java
  16. 0
    1
      app/src/main/java/ch/spherIC/recurvebowsight/ui/userguide/UserGuideRiserActivity.java
  17. 38
    0
      app/src/main/java/ch/spherIC/recurvebowsight/ui/userguide/UserGuideSightActivity.java
  18. 6
    6
      app/src/main/java/ch/spherIC/recurvebowsight/ui/userguide/UserguideFragment.java
  19. 309
    3
      app/src/main/res/layout/activity_user_guide_archerysetup.xml
  20. 260
    2
      app/src/main/res/layout/activity_user_guide_sight.xml
  21. 6
    1
      app/src/main/res/menu/main.xml
  22. 7
    7
      app/src/main/res/values-de/strings.xml
  23. 7
    8
      app/src/main/res/values/strings.xml

Двоични данни
.gradle/7.3.3/executionHistory/executionHistory.bin Целия файл


Двоични данни
.gradle/7.3.3/executionHistory/executionHistory.lock Целия файл


Двоични данни
.gradle/7.3.3/fileHashes/fileHashes.bin Целия файл


Двоични данни
.gradle/7.3.3/fileHashes/fileHashes.lock Целия файл


Двоични данни
.gradle/7.3.3/fileHashes/resourceHashesCache.bin Целия файл


Двоични данни
.gradle/buildOutputCleanup/buildOutputCleanup.lock Целия файл


+ 4
- 0
.idea/misc.xml Целия файл

@@ -40,9 +40,13 @@
<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_test_basic.xml" value="0.15833333333333333" />
<entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/layout/activity_user_guide_archerysetup.xml" value="0.2" />
<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/activity_user_guide_sight.xml" value="0.22" />
<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/content_test_basic.xml" value="0.15833333333333333" />
<entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/layout/fragment_about.xml" value="0.22" />
<entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/layout/fragment_calcsight.xml" value="0.15812841530054644" />
<entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/layout/fragment_calcsight_parameters.xml" value="0.2" />

+ 34
- 29
.idea/workspace.xml Целия файл

@@ -21,44 +21,26 @@
</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/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/configuration/ArcherySetupConfigurationActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/ch/spherIC/recurvebowsight/ui/configuration/ArcherySetupConfigurationActivity.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/ch/spherIC/recurvebowsight/ui/configuration/RiserConfigurationActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/ch/spherIC/recurvebowsight/ui/configuration/RiserConfigurationActivity.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/ch/spherIC/recurvebowsight/ui/configuration/SightConfigurationActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/ch/spherIC/recurvebowsight/ui/configuration/SightConfigurationActivity.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/ch/spherIC/recurvebowsight/ui/userguide/UserGuideEquipmentActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/ch/spherIC/recurvebowsight/ui/userguide/UserGuideArcherySetupActivity.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/ch/spherIC/recurvebowsight/ui/userguide/UserGuideRiserActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/ch/spherIC/recurvebowsight/ui/userguide/UserGuideRiserActivity.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/ch/spherIC/recurvebowsight/ui/userguide/UserGuideSightActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/ch/spherIC/recurvebowsight/ui/userguide/UserGuideSightActivity.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/layout/activity_user_guide_archerysetup.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_user_guide_archerysetup.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_user_guide_sight.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_user_guide_sight.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/menu/main.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/menu/main.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>
@@ -182,6 +164,9 @@
<recent name="Z:\Work\Java Projects\Android\RecurveBowSight\V2\app\src\main\res\anim" />
<recent name="Z:\Work\Java Projects\Android\RecurveBowSight\V2\app\src\main\res\drawable-v24" />
</key>
<key name="android.template.-1632241716">
<recent name="ch.spherIC.recurvebowsight" />
</key>
<key name="android.template.170908341">
<recent name="ch.spherIC.recurvebowsight" />
</key>
@@ -325,7 +310,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>76</line>
<line>81</line>
<option name="timeStamp" value="125" />
</line-breakpoint>
<line-breakpoint enabled="true" suspend="THREAD" type="java-line">
@@ -348,12 +333,32 @@
<line>72</line>
<option name="timeStamp" value="132" />
</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>74</line>
<option name="timeStamp" value="133" />
</line-breakpoint>
<line-breakpoint enabled="true" suspend="THREAD" type="java-line">
<url>file://$PROJECT_DIR$/app/src/main/java/ch/spherIC/recurvebowsight/ui/configuration/RiserConfigurationActivity.java</url>
<line>55</line>
<option name="timeStamp" value="135" />
</line-breakpoint>
<line-breakpoint enabled="true" suspend="THREAD" type="java-line">
<url>file://$PROJECT_DIR$/app/src/main/java/ch/spherIC/recurvebowsight/ui/userguide/UserGuideArcherySetupActivity.java</url>
<line>16</line>
<option name="timeStamp" value="136" />
</line-breakpoint>
<line-breakpoint enabled="true" suspend="THREAD" type="java-line">
<url>file://$PROJECT_DIR$/app/src/main/java/ch/spherIC/recurvebowsight/ui/userguide/UserGuideArcherySetupActivity.java</url>
<line>26</line>
<option name="timeStamp" value="137" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
<watches-manager>
<configuration name="app">
<watch expression="this" />
<watch expression="v.getLayoutParams()" language="JAVA" />
<watch expression="menu.findItem(R.id.action_help)" language="JAVA" custom="ch.spherIC.recurvebowsight.R" />
</configuration>
</watches-manager>
</component>

+ 2
- 3
app/src/main/AndroidManifest.xml Целия файл

@@ -14,7 +14,7 @@
android:theme="@style/Theme.RecurveBowSight"
tools:targetApi="31">
<activity
android:name=".ui.userguide.UserGuideEquipmentActivity"
android:name=".ui.userguide.UserGuideArcherySetupActivity"
android:exported="false" />
<activity
android:name=".ui.userguide.UserGuideSightActivity"
@@ -36,12 +36,11 @@
android:exported="false" />
<activity
android:name=".RBSMainActivity"
android:exported="true"
android:configChanges="orientation|screenSize"
android:exported="true"
android:theme="@style/Theme.RecurveBowSight.Starting">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>

+ 11
- 6
app/src/main/java/ch/spherIC/recurvebowsight/RBSMainActivity.java Целия файл

@@ -3,8 +3,10 @@
*/
package ch.spherIC.recurvebowsight;

import android.app.ActivityManager;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.res.Configuration;
import android.os.Bundle;
import android.view.Menu;
import android.view.MenuItem;
@@ -55,11 +57,6 @@ 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.
@@ -74,6 +71,14 @@ public class RBSMainActivity extends AppCompatActivity {
Intent defaultSettingsActivityIntent = new Intent(this.binding.getRoot().getContext(), DefaultSettingsActivity.class);
startActivity(defaultSettingsActivityIntent);
return true;
case R.id.action_help:
ActivityManager am = (ActivityManager) this.binding.getRoot().getContext().getSystemService(Context.ACTIVITY_SERVICE);
ComponentName cn = am.getRunningTasks(1).get(0).topActivity;
/*
Intent defaultSettingsActivityIntent = new Intent(this.binding.getRoot().getContext(), DefaultSettingsActivity.class);
startActivity(defaultSettingsActivityIntent);
*/
return true;
default:
return super.onOptionsItemSelected(item);
}

+ 16
- 0
app/src/main/java/ch/spherIC/recurvebowsight/ui/configuration/ArcherySetupConfigurationActivity.java Целия файл

@@ -5,7 +5,9 @@ package ch.spherIC.recurvebowsight.ui.configuration;

import android.app.AlertDialog;
import android.content.DialogInterface;
import android.content.Intent;
import android.os.Bundle;
import android.view.Menu;
import android.view.MenuItem;
import android.widget.ArrayAdapter;
import android.widget.AutoCompleteTextView;
@@ -26,6 +28,7 @@ import ch.spherIC.recurvebowsight.model.ArcherySetup;
import ch.spherIC.recurvebowsight.model.IArcherySetup;
import ch.spherIC.recurvebowsight.model.IRiser;
import ch.spherIC.recurvebowsight.model.ISight;
import ch.spherIC.recurvebowsight.ui.userguide.UserGuideArcherySetupActivity;
import ch.spherIC.recurvebowsight.utilities.NoFilterArrayAdapter;
import ch.spherIC.recurvebowsight.utilities.PlatformUtils;

@@ -52,12 +55,25 @@ public class ArcherySetupConfigurationActivity extends AppCompatActivity {
loadArcherySetups();
}

@Override
public boolean onCreateOptionsMenu(Menu menu) {
// Inflate the menu; this adds items to the action bar if it is present.
getMenuInflater().inflate(R.menu.main, menu);
MenuItem menuItemHelp = menu.findItem(R.id.action_help);
menuItemHelp.setEnabled(true);
return true;
}

@Override
public boolean onOptionsItemSelected(@NonNull MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home:
this.finish();
return true;
case R.id.action_help:
Intent userGuideASIntent = new Intent(this.binding.getRoot().getContext(), UserGuideArcherySetupActivity.class);
startActivity(userGuideASIntent);
return true;
}
return super.onOptionsItemSelected(item);
}

+ 15
- 0
app/src/main/java/ch/spherIC/recurvebowsight/ui/configuration/RiserConfigurationActivity.java Целия файл

@@ -5,7 +5,9 @@ package ch.spherIC.recurvebowsight.ui.configuration;

import android.app.AlertDialog;
import android.content.DialogInterface;
import android.content.Intent;
import android.os.Bundle;
import android.view.Menu;
import android.view.MenuItem;
import android.widget.ArrayAdapter;
import android.widget.AutoCompleteTextView;
@@ -22,6 +24,7 @@ import ch.spherIC.recurvebowsight.database.dao.RiserDao;
import ch.spherIC.recurvebowsight.databinding.ActivityRiserConfigurationBinding;
import ch.spherIC.recurvebowsight.model.IRiser;
import ch.spherIC.recurvebowsight.model.Riser;
import ch.spherIC.recurvebowsight.ui.userguide.UserGuideRiserActivity;
import ch.spherIC.recurvebowsight.utilities.NoFilterArrayAdapter;
import ch.spherIC.recurvebowsight.utilities.PlatformUtils;

@@ -46,6 +49,14 @@ public class RiserConfigurationActivity extends AppCompatActivity {
loadRisers();
}

@Override
public boolean onCreateOptionsMenu(Menu menu) {
// Inflate the menu; this adds items to the action bar if it is present.
getMenuInflater().inflate(R.menu.main, menu);
MenuItem menuItemHelp = menu.findItem(R.id.action_help);
menuItemHelp.setEnabled(true);
return true;
}

@Override
public boolean onOptionsItemSelected(@NonNull MenuItem item) {
@@ -53,6 +64,10 @@ public class RiserConfigurationActivity extends AppCompatActivity {
case android.R.id.home:
this.finish();
return true;
case R.id.action_help:
Intent userGuideRiserIntent = new Intent(this.binding.getRoot().getContext(), UserGuideRiserActivity.class);
startActivity(userGuideRiserIntent);
return true;
}
return super.onOptionsItemSelected(item);
}

+ 15
- 0
app/src/main/java/ch/spherIC/recurvebowsight/ui/configuration/SightConfigurationActivity.java Целия файл

@@ -5,7 +5,9 @@ package ch.spherIC.recurvebowsight.ui.configuration;

import android.app.AlertDialog;
import android.content.DialogInterface;
import android.content.Intent;
import android.os.Bundle;
import android.view.Menu;
import android.view.MenuItem;
import android.widget.ArrayAdapter;
import android.widget.AutoCompleteTextView;
@@ -22,6 +24,7 @@ import ch.spherIC.recurvebowsight.database.dao.SightDao;
import ch.spherIC.recurvebowsight.databinding.ActivitySightConfigurationBinding;
import ch.spherIC.recurvebowsight.model.ISight;
import ch.spherIC.recurvebowsight.model.Sight;
import ch.spherIC.recurvebowsight.ui.userguide.UserGuideSightActivity;
import ch.spherIC.recurvebowsight.utilities.NoFilterArrayAdapter;
import ch.spherIC.recurvebowsight.utilities.PlatformUtils;

@@ -46,6 +49,14 @@ public class SightConfigurationActivity extends AppCompatActivity {
loadSights();
}

@Override
public boolean onCreateOptionsMenu(Menu menu) {
// Inflate the menu; this adds items to the action bar if it is present.
getMenuInflater().inflate(R.menu.main, menu);
MenuItem menuItemHelp = menu.findItem(R.id.action_help);
menuItemHelp.setEnabled(true);
return true;
}

@Override
public boolean onOptionsItemSelected(@NonNull MenuItem item) {
@@ -53,6 +64,10 @@ public class SightConfigurationActivity extends AppCompatActivity {
case android.R.id.home:
this.finish();
return true;
case R.id.action_help:
Intent userGuideSightIntent = new Intent(this.binding.getRoot().getContext(), UserGuideSightActivity.class);
startActivity(userGuideSightIntent);
return true;
}
return super.onOptionsItemSelected(item);
}

+ 34
- 0
app/src/main/java/ch/spherIC/recurvebowsight/ui/userguide/UserGuideArcherySetupActivity.java Целия файл

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

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

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

public class UserGuideArcherySetupActivity extends AppCompatActivity {

private ActivityUserGuideArcherysetupBinding binding;

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

this.binding = ActivityUserGuideArcherysetupBinding.bind(findViewById(R.id.activity_ug_as));
}

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

+ 0
- 15
app/src/main/java/ch/spherIC/recurvebowsight/ui/userguide/UserGuideEquipmentActivity.java Целия файл

@@ -1,15 +0,0 @@
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);
}
}

+ 0
- 1
app/src/main/java/ch/spherIC/recurvebowsight/ui/userguide/UserGuideRiserActivity.java Целия файл

@@ -11,7 +11,6 @@ import ch.spherIC.recurvebowsight.databinding.ActivityUserGuideRiserBinding;

public class UserGuideRiserActivity extends AppCompatActivity {


private ActivityUserGuideRiserBinding binding;

@Override

+ 38
- 0
app/src/main/java/ch/spherIC/recurvebowsight/ui/userguide/UserGuideSightActivity.java Целия файл

@@ -1,15 +1,53 @@
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.ActivityUserGuideSightBinding;

public class UserGuideSightActivity extends AppCompatActivity {

private ActivityUserGuideSightBinding binding;

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

this.binding = ActivityUserGuideSightBinding.bind(findViewById(R.id.activity_ug_sight));

TextView aV = findViewById(R.id.ugSightAV);
TextView aH = findViewById(R.id.ugSightAH);
TextView heVis = findViewById(R.id.ugSightHeVis);
TextView minRngVertScale = findViewById(R.id.ugMinRngVertScale);
TextView maxRngVertScale = findViewById(R.id.ugMaxRngVertScale);
TextView vertSkalaMiddle = findViewById(R.id.ugVertSkalaMiddle);
TextView evs = findViewById(R.id.ugEvS);
TextView pointerOffset = findViewById(R.id.ugPointerOffset);

aV.setText("1. " + aV.getText());
aH.setText("2. " + aH.getText());
heVis.setText("3. " + heVis.getText());
minRngVertScale.setText("4. " + minRngVertScale.getText());
maxRngVertScale.setText("5. " + maxRngVertScale.getText());
vertSkalaMiddle.setText("6. " + vertSkalaMiddle.getText());
evs.setText("7. " + evs.getText());
pointerOffset.setText("8. " + pointerOffset.getText());
}

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

+ 6
- 6
app/src/main/java/ch/spherIC/recurvebowsight/ui/userguide/UserguideFragment.java Целия файл

@@ -89,12 +89,12 @@ public class UserguideFragment extends Fragment {
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)*/
} else if (v.getId() == R.id.card_view_ug_sight) {
Intent userGuideSightIntent = new Intent(v.getContext(), UserGuideSightActivity.class);
startActivity(userGuideSightIntent);
} else if (v.getId() == R.id.card_view_ug_as) {
Intent userGuideArcherySetupIntent = new Intent(v.getContext(), UserGuideArcherySetupActivity.class);
startActivity(userGuideArcherySetupIntent);
}
}
return true;

+ 309
- 3
app/src/main/res/layout/activity_user_guide_archerysetup.xml Целия файл

@@ -1,9 +1,315 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<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_as"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".ui.userguide.UserGuideEquipmentActivity">
tools:context=".ui.userguide.UserGuideArcherySetupActivity">

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

<TextView
android:id="@+id/ugASEquipment"
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/menu_equipment"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<TextView
android:id="@+id/ugASEquipment_Desc"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp"
android:text="@string/ug_UserguideASParams_Add1"
android:textSize="16sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ugASEquipment" />

<TextView
android:id="@+id/ugASLabel"
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/asLabel"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ugASEquipment_Desc" />

<TextView
android:id="@+id/ugASLabel_Desc"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp"
android:text="@string/ug_UserguideASParams_Add2"
android:textSize="16sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ugASLabel" />

<TextView
android:id="@+id/ugASRiser"
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/rcRiserLbl"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ugASLabel_Desc" />

<TextView
android:id="@+id/ugASRiser_Desc"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp"
android:text="@string/ug_UserguideASParams_Add3"
android:textSize="16sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ugASRiser" />

<TextView
android:id="@+id/ugASSight"
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/rcSightLbl"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ugASRiser_Desc" />

<TextView
android:id="@+id/ugASSight_Desc"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp"
android:text="@string/ug_UserguideASParams_Add4"
android:textSize="16sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ugASSight" />

<TextView
android:id="@+id/ugASDeltaTime"
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/deltaTimeLbl"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ugASSight_Desc" />

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

<TextView
android:id="@+id/ugASCalcPrecision_Desc"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp"
android:text="@string/ug_UserguideASParams_Add5"
android:textSize="16sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ugASCalcPrecision" />

<TextView
android:id="@+id/ugASVertSkalaMiddle"
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/scVertSkalaMiddleLbl"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ugASCalcPrecision_Desc" />

<TextView
android:id="@+id/ugASVertSkalaMiddle_Desc"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp"
android:text="@string/ug_UserguideASParams_Add6"
android:textSize="16sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ugASVertSkalaMiddle" />

<TextView
android:id="@+id/ugASHeVS"
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/scHeVSLbl"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ugASVertSkalaMiddle_Desc" />

<TextView
android:id="@+id/ugHeVS_Desc"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp"
android:text="@string/ug_UserguideASParams_Add7"
android:textSize="16sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ugASHeVS" />

<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/ugHeVS_Desc" />

<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>

+ 260
- 2
app/src/main/res/layout/activity_user_guide_sight.xml Целия файл

@@ -1,9 +1,267 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<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_sight"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".ui.userguide.UserGuideSightActivity">

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

<ImageView
android:id="@+id/sightImageView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp"
android:contentDescription="@string/rcRiserLbl"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/userguide_sight" />

<TextView
android:id="@+id/ugSightAV"
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/sightImageView" />

<TextView
android:id="@+id/ugSightAH"
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/ugSightAV" />

<TextView
android:id="@+id/ugSightAH_Desc"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp"
android:layout_marginTop="2dp"
android:inputType="none"
android:text="@string/ug_UserguideSightParams_Add1"
android:textSize="16sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ugSightAH" />


<TextView
android:id="@+id/ugSightHeVis"
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/scHeVSLbl"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ugSightAH_Desc" />

<TextView
android:id="@+id/ugSightHeVis_Desc"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp"
android:layout_marginTop="2dp"
android:inputType="none"
android:text="@string/ug_UserguideSightParams_Add2"
android:textSize="16sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ugSightHeVis" />

<TextView
android:id="@+id/ugMinRngVertScale"
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/scVertScaleRngMinLbl"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ugSightHeVis_Desc" />

<TextView
android:id="@+id/ugMaxRngVertScale"
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/scVertScaleRngMaxLbl"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ugMinRngVertScale" />

<TextView
android:id="@+id/ugVertSkalaMiddle"
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/scVertSkalaMiddleLbl"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ugMaxRngVertScale" />

<TextView
android:id="@+id/ugEvS"
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/scEvSLbl"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ugVertSkalaMiddle" />

<TextView
android:id="@+id/ugPointerOffset"
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/scPointerOffsetLbl"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ugEvS" />

<TextView
android:id="@+id/ugSightBtnNew"
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/ugPointerOffset" />

<TextView
android:id="@+id/ugSightBtnNew_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/ugSightBtnNew" />

<TextView
android:id="@+id/ugSightBtnSave"
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/ugSightBtnNew_Desc" />

<TextView
android:id="@+id/ugSightBtnSave_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/ugSightBtnSave" />

<TextView
android:id="@+id/ugSightBtnDelete"
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/ugSightBtnSave_Desc" />

<TextView
android:id="@+id/ugSightBtnDelete_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/ugSightBtnDelete" />


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

+ 6
- 1
app/src/main/res/menu/main.xml Целия файл

@@ -4,7 +4,12 @@
<item
android:id="@+id/action_settings"
android:icon="@drawable/ic_settings"
android:orderInCategory="100"
android:orderInCategory="10"
android:title="@string/action_settings"
app:showAsAction="never" />
<item
android:id="@+id/action_help"
android:enabled="false"
android:orderInCategory="20"
android:title="@string/menu_userguide" />
</menu>

+ 7
- 7
app/src/main/res/values-de/strings.xml Целия файл

@@ -135,12 +135,12 @@
<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>
<string name="ug_UserguideASParams_Add1">Wählen Sie eine Ausrüstung zum Editieren</string>
<string name="ug_UserguideASParams_Add2">Die Bezeichnung der Ausrüstung. Geben Sie hier eine Bezeichnung ein wenn Sie eine neue Ausrüstung erstellen</string>
<string name="ug_UserguideASParams_Add3">Wählen Sie ein Griffstück aus der Liste der verfügbaren aus</string>
<string name="ug_UserguideASParams_Add4">Wählen Sie ein Visier aus der Liste der verfügbaren aus</string>
<string name="ug_UserguideASParams_Add5">Standardwerte für die Berechnung</string>
<string name="ug_UserguideASParams_Add6">Wert auf der vertikalen Skala bei welchem die Mittelachse des Visierschlittens befestigt ist (siehe auch Benutzeranleitung Visier)</string>
<string name="ug_UserguideASParams_Add7">Standardwert der horizontalen Stellung des Visierschlittens</string>
</resources>

+ 7
- 8
app/src/main/res/values/strings.xml Целия файл

@@ -134,13 +134,12 @@
<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>

<string name="ug_UserguideASParams_Add1">Choose an equipment to edit</string>
<string name="ug_UserguideASParams_Add2">The label of the eqipment. Type a name if you are configuring a new one</string>
<string name="ug_UserguideASParams_Add3">Select a riser from the list of available risers</string>
<string name="ug_UserguideASParams_Add4">Select a sight from the list of available sights</string>
<string name="ug_UserguideASParams_Add5">Default values for calculation</string>
<string name="ug_UserguideASParams_Add6">Value 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">Default value of the horizontal setting of the sight</string>

</resources>

Loading…
Отказ
Запис