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.

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

Fix #4735 Text unit is set in dp instead of sp #5134

Merged
merged 12 commits into from
Sep 5, 2023
Prev Previous commit
Next Next commit
fix content description
Vishwajith-Shettigar committed Aug 22, 2023
commit 0801af79bf1dba93970d6337b1f7d66d326b6aed
Original file line number Diff line number Diff line change
@@ -2,8 +2,10 @@ package org.oppia.android.app.profile

import android.content.Context
import android.view.KeyEvent
import android.view.View
import android.view.inputmethod.EditorInfo
import androidx.appcompat.app.AppCompatActivity
import androidx.appcompat.widget.Toolbar
import androidx.databinding.DataBindingUtil
import androidx.lifecycle.Observer
import org.oppia.android.R
@@ -38,13 +40,15 @@ class AdminPinActivityPresenter @Inject constructor(

/** Binds ViewModel and sets up text and button listeners. */
fun handleOnCreate() {
activity.supportActionBar?.setDisplayHomeAsUpEnabled(true)
activity.supportActionBar?.setHomeAsUpIndicator(R.drawable.ic_close_white_24dp)
activity.supportActionBar?.setHomeActionContentDescription(R.string.admin_auth_close)

val binding =
DataBindingUtil.setContentView<AdminPinActivityBinding>(activity, R.layout.admin_pin_activity)

activity.setSupportActionBar(binding.adminPinToolbar)
activity.supportActionBar?.setDisplayHomeAsUpEnabled(true)
activity.supportActionBar?.setHomeAsUpIndicator(R.drawable.ic_close_white_24dp)
activity.supportActionBar?.setHomeActionContentDescription(R.string.admin_auth_close)

binding.apply {
lifecycleOwner = activity
viewModel = adminViewModel
1 change: 0 additions & 1 deletion app/src/main/res/layout/admin_pin_activity.xml
Original file line number Diff line number Diff line change
@@ -24,7 +24,6 @@
style="@style/AdminPinToolbarTextAppearance"
app:titleTextAppearance="@style/AdminPinToolbarTextAppearance"
app:titleTextColor="@color/component_color_shared_activity_toolbar_text_color"
app:navigationIcon="@drawable/ic_close_white_24dp"
app:layout_constraintTop_toTopOf="parent" />

<androidx.core.widget.NestedScrollView
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ buildscript {
gradlePluginPortal()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.6.1'
classpath 'com.android.tools.build:gradle:4.2.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.17'
classpath 'com.google.gms:google-services:4.3.3'