-
-
Notifications
You must be signed in to change notification settings - Fork 446
Fix/#67 #1004
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.
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
Open
Tatsunori-Morita
wants to merge
6
commits into
react-native-datetimepicker:master
Choose a base branch
from
Tatsunori-Morita:fix/#67
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+125
−1
Open
Fix/#67 #1004
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
d589750
add option to show year selection view first.
TatsunoriMorita e12fa5f
add showYearPickerFirst option to example.
TatsunoriMorita b21c38f
add readme.
TatsunoriMorita 1eb1136
Add a gourd clause.
TatsunoriMorita fe3ebaa
Merge variables.
TatsunoriMorita d23930a
Fix year section display logic.
TatsunoriMorita File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -7,7 +7,9 @@ | |||||
|
||||||
package com.reactcommunity.rndatetimepicker; | ||||||
|
||||||
import static com.reactcommunity.rndatetimepicker.Common.combine; | ||||||
import static com.reactcommunity.rndatetimepicker.Common.getDisplayDate; | ||||||
import static com.reactcommunity.rndatetimepicker.Common.openYearDialog; | ||||||
import static com.reactcommunity.rndatetimepicker.Common.setButtonTextColor; | ||||||
import static com.reactcommunity.rndatetimepicker.Common.setButtonTitles; | ||||||
|
||||||
|
@@ -101,7 +103,14 @@ private DatePickerDialog createDialog(Bundle args) { | |||||
if (activityContext != null) { | ||||||
RNDatePickerDisplay display = getDisplayDate(args); | ||||||
boolean needsColorOverride = display == RNDatePickerDisplay.SPINNER; | ||||||
dialog.setOnShowListener(setButtonTextColor(activityContext, dialog, args, needsColorOverride)); | ||||||
boolean canOpenYearDialog = display == RNDatePickerDisplay.DEFAULT; | ||||||
boolean showYearPickerFirst = args.getBoolean(RNConstants.ARG_SHOW_YEAR_PICKER_FIRST); | ||||||
dialog.setOnShowListener( | ||||||
combine( | ||||||
openYearDialog(dialog, canOpenYearDialog, showYearPickerFirst), | ||||||
|
openYearDialog(dialog, canOpenYearDialog, showYearPickerFirst), | |
openYearDialog(dialog, canOpenYearDialog && showYearPickerFirst), |
Fewer booleans is better than more
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,6 +3,10 @@ package com.reactcommunity.rndatetimepicker | |
import android.content.DialogInterface | ||
import android.os.Bundle | ||
import android.util.TypedValue | ||
import android.view.View | ||
import android.view.ViewGroup | ||
import android.widget.TextView | ||
import androidx.appcompat.app.AppCompatActivity | ||
import androidx.fragment.app.FragmentManager | ||
import com.facebook.react.bridge.Promise | ||
import com.facebook.react.bridge.ReactApplicationContext | ||
|
@@ -42,6 +46,8 @@ class RNMaterialDatePicker( | |
setFullscreen() | ||
|
||
datePicker = builder.build() | ||
|
||
setYearPickerFirst() | ||
} | ||
|
||
private fun setInitialDate() { | ||
|
@@ -108,6 +114,42 @@ class RNMaterialDatePicker( | |
} | ||
} | ||
|
||
private fun setYearPickerFirst() { | ||
val showYearPickerFirst = args.getBoolean(RNConstants.ARG_SHOW_YEAR_PICKER_FIRST) | ||
if (!showYearPickerFirst) return | ||
val initialDate = RNDate(args) | ||
val activity = reactContext.currentActivity as? AppCompatActivity | ||
activity?.let { lifecycleOwner -> | ||
datePicker!!.viewLifecycleOwnerLiveData.observe(lifecycleOwner) { owner -> | ||
if (owner != null) { | ||
datePicker?.requireDialog()?.window?.decorView?.post { | ||
val root = datePicker!!.dialog?.window?.decorView ?: return@post | ||
|
||
val yearText = initialDate.year().toString() | ||
val hit = findViewBy(root) { v -> | ||
v is TextView && v.isShown && v.isClickable && v.text?.toString()?.contains(yearText) == true | ||
} | ||
if (hit != null) { | ||
hit.performClick() | ||
return@post | ||
} | ||
} | ||
} | ||
} | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this seems rather hacky... but okay. Let's say we use this. But before we do, please
|
||
} | ||
|
||
private fun findViewBy(root: View, pred: (View) -> Boolean): View? { | ||
if (pred(root)) return root | ||
|
||
if (root is ViewGroup) { | ||
for (i in 0 until root.childCount) { | ||
findViewBy(root.getChildAt(i), pred)?.let { return it } | ||
} | ||
} | ||
return null | ||
} | ||
|
||
private fun obtainMaterialThemeOverlayId(resId: Int): Int { | ||
val theme = reactContext.currentActivity?.theme ?: run { | ||
return resId | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
let's please add an early return if
yearId == 0
. It probably isn't needed but let's be on the safer side of things. Android is a mess so you never know.