| <entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/layout/fragment_equipment.xml" value="0.12361111111111112" /> | <entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/layout/fragment_equipment.xml" value="0.12361111111111112" /> | ||||
| <entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/layout/fragment_equipment_add.xml" value="0.15812841530054644" /> | <entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/layout/fragment_equipment_add.xml" value="0.15812841530054644" /> | ||||
| <entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/layout/fragment_equipment_add_list.xml" value="0.33" /> | <entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/layout/fragment_equipment_add_list.xml" value="0.33" /> | ||||
| <entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/layout/fragment_equipment_choose.xml" value="0.33" /> | |||||
| <entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/layout/fragment_equipment_choose.xml" value="0.25" /> | |||||
| <entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/layout/fragment_equipment_choose_list.xml" value="0.25" /> | <entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/layout/fragment_equipment_choose_list.xml" value="0.25" /> | ||||
| <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_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_home.xml" value="0.14855072463768115" /> |
| </component> | </component> | ||||
| <component name="ChangeListManager"> | <component name="ChangeListManager"> | ||||
| <list default="true" id="41369230-c648-4299-baf3-de5f13bcb18c" name="Changes" comment=""> | <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$/.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/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/calcsight/CalculateSightSightSettingFragment.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/ch/spherIC/recurvebowsight/ui/calcsight/CalculateSightSightSettingFragment.java" 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/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/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/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> | </list> | ||||
| <option name="SHOW_DIALOG" value="false" /> | <option name="SHOW_DIALOG" value="false" /> | ||||
| <option name="HIGHLIGHT_CONFLICTS" value="true" /> | <option name="HIGHLIGHT_CONFLICTS" value="true" /> | ||||
| <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> | <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> | ||||
| <option name="LAST_RESOLUTION" value="IGNORE" /> | <option name="LAST_RESOLUTION" value="IGNORE" /> | ||||
| </component> | </component> | ||||
| <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[C:\Users\FSmilari\.android\avd\Pixel_4_API_31.avd]" /> | |||||
| <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[C:\Users\FSmilari\.android\avd\pixel_2_q_10_0_-_api_29.avd]" /> | |||||
| <component name="ExternalProjectsData"> | <component name="ExternalProjectsData"> | ||||
| <projectState path="$PROJECT_DIR$"> | <projectState path="$PROJECT_DIR$"> | ||||
| <ProjectState /> | <ProjectState /> | ||||
| <line>74</line> | <line>74</line> | ||||
| <option name="timeStamp" value="133" /> | <option name="timeStamp" value="133" /> | ||||
| </line-breakpoint> | </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"> | <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> | <url>file://$PROJECT_DIR$/app/src/main/java/ch/spherIC/recurvebowsight/ui/userguide/UserGuideArcherySetupActivity.java</url> | ||||
| <line>16</line> | <line>16</line> | ||||
| <watch expression="this.db.get()" language="JAVA" /> | <watch expression="this.db.get()" language="JAVA" /> | ||||
| <watch expression="cursor.getCount()" language="JAVA" /> | <watch expression="cursor.getCount()" language="JAVA" /> | ||||
| <watch expression="cursor.getColumnCount()" language="JAVA" /> | <watch expression="cursor.getColumnCount()" language="JAVA" /> | ||||
| <watch expression="event.getAction() == MotionEvent.ACTION_DOWN" language="JAVA" /> | |||||
| <watch expression="v.getWidth()" language="JAVA" /> | |||||
| <watch expression="displayMetrics.xdpi" language="JAVA" /> | |||||
| <watch expression="displayMetrics.density" language="JAVA" /> | |||||
| </configuration> | </configuration> | ||||
| </watches-manager> | </watches-manager> | ||||
| </component> | </component> |
| @Override | @Override | ||||
| public boolean onTouch(View v, MotionEvent event) { | public boolean onTouch(View v, MotionEvent event) { | ||||
| float alpha = 1.0f; | |||||
| int horzMargin = v.getResources().getDimensionPixelSize(R.dimen.nav_header_horizontal_spacing); | |||||
| int vertMargin = v.getResources().getDimensionPixelSize(R.dimen.nav_header_vertical_spacing); | |||||
| float alpha = setupCardView.getAlpha(); | |||||
| int horzMargin = ((ConstraintLayout.LayoutParams) borderCardView.getLayoutParams()).leftMargin; | |||||
| int vertMargin = ((ConstraintLayout.LayoutParams) borderCardView.getLayoutParams()).topMargin; | |||||
| if (event.getAction() == MotionEvent.ACTION_DOWN) { | if (event.getAction() == MotionEvent.ACTION_DOWN) { | ||||
| alpha = 0.95f; | alpha = 0.95f; | ||||
| horzMargin = v.getResources().getDimensionPixelSize(R.dimen.nav_header_horizontal_spacing_onclick); | horzMargin = v.getResources().getDimensionPixelSize(R.dimen.nav_header_horizontal_spacing_onclick); | ||||
| vertMargin = v.getResources().getDimensionPixelSize(R.dimen.nav_header_vertical_spacing_onclick); | vertMargin = v.getResources().getDimensionPixelSize(R.dimen.nav_header_vertical_spacing_onclick); | ||||
| } else if (event.getAction() == MotionEvent.ACTION_UP) { | |||||
| alpha = 1.0f; | |||||
| horzMargin = v.getResources().getDimensionPixelSize(R.dimen.nav_header_horizontal_spacing); | |||||
| vertMargin = v.getResources().getDimensionPixelSize(R.dimen.nav_header_vertical_spacing); | |||||
| } | } | ||||
| setupCardView.setAlpha(alpha); | setupCardView.setAlpha(alpha); | ||||
| ConstraintLayout.LayoutParams layoutParams = (ConstraintLayout.LayoutParams) v.getLayoutParams(); | |||||
| ConstraintLayout.LayoutParams layoutParams = (ConstraintLayout.LayoutParams) borderCardView.getLayoutParams(); | |||||
| layoutParams.setMargins(horzMargin, vertMargin, horzMargin, vertMargin); | layoutParams.setMargins(horzMargin, vertMargin, horzMargin, vertMargin); | ||||
| v.requestLayout(); | |||||
| borderCardView.requestLayout(); | |||||
| if (event.getAction() == MotionEvent.ACTION_UP) { | if (event.getAction() == MotionEvent.ACTION_UP) { | ||||
| if (v.getId() == R.id.card_view_riser_border) { | if (v.getId() == R.id.card_view_riser_border) { |
| holder.itemView.setOnTouchListener(new View.OnTouchListener() { | holder.itemView.setOnTouchListener(new View.OnTouchListener() { | ||||
| @Override | @Override | ||||
| public boolean onTouch(View v, MotionEvent event) { | public boolean onTouch(View v, MotionEvent event) { | ||||
| float alpha = 1.0f; | |||||
| int horzMargin = v.getResources().getDimensionPixelSize(R.dimen.nav_header_horizontal_spacing); | |||||
| int vertMargin = v.getResources().getDimensionPixelSize(R.dimen.nav_header_vertical_spacing); | |||||
| View setupCardView = v.findViewById(R.id.card_view_setup); | |||||
| View setupCardViewBorder = v.findViewById(R.id.card_view_border); | |||||
| float alpha = setupCardView.getAlpha(); | |||||
| int horzMargin = ((ConstraintLayout.LayoutParams) setupCardViewBorder.getLayoutParams()).leftMargin; | |||||
| int vertMargin = ((ConstraintLayout.LayoutParams) setupCardViewBorder.getLayoutParams()).topMargin; | |||||
| if (event.getAction() == MotionEvent.ACTION_DOWN) { | if (event.getAction() == MotionEvent.ACTION_DOWN) { | ||||
| alpha = 0.75f; | alpha = 0.75f; | ||||
| horzMargin = v.getResources().getDimensionPixelSize(R.dimen.nav_header_horizontal_spacing_onclick); | horzMargin = v.getResources().getDimensionPixelSize(R.dimen.nav_header_horizontal_spacing_onclick); | ||||
| vertMargin = v.getResources().getDimensionPixelSize(R.dimen.nav_header_vertical_spacing_onclick); | vertMargin = v.getResources().getDimensionPixelSize(R.dimen.nav_header_vertical_spacing_onclick); | ||||
| } else if (event.getAction() == MotionEvent.ACTION_UP) { | |||||
| alpha = 1.0f; | |||||
| horzMargin = v.getResources().getDimensionPixelSize(R.dimen.nav_header_horizontal_spacing); | |||||
| vertMargin = v.getResources().getDimensionPixelSize(R.dimen.nav_header_vertical_spacing); | |||||
| } | } | ||||
| View setupCardView = v.findViewById(R.id.card_view_setup); | |||||
| setupCardView.setAlpha(alpha); | setupCardView.setAlpha(alpha); | ||||
| setupCardView = v.findViewById(R.id.card_view_border); | |||||
| ConstraintLayout.LayoutParams layoutParams = (ConstraintLayout.LayoutParams) setupCardView.getLayoutParams(); | |||||
| ConstraintLayout.LayoutParams layoutParams = (ConstraintLayout.LayoutParams) setupCardViewBorder.getLayoutParams(); | |||||
| layoutParams.setMargins(horzMargin, vertMargin, horzMargin, vertMargin); | layoutParams.setMargins(horzMargin, vertMargin, horzMargin, vertMargin); | ||||
| setupCardView.requestLayout(); | |||||
| setupCardViewBorder.requestLayout(); | |||||
| return false; | return false; | ||||
| } | } | ||||
| }); | }); |
| @Override | @Override | ||||
| public boolean onTouch(View v, MotionEvent event) { | public boolean onTouch(View v, MotionEvent event) { | ||||
| float alpha = 1.0f; | |||||
| int layoutWidth = UnitConverter.dpToPxH(150); | |||||
| int layoutHeigth = UnitConverter.dpToPxV(150); | |||||
| float alpha = v.getAlpha(); | |||||
| int layoutWidth = v.getWidth(); | |||||
| int layoutHeigth = v.getHeight(); | |||||
| if (event.getAction() == MotionEvent.ACTION_DOWN) { | if (event.getAction() == MotionEvent.ACTION_DOWN) { | ||||
| alpha = 0.5f; | alpha = 0.5f; | ||||
| layoutWidth = UnitConverter.dpToPxH(142); | |||||
| layoutHeigth = UnitConverter.dpToPxV(142); | |||||
| layoutWidth = UnitConverter.dpToPxH(140); | |||||
| layoutHeigth = UnitConverter.dpToPxV(140); | |||||
| } else if (event.getAction() == MotionEvent.ACTION_UP) { | |||||
| alpha = 1.0f; | |||||
| layoutWidth = UnitConverter.dpToPxH(150); | |||||
| layoutHeigth = UnitConverter.dpToPxV(150); | |||||
| } | } | ||||
| v.setAlpha(alpha); | v.setAlpha(alpha); | ||||
| */ | */ | ||||
| public static int dpToPxH(final int dp) { | public static int dpToPxH(final int dp) { | ||||
| DisplayMetrics displayMetrics = app.getApplicationContext().getResources().getDisplayMetrics(); | DisplayMetrics displayMetrics = app.getApplicationContext().getResources().getDisplayMetrics(); | ||||
| int px = Math.round(dp * (displayMetrics.xdpi / DisplayMetrics.DENSITY_DEFAULT)); | |||||
| int px = Math.round(dp * displayMetrics.density); | |||||
| return px; | return px; | ||||
| } | } | ||||
| */ | */ | ||||
| public static int pxToDpH(final int px) { | public static int pxToDpH(final int px) { | ||||
| DisplayMetrics displayMetrics = app.getApplicationContext().getResources().getDisplayMetrics(); | DisplayMetrics displayMetrics = app.getApplicationContext().getResources().getDisplayMetrics(); | ||||
| int dp = Math.round(px / (displayMetrics.xdpi / DisplayMetrics.DENSITY_DEFAULT)); | |||||
| int dp = Math.round(px / displayMetrics.density); | |||||
| return dp; | return dp; | ||||
| } | } | ||||
| */ | */ | ||||
| public static int dpToPxV(final int dp) { | public static int dpToPxV(final int dp) { | ||||
| DisplayMetrics displayMetrics = app.getApplicationContext().getResources().getDisplayMetrics(); | DisplayMetrics displayMetrics = app.getApplicationContext().getResources().getDisplayMetrics(); | ||||
| int px = Math.round(dp * (displayMetrics.ydpi / DisplayMetrics.DENSITY_DEFAULT)); | |||||
| int px = Math.round(dp * displayMetrics.density); | |||||
| return px; | return px; | ||||
| } | } | ||||
| */ | */ | ||||
| public static int pxToDpV(final int px) { | public static int pxToDpV(final int px) { | ||||
| DisplayMetrics displayMetrics = app.getApplicationContext().getResources().getDisplayMetrics(); | DisplayMetrics displayMetrics = app.getApplicationContext().getResources().getDisplayMetrics(); | ||||
| int dp = Math.round(px / (displayMetrics.ydpi / DisplayMetrics.DENSITY_DEFAULT)); | |||||
| int dp = Math.round(px / displayMetrics.density); | |||||
| return dp; | return dp; | ||||
| } | } | ||||
| } | } |
| android:viewportHeight="24" | android:viewportHeight="24" | ||||
| android:tint="#000000"> | android:tint="#000000"> | ||||
| <path | <path | ||||
| android:fillColor="@android:color/white" | |||||
| android:fillColor="@android:color/black" | |||||
| 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" /> | 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 | <path | ||||
| android:fillColor="@android:color/white" | |||||
| android:fillColor="@android:color/black" | |||||
| android:pathData="M1,13 l22,0 l0,-2 l-22,0z M13,1 l0,22 l-2,0 l0,-22z" /> | android:pathData="M1,13 l22,0 l0,-2 l-22,0z M13,1 l0,22 l-2,0 l0,-22z" /> | ||||
| </vector> | </vector> |
| <ImageView | <ImageView | ||||
| android:id="@+id/imageView2" | android:id="@+id/imageView2" | ||||
| android:layout_width="wrap_content" | |||||
| android:layout_height="wrap_content" | |||||
| android:layout_width="100dp" | |||||
| android:layout_height="100dp" | |||||
| android:layout_marginStart="24dp" | android:layout_marginStart="24dp" | ||||
| android:layout_marginTop="32dp" | android:layout_marginTop="32dp" | ||||
| android:src="@drawable/ic_launcher_foreground" | android:src="@drawable/ic_launcher_foreground" | ||||
| android:id="@+id/about_Text" | android:id="@+id/about_Text" | ||||
| android:layout_width="0dp" | android:layout_width="0dp" | ||||
| android:layout_height="0dp" | android:layout_height="0dp" | ||||
| android:layout_marginBottom="32dp" | |||||
| android:layout_marginEnd="16dp" | android:layout_marginEnd="16dp" | ||||
| android:layout_marginStart="16dp" | android:layout_marginStart="16dp" | ||||
| android:ems="10" | android:ems="10" |