code changes as per review

This commit is contained in:
MohitMali 2022-05-19 14:21:23 +05:30 committed by Kelson
parent 9cdac0aa56
commit 21b7b14465
3 changed files with 14 additions and 27 deletions

View File

@ -154,7 +154,20 @@ class OnlineLibraryFragment : BaseFragment(), FragmentActivityExtensions {
zimManageViewModel.networkStates.observe(viewLifecycleOwner, Observer(::onNetworkStateChange))
zimManageViewModel.shouldShowWifiOnlyDialog.observe(viewLifecycleOwner, Observer {
if (it) {
showAllowMobileNetworkDialog()
dialogShower.show(
WifiOnly,
{
sharedPreferenceUtil.putPrefWifiOnly(false)
zimManageViewModel.shouldShowWifiOnlyDialog.value = false
},
{
onRefreshStateChange(false)
context.toast(
resources.getString(R.string.denied_internet_permission_message),
Toast.LENGTH_SHORT
)
}
)
}
})
@ -166,24 +179,6 @@ class OnlineLibraryFragment : BaseFragment(), FragmentActivityExtensions {
})
}
private fun showAllowMobileNetworkDialog() {
dialogShower.show(WifiOnly, {
sharedPreferenceUtil.putPrefWifiOnly(false)
zimManageViewModel.shouldShowWifiOnlyDialog.value = false
}, {
dialogShower.show(
KiwixDialog.AllowMobileNetwork,
::showAllowMobileNetworkDialog, {
onRefreshStateChange(false)
context.toast(
resources.getString(R.string.denied_internet_permission_message),
Toast.LENGTH_SHORT
)
}
)
})
}
override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
super<BaseFragment>.onCreateOptionsMenu(menu, inflater)
inflater.inflate(R.menu.menu_zim_manager, menu)

View File

@ -68,13 +68,6 @@ sealed class KiwixDialog(
android.R.string.cancel
)
object AllowMobileNetwork : KiwixDialog(
null,
R.string.allow_network_access,
android.R.string.yes,
android.R.string.cancel
)
object EnableWifiP2pServices : KiwixDialog(
null, R.string.request_enable_wifi, R.string.yes, android.R.string.no
)

View File

@ -143,7 +143,6 @@
<string name="next">Next</string>
<string name="previous">Previous</string>
<string name="wifi_only_title">Allow downloading content via mobile network?</string>
<string name="allow_network_access">Since you are on mobile network we required network access or enable wifi</string>
<string name="wifi_only_msg">If you choose “Yes” you won\'t be warned in future. However, you can always change this in Settings</string>
<string name="pref_wifi_only">Download content only via WiFi</string>
<string name="time_day" tools:keep="@string/time_day">day</string>