smiuser/hpos-registration-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: smiuser:dev
Branches Tags
smiuser:dev smiuser:AppVersion smiuser:master smiuser:Label_structure_changes_in_exporting_csv_and_images smiuser:preprod-backlogfile smiuser:Export_registration_data_to_CSV_and_Save_IMAGE_LOCALLY smiuser:Feature_app_work_only_locally smiuser:Feature_-_Develop_the_feature_to_shift_between_multiple_languages_in_Registration_app smiuser:LanguageTranslation smiuser:main smiuser:preprod smiuser:qa smiuser:castecategorydropdownchange smiuser:crop
...
pull from: smiuser:master
Branches Tags
smiuser:dev smiuser:AppVersion smiuser:master smiuser:Label_structure_changes_in_exporting_csv_and_images smiuser:preprod-backlogfile smiuser:Export_registration_data_to_CSV_and_Save_IMAGE_LOCALLY smiuser:Feature_app_work_only_locally smiuser:Feature_-_Develop_the_feature_to_shift_between_multiple_languages_in_Registration_app smiuser:LanguageTranslation smiuser:main smiuser:preprod smiuser:qa smiuser:castecategorydropdownchange smiuser:crop

2 Commits
dev ... master

Author SHA1 Message Date
Mariya
fe1f6f5a16 Merge branch 'master' of https://gitlab.com/sminnovations/hpos-registration-app 
# Conflicts:
#	app/build.gradle
 2024-04-01 14:22:08 +05:30
Mariya
3daec52ee8 BackLog file added for nagpur consignment for Online Registration code added, fixed all issues 2024-04-01 14:21:35 +05:30
2 changed files with 5 additions and 8 deletions
Expand all files Collapse all files

5
.idea/gradle.xml generated
View File

@@ -4,17 +4,16 @@
<component name="GradleSettings"> <component name="GradleSettings">
<option name="linkedExternalProjectsSettings"> <option name="linkedExternalProjectsSettings">
<GradleProjectSettings> <GradleProjectSettings>
<option name="testRunner" value="GRADLE" />
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" /> <option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleHome" value="$USER_HOME$/andriod studio gradle/gradle-7.3" /> <option name="gradleHome" value="$USER_HOME$/andriod studio gradle/gradle-7.3" />
<option name="gradleJvm" value="jbr-17" /> <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
<option name="modules"> <option name="modules">
<set> <set>
<option value="$PROJECT_DIR$" /> <option value="$PROJECT_DIR$" />
<option value="$PROJECT_DIR$/app" /> <option value="$PROJECT_DIR$/app" />
</set> </set>
</option> </option>
<option name="resolveExternalAnnotations" value="false" />
</GradleProjectSettings> </GradleProjectSettings>
</option> </option>
</component> </component>

8
app/build.gradle
View File

@@ -13,11 +13,11 @@ android {
compileSdk 34 compileSdk 34
defaultConfig { defaultConfig {
applicationId "in.sminnovations.hposregistration" applicationId "in.sminnovations.hposregistration.quality"
minSdk 26 minSdk 26
targetSdk 34 targetSdk 34
versionCode 6 versionCode 13
versionName "1.0.6" versionName "1.0.13"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
} }
@@ -59,8 +59,6 @@ dependencies {
implementation 'com.google.firebase:firebase-storage-ktx' implementation 'com.google.firebase:firebase-storage-ktx'
implementation 'com.firebaseui:firebase-ui-firestore:8.0.2' implementation 'com.firebaseui:firebase-ui-firestore:8.0.2'
implementation 'com.google.android.gms:play-services-auth:20.6.0' implementation 'com.google.android.gms:play-services-auth:20.6.0'
implementation 'com.google.firebase:firebase-appdistribution:16.0.0-beta10'
implementation("com.google.firebase:firebase-appdistribution-api-ktx:16.0.0-beta10")
// Coroutines // Coroutines
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1' implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1'