Skip to content

A
android-yes
Commit 10663e97 authored by satya's avatar satya
Browse files
Options

add header "model"

parent 00f102af
Show whitespace changes
Inline Side-by-side
Showing with 249 additions and 104 deletions
.idea/caches/deviceStreaming.xml
View file @ 10663e97
...@@ -14,6 +14,17 @@ ...@@ -14,6 +14,17 @@
<option name="screenX" value="720" /> <option name="screenX" value="720" />
<option name="screenY" value="1280" /> <option name="screenY" value="1280" />
</PersistentDeviceSelectionData> </PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="OPPO" />
<option name="codename" value="OP573DL1" />
<option name="id" value="OP573DL1" />
<option name="manufacturer" value="OPPO" />
<option name="name" value="CPH2557" />
<option name="screenDensity" value="480" />
<option name="screenX" value="1080" />
<option name="screenY" value="2400" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData> <PersistentDeviceSelectionData>
<option name="api" value="28" /> <option name="api" value="28" />
<option name="brand" value="DOCOMO" /> <option name="brand" value="DOCOMO" />
...@@ -58,6 +69,17 @@ ...@@ -58,6 +69,17 @@
<option name="screenX" value="1080" /> <option name="screenX" value="1080" />
<option name="screenY" value="2400" /> <option name="screenY" value="2400" />
</PersistentDeviceSelectionData> </PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="motorola" />
<option name="codename" value="arcfox" />
<option name="id" value="arcfox" />
<option name="manufacturer" value="Motorola" />
<option name="name" value="razr plus 2024" />
<option name="screenDensity" value="360" />
<option name="screenX" value="1080" />
<option name="screenY" value="1272" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData> <PersistentDeviceSelectionData>
<option name="api" value="33" /> <option name="api" value="33" />
<option name="brand" value="samsung" /> <option name="brand" value="samsung" />
...@@ -113,6 +135,17 @@ ...@@ -113,6 +135,17 @@
<option name="screenX" value="2220" /> <option name="screenX" value="2220" />
<option name="screenY" value="1080" /> <option name="screenY" value="1080" />
</PersistentDeviceSelectionData> </PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="samsung" />
<option name="codename" value="dm2q" />
<option name="id" value="dm2q" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="S23 Plus" />
<option name="screenDensity" value="450" />
<option name="screenX" value="1080" />
<option name="screenY" value="2340" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData> <PersistentDeviceSelectionData>
<option name="api" value="34" /> <option name="api" value="34" />
<option name="brand" value="samsung" /> <option name="brand" value="samsung" />
...@@ -135,6 +168,28 @@ ...@@ -135,6 +168,28 @@
<option name="screenX" value="1080" /> <option name="screenX" value="1080" />
<option name="screenY" value="2340" /> <option name="screenY" value="2340" />
</PersistentDeviceSelectionData> </PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="samsung" />
<option name="codename" value="e3q" />
<option name="id" value="e3q" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy S24 Ultra" />
<option name="screenDensity" value="450" />
<option name="screenX" value="1440" />
<option name="screenY" value="3120" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="33" />
<option name="brand" value="google" />
<option name="codename" value="eos" />
<option name="id" value="eos" />
<option name="manufacturer" value="Google" />
<option name="name" value="Eos" />
<option name="screenDensity" value="320" />
<option name="screenX" value="384" />
<option name="screenY" value="384" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData> <PersistentDeviceSelectionData>
<option name="api" value="33" /> <option name="api" value="33" />
<option name="brand" value="google" /> <option name="brand" value="google" />
...@@ -168,6 +223,28 @@ ...@@ -168,6 +223,28 @@
<option name="screenX" value="2208" /> <option name="screenX" value="2208" />
<option name="screenY" value="1840" /> <option name="screenY" value="1840" />
</PersistentDeviceSelectionData> </PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="motorola" />
<option name="codename" value="fogona" />
<option name="id" value="fogona" />
<option name="manufacturer" value="Motorola" />
<option name="name" value="moto g play - 2024" />
<option name="screenDensity" value="280" />
<option name="screenX" value="720" />
<option name="screenY" value="1600" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="samsung" />
<option name="codename" value="g0q" />
<option name="id" value="g0q" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="SM-S906U1" />
<option name="screenDensity" value="450" />
<option name="screenX" value="1080" />
<option name="screenY" value="2340" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData> <PersistentDeviceSelectionData>
<option name="api" value="33" /> <option name="api" value="33" />
<option name="brand" value="samsung" /> <option name="brand" value="samsung" />
...@@ -223,6 +300,17 @@ ...@@ -223,6 +300,17 @@
<option name="screenX" value="1080" /> <option name="screenX" value="1080" />
<option name="screenY" value="2400" /> <option name="screenY" value="2400" />
</PersistentDeviceSelectionData> </PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="33" />
<option name="brand" value="motorola" />
<option name="codename" value="maui" />
<option name="id" value="maui" />
<option name="manufacturer" value="Motorola" />
<option name="name" value="moto g play - 2023" />
<option name="screenDensity" value="280" />
<option name="screenX" value="720" />
<option name="screenY" value="1600" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData> <PersistentDeviceSelectionData>
<option name="api" value="31" /> <option name="api" value="31" />
<option name="brand" value="google" /> <option name="brand" value="google" />
......
.idea/workspace.xml
View file @ 10663e97
...@@ -66,6 +66,11 @@ ...@@ -66,6 +66,11 @@
<theme>@style/AppBaseTheme</theme> <theme>@style/AppBaseTheme</theme>
</config> </config>
</layout> </layout>
<layout url="file://$PROJECT_DIR$/app/src/main/res/layout/activity_enable_fingerprint.xml">
<config>
<theme>@style/AppBaseTheme</theme>
</config>
</layout>
<layout url="file://$PROJECT_DIR$/app/src/main/res/layout/activity_eshop_phase_two.xml"> <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/activity_eshop_phase_two.xml">
<config> <config>
<theme>@style/AppBaseTheme</theme> <theme>@style/AppBaseTheme</theme>
...@@ -161,6 +166,11 @@ ...@@ -161,6 +166,11 @@
<theme>@style/AppBaseTheme</theme> <theme>@style/AppBaseTheme</theme>
</config> </config>
</layout> </layout>
<layout url="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_forget_password.xml">
<config>
<theme>@style/AppBaseTheme</theme>
</config>
</layout>
<layout url="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_full_number.xml"> <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_full_number.xml">
<config> <config>
<theme>@style/AppBaseTheme</theme> <theme>@style/AppBaseTheme</theme>
...@@ -221,6 +231,11 @@ ...@@ -221,6 +231,11 @@
<theme>@style/AppBaseTheme</theme> <theme>@style/AppBaseTheme</theme>
</config> </config>
</layout> </layout>
<layout url="file://$PROJECT_DIR$/app/src/main/res/layout/holder_dialog_choose_account_item.xml">
<config>
<theme>@style/AppBaseTheme</theme>
</config>
</layout>
<layout url="file://$PROJECT_DIR$/app/src/main/res/layout/holder_dialog_invite_friend_item.xml"> <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/holder_dialog_invite_friend_item.xml">
<config> <config>
<theme>@style/AppBaseTheme</theme> <theme>@style/AppBaseTheme</theme>
...@@ -241,6 +256,11 @@ ...@@ -241,6 +256,11 @@
<theme>@style/AppBaseTheme</theme> <theme>@style/AppBaseTheme</theme>
</config> </config>
</layout> </layout>
<layout url="file://$PROJECT_DIR$/app/src/main/res/layout/item_home_image_slider.xml">
<config>
<theme>@style/AppBaseTheme</theme>
</config>
</layout>
<layout url="file://$PROJECT_DIR$/app/src/main/res/layout/item_image_slider.xml"> <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/item_image_slider.xml">
<config> <config>
<theme>@style/AppBaseTheme</theme> <theme>@style/AppBaseTheme</theme>
...@@ -403,52 +423,29 @@ ...@@ -403,52 +423,29 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="b947e2f9-b70e-404d-b6f9-40fd3f83c1e2" name="Changes" comment="fix pinfragment and update game"> <list default="true" id="b947e2f9-b70e-404d-b6f9-40fd3f83c1e2" name="Changes" comment="fix pinfragment and update game">
<change afterPath="$PROJECT_DIR$/.idea/android-yes.iml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/assetWizardSettings.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/java/com/seatel/mobilehall/ui/packages/RoamingActivity.kt" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/java/com/seatel/mobilehall/ui/packages/adapter/Roaming1Adapter.kt" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/java/com/seatel/mobilehall/ui/packages/adapter/RoamingAdapter.kt" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/java/com/seatel/mobilehall/ui/packages/adapter/RoamingListAdapter.kt" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/java/com/seatel/mobilehall/util/dialogannouncement/CustomDialog.kt" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/res/drawable/bg_dialog_round.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/res/drawable/bg_frame_selector.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/res/drawable/bg_roaming_round_gray.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/res/drawable/bg_roaming_round_pink.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/res/drawable/bg_transparent_roaming_round_pink.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/res/drawable/ic_confirmation.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/res/drawable/ic_roaming_banner.jpg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_roaming.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/res/layout/dialog_custom.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_layout_roaming_list.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/8.9/checksums/checksums.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.9/checksums/checksums.lock" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.gradle/8.9/checksums/checksums.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.9/checksums/checksums.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/8.9/checksums/sha1-checksums.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.9/checksums/sha1-checksums.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/8.9/executionHistory/executionHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.9/executionHistory/executionHistory.bin" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.gradle/8.9/executionHistory/executionHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.9/executionHistory/executionHistory.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/8.9/executionHistory/executionHistory.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.9/executionHistory/executionHistory.lock" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.gradle/8.9/executionHistory/executionHistory.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.9/executionHistory/executionHistory.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/8.9/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.9/fileHashes/fileHashes.bin" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.gradle/8.9/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.9/fileHashes/fileHashes.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/8.9/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.9/fileHashes/fileHashes.lock" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.gradle/8.9/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.9/fileHashes/fileHashes.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/8.9/fileHashes/resourceHashesCache.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.9/fileHashes/resourceHashesCache.bin" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.gradle/8.9/fileHashes/resourceHashesCache.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.9/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/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/caches/deviceStreaming.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/caches/deviceStreaming.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/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/release/output-metadata.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/release/output-metadata.json" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/release/output-metadata.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/release/output-metadata.json" 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/release/yes_seatel_v2.3.15_241203.apk" beforeDir="false" afterPath="$PROJECT_DIR$/app/release/yes-app-v2.3.16.apk" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/seatel/mobilehall/data/prefs/SeatelSharePreferences.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/seatel/mobilehall/data/prefs/SeatelSharePreferences.kt" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/com/seatel/mobilehall/data/network/Devices.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/seatel/mobilehall/data/network/Devices.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/seatel/mobilehall/ui/home/activity/ConfirmBuyDataPackActivity.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/seatel/mobilehall/ui/home/activity/ConfirmBuyDataPackActivity.kt" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/com/seatel/mobilehall/data/network/SeatelSuperRequest.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/seatel/mobilehall/data/network/SeatelSuperRequest.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/seatel/mobilehall/ui/home/adapter/HomeImageSliderAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/seatel/mobilehall/ui/home/adapter/HomeImageSliderAdapter.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/seatel/mobilehall/ui/home/fragment/HomeFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/seatel/mobilehall/ui/home/fragment/HomeFragment.kt" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/com/seatel/mobilehall/ui/home/fragment/HomeFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/seatel/mobilehall/ui/home/fragment/HomeFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/seatel/mobilehall/ui/home/model/MainDataModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/seatel/mobilehall/ui/home/model/MainDataModel.kt" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/com/seatel/mobilehall/ui/login/fragment/ForgotPasswordFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/seatel/mobilehall/ui/login/fragment/ForgotPasswordFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/seatel/mobilehall/ui/home/model/OnePlanDetailSecOneModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/seatel/mobilehall/ui/home/model/OnePlanDetailSecOneModel.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/com/seatel/mobilehall/ui/login/fragment/SignUpFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/seatel/mobilehall/ui/login/fragment/SignUpFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/seatel/mobilehall/ui/home/model/ValuePackSecTwoModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/seatel/mobilehall/ui/home/model/ValuePackSecTwoModel.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/com/seatel/mobilehall/ui/packages/adapter/Roaming1Adapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/seatel/mobilehall/ui/packages/adapter/Roaming1Adapter.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/seatel/mobilehall/ui/home/model/ValuePackTableModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/seatel/mobilehall/ui/home/model/ValuePackTableModel.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/com/seatel/mobilehall/ui/packages/adapter/RoamingAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/seatel/mobilehall/ui/packages/adapter/RoamingAdapter.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/seatel/mobilehall/ui/home/presenter/ProductServiceDetailPrsenter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/seatel/mobilehall/ui/home/presenter/ProductServiceDetailPrsenter.kt" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/com/seatel/mobilehall/ui/profile/activity/SettingActivity.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/seatel/mobilehall/ui/profile/activity/SettingActivity.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/seatel/mobilehall/ui/packages/fragment/ServicesFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/seatel/mobilehall/ui/packages/fragment/ServicesFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/seatel/mobilehall/ui/profile/adapter/MySubscriptionAdapter.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/seatel/mobilehall/ui/profile/adapter/MySubscriptionAdapter.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/seatel/mobilehall/ui/profile/fragment/ProfilesFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/seatel/mobilehall/ui/profile/fragment/ProfilesFragment.kt" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/com/seatel/mobilehall/ui/profile/fragment/ProfilesFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/seatel/mobilehall/ui/profile/fragment/ProfilesFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/seatel/mobilehall/util/request/GetMainData.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/seatel/mobilehall/util/request/GetMainData.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/drawable/custom_thumb.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/drawable/custom_thumb.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/drawable/custom_track.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/drawable/custom_track.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_full_number.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_full_number.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_services.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_services.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_layout_roaming.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_layout_roaming.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" />
...@@ -458,7 +455,7 @@ ...@@ -458,7 +455,7 @@
<component name="ClangdSettings"> <component name="ClangdSettings">
<option name="formatViaClangd" value="false" /> <option name="formatViaClangd" value="false" />
</component> </component>
<component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[DeviceId(pluginId=PhysicalDevice, isTemplate=false, identifier=serial=RFCT414QYJF)]" /> <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[DeviceId(pluginId=PhysicalDevice, isTemplate=false, identifier=serial=ce04171470f5c4e60c)]" />
<component name="ExternalProjectsData"> <component name="ExternalProjectsData">
<projectState path="$PROJECT_DIR$"> <projectState path="$PROJECT_DIR$">
<ProjectState /> <ProjectState />
...@@ -593,7 +590,7 @@ ...@@ -593,7 +590,7 @@
"project.structure.proportion": "0.17", "project.structure.proportion": "0.17",
"project.structure.side.proportion": "0.2", "project.structure.side.proportion": "0.2",
"run.code.analysis.last.selected.profile": "pProject Default", "run.code.analysis.last.selected.profile": "pProject Default",
"settings.editor.selected.configurable": "reference.settingsdialog.project.gradle", "settings.editor.selected.configurable": "vcs.Git",
"show.migrate.to.gradle.popup": "false" "show.migrate.to.gradle.popup": "false"
}, },
"keyToStringList": { "keyToStringList": {
...@@ -814,11 +811,18 @@ ...@@ -814,11 +811,18 @@
</line-breakpoint> </line-breakpoint>
<line-breakpoint enabled="true" type="kotlin-line"> <line-breakpoint enabled="true" type="kotlin-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/seatel/mobilehall/ui/profile/fragment/ProfilesFragment.kt</url> <url>file://$PROJECT_DIR$/app/src/main/java/com/seatel/mobilehall/ui/profile/fragment/ProfilesFragment.kt</url>
<line>141</line> <line>170</line>
<properties> <option name="timeStamp" value="14" />
<option name="lambda-ordinal" value="-1" /> </line-breakpoint>
</properties> <line-breakpoint enabled="true" type="kotlin-line">
<option name="timeStamp" value="6" /> <url>file://$PROJECT_DIR$/app/src/main/java/com/seatel/mobilehall/ui/profile/fragment/ProfilesFragment.kt</url>
<line>178</line>
<option name="timeStamp" value="15" />
</line-breakpoint>
<line-breakpoint enabled="true" type="kotlin-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/seatel/mobilehall/ui/profile/fragment/ProfilesFragment.kt</url>
<line>180</line>
<option name="timeStamp" value="16" />
</line-breakpoint> </line-breakpoint>
</breakpoints> </breakpoints>
</breakpoint-manager> </breakpoint-manager>
......
app/build.gradle
View file @ 10663e97
...@@ -26,8 +26,8 @@ android { ...@@ -26,8 +26,8 @@ android {
applicationId "com.seatel.mobilehall" applicationId "com.seatel.mobilehall"
minSdk 23 minSdk 23
targetSdk 34 targetSdk 34
versionCode 201907116 versionCode 201907117
versionName "2.3.15" versionName "2.3.16"
multiDexEnabled true multiDexEnabled true
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
signingConfig signingConfigs.release signingConfig signingConfigs.release
...@@ -35,6 +35,7 @@ android { ...@@ -35,6 +35,7 @@ android {
buildTypes { buildTypes {
release { release {
resValue "string", "app_name", "yes seatel"
buildConfigField 'String', 'CLIENT_ID', '"eyJhbGciOiJIUzI1NiJ9.c2VhdGVsLWFwaS1kZXY.NsFhP0C7pqeONbcGAf42lQLLe6AIgy1QdOUOrg0uqcI"' buildConfigField 'String', 'CLIENT_ID', '"eyJhbGciOiJIUzI1NiJ9.c2VhdGVsLWFwaS1kZXY.NsFhP0C7pqeONbcGAf42lQLLe6AIgy1QdOUOrg0uqcI"'
buildConfigField 'String', 'BASE_URL', '"https://api.yes.com.kh/"' buildConfigField 'String', 'BASE_URL', '"https://api.yes.com.kh/"'
//production version //production version
...@@ -48,6 +49,7 @@ android { ...@@ -48,6 +49,7 @@ android {
} }
debug { debug {
resValue "string", "app_name", "yes dev"
buildConfigField 'String', 'CLIENT_ID', '"eyJhbGciOiJIUzI1NiJ9.c2VhdGVsLWFwaS1kZXY.NsFhP0C7pqeONbcGAf42lQLLe6AIgy1QdOUOrg0uqcI"' buildConfigField 'String', 'CLIENT_ID', '"eyJhbGciOiJIUzI1NiJ9.c2VhdGVsLWFwaS1kZXY.NsFhP0C7pqeONbcGAf42lQLLe6AIgy1QdOUOrg0uqcI"'
buildConfigField 'String', 'BASE_URL', '"http://api-dev.yes.com.kh/"' buildConfigField 'String', 'BASE_URL', '"http://api-dev.yes.com.kh/"'
buildConfigField 'String', 'CLIENT_SECRET', '"MjExNzM0NWNiNTA3NDZmNzg4NmE0NTNlYjYyMWNkODk="' buildConfigField 'String', 'CLIENT_SECRET', '"MjExNzM0NWNiNTA3NDZmNzg4NmE0NTNlYjYyMWNkODk="'
......
app/release/output-metadata.json
View file @ 10663e97
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
"type": "SINGLE", "type": "SINGLE",
"filters": [], "filters": [],
"attributes": [], "attributes": [],
"versionCode": 201907116, "versionCode": 201907117,
"versionName": "2.3.15", "versionName": "2.3.16",
"outputFile": "app-release.apk" "outputFile": "app-release.apk"
} }
], ],
......
app/src/main/java/com/seatel/mobilehall/data/network/Devices.kt
View file @ 10663e97
...@@ -29,11 +29,10 @@ object Devices { ...@@ -29,11 +29,10 @@ object Devices {
} }
fun getDeviceID(context: Context): String { fun getDeviceID(context: Context): String {
val mModel: String return Settings.Secure.getString(context.contentResolver, Settings.Secure.ANDROID_ID)
mModel = Settings.Secure.getString(context.contentResolver, Settings.Secure.ANDROID_ID)
return mModel
} }
fun getDeviceInfo(context: Context?) { fun getDeviceInfo(context: Context?) {
if (mMarketName == null) { if (mMarketName == null) {
DeviceName.with(context) DeviceName.with(context)
...@@ -85,12 +84,13 @@ object Devices { ...@@ -85,12 +84,13 @@ object Devices {
} else { } else {
"" ""
} }
val deviceOSVersion: String
get() {
val mOSVersion: String fun getDeviceOSVersion(): String {
mOSVersion = Build.VERSION.RELEASE return Build.VERSION.RELEASE
return mOSVersion
} }
val deviceSDKVersion: Int val deviceSDKVersion: Int
get() { get() {
val mSdkVersion: Int val mSdkVersion: Int
......
app/src/main/java/com/seatel/mobilehall/data/network/SeatelSuperRequest.java
View file @ 10663e97
...@@ -71,6 +71,7 @@ public abstract class SeatelSuperRequest<T> extends CoreRequest<T> { ...@@ -71,6 +71,7 @@ public abstract class SeatelSuperRequest<T> extends CoreRequest<T> {
header.put("X-Timestamp", getTimestamp()); header.put("X-Timestamp", getTimestamp());
header.put("X-Timezone", getLocalTimezone()); header.put("X-Timezone", getLocalTimezone());
header.put("X-Platform", "android"); header.put("X-Platform", "android");
header.put("Model", Devices.INSTANCE.getDeviceModel());
header.put("X-OS-Version", Devices.INSTANCE.getDeviceOSVersion()); header.put("X-OS-Version", Devices.INSTANCE.getDeviceOSVersion());
header.put("X-UDID", Devices.INSTANCE.getDeviceID(getContext())); header.put("X-UDID", Devices.INSTANCE.getDeviceID(getContext()));
header.put("X-App-Signature", getAppSignatures()); header.put("X-App-Signature", getAppSignatures());
......
app/src/main/java/com/seatel/mobilehall/ui/home/adapter/HomeImageSliderAdapter.kt
View file @ 10663e97
...@@ -5,6 +5,7 @@ import android.view.LayoutInflater ...@@ -5,6 +5,7 @@ import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import coil.load import coil.load
import com.seatel.mobilehall.R
import com.seatel.mobilehall.databinding.ItemHomeImageSliderBinding import com.seatel.mobilehall.databinding.ItemHomeImageSliderBinding
import com.seatel.mobilehall.ui.home.model.BannersModel import com.seatel.mobilehall.ui.home.model.BannersModel
import com.seatel.mobilehall.ui.login.activity.TermsAndConditionsActivity import com.seatel.mobilehall.ui.login.activity.TermsAndConditionsActivity
...@@ -43,10 +44,19 @@ class HomeImageSliderAdapter(var context: Context) : ...@@ -43,10 +44,19 @@ class HomeImageSliderAdapter(var context: Context) :
override fun onBindViewHolder(viewHolder: SliderAdapterVH, position: Int) { override fun onBindViewHolder(viewHolder: SliderAdapterVH, position: Int) {
val sliderItem = mSliderItems[position] val sliderItem = mSliderItems[position]
if (sliderItem.getMobileUrl().isEmpty()) {
viewHolder.view.ivAutoImageSlider.load(sliderItem.getUrl()) {
crossfade(true)
placeholder(R.drawable.bg_button_primary)
error(R.drawable.bg_button_primary)
}
} else
viewHolder.view.ivAutoImageSlider.load(sliderItem.getMobileUrl()) { viewHolder.view.ivAutoImageSlider.load(sliderItem.getMobileUrl()) {
crossfade(true) crossfade(true)
placeholder(R.drawable.bg_round_gray_section)
error(R.drawable.bg_round_gray_section)
} }
// viewHolder.view.titleBanner.text = sliderItem.getTitle()
viewHolder.itemView.setOnClickListener( viewHolder.itemView.setOnClickListener(
View.OnClickListener { View.OnClickListener {
if (sliderItem.getUrl().isNotBlank()) { if (sliderItem.getUrl().isNotBlank()) {
......
app/src/main/java/com/seatel/mobilehall/ui/home/fragment/HomeFragment.kt
View file @ 10663e97
...@@ -333,7 +333,6 @@ class HomeFragment : BaseFragment(), View.OnClickListener, BannersInteractor.Vie ...@@ -333,7 +333,6 @@ class HomeFragment : BaseFragment(), View.OnClickListener, BannersInteractor.Vie
circleProfile.load(dataMainScreen.getProfilePicture()) { circleProfile.load(dataMainScreen.getProfilePicture()) {
crossfade(true) crossfade(true)
transformations(CircleCropTransformation()) transformations(CircleCropTransformation())
placeholder(R.drawable.ic_yes_profile)
} }
imageBuyTopup.load(dataMainScreen.getBannerBuyTopup()) { imageBuyTopup.load(dataMainScreen.getBannerBuyTopup()) {
......
app/src/main/java/com/seatel/mobilehall/ui/login/fragment/ForgotPasswordFragment.kt
View file @ 10663e97
...@@ -3,8 +3,10 @@ package com.seatel.mobilehall.ui.login.fragment ...@@ -3,8 +3,10 @@ package com.seatel.mobilehall.ui.login.fragment
import android.content.Context import android.content.Context
import android.os.Bundle import android.os.Bundle
import android.text.TextUtils import android.text.TextUtils
import android.view.LayoutInflater
import android.view.MotionEvent import android.view.MotionEvent
import android.view.View import android.view.View
import android.view.ViewGroup
import android.widget.EditText import android.widget.EditText
import com.android.volley.VolleyError import com.android.volley.VolleyError
import com.seatel.mobilehall.R import com.seatel.mobilehall.R
...@@ -19,6 +21,8 @@ import com.seatel.mobilehall.util.SeatelUtils ...@@ -19,6 +21,8 @@ import com.seatel.mobilehall.util.SeatelUtils
import com.seatel.mobilehall.util.customview.CustomKeyboard import com.seatel.mobilehall.util.customview.CustomKeyboard
import com.seatel.mobilehall.util.customview.ErrorHandleView import com.seatel.mobilehall.util.customview.ErrorHandleView
import com.seatel.mobilehall.databinding.FragmentForgetPasswordBinding import com.seatel.mobilehall.databinding.FragmentForgetPasswordBinding
import com.seatel.mobilehall.databinding.FragmentSignupBinding
import com.seatel.mobilehall.util.viewFragmentBinding
class ForgotPasswordFragment : MainFragment(), SignUpInteractor.View { class ForgotPasswordFragment : MainFragment(), SignUpInteractor.View {
...@@ -31,8 +35,9 @@ class ForgotPasswordFragment : MainFragment(), SignUpInteractor.View { ...@@ -31,8 +35,9 @@ class ForgotPasswordFragment : MainFragment(), SignUpInteractor.View {
private var keyboardView: CustomKeyboard? = null private var keyboardView: CustomKeyboard? = null
private var _binding: FragmentForgetPasswordBinding? = null private val binding by viewFragmentBinding(
private val binding get() = _binding!! FragmentForgetPasswordBinding::inflate
)
fun setDataForAddNewPhone(mainPhone: String) { fun setDataForAddNewPhone(mainPhone: String) {
this.mMainPhoneNumber = mainPhone this.mMainPhoneNumber = mainPhone
...@@ -60,14 +65,23 @@ class ForgotPasswordFragment : MainFragment(), SignUpInteractor.View { ...@@ -60,14 +65,23 @@ class ForgotPasswordFragment : MainFragment(), SignUpInteractor.View {
// setFragmentLayout(R.layout.fragment_forget_password) // setFragmentLayout(R.layout.fragment_forget_password)
} }
override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
savedInstanceState: Bundle?
): View? {
keyboardView = binding.keyboardView // Set up the keyboard view
init()
return binding.root
}
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState) super.onViewCreated(view, savedInstanceState)
// Initialize ViewBinding // Initialize ViewBinding
_binding = FragmentForgetPasswordBinding.bind(view) // _binding = FragmentForgetPasswordBinding.bind(view)
keyboardView = binding.keyboardView // Set up the keyboard view
init()
} }
private fun init() { private fun init() {
...@@ -173,7 +187,6 @@ class ForgotPasswordFragment : MainFragment(), SignUpInteractor.View { ...@@ -173,7 +187,6 @@ class ForgotPasswordFragment : MainFragment(), SignUpInteractor.View {
override fun onDestroyView() { override fun onDestroyView() {
super.onDestroyView() super.onDestroyView()
_binding = null // Clean up binding
mSignUpPresenter.onDestroy() mSignUpPresenter.onDestroy()
} }
......
app/src/main/java/com/seatel/mobilehall/ui/login/fragment/SignUpFragment.kt
View file @ 10663e97
...@@ -5,7 +5,9 @@ import android.content.Context ...@@ -5,7 +5,9 @@ import android.content.Context
import android.content.Intent import android.content.Intent
import android.os.Bundle import android.os.Bundle
import android.text.TextUtils import android.text.TextUtils
import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import com.android.volley.VolleyError import com.android.volley.VolleyError
import com.seatel.mobilehall.R import com.seatel.mobilehall.R
...@@ -22,8 +24,10 @@ import com.seatel.mobilehall.util.SeatelAlertDialog ...@@ -22,8 +24,10 @@ import com.seatel.mobilehall.util.SeatelAlertDialog
import com.seatel.mobilehall.util.SeatelUtils import com.seatel.mobilehall.util.SeatelUtils
import com.facebook.login.LoginManager import com.facebook.login.LoginManager
import com.seatel.mobilehall.data.network.SeatelSuperRequest import com.seatel.mobilehall.data.network.SeatelSuperRequest
import com.seatel.mobilehall.databinding.FragmentHomeBinding
import com.seatel.mobilehall.util.customview.ErrorHandleView import com.seatel.mobilehall.util.customview.ErrorHandleView
import com.seatel.mobilehall.databinding.FragmentSignupBinding import com.seatel.mobilehall.databinding.FragmentSignupBinding
import com.seatel.mobilehall.util.viewFragmentBinding
class SignUpFragment : MainFragment(), SignUpInteractor.View, LoginInteractor.View { class SignUpFragment : MainFragment(), SignUpInteractor.View, LoginInteractor.View {
...@@ -35,7 +39,12 @@ class SignUpFragment : MainFragment(), SignUpInteractor.View, LoginInteractor.Vi ...@@ -35,7 +39,12 @@ class SignUpFragment : MainFragment(), SignUpInteractor.View, LoginInteractor.Vi
private lateinit var mSocialType: String private lateinit var mSocialType: String
private var isRegisterSocail = false private var isRegisterSocail = false
private var typeSignUp = Constant.REGISTER private var typeSignUp = Constant.REGISTER
private lateinit var binding: FragmentSignupBinding // ViewBinding for this fragment
private val binding by viewFragmentBinding(
FragmentSignupBinding::inflate
)
// private lateinit var binding: FragmentSignupBinding // ViewBinding for this fragment
override fun onLoginSucceed(isNoneSeatel: Boolean, isPostPad: Boolean) {} override fun onLoginSucceed(isNoneSeatel: Boolean, isPostPad: Boolean) {}
...@@ -96,11 +105,11 @@ class SignUpFragment : MainFragment(), SignUpInteractor.View, LoginInteractor.Vi ...@@ -96,11 +105,11 @@ class SignUpFragment : MainFragment(), SignUpInteractor.View, LoginInteractor.Vi
// setFragmentLayout(R.layout.fragment_signup) // setFragmentLayout(R.layout.fragment_signup)
} }
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { override fun onCreateView(
super.onViewCreated(view, savedInstanceState) inflater: LayoutInflater,
container: ViewGroup?,
binding = FragmentSignupBinding.bind(view) // Initialize ViewBinding savedInstanceState: Bundle?
): View? {
mLoginPresenter = LoginPresenter(getmContext(), this) mLoginPresenter = LoginPresenter(getmContext(), this)
if (!TextUtils.isEmpty(mUserId)) { if (!TextUtils.isEmpty(mUserId)) {
...@@ -154,6 +163,15 @@ class SignUpFragment : MainFragment(), SignUpInteractor.View, LoginInteractor.Vi ...@@ -154,6 +163,15 @@ class SignUpFragment : MainFragment(), SignUpInteractor.View, LoginInteractor.Vi
binding.imageViewInstagram.setOnClickListener { binding.imageViewInstagram.setOnClickListener {
// Handle Instagram login // Handle Instagram login
} }
return binding.root
}
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
// binding = FragmentSignupBinding.bind(view) // Initialize ViewBinding
} }
override fun onRequestCodeSucceed(resetPasswordModel: ResetPasswordModel) { override fun onRequestCodeSucceed(resetPasswordModel: ResetPasswordModel) {
......
app/src/main/java/com/seatel/mobilehall/ui/packages/adapter/Roaming1Adapter.kt
View file @ 10663e97
...@@ -66,6 +66,10 @@ class Roaming1Adapter( ...@@ -66,6 +66,10 @@ class Roaming1Adapter(
holder.binding.tvMainTitle.text = appProductsDetail.valuePackSecTwoModel.title holder.binding.tvMainTitle.text = appProductsDetail.valuePackSecTwoModel.title
isSpecialSim = SeatelSharePreferences.getInstance(mContext)?.isSpecialSimcard()!!
if (!isSpecialSim) {
holder.binding.tvRemindTitle.visibility = View.VISIBLE
holder.binding.tvRemindTitle.apply { holder.binding.tvRemindTitle.apply {
settings.javaScriptEnabled = true settings.javaScriptEnabled = true
loadDataWithBaseURL( loadDataWithBaseURL(
...@@ -78,6 +82,9 @@ class Roaming1Adapter( ...@@ -78,6 +82,9 @@ class Roaming1Adapter(
settings.defaultFontSize = 12 settings.defaultFontSize = 12
} }
} else holder.binding.tvRemindTitle.visibility = View.GONE
holder.binding.customTextView.apply { holder.binding.customTextView.apply {
settings.javaScriptEnabled = true settings.javaScriptEnabled = true
...@@ -91,8 +98,6 @@ class Roaming1Adapter( ...@@ -91,8 +98,6 @@ class Roaming1Adapter(
settings.defaultFontSize = 12 settings.defaultFontSize = 12
} }
holder.binding.swOnOff.isChecked = holder.binding.swOnOff.isChecked =
SeatelSharePreferences.getInstance(mContext)?.isRoamingActivation()!! SeatelSharePreferences.getInstance(mContext)?.isRoamingActivation()!!
......
app/src/main/java/com/seatel/mobilehall/ui/packages/adapter/RoamingAdapter.kt
View file @ 10663e97
...@@ -66,6 +66,10 @@ class RoamingAdapter( ...@@ -66,6 +66,10 @@ class RoamingAdapter(
holder.binding.tvMainTitle.text = appProductsDetail.valuePackSecTwoModel.title holder.binding.tvMainTitle.text = appProductsDetail.valuePackSecTwoModel.title
isSpecialSim = SeatelSharePreferences.getInstance(mContext)?.isSpecialSimcard()!!
if (!isSpecialSim) {
holder.binding.tvRemindTitle.visibility = View.VISIBLE
holder.binding.tvRemindTitle.apply { holder.binding.tvRemindTitle.apply {
settings.javaScriptEnabled = true settings.javaScriptEnabled = true
loadDataWithBaseURL( loadDataWithBaseURL(
...@@ -78,6 +82,7 @@ class RoamingAdapter( ...@@ -78,6 +82,7 @@ class RoamingAdapter(
settings.defaultFontSize = 12 settings.defaultFontSize = 12
} }
} else holder.binding.tvRemindTitle.visibility = View.GONE
holder.binding.customTextView.apply { holder.binding.customTextView.apply {
settings.javaScriptEnabled = true settings.javaScriptEnabled = true
......
app/src/main/java/com/seatel/mobilehall/ui/profile/activity/SettingActivity.kt
View file @ 10663e97
...@@ -250,6 +250,7 @@ class SettingActivity : BaseActivity<ActivitySettingBinding>(), View.OnClickList ...@@ -250,6 +250,7 @@ class SettingActivity : BaseActivity<ActivitySettingBinding>(), View.OnClickList
} }
val currentVersions = Devices.getAppVersionName(this).split("\\.") val currentVersions = Devices.getAppVersionName(this).split("\\.")
binding.tvAppVersion.text = "V ${currentVersions.joinToString()}" binding.tvAppVersion.text = "V ${currentVersions.joinToString()}"
// binding.tvAppVersion.text = "V ${Devices.getAppVersionName(this)}"
binding.tvCacheNum.text = analyseStorage(this) binding.tvCacheNum.text = analyseStorage(this)
binding.tvCacheNum.text = binding.tvCacheNum.text.toString().replace(",", ".") binding.tvCacheNum.text = binding.tvCacheNum.text.toString().replace(",", ".")
...@@ -468,7 +469,7 @@ class SettingActivity : BaseActivity<ActivitySettingBinding>(), View.OnClickList ...@@ -468,7 +469,7 @@ class SettingActivity : BaseActivity<ActivitySettingBinding>(), View.OnClickList
binding.ctvLanguage.text = getString(R.string.language) binding.ctvLanguage.text = getString(R.string.language)
binding.ctvNotification.text = getString(R.string.notification) binding.ctvNotification.text = getString(R.string.notification)
binding.ctvClearCache.text = getString(R.string.clear_cache) binding.ctvClearCache.text = getString(R.string.clear_cache)
binding.tvAppVersion.text = getString(R.string.app_version) // binding.tvAppVersion.text = getString(R.string.app_version)
// text_view_titleBar.text = getString(R.string.setting) // text_view_titleBar.text = getString(R.string.setting)
binding.ctvFingerprint.text = getString(R.string.enable_fingerprint) binding.ctvFingerprint.text = getString(R.string.enable_fingerprint)
binding.ivlogout.text = getString(R.string.log_out) binding.ivlogout.text = getString(R.string.log_out)
......
app/src/main/java/com/seatel/mobilehall/ui/profile/fragment/ProfilesFragment.kt
View file @ 10663e97
...@@ -82,9 +82,6 @@ class ProfilesFragment : BaseFragment(), RequestSlideAccountUserNameInteractor.V ...@@ -82,9 +82,6 @@ class ProfilesFragment : BaseFragment(), RequestSlideAccountUserNameInteractor.V
AnalyticsHelper.Event.PROFILE_TAP_SETTING, AnalyticsHelper.Event.PROFILE_TAP_SETTING,
null null
) )
if (getMainPhoneLogin().isEmpty() || getPhoneLogin().isEmpty()) {
LoginActivity.lunch(requireContext())
} else
SettingActivity.lunch(getmContext()) SettingActivity.lunch(getmContext())
} }
...@@ -142,7 +139,9 @@ class ProfilesFragment : BaseFragment(), RequestSlideAccountUserNameInteractor.V ...@@ -142,7 +139,9 @@ class ProfilesFragment : BaseFragment(), RequestSlideAccountUserNameInteractor.V
GetMainData(getmContext(), getPhoneLogin(), "") { it -> GetMainData(getmContext(), getPhoneLogin(), "") { it ->
if (it) { if (it) {
dataMainScreen = Gson().fromJson( dataMainScreen = Gson().fromJson(
context?.let { it1 -> SeatelSharePreferences.getInstance(it1)?.getMainScreenData() }, context?.let { it1 ->
SeatelSharePreferences.getInstance(it1)?.getMainScreenData()
},
MainDataModel::class.java MainDataModel::class.java
) )
dataMainScreen?.let { dataMainScreen?.let {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment