mirror of https://github.com/tasks/tasks
Add Places to navigation drawer
Alex Baker
4 years ago
parent
0b95b11b68
commit
bd1aa46d13
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,108 @@
|
||||
package org.tasks.activities
|
||||
|
||||
import android.app.Activity
|
||||
import android.content.Intent
|
||||
import android.os.Bundle
|
||||
import android.text.TextUtils
|
||||
import butterknife.BindView
|
||||
import butterknife.OnTextChanged
|
||||
import com.google.android.material.textfield.TextInputEditText
|
||||
import com.google.android.material.textfield.TextInputLayout
|
||||
import com.todoroo.astrid.activity.MainActivity
|
||||
import com.todoroo.astrid.activity.TaskListFragment
|
||||
import org.tasks.R
|
||||
import org.tasks.data.LocationDao
|
||||
import org.tasks.data.Place
|
||||
import org.tasks.filters.LocationFilter
|
||||
import org.tasks.injection.ActivityComponent
|
||||
import org.tasks.location.MapFragment
|
||||
import javax.inject.Inject
|
||||
|
||||
class PlaceSettingsActivity : BaseListSettingsActivity(), MapFragment.MapFragmentCallback {
|
||||
|
||||
companion object {
|
||||
const val EXTRA_PLACE = "extra_place"
|
||||
}
|
||||
|
||||
@BindView(R.id.name) lateinit var name: TextInputEditText
|
||||
@BindView(R.id.name_layout) lateinit var nameLayout: TextInputLayout
|
||||
|
||||
@Inject lateinit var locationDao: LocationDao
|
||||
@Inject lateinit var map: MapFragment
|
||||
|
||||
private lateinit var place: Place
|
||||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
if (intent?.hasExtra(EXTRA_PLACE) != true) {
|
||||
finish()
|
||||
}
|
||||
|
||||
place = intent?.getParcelableExtra(EXTRA_PLACE)!!
|
||||
|
||||
super.onCreate(savedInstanceState)
|
||||
|
||||
if (savedInstanceState == null) {
|
||||
name.setText(place.displayName)
|
||||
selectedColor = place.color
|
||||
selectedIcon = place.icon
|
||||
}
|
||||
|
||||
map.init(supportFragmentManager, this, theme.themeBase.isDarkTheme(this))
|
||||
|
||||
updateTheme()
|
||||
}
|
||||
|
||||
override fun getLayout() = R.layout.activity_location_settings
|
||||
|
||||
override fun hasChanges() = name.text.toString() != place.displayName
|
||||
|| selectedColor != place.color
|
||||
|| selectedIcon != place.icon
|
||||
|
||||
@OnTextChanged(R.id.name)
|
||||
fun onNameChanged(text: CharSequence?) {
|
||||
nameLayout.error = null
|
||||
}
|
||||
|
||||
override fun save() {
|
||||
val newName: String = name.text.toString()
|
||||
|
||||
if (TextUtils.isEmpty(newName)) {
|
||||
nameLayout.error = getString(R.string.name_cannot_be_empty)
|
||||
return
|
||||
}
|
||||
|
||||
place.name = newName
|
||||
place.color = selectedColor
|
||||
place.icon = selectedIcon
|
||||
locationDao.update(place)
|
||||
setResult(
|
||||
Activity.RESULT_OK,
|
||||
Intent(TaskListFragment.ACTION_RELOAD)
|
||||
.putExtra(MainActivity.OPEN_FILTER, LocationFilter(place)))
|
||||
finish()
|
||||
}
|
||||
|
||||
override fun isNew() = false
|
||||
|
||||
override fun getToolbarTitle(): String {
|
||||
return place.address
|
||||
}
|
||||
|
||||
override fun delete() {
|
||||
locationDao.getGeofencesByPlace(place.uid).forEach(locationDao::delete)
|
||||
locationDao.delete(place)
|
||||
setResult(Activity.RESULT_OK, Intent(TaskListFragment.ACTION_DELETED))
|
||||
finish()
|
||||
}
|
||||
|
||||
override fun inject(component: ActivityComponent) = component.inject(this)
|
||||
|
||||
override fun onMapReady(mapFragment: MapFragment?) {
|
||||
map = mapFragment!!
|
||||
map.setMarkers(listOf(place))
|
||||
map.disableGestures()
|
||||
map.movePosition(place.mapPosition, false)
|
||||
}
|
||||
|
||||
override fun onPlaceSelected(place: Place?) {}
|
||||
}
|
||||
@ -0,0 +1,48 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:id="@+id/root_layout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:descendantFocusability="beforeDescendants"
|
||||
android:focusableInTouchMode="true"
|
||||
android:orientation="vertical">
|
||||
|
||||
<include layout="@layout/toolbar"/>
|
||||
|
||||
<ScrollView
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical">
|
||||
|
||||
<com.google.android.material.textfield.TextInputLayout
|
||||
android:id="@+id/name_layout"
|
||||
style="@style/TagSettingsRow"
|
||||
android:hint="@string/display_name">
|
||||
|
||||
<com.google.android.material.textfield.TextInputEditText
|
||||
android:id="@+id/name"
|
||||
style="@style/TagSettingsEditText"
|
||||
android:inputType="textCapSentences|textAutoCorrect" />
|
||||
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
|
||||
<include layout="@layout/list_settings_color"/>
|
||||
|
||||
<include layout="@layout/list_settings_icon"/>
|
||||
|
||||
<FrameLayout
|
||||
android:id="@+id/map"
|
||||
android:padding="@dimen/keyline_first"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="300dp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</ScrollView>
|
||||
|
||||
</LinearLayout>
|
||||
@ -0,0 +1,8 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<menu xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<item
|
||||
android:id="@+id/menu_location_settings"
|
||||
android:title="@string/place_settings"
|
||||
app:showAsAction="never"/>
|
||||
</menu>
|
||||
Loading…
Reference in New Issue