Skip to content
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

Jump to bottom

Fix #5284: Revert "Fix: #5186: MissingDefaultResource + AppCompatCustomView + FragmentTagUsage" #5287

Merged
merged 1 commit into from
Dec 23, 2023
Merged

Fix #5284: Revert "Fix: #5186: MissingDefaultResource + AppCompatCustomView + FragmentTagUsage" #5287

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
1 change: 0 additions & 1 deletion app/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -660,7 +660,6 @@ kt_android_library(
"//third_party:androidx_core_core-ktx",
"//third_party:androidx_databinding_databinding-common",
"//third_party:androidx_databinding_databinding-runtime",
"//third_party:androidx_fragment_fragment",
"//third_party:circularimageview_circular_image_view",
"//utility/src/main/java/org/oppia/android/util/accessibility",
"//utility/src/main/java/org/oppia/android/util/parser/html:html_parser",
Expand Down
2 changes: 1 addition & 1 deletion ...ava/org/oppia/android/app/administratorcontrols/AdministratorControlsActivityPresenter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ class AdministratorControlsActivityPresenter @Inject constructor(
.findFragmentById(
R.id.administrator_controls_activity_fragment_navigation_drawer
) as NavigationDrawerFragment
navigationDrawerFragment.initializeDrawer(
navigationDrawerFragment.setUpDrawer(
binding.administratorControlsActivityDrawerLayout,
toolbar, /* menuItemId= */ 0
)
Expand Down
8 changes: 4 additions & 4 deletions ...rc/main/java/org/oppia/android/app/customview/interaction/FractionInputInteractionView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import android.view.KeyEvent.ACTION_UP
import android.view.KeyEvent.KEYCODE_BACK
import android.view.View
import android.view.inputmethod.EditorInfo
import androidx.appcompat.widget.AppCompatEditText
import android.widget.EditText
import org.oppia.android.app.player.state.listener.StateKeyboardButtonListener
import org.oppia.android.app.utility.KeyboardHelper.Companion.hideSoftKeyboard
import org.oppia.android.app.utility.KeyboardHelper.Companion.showSoftKeyboard
Expand All @@ -22,12 +22,12 @@ import org.oppia.android.app.utility.KeyboardHelper.Companion.showSoftKeyboard

// TODO(#4135): Add a dedicated test suite for this class.

/** The custom [AppCompatEditText] class for fraction input interaction view. */
/** The custom EditText class for fraction input interaction view. */
class FractionInputInteractionView @JvmOverloads constructor(
context: Context,
attrs: AttributeSet? = null,
defStyle: Int = android.R.attr.editTextStyle
) : AppCompatEditText(context, attrs, defStyle), View.OnFocusChangeListener {
) : EditText(context, attrs, defStyle), View.OnFocusChangeListener {
private var hintText: CharSequence = ""
private val stateKeyboardButtonListener: StateKeyboardButtonListener

Expand Down Expand Up @@ -71,7 +71,7 @@ class FractionInputInteractionView @JvmOverloads constructor(

private fun restoreHint() {
hint = hintText
if (text?.isEmpty() == true) setTypeface(typeface, Typeface.ITALIC)
if (text.isEmpty()) setTypeface(typeface, Typeface.ITALIC)
setSingleLine(false)
}
}
8 changes: 4 additions & 4 deletions .../main/java/org/oppia/android/app/customview/interaction/MathExpressionInteractionsView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import android.util.AttributeSet
import android.view.KeyEvent
import android.view.View
import android.view.inputmethod.EditorInfo
import androidx.appcompat.widget.AppCompatEditText
import android.widget.EditText
import org.oppia.android.app.player.state.listener.StateKeyboardButtonListener
import org.oppia.android.app.utility.KeyboardHelper.Companion.hideSoftKeyboard
import org.oppia.android.app.utility.KeyboardHelper.Companion.showSoftKeyboard
Expand All @@ -19,7 +19,7 @@ import org.oppia.android.app.utility.KeyboardHelper.Companion.showSoftKeyboard
// maxLength="200".

/**
* The custom [AppCompatEditText] class for math expression interactions interaction view.
* The custom [EditText] class for math expression interactions interaction view.
*
* Note that the hint should be set via [setPlaceholder] to ensure that it's properly initialized if
* using databinding, otherwise setting the hint through android:hint should work fine.
Expand All @@ -28,7 +28,7 @@ class MathExpressionInteractionsView @JvmOverloads constructor(
context: Context,
attrs: AttributeSet? = null,
defStyle: Int = android.R.attr.editTextStyle
) : AppCompatEditText(context, attrs, defStyle), View.OnFocusChangeListener {
) : EditText(context, attrs, defStyle), View.OnFocusChangeListener {
private var hintText: CharSequence = ""
private val stateKeyboardButtonListener: StateKeyboardButtonListener

Expand Down Expand Up @@ -84,7 +84,7 @@ class MathExpressionInteractionsView @JvmOverloads constructor(

private fun restoreHint() {
hint = hintText
if (text?.isEmpty() == true) setTypeface(typeface, Typeface.ITALIC)
if (text.isEmpty()) setTypeface(typeface, Typeface.ITALIC)
setSingleLine(false)
}
}
8 changes: 4 additions & 4 deletions ...src/main/java/org/oppia/android/app/customview/interaction/NumericInputInteractionView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import android.view.KeyEvent.ACTION_UP
import android.view.KeyEvent.KEYCODE_BACK
import android.view.View
import android.view.inputmethod.EditorInfo
import androidx.appcompat.widget.AppCompatEditText
import android.widget.EditText
import org.oppia.android.app.player.state.listener.StateKeyboardButtonListener
import org.oppia.android.app.utility.KeyboardHelper.Companion.hideSoftKeyboard
import org.oppia.android.app.utility.KeyboardHelper.Companion.showSoftKeyboard
Expand All @@ -20,12 +20,12 @@ import org.oppia.android.app.utility.KeyboardHelper.Companion.showSoftKeyboard
// background="@drawable/edit_text_background"
// maxLength="200".

/** The custom [AppCompatEditText] class for numeric input interaction view. */
/** The custom EditText class for numeric input interaction view. */
class NumericInputInteractionView @JvmOverloads constructor(
context: Context,
attrs: AttributeSet? = null,
defStyle: Int = android.R.attr.editTextStyle
) : AppCompatEditText(context, attrs, defStyle), View.OnFocusChangeListener {
) : EditText(context, attrs, defStyle), View.OnFocusChangeListener {
private val stateKeyboardButtonListener: StateKeyboardButtonListener
private var hintText: CharSequence = ""

Expand Down Expand Up @@ -69,7 +69,7 @@ class NumericInputInteractionView @JvmOverloads constructor(

private fun restoreHint() {
hint = hintText
if (text?.isEmpty() == true) setTypeface(typeface, Typeface.ITALIC)
if (text.isEmpty()) setTypeface(typeface, Typeface.ITALIC)
setSingleLine(false)
}
}
8 changes: 4 additions & 4 deletions app/src/main/java/org/oppia/android/app/customview/interaction/RatioInputInteractionView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ import android.util.AttributeSet
import android.view.KeyEvent
import android.view.View
import android.view.inputmethod.EditorInfo
import androidx.appcompat.widget.AppCompatEditText
import android.widget.EditText
import org.oppia.android.app.player.state.listener.StateKeyboardButtonListener
import org.oppia.android.app.utility.KeyboardHelper

/** The custom [AppCompatEditText] class for ratio input interaction view. */
/** The custom EditText class for ratio input interaction view. */
class RatioInputInteractionView @JvmOverloads constructor(
context: Context,
attrs: AttributeSet? = null,
defStyle: Int = android.R.attr.editTextStyle
) : AppCompatEditText(context, attrs, defStyle), View.OnFocusChangeListener {
) : EditText(context, attrs, defStyle), View.OnFocusChangeListener {
private var hintText: CharSequence = ""
private val stateKeyboardButtonListener: StateKeyboardButtonListener

Expand Down Expand Up @@ -59,7 +59,7 @@ class RatioInputInteractionView @JvmOverloads constructor(

private fun restoreHint() {
hint = hintText
if (text?.isEmpty() == true) setTypeface(typeface, Typeface.ITALIC)
if (text.isEmpty()) setTypeface(typeface, Typeface.ITALIC)
setSingleLine(false)
}
}
10 changes: 5 additions & 5 deletions app/src/main/java/org/oppia/android/app/customview/interaction/TextInputInteractionView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import android.util.AttributeSet
import android.view.KeyEvent
import android.view.View
import android.view.inputmethod.EditorInfo
import androidx.appcompat.widget.AppCompatEditText
import android.widget.EditText
import org.oppia.android.app.player.state.listener.StateKeyboardButtonListener
import org.oppia.android.app.utility.KeyboardHelper.Companion.hideSoftKeyboard
import org.oppia.android.app.utility.KeyboardHelper.Companion.showSoftKeyboard
Expand All @@ -17,12 +17,12 @@ import org.oppia.android.app.utility.KeyboardHelper.Companion.showSoftKeyboard
// background="@drawable/edit_text_background"
// maxLength="200".

/** The custom [AppCompatEditText] class for text input interaction view. */
/** The custom EditText class for text input interaction view. */
class TextInputInteractionView @JvmOverloads constructor(
context: Context,
attrs: AttributeSet? = null,
defStyle: Int = android.R.attr.editTextStyle
) : AppCompatEditText(context, attrs, defStyle), View.OnFocusChangeListener {
) : EditText(context, attrs, defStyle), View.OnFocusChangeListener {
private var hintText: CharSequence = ""
private val stateKeyboardButtonListener: StateKeyboardButtonListener

Expand Down Expand Up @@ -66,7 +66,7 @@ class TextInputInteractionView @JvmOverloads constructor(

private fun restoreHint() {
hint = hintText
if (text?.isEmpty() == true) setTypeface(typeface, Typeface.ITALIC)
isSingleLine = false
if (text.isEmpty()) setTypeface(typeface, Typeface.ITALIC)
setSingleLine(false)
}
}
2 changes: 1 addition & 1 deletion app/src/main/java/org/oppia/android/app/devoptions/DeveloperOptionsActivityPresenter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class DeveloperOptionsActivityPresenter @Inject constructor(
.findFragmentById(
R.id.developer_options_activity_fragment_navigation_drawer
) as NavigationDrawerFragment
navigationDrawerFragment.initializeDrawer(
navigationDrawerFragment.setUpDrawer(
binding.developerOptionsActivityDrawerLayout,
toolbar, menuItemId = -1
)
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ class NavigationDrawerFragment :
return navigationDrawerFragmentPresenter.handleCreateView(inflater, container)
}

fun initializeDrawer(drawerLayout: DrawerLayout, toolbar: Toolbar, menuItemId: Int) {
navigationDrawerFragmentPresenter.initializeDrawer(drawerLayout, toolbar, menuItemId)
fun setUpDrawer(drawerLayout: DrawerLayout, toolbar: Toolbar, menuItemId: Int) {
navigationDrawerFragmentPresenter.setUpDrawer(drawerLayout, toolbar, menuItemId)
}

override fun routeToProfileProgress(profileId: Int) {
Expand Down
14 changes: 3 additions & 11 deletions app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerFragmentPresenter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,17 +62,13 @@ class NavigationDrawerFragmentPresenter @Inject constructor(
private lateinit var drawerLayout: DrawerLayout
private lateinit var binding: DrawerFragmentBinding
private lateinit var profileId: ProfileId
private lateinit var toolbar: Toolbar
private var previousMenuItemId: Int? = null
private var internalProfileId: Int = -1
private var menuItemId: Int = 0

fun handleCreateView(inflater: LayoutInflater, container: ViewGroup?): View? {
binding = DrawerFragmentBinding.inflate(inflater, container, /* attachToRoot= */ false)
binding.fragmentDrawerNavView.setNavigationItemSelectedListener(this)

setUpDrawer(drawerLayout, toolbar, menuItemId)

fragment.setHasOptionsMenu(true)

internalProfileId = activity.intent.getIntExtra(NAVIGATION_PROFILE_ID_ARGUMENT_KEY, -1)
Expand Down Expand Up @@ -370,17 +366,11 @@ class NavigationDrawerFragmentPresenter @Inject constructor(
}
}

fun initializeDrawer(drawerLayout: DrawerLayout, toolbar: Toolbar, menuItemId: Int) {
this.drawerLayout = drawerLayout
this.toolbar = toolbar
this.menuItemId = menuItemId
}

/**
* Initializes the navigation drawer for the specified [DrawerLayout] and [Toolbar], which the host activity is
* expected to provide. The [menuItemId] corresponds to the menu ID of the current activity, for navigation purposes.
*/
private fun setUpDrawer(drawerLayout: DrawerLayout, toolbar: Toolbar, menuItemId: Int) {
fun setUpDrawer(drawerLayout: DrawerLayout, toolbar: Toolbar, menuItemId: Int) {
previousMenuItemId = if (activity is TopicActivity) null else menuItemId
if (menuItemId != 0 && menuItemId != -1) {
getFooterViewModel().isAdministratorControlsSelected.set(false)
Expand Down Expand Up @@ -417,6 +407,7 @@ class NavigationDrawerFragmentPresenter @Inject constructor(
true
}
}
this.drawerLayout = drawerLayout
drawerToggle = object : ActionBarDrawerToggle(
fragment.activity,
drawerLayout,
Expand Down Expand Up @@ -455,6 +446,7 @@ class NavigationDrawerFragmentPresenter @Inject constructor(
// For showing navigation drawer in DeveloperOptionsActivity
else if (menuItemId == -1) getFooterViewModel().isDeveloperOptionsSelected.set(true)
uncheckAllMenuItemsWhenAdministratorControlsOrDeveloperOptionsIsSelected()
this.drawerLayout = drawerLayout
drawerToggle = object : ActionBarDrawerToggle(
fragment.activity,
drawerLayout,
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/oppia/android/app/help/HelpActivityPresenter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ class HelpActivityPresenter @Inject constructor(
.findFragmentById(
R.id.help_activity_fragment_navigation_drawer
) as NavigationDrawerFragment
navigationDrawerFragment.initializeDrawer(
navigationDrawerFragment.setUpDrawer(
activity.findViewById<View>(R.id.help_activity_drawer_layout) as DrawerLayout,
toolbar, R.id.nav_help
)
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/oppia/android/app/home/HomeActivityPresenter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class HomeActivityPresenter @Inject constructor(private val activity: AppCompatA
navigationDrawerFragment = activity
.supportFragmentManager
.findFragmentById(R.id.home_activity_fragment_navigation_drawer) as NavigationDrawerFragment
navigationDrawerFragment!!.initializeDrawer(
navigationDrawerFragment!!.setUpDrawer(
activity.findViewById<View>(R.id.home_activity_drawer_layout) as DrawerLayout,
toolbar, R.id.nav_home
)
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/oppia/android/app/options/OptionsActivityPresenter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ class OptionsActivityPresenter @Inject constructor(
.findFragmentById(
R.id.options_activity_fragment_navigation_drawer
) as NavigationDrawerFragment
navigationDrawerFragment!!.initializeDrawer(
navigationDrawerFragment!!.setUpDrawer(
activity.findViewById<View>(R.id.options_activity_drawer_layout) as DrawerLayout,
toolbar, R.id.nav_options
)
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout-sw600dp/administrator_controls_activity.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
app:layout_constraintTop_toBottomOf="@id/administrator_controls_activity_toolbar" />
</androidx.constraintlayout.widget.ConstraintLayout>

<androidx.fragment.app.FragmentContainerView
<fragment
android:id="@+id/administrator_controls_activity_fragment_navigation_drawer"
android:name="org.oppia.android.app.drawer.NavigationDrawerFragment"
android:layout_width="@dimen/navigation_drawer_width"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout-sw600dp/help_activity.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>

<androidx.fragment.app.FragmentContainerView
<fragment
android:id="@+id/help_activity_fragment_navigation_drawer"
android:name="org.oppia.android.app.drawer.NavigationDrawerFragment"
android:layout_width="wrap_content"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout-sw600dp/option_activity.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>

<androidx.fragment.app.FragmentContainerView
<fragment
android:id="@+id/options_activity_fragment_navigation_drawer"
android:name="org.oppia.android.app.drawer.NavigationDrawerFragment"
android:layout_width="wrap_content"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/administrator_controls_activity.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
android:layout_height="match_parent" />
</LinearLayout>

<androidx.fragment.app.FragmentContainerView
<fragment
android:id="@+id/administrator_controls_activity_fragment_navigation_drawer"
android:name="org.oppia.android.app.drawer.NavigationDrawerFragment"
android:layout_width="wrap_content"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/developer_options_activity.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
</FrameLayout>
</LinearLayout>

<androidx.fragment.app.FragmentContainerView
<fragment
android:id="@+id/developer_options_activity_fragment_navigation_drawer"
android:name="org.oppia.android.app.drawer.NavigationDrawerFragment"
android:layout_width="wrap_content"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/help_activity.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
</FrameLayout>
</LinearLayout>

<androidx.fragment.app.FragmentContainerView
<fragment
android:id="@+id/help_activity_fragment_navigation_drawer"
android:name="org.oppia.android.app.drawer.NavigationDrawerFragment"
android:layout_width="wrap_content"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/home_activity.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
android:layout_weight="1" />
</LinearLayout>

<androidx.fragment.app.FragmentContainerView
<fragment
android:id="@+id/home_activity_fragment_navigation_drawer"
android:name="org.oppia.android.app.drawer.NavigationDrawerFragment"
android:layout_width="wrap_content"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/option_activity.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
</FrameLayout>
</LinearLayout>

<androidx.fragment.app.FragmentContainerView
<fragment
android:id="@+id/options_activity_fragment_navigation_drawer"
android:name="org.oppia.android.app.drawer.NavigationDrawerFragment"
android:layout_width="wrap_content"
Expand Down
1 change: 0 additions & 1 deletion testing/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ kt_android_library(
"//testing/src/main/java/org/oppia/android/testing/threading:test_coroutine_dispatchers",
"//testing/src/main/java/org/oppia/android/testing/time:fake_oppia_clock",
"//third_party:androidx_core_core-ktx",
"//third_party:androidx_fragment_fragment",
"//third_party:androidx_lifecycle_lifecycle-livedata-ktx",
"//third_party:androidx_test_espresso_espresso-accessibility",
"//third_party:androidx_test_espresso_espresso-contrib",
Expand Down
Loading
Loading