From fea565192d3b68becbb53d7f4aa30b4e8bed9861 Mon Sep 17 00:00:00 2001 From: Alex Sytnyk Date: Wed, 8 Aug 2018 19:17:00 +0300 Subject: [PATCH] SettingsDialogFragment in progress --- .../res/layout/fragement_settings_dialog.xml | 100 +++++++++++ .../layout/item_with_desc_and_right_value.xml | 59 +++++++ .../res/layout/item_with_rb_and_btn.xml | 46 ++++++ OsmAnd-telegram/res/values/dimens.xml | 2 + OsmAnd-telegram/res/values/strings.xml | 8 + .../telegram/ui/SettingsDialogFragment.kt | 155 +++++++++++++++++- 6 files changed, 368 insertions(+), 2 deletions(-) create mode 100644 OsmAnd-telegram/res/layout/item_with_desc_and_right_value.xml create mode 100644 OsmAnd-telegram/res/layout/item_with_rb_and_btn.xml diff --git a/OsmAnd-telegram/res/layout/fragement_settings_dialog.xml b/OsmAnd-telegram/res/layout/fragement_settings_dialog.xml index 999659c105..3585975ea1 100644 --- a/OsmAnd-telegram/res/layout/fragement_settings_dialog.xml +++ b/OsmAnd-telegram/res/layout/fragement_settings_dialog.xml @@ -1,8 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/OsmAnd-telegram/res/layout/item_with_desc_and_right_value.xml b/OsmAnd-telegram/res/layout/item_with_desc_and_right_value.xml new file mode 100644 index 0000000000..9c8b5df48e --- /dev/null +++ b/OsmAnd-telegram/res/layout/item_with_desc_and_right_value.xml @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + diff --git a/OsmAnd-telegram/res/layout/item_with_rb_and_btn.xml b/OsmAnd-telegram/res/layout/item_with_rb_and_btn.xml new file mode 100644 index 0000000000..c8e9d78ce8 --- /dev/null +++ b/OsmAnd-telegram/res/layout/item_with_rb_and_btn.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + diff --git a/OsmAnd-telegram/res/values/dimens.xml b/OsmAnd-telegram/res/values/dimens.xml index 1efb279022..bbf839a8d9 100644 --- a/OsmAnd-telegram/res/values/dimens.xml +++ b/OsmAnd-telegram/res/values/dimens.xml @@ -23,6 +23,8 @@ 70dp 85dp + 48dp + 56dp 48dp diff --git a/OsmAnd-telegram/res/values/strings.xml b/OsmAnd-telegram/res/values/strings.xml index 45d7cc991e..cde337e6d9 100644 --- a/OsmAnd-telegram/res/values/strings.xml +++ b/OsmAnd-telegram/res/values/strings.xml @@ -1,4 +1,12 @@ + OsmAnd connect + Hide contacts that are not updated their location after the specified period of time. + Location history + Time when contact last time sent an update to its location. + Stale location + Set minimum interval for location sharing. + Send my location + GPS & location Open OsmAnd Live Bot diff --git a/OsmAnd-telegram/src/net/osmand/telegram/ui/SettingsDialogFragment.kt b/OsmAnd-telegram/src/net/osmand/telegram/ui/SettingsDialogFragment.kt index d228c64e02..d46b89d99a 100644 --- a/OsmAnd-telegram/src/net/osmand/telegram/ui/SettingsDialogFragment.kt +++ b/OsmAnd-telegram/src/net/osmand/telegram/ui/SettingsDialogFragment.kt @@ -1,15 +1,37 @@ package net.osmand.telegram.ui import android.os.Bundle +import android.support.annotation.DrawableRes +import android.support.annotation.StringRes import android.support.v4.app.DialogFragment import android.support.v4.app.FragmentManager +import android.support.v7.widget.ListPopupWindow +import android.support.v7.widget.Toolbar +import android.view.Gravity import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.ArrayAdapter +import android.widget.ImageView +import android.widget.TextView +import android.widget.Toast import net.osmand.telegram.R +import net.osmand.telegram.TelegramApplication +import net.osmand.telegram.helpers.OsmandAidlHelper +import net.osmand.telegram.utils.AndroidUtils +import net.osmand.telegram.utils.OsmandFormatter class SettingsDialogFragment : DialogFragment() { + private val app: TelegramApplication + get() = activity?.application as TelegramApplication + + private val uiUtils get() = app.uiUtils + private val telegramHelper get() = app.telegramHelper + private val settings get() = app.settings + + private val gpsAndLocPrefs = listOf(SendMyLocPref(), StaleLocPref(), LocHistoryPref()) + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setStyle(android.support.v4.app.DialogFragment.STYLE_NO_FRAME, R.style.AppTheme_NoActionbar) @@ -17,10 +39,139 @@ class SettingsDialogFragment : DialogFragment() { override fun onCreateView( inflater: LayoutInflater, - container: ViewGroup?, + parent: ViewGroup?, savedInstanceState: Bundle? ): View { - return inflater.inflate(R.layout.fragement_settings_dialog, container) + val mainView = inflater.inflate(R.layout.fragement_settings_dialog, parent) + + mainView.findViewById(R.id.toolbar).apply { + navigationIcon = uiUtils.getThemedIcon(R.drawable.ic_arrow_back) + setNavigationOnClickListener { dismiss() } + } + + var container = mainView.findViewById(R.id.gps_and_loc_container) + for (pref in gpsAndLocPrefs) { + inflater.inflate(R.layout.item_with_desc_and_right_value, container, false).apply { + findViewById(R.id.icon).setImageDrawable(uiUtils.getThemedIcon(pref.iconId)) + findViewById(R.id.title).setText(pref.titleId) + findViewById(R.id.description).setText(pref.descriptionId) + val valueView = findViewById(R.id.value) + valueView.text = pref.getCurrentValue() + setOnClickListener { + showPopupMenu(pref, valueView) + } + container.addView(this) + } + } + + container = mainView.findViewById(R.id.osmand_connect_container) + for (appConn in AppConnect.values()) { + inflater.inflate(R.layout.item_with_rb_and_btn, container, false).apply { + findViewById(R.id.icon).setImageDrawable(uiUtils.getThemedIcon(appConn.iconId)) + findViewById(R.id.title).text = appConn.title + // FIXME + container.addView(this) + } + } + + return mainView + } + + private fun showPopupMenu(pref: DurationPref, valueView: TextView) { + val menuList = pref.getMenuItems() + val ctx = valueView.context + ListPopupWindow(ctx).apply { + isModal = true + anchorView = valueView + setContentWidth(AndroidUtils.getPopupMenuWidth(ctx, menuList)) + setDropDownGravity(Gravity.END or Gravity.TOP) + setAdapter(ArrayAdapter(ctx, R.layout.popup_list_text_item, menuList)) + setOnItemClickListener { _, _, position, _ -> + pref.setCurrentValue(position) + valueView.text = pref.getCurrentValue() + dismiss() + } + show() + } + } + + // FIXME + private inner class SendMyLocPref : DurationPref( + R.drawable.ic_action_share_location, + R.string.send_my_location, + R.string.send_my_location_desc, + listOf(30 * 60, 60 * 60, 90 * 60) + ) { + + override fun getCurrentValue() = OsmandFormatter.getFormattedDuration(app, values[0]) + + override fun setCurrentValue(index: Int) { + val value = OsmandFormatter.getFormattedDuration(app, values[index]) + Toast.makeText(context, value, Toast.LENGTH_SHORT).show() + } + } + + // FIXME + private inner class StaleLocPref : DurationPref( + R.drawable.ic_action_share_location, + R.string.stale_location, + R.string.stale_location_desc, + listOf(30 * 60, 60 * 60, 90 * 60) + ) { + + override fun getCurrentValue() = OsmandFormatter.getFormattedDuration(app, values[0]) + + override fun setCurrentValue(index: Int) { + val value = OsmandFormatter.getFormattedDuration(app, values[index]) + Toast.makeText(context, value, Toast.LENGTH_SHORT).show() + } + } + + // FIXME + private inner class LocHistoryPref : DurationPref( + R.drawable.ic_action_time_span, + R.string.location_history, + R.string.location_history_desc, + listOf(30 * 60, 60 * 60, 90 * 60) + ) { + + override fun getCurrentValue() = OsmandFormatter.getFormattedDuration(app, values[0]) + + override fun setCurrentValue(index: Int) { + val value = OsmandFormatter.getFormattedDuration(app, values[index]) + Toast.makeText(context, value, Toast.LENGTH_SHORT).show() + } + } + + private abstract inner class DurationPref( + @DrawableRes val iconId: Int, + @StringRes val titleId: Int, + @StringRes val descriptionId: Int, + val values: List + ) { + + abstract fun getCurrentValue(): String + + abstract fun setCurrentValue(index: Int) + + fun getMenuItems() = values.map { OsmandFormatter.getFormattedDuration(app, it) } + } + + private enum class AppConnect( + @DrawableRes val iconId: Int, + val title: String, + val appPackage: String + ) { + OSMAND_PLUS( + R.drawable.ic_action_osmand_plus, + "OsmAnd+", + OsmandAidlHelper.OSMAND_PLUS_PACKAGE_NAME + ), + OSMAND_FREE( + R.drawable.ic_action_osmand_free, + "OsmAnd", + OsmandAidlHelper.OSMAND_FREE_PACKAGE_NAME + ) } companion object {