github/wulkanowy-mirror
1
0
Fork 1
mirror of https://github.com/wulkanowy/wulkanowy.git synced 2025-01-19 00:06:46 -06:00
Code

Change dialog closing button text (#32)

Browse Source
This commit is contained in:
Mikołaj Pich 2017-11-01 22:14:44 +01:00 committed by Rafał Borcz
parent d796702ade
commit 54112f73f1
4 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/io/github/wulkanowy/activity/dashboard/grades/GradesDialogFragment.java
View File

@ -6,6 +6,7 @@ import android.os.Bundle;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.Button;
import android.widget.TextView; import android.widget.TextView;
import io.github.wulkanowy.R; import io.github.wulkanowy.R;
@ -35,7 +36,7 @@ public class GradesDialogFragment extends DialogFragment {
TextView teacherText = view.findViewById(R.id.teacher_dialog_text_value); TextView teacherText = view.findViewById(R.id.teacher_dialog_text_value);
TextView dateText = view.findViewById(R.id.date_dialog_text_value); TextView dateText = view.findViewById(R.id.date_dialog_text_value);
TextView colorText = view.findViewById(R.id.color_dialog_text_value); TextView colorText = view.findViewById(R.id.color_dialog_text_value);
TextView okTextClick = view.findViewById(R.id.OK_dialog); Button closeDialog = view.findViewById(R.id.close_dialog);
subjectText.setText(grade.getSubject()); subjectText.setText(grade.getSubject());
gradeText.setText(grade.getValue()); gradeText.setText(grade.getValue());
@ -58,7 +59,7 @@ public class GradesDialogFragment extends DialogFragment {
teacherText.setText(grade.getTeacher()); teacherText.setText(grade.getTeacher());
} }
okTextClick.setOnClickListener(new View.OnClickListener() { closeDialog.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
dismiss(); dismiss();

21
app/src/main/res/layout/grades_dialog.xml
View File

@ -167,22 +167,19 @@
android:textIsSelectable="true" android:textIsSelectable="true"
android:textSize="12sp" /> android:textSize="12sp" />
<TextView <Button
android:id="@+id/OK_dialog" android:id="@+id/close_dialog"
android:layout_width="40dp" android:layout_width="wrap_content"
android:layout_height="40dp" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_marginBottom="10dp" android:background="?attr/selectableItemBackground"
android:layout_marginEnd="10dp"
android:layout_marginRight="10dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:clickable="true"
android:focusable="true" android:focusable="true"
android:gravity="center" android:text="@string/dialog_close"
android:text="@string/ok_text" android:textAllCaps="true"
android:textSize="16sp" /> android:textSize="15sp"
/>
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>

2
app/src/main/res/values-pl/strings.xml
View File

@ -44,7 +44,7 @@
<string name="color_blue_text">Niebieski</string> <string name="color_blue_text">Niebieski</string>
<string name="color_green_text">Zielony</string> <string name="color_green_text">Zielony</string>
<string name="noColor_text">Brak koloru</string> <string name="noColor_text">Brak koloru</string>
<string name="ok_text">OK</string> <string name="dialog_close">Zamknij</string>
<string name="refresh_error_text">"Podczas odświeżania zawartości wystąpił błąd. "</string> <string name="refresh_error_text">"Podczas odświeżania zawartości wystąpił błąd. "</string>
<string name="snackbar_no_grades">Brak nowych ocen</string> <string name="snackbar_no_grades">Brak nowych ocen</string>
<string name="snackbar_new_grade">Ilość nowych ocen: %1$d</string> <string name="snackbar_new_grade">Ilość nowych ocen: %1$d</string>

2
app/src/main/res/values/strings.xml
View File

@ -44,7 +44,7 @@
<string name="color_blue_text">Blue</string> <string name="color_blue_text">Blue</string>
<string name="color_green_text">Green</string> <string name="color_green_text">Green</string>
<string name="noColor_text">No color</string> <string name="noColor_text">No color</string>
<string name="ok_text">OK</string> <string name="dialog_close">Close</string>
<string name="refresh_error_text">An error occurred while refreshing the content.</string> <string name="refresh_error_text">An error occurred while refreshing the content.</string>
<string name="snackbar_no_grades">No new grades</string> <string name="snackbar_no_grades">No new grades</string>
<string name="snackbar_new_grade">Number of new grades: %1$d</string> <string name="snackbar_new_grade">Number of new grades: %1$d</string>