Skip to content

feat: Remove search time activity with fragment using navigation #851

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 6, 2019
Merged

feat: Remove search time activity with fragment using navigation #851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions app/src/main/java/org/fossasia/openevent/general/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ import kotlinx.android.synthetic.main.activity_main.navigation
import kotlinx.android.synthetic.main.activity_main.navigationAuth
import org.fossasia.openevent.general.order.LAUNCH_TICKETS
import org.fossasia.openevent.general.order.TICKETS

private const val TO_SEARCH: String = "ToSearchFragment"
import org.fossasia.openevent.general.search.TO_SEARCH

class MainActivity : AppCompatActivity() {
private lateinit var navController: NavController
Expand Down
7 changes: 4 additions & 3 deletions app/src/main/java/org/fossasia/openevent/general/search/SearchFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import org.fossasia.openevent.general.R
import org.fossasia.openevent.general.utils.nullToEmpty
import org.koin.androidx.viewmodel.ext.android.viewModel
import androidx.core.view.MenuItemCompat
import androidx.navigation.Navigation
import org.fossasia.openevent.general.MainActivity

private const val FROM_SEARCH: String = "FromSearchFragment"
Expand Down Expand Up @@ -47,9 +48,9 @@ class SearchFragment : Fragment() {
setHasOptionsMenu(true)

rootView.timeTextView.setOnClickListener {
val intent = Intent(activity, SearchTimeActivity::class.java)
intent.putExtra(SEARCH_TIME, rootView.timeTextView.text.toString())
startActivity(intent)
val bundle = Bundle()
bundle.putString(SEARCH_TIME, rootView.timeTextView.text.toString())
Navigation.findNavController(rootView).navigate(R.id.searchTimeFragment, bundle)
}

if (searchViewModel.savedDate != null) {
Expand Down
1 change: 0 additions & 1 deletion app/src/main/java/org/fossasia/openevent/general/search/SearchLocationActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import org.fossasia.openevent.general.R
import org.koin.androidx.viewmodel.ext.android.viewModel

private const val FROM_SEARCH: String = "FromSearchFragment"
private const val TO_SEARCH: String = "ToSearchFragment"
const val LOCATION_PERMISSION_REQUEST = 1000

class SearchLocationActivity : AppCompatActivity() {
Expand Down
68 changes: 43 additions & 25 deletions ...vent/general/search/SearchTimeActivity.kt → ...vent/general/search/SearchTimeFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,18 @@ package org.fossasia.openevent.general.search
import android.app.DatePickerDialog
import android.content.Intent
import android.os.Bundle
import android.view.LayoutInflater
import android.view.MenuItem
import android.view.View
import android.view.ViewGroup
import androidx.appcompat.app.AppCompatActivity
import kotlinx.android.synthetic.main.activity_search_time.*
import androidx.fragment.app.Fragment
import kotlinx.android.synthetic.main.fragment_search_time.view.anytimeTextView
import kotlinx.android.synthetic.main.fragment_search_time.view.todayTextView
import kotlinx.android.synthetic.main.fragment_search_time.view.tomorrowTextView
import kotlinx.android.synthetic.main.fragment_search_time.view.thisWeekendTextView
import kotlinx.android.synthetic.main.fragment_search_time.view.nextMonthTextView
import kotlinx.android.synthetic.main.fragment_search_time.view.timeTextView
import org.fossasia.openevent.general.MainActivity
import org.fossasia.openevent.general.R
import org.fossasia.openevent.general.event.EventUtils.getSimpleFormattedDate
Expand All @@ -17,17 +26,22 @@ const val TODAY = "Today"
const val TOMORROW = "Tomorrow"
const val THIS_WEEKEND = "This Weekend"
const val NEXT_MONTH = "In the next month"
const val TO_SEARCH = "ToSearchFragment"

class SearchTimeActivity : AppCompatActivity() {
class SearchTimeFragment : Fragment() {
private val searchTimeViewModel by viewModel<SearchTimeViewModel>()
private val TO_SEARCH: String = "ToSearchFragment"
private lateinit var rootView: View

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_search_time)
this.supportActionBar?.setDisplayHomeAsUpEnabled(true)
this.supportActionBar?.title = ""
setCurrentChoice(intent.getStringExtra(SEARCH_TIME))
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
rootView = inflater.inflate(R.layout.fragment_search_time, container, false)

val thisActivity = activity
if (thisActivity is AppCompatActivity) {
thisActivity.supportActionBar?.title = ""
thisActivity.supportActionBar?.setDisplayHomeAsUpEnabled(true)
}
setHasOptionsMenu(true)
setCurrentChoice(arguments?.getString(SEARCH_TIME))

val calendar = Calendar.getInstance()

Expand All @@ -42,20 +56,20 @@ class SearchTimeActivity : AppCompatActivity() {
redirectToSearch()
}

anytimeTextView.setOnClickListener {
rootView.anytimeTextView.setOnClickListener {
searchTimeViewModel.saveDate(ANYTIME)
redirectToSearch()
}

todayTextView.setOnClickListener {
rootView.todayTextView.setOnClickListener {
searchTimeViewModel.saveDate(getSimpleFormattedDate(calendar.time))
calendar.add(Calendar.DATE, 1)
searchTimeViewModel.saveNextDate(getSimpleFormattedDate(calendar.time))
searchTimeViewModel.saveDate(TODAY)
redirectToSearch()
}

tomorrowTextView.setOnClickListener {
rootView.tomorrowTextView.setOnClickListener {
calendar.add(Calendar.DATE, 1)
searchTimeViewModel.saveNextDate(getSimpleFormattedDate(calendar.time))
calendar.add(Calendar.DATE, 1)
Expand All @@ -64,7 +78,7 @@ class SearchTimeActivity : AppCompatActivity() {
redirectToSearch()
}

thisWeekendTextView.setOnClickListener {
rootView.thisWeekendTextView.setOnClickListener {
val today = calendar.get(Calendar.DAY_OF_WEEK)
if (today != Calendar.SATURDAY) {
val offset = Calendar.SATURDAY - today
Expand All @@ -77,7 +91,7 @@ class SearchTimeActivity : AppCompatActivity() {
redirectToSearch()
}

nextMonthTextView.setOnClickListener {
rootView.nextMonthTextView.setOnClickListener {
val today = calendar.get(Calendar.DAY_OF_MONTH)
val offset = 30 - today
calendar.add(Calendar.DATE, offset)
Expand All @@ -88,39 +102,43 @@ class SearchTimeActivity : AppCompatActivity() {
redirectToSearch()
}

timeTextView.setOnClickListener {
DatePickerDialog(this, date, calendar
rootView.timeTextView.setOnClickListener {
DatePickerDialog(context, date, calendar
.get(Calendar.YEAR), calendar.get(Calendar.MONTH),
calendar.get(Calendar.DAY_OF_MONTH)).show()
}

return rootView
}

private fun redirectToSearch() {
val intent = Intent(this, MainActivity::class.java).setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
val intent = Intent(context, MainActivity::class.java).setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
val bundle = Bundle()
bundle.putBoolean(TO_SEARCH, true)
intent.putExtras(bundle)
startActivity(intent)
activity?.overridePendingTransition(R.anim.slide_in_left, R.anim.slide_out_right)
activity?.finish()
}

override fun onOptionsItemSelected(item: MenuItem): Boolean {
return when (item.itemId) {
android.R.id.home -> {
onBackPressed()
activity?.onBackPressed()
true
}
else -> super.onOptionsItemSelected(item)
}
}

private fun setCurrentChoice(value: String) {
private fun setCurrentChoice(value: String?) {
when (value) {
ANYTIME -> anytimeTextView.setCheckMarkDrawable(R.drawable.ic_checked)
TODAY -> todayTextView.setCheckMarkDrawable(R.drawable.ic_checked)
TOMORROW -> tomorrowTextView.setCheckMarkDrawable(R.drawable.ic_checked)
THIS_WEEKEND -> thisWeekendTextView.setCheckMarkDrawable(R.drawable.ic_checked)
NEXT_MONTH -> nextMonthTextView.setCheckMarkDrawable(R.drawable.ic_checked)
else -> timeTextView.setCheckMarkDrawable(R.drawable.ic_checked)
ANYTIME -> rootView.anytimeTextView.setCheckMarkDrawable(R.drawable.ic_checked)
TODAY -> rootView.todayTextView.setCheckMarkDrawable(R.drawable.ic_checked)
TOMORROW -> rootView.tomorrowTextView.setCheckMarkDrawable(R.drawable.ic_checked)
THIS_WEEKEND -> rootView.thisWeekendTextView.setCheckMarkDrawable(R.drawable.ic_checked)
NEXT_MONTH -> rootView.nextMonthTextView.setCheckMarkDrawable(R.drawable.ic_checked)
else -> rootView.timeTextView.setCheckMarkDrawable(R.drawable.ic_checked)
}
}
}
7 changes: 4 additions & 3 deletions .../main/res/layout/activity_search_time.xml → .../main/res/layout/fragment_search_time.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
<?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"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="@dimen/layout_margin_medium"
android:orientation="vertical">
android:orientation="vertical"
tools:context="org.fossasia.openevent.general.search.SearchTimeFragment">

<TextView
android:layout_width="wrap_content"
Expand Down Expand Up @@ -69,5 +70,5 @@
android:text="@string/pick_date"
android:textColor="@color/light_grey"
android:textSize="@dimen/text_size_expanded_title" />

</LinearLayout>

Copy link
Member

@nikit19 nikit19 Jan 6, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Extra

Copy link
Member Author

@liveHarshit liveHarshit Jan 6, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But this new line is automatically added at the and of layout when I commit the file.

Copy link
Member Author

@liveHarshit liveHarshit Jan 6, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How to complies play store package in android studio? Please help build is showing error in that package.

Copy link
Member

@nikit19 nikit19 Jan 6, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose the playstore flavor and then build the app.

Copy link
Member Author

@liveHarshit liveHarshit Jan 6, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it. Thanks 😄

4 changes: 4 additions & 0 deletions app/src/main/res/navigation/navigation_graph.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@
android:id="@+id/searchFragment"
android:name="org.fossasia.openevent.general.search.SearchFragment"
android:label="SearchFragment" />
<fragment
android:id="@+id/searchTimeFragment"
android:name="org.fossasia.openevent.general.search.SearchTimeFragment"
android:label="SearchTimeFragment" />
<fragment
android:id="@+id/searchResultsFragment"
android:name="org.fossasia.openevent.general.search.SearchResultsFragment"
Expand Down
2 changes: 0 additions & 2 deletions app/src/playStore/java/org/fossasia/openevent/general/search/GeoLocationUI.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ import timber.log.Timber
import java.io.IOException
import java.util.Locale

private const val TO_SEARCH: String = "ToSearchFragment"

class GeoLocationUI {

@SuppressLint("MissingPermission")
Expand Down