verdnatura/vn-warehouse
verdnatura
/
vn-warehouse
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refs Precontrol activado

This commit is contained in:
Sergio De la torre 2023-04-20 08:04:36 +02:00
parent 705efcf1d3
commit 47b1fce0b9
3 changed files with 15 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
.idea/workspace.xml
View File

@ -83,15 +83,10 @@
</select>
</component>
<component name="ChangeListManager">
<list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="refs #4830">
<list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="refs varios">
<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/es/verdnatura/presentation/base/BaseFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_ajustes.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_ajustes.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/values-es/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values-es/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" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPreChecker.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPreChecker.kt" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -403,13 +398,6 @@
<option name="presentableId" value="Default" />
<updated>1618825571576</updated>
</task>
<task id="LOCAL-00077" summary="Version 9.1Beta- Modificar original y originalQuantity">
<created>1663849445751</created>
<option name="number" value="00077" />
<option name="presentableId" value="LOCAL-00077" />
<option name="project" value="LOCAL" />
<updated>1663849445751</updated>
</task>
<task id="LOCAL-00078" summary="Version 9.1Beta-CMR quitado, rgb quitado">
<created>1663850881923</created>
<option name="number" value="00078" />
@ -746,7 +734,14 @@
<option name="project" value="LOCAL" />
<updated>1681292397191</updated>
</task>
<option name="localTasksCounter" value="126" />
<task id="LOCAL-00126" summary="refs varios">
<created>1681967763126</created>
<option name="number" value="00126" />
<option name="presentableId" value="LOCAL-00126" />
<option name="project" value="LOCAL" />
<updated>1681967763127</updated>
</task>
<option name="localTasksCounter" value="127" />
<servers />
</component>
<component name="Vcs.Log.History.Properties">
@ -847,7 +842,6 @@
</component>
<component name="VcsManagerConfiguration">
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
<MESSAGE value="Version 9.6Beta. TEST5: imprimir ok, ubicador ok, no se cierra app sacador" />
<MESSAGE value="Version 9.6Beta. TEST6-final: Modificando llamadas con clase" />
<MESSAGE value="Version 9.6Beta. TEST6-final: Modificando llamadas a SilexCallback (AjustesFragment)" />
<MESSAGE value="Version 9.6Beta. TEST6-13122022. Dos revisiones de ubicador." />
@ -872,7 +866,8 @@
<MESSAGE value="refs #4765" />
<MESSAGE value="refs #4765 Refactor" />
<MESSAGE value="refs #4830" />
<option name="LAST_COMMIT_MESSAGE" value="refs #4830" />
<MESSAGE value="refs varios" />
<option name="LAST_COMMIT_MESSAGE" value="refs varios" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>

4
app/build.gradle
View File

@ -13,8 +13,8 @@ android {
applicationId "es.verdnatura"
minSdkVersion 24 //21
targetSdkVersion 33
versionCode 177
versionName = "23.14"
versionCode 178
versionName = "23.14.1"
//versionName = "23.10" versionCode 174
//versionName = "23.10.2Beta" versionCode 174
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

9
app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPreChecker.kt
View File

@ -1176,14 +1176,7 @@ class CollectionFragmentPreChecker(
if (type == CONTROLADOR || type == PRECHECKER) {// sergio:cuidado , esta es de lo último para marcar colores
isScanned = false
// markLine(index, type)
/// Log.i("VERDNATURA:","marcamos linea")
d("VERDNA:TURA:","storedPosition $storedPosition : backPosition:$storedBackPosition")
lm!!.scrollToPositionWithOffset(30, 0)
d("VERDNA:TURA:","Primer elemento visible ${lm!!.findFirstVisibleItemPosition()}")
d("VERDNA:TURA:","Last elemento visible ${lm!!.findLastVisibleItemPosition()}")
markLine(index, type)
} else if (type == SACADOR) {