Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-05-03 15:11:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Restore the 3-dot menu when creating a PIN.

Browse Source
This commit is contained in:
Greyson Parrelli
2023-01-27 17:28:05 -05:00
parent 7348224dc2
commit e12bbe943b
2 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/org/thoughtcrime/securesms/lock/v2/BaseKbsPinFragment.java
View File

@@ -17,6 +17,8 @@ import android.widget.TextView;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.annotation.StringRes; import androidx.annotation.StringRes;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
import org.thoughtcrime.securesms.LoggingFragment; import org.thoughtcrime.securesms.LoggingFragment;
import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.R;
@@ -73,6 +75,10 @@ public abstract class BaseKbsPinFragment<ViewModel extends BaseKbsPinViewModel>
CommunicationActions.openBrowserLink(requireContext(), getString(R.string.BaseKbsPinFragment__learn_more_url)); CommunicationActions.openBrowserLink(requireContext(), getString(R.string.BaseKbsPinFragment__learn_more_url));
}); });
Toolbar toolbar = view.findViewById(R.id.kbs_pin_toolbar);
((AppCompatActivity) requireActivity()).setSupportActionBar(toolbar);
((AppCompatActivity) requireActivity()).getSupportActionBar().setTitle(null);
initializeListeners(); initializeListeners();
} }
@@ -100,17 +106,16 @@ public abstract class BaseKbsPinFragment<ViewModel extends BaseKbsPinViewModel>
@Override @Override
public boolean onOptionsItemSelected(@NonNull MenuItem item) { public boolean onOptionsItemSelected(@NonNull MenuItem item) {
switch (item.getItemId()) { if (item.getItemId() == R.id.menu_pin_learn_more) {
case R.id.menu_pin_learn_more:
onLearnMore(); onLearnMore();
return true; return true;
case R.id.menu_pin_skip: } else if (item.getItemId() == R.id.menu_pin_skip) {
onPinSkipped(); onPinSkipped();
return true; return true;
} } else {
return false; return false;
} }
}
protected abstract ViewModel initializeViewModel(); protected abstract ViewModel initializeViewModel();

11
app/src/main/res/layout/base_kbs_pin_fragment.xml
View File

@@ -12,17 +12,24 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<androidx.appcompat.widget.Toolbar
android:id="@+id/kbs_pin_toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toStartOf="parent" />
<TextView <TextView
android:id="@+id/edit_kbs_pin_title" android:id="@+id/edit_kbs_pin_title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="24dp" android:layout_marginStart="24dp"
android:layout_marginTop="32dp" android:layout_marginTop="0dp"
android:layout_marginEnd="24dp" android:layout_marginEnd="24dp"
android:textAppearance="@style/Signal.Text.HeadlineMedium" android:textAppearance="@style/Signal.Text.HeadlineMedium"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toBottomOf="@id/kbs_pin_toolbar"
tools:text="@string/CreateKbsPinFragment__create_your_pin" /> tools:text="@string/CreateKbsPinFragment__create_your_pin" />
<org.thoughtcrime.securesms.util.views.LearnMoreTextView <org.thoughtcrime.securesms.util.views.LearnMoreTextView