Browse Source

Enhancements

master
Flo Smilari 3 years ago
parent
commit
511420ccfa

BIN
.gradle/7.3.3/executionHistory/executionHistory.bin View File


BIN
.gradle/7.3.3/executionHistory/executionHistory.lock View File


BIN
.gradle/7.3.3/fileHashes/fileHashes.bin View File


BIN
.gradle/7.3.3/fileHashes/fileHashes.lock View File


BIN
.gradle/7.3.3/fileHashes/resourceHashesCache.bin View File


BIN
.gradle/buildOutputCleanup/buildOutputCleanup.lock View File


+ 1
- 0
.idea/misc.xml View File

@@ -22,6 +22,7 @@
<entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/drawable/ic_launcher_foreground.xml" value="0.25" />
<entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/drawable/ic_launcher_round.xml" value="0.25" />
<entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/drawable/ic_mediation_black_24dp.xml" value="0.285" />
<entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/drawable/ic_menu_about.xml" value="0.2505" />
<entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/drawable/ic_menu_calcsight.xml" value="0.248" />
<entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/drawable/ic_menu_camera.xml" value="0.25" />
<entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/drawable/ic_menu_equipment.xml" value="0.25" />

+ 5
- 13
.idea/workspace.xml View File

@@ -21,22 +21,14 @@
</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/dependencies-accessors/dependencies-accessors.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/7.3.3/dependencies-accessors/dependencies-accessors.lock" 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$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/ch/spherIC/recurvebowsight/ui/equipment/AddEquipmentFragment.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/ch/spherIC/recurvebowsight/ui/equipment/AddEquipmentFragment.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/ch/spherIC/recurvebowsight/ui/equipment/EquipmentRecyclerViewAdapter.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/ch/spherIC/recurvebowsight/ui/equipment/EquipmentRecyclerViewAdapter.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/java/ch/spherIC/recurvebowsight/utilities/UnitConverter.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/ch/spherIC/recurvebowsight/utilities/UnitConverter.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/ch/spherIC/recurvebowsight/ui/calcsight/CalculateSightParametersFragment.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/ch/spherIC/recurvebowsight/ui/calcsight/CalculateSightParametersFragment.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/drawable/ic_menu_about.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/drawable/ic_menu_about.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/drawable/ic_menu_calcsight.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/drawable/ic_menu_calcsight.xml" afterDir="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/res/drawable/ic_menu_equipment.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/drawable/ic_menu_equipment.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/fragment_userguide.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_userguide.xml" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />

+ 2
- 2
app/src/main/java/ch/spherIC/recurvebowsight/ui/calcsight/CalculateSightParametersFragment.java View File

@@ -207,8 +207,8 @@ public class CalculateSightParametersFragment extends Fragment implements Trajec
&& !this.binding.nockRaisingTxt.getText().toString().isEmpty()
&& !this.binding.braceHeightTxt.getText().toString().isEmpty()
&& !this.binding.airTemperatureTxt.getText().toString().isEmpty()
&& !this.binding.airRelativeHumidityTxt.getText().toString().isEmpty()
&& !this.binding.shootingDistanzTxt.getText().toString().isEmpty()
&& !this.binding.airRelativeHumidityTxt.getText().toString().isEmpty() && !this.binding.airRelativeHumidityTxt.getText().toString().equals("0")
&& !this.binding.shootingDistanzTxt.getText().toString().isEmpty() && !this.binding.shootingDistanzTxt.getText().toString().equals("0")
&& !this.binding.arrowNockHeightTxt.getText().toString().isEmpty()
&& !this.binding.targetCenterHeightTxt.getText().toString().isEmpty()
&& !this.binding.deltaTimeTxt.getText().toString().isEmpty()

+ 2
- 1
app/src/main/res/drawable/ic_menu_about.xml View File

@@ -1,9 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="#000000">
android:tint="#FF000000">
<path
android:fillColor="@android:color/white"
android:pathData="M11,7h2v2h-2zM11,11h2v6h-2zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z"/>

+ 2
- 2
app/src/main/res/drawable/ic_menu_calcsight.xml View File

@@ -5,9 +5,9 @@
android:viewportHeight="24"
android:tint="#000000">
<path
android:fillColor="@android:color/black"
android:fillColor="#000000"
android:pathData="M12,8c-2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM20.94,11c-0.46,-4.17 -3.77,-7.48 -7.94,-7.94L13,1h-2v2.06C6.83,3.52 3.52,6.83 3.06,11L1,11v2h2.06c0.46,4.17 3.77,7.48 7.94,7.94L11,23h2v-2.06c4.17,-0.46 7.48,-3.77 7.94,-7.94L23,13v-2h-2.06zM12,19c-3.87,0 -7,-3.13 -7,-7s3.13,-7 7,-7 7,3.13 7,7 -3.13,7 -7,7z" />
<path
android:fillColor="@android:color/black"
android:fillColor="#000000"
android:pathData="M1,13 l22,0 l0,-2 l-22,0z M13,1 l0,22 l-2,0 l0,-22z" />
</vector>

+ 19
- 19
app/src/main/res/drawable/ic_menu_equipment.xml View File

@@ -3,35 +3,35 @@
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="m18,11.97c0,-4.69 -1.9,-8.93 -4.98,-12L1,11.97l12.02,12c3.08,-3.07 4.98,-7.31 4.98,-12zM12.219,2.002c2.494,2.264 4.061,6.45 4.018,9.939 -0.055,4.493 -1.841,7.91 -3.959,10.147L2.2,12.03Z"
android:fillColor="#000000"/>
<path
android:pathData="M0.877,11.577h20.547v0.845h-20.547z"
android:strokeLineJoin="round"
android:strokeWidth="0.35477734"
android:fillColor="#000000"
android:strokeColor="#000000"
android:strokeLineCap="butt"/>
<path
android:fillColor="#000000"
android:pathData="m18,11.97c0,-4.69 -1.9,-8.93 -4.98,-12L1,11.97l12.02,12c3.08,-3.07 4.98,-7.31 4.98,-12zM12.219,2.002c2.494,2.264 4.061,6.45 4.018,9.939 -0.055,4.493 -1.841,7.91 -3.959,10.147L2.2,12.03Z" />
<path
android:pathData="M0.877,11.577h20.547v0.845h-20.547z"
android:strokeLineJoin="round"
android:strokeWidth="0.35477734"
android:fillColor="#000000"
android:strokeColor="#000000"
android:strokeLineCap="butt" />
<path
android:pathData="m22.165,12.002 l-0.754,0.426l0,-0.851z"
android:strokeLineJoin="round"
android:strokeWidth="0.349"
android:fillColor="#000000"
android:strokeColor="#000000"
android:strokeLineCap="butt"/>
<path
android:pathData="M0.5,10.1l3,0l0.948,1.5l-3,0z"
android:strokeLineJoin="round"
android:strokeWidth="0.38228208"
android:fillColor="#000000"
android:strokeColor="#00000000"
android:strokeLineCap="butt"/>
android:strokeLineCap="butt" />
<path
android:pathData="M0.5,10.1l3,0l0.948,1.5l-3,0z"
android:strokeLineJoin="round"
android:strokeWidth="0.38228208"
android:fillColor="#000000"
android:strokeColor="#00000000"
android:strokeLineCap="butt" />
<path
android:pathData="M0.5,13.9l3,0l0.948,-1.5l-3,-0z"
android:strokeLineJoin="round"
android:strokeWidth="0.38228208"
android:fillColor="#000000"
android:strokeColor="#00000000"
android:strokeLineCap="butt"/>
android:strokeLineCap="butt" />
</vector>

+ 183
- 3
app/src/main/res/layout/activity_user_guide_archerysetup.xml View File

@@ -11,6 +11,173 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">

<ImageView
android:id="@+id/imageViewEquipment"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/userguide_params" />

<TextView
android:id="@+id/ug_ArrowNock_Index"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp"
android:text="1."
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imageViewEquipment" />

<TextView
android:id="@+id/ug_ArrowNock"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:text="@string/arrowNockHeightLbl"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintStart_toEndOf="@+id/ug_ArrowNock_Index"
app:layout_constraintTop_toBottomOf="@+id/imageViewEquipment" />

<TextView
android:id="@+id/ug_TargetHeight_Index"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:text="2."
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ug_ArrowNock_Index" />

<TextView
android:id="@+id/ug_TargetHeight"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:text="@string/targetCenterHeightLbl"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintStart_toEndOf="@+id/ug_TargetHeight_Index"
app:layout_constraintTop_toBottomOf="@+id/ug_ArrowNock" />

<TextView
android:id="@+id/ug_ShootingDistance_Index"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:text="3."
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ug_TargetHeight_Index" />

<TextView
android:id="@+id/ug_ShootingDistance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:text="@string/shootingDistanzLbl"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintStart_toEndOf="@+id/ug_ShootingDistance_Index"
app:layout_constraintTop_toBottomOf="@+id/ug_TargetHeight" />

<TextView
android:id="@+id/ug_HNA_Index"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:text="4."
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ug_ShootingDistance_Index" />

<TextView
android:id="@+id/ug_HNA"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:text="@string/ashNA"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintStart_toEndOf="@+id/ug_HNA_Index"
app:layout_constraintTop_toBottomOf="@+id/ug_ShootingDistance" />

<TextView
android:id="@+id/ug_BowPullout_Index"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:text="5."
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ug_HNA_Index" />

<TextView
android:id="@+id/ug_BowPullout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:text="@string/bowPulloutLbl"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintStart_toEndOf="@+id/ug_BowPullout_Index"
app:layout_constraintTop_toBottomOf="@+id/ug_HNA" />

<TextView
android:id="@+id/ug_NockRaising_Index"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:text="6."
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ug_BowPullout_Index" />

<TextView
android:id="@+id/ug_NockRaising"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:text="@string/asNockRaising"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintStart_toEndOf="@+id/ug_NockRaising_Index"
app:layout_constraintTop_toBottomOf="@+id/ug_BowPullout" />

<TextView
android:id="@+id/ug_BraceHeigth_Index"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:text="7."
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ug_NockRaising_Index" />

<TextView
android:id="@+id/ug_BraceHeigth"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:text="@string/asBraceHeight"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintStart_toEndOf="@+id/ug_BraceHeigth_Index"
app:layout_constraintTop_toBottomOf="@+id/ug_NockRaising" />

<TextView
android:id="@+id/ugASEquipment"
android:layout_width="0dp"
@@ -25,7 +192,7 @@
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toBottomOf="@+id/ug_BraceHeigth_Index" />

<TextView
android:id="@+id/ugASEquipment_Desc"
@@ -139,12 +306,25 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ugASSight_Desc" />

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

<TextView
android:id="@+id/ugASCalcPrecision"
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/calcPrecisionLbl"
@@ -152,7 +332,7 @@
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ugASDeltaTime" />
app:layout_constraintTop_toBottomOf="@+id/ugASDeltaTime_Desc" />

<TextView
android:id="@+id/ugASCalcPrecision_Desc"
@@ -160,7 +340,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp"
android:text="@string/ug_UserguideASParams_Add5"
android:text="@string/ug_UserguideParams_Add2"
android:textSize="16sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"

+ 1
- 0
app/src/main/res/layout/fragment_userguide.xml View File

@@ -75,6 +75,7 @@
android:id="@+id/imgSightUG"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:foregroundTint="#000000"
android:src="@drawable/ic_menu_calcsight" />

<TextView

Loading…
Cancel
Save