Skip to content

Commit

Permalink
refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
@xenonnn4w
xenonnn4w committed Aug 4, 2024
1 parent 093c7f8 commit 34b1b25
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 31 deletions.
46 changes: 28 additions & 18 deletions AnkiDroid/src/main/res/layout/widget_deck_picker_drawable_v31.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
Expand Down Expand Up @@ -30,29 +31,32 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:paddingEnd="5dp"
android:text="@string/deck1New_deck_picker_widget"
android:text="50"
android:textColor="@color/flag_reviewer_blue"
android:textSize="20sp" />
android:textSize="20sp"
tools:ignore="HardcodedText" />

<TextView
android:id="@+id/deckDue1"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:paddingEnd="5dp"
android:text="@string/deck1Due_deck_picker_widget"
android:text="52"
android:textColor="@color/material_red_A700"
android:textSize="20sp" />
android:textSize="20sp"
tools:ignore="HardcodedText" />

<TextView
android:id="@+id/deckLearn1"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:paddingEnd="5dp"
android:text="@string/deck1Learn_deck_picker_widget"
android:text="50"
android:textColor="@color/flag_reviewer_green"
android:textSize="20sp" />
android:textSize="20sp"
tools:ignore="HardcodedText" />

</LinearLayout>

Expand Down Expand Up @@ -80,29 +84,32 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:paddingEnd="5dp"
android:text="@string/deck2New_deck_picker_widget"
android:text="30"
android:textColor="@color/flag_reviewer_blue"
android:textSize="20sp" />
android:textSize="20sp"
tools:ignore="HardcodedText" />

<TextView
android:id="@+id/deckDue2"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:paddingEnd="5dp"
android:text="@string/deck2Due_deck_picker_widget"
android:text="20"
android:textColor="@color/material_red_A700"
android:textSize="20sp" />
android:textSize="20sp"
tools:ignore="HardcodedText" />

<TextView
android:id="@+id/deckLearn2"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:paddingEnd="5dp"
android:text="@string/deck2Learn_deck_picker_widget"
android:text="10"
android:textColor="@color/flag_reviewer_green"
android:textSize="20sp" />
android:textSize="20sp"
tools:ignore="HardcodedText" />

</LinearLayout>

Expand Down Expand Up @@ -130,29 +137,32 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:paddingEnd="5dp"
android:text="@string/deck3New_deck_picker_widget"
android:text="25"
android:textColor="@color/flag_reviewer_blue"
android:textSize="20sp" />
android:textSize="20sp"
tools:ignore="HardcodedText" />

<TextView
android:id="@+id/deckDue3"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:paddingEnd="5dp"
android:text="@string/deck3Due_deck_picker_widget"
android:text="15"
android:textColor="@color/material_red_A700"
android:textSize="20sp" />
android:textSize="20sp"
tools:ignore="HardcodedText" />

<TextView
android:id="@+id/deckLearn3"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:paddingEnd="5dp"
android:text="@string/deck3Learn_deck_picker_widget"
android:text="58"
android:textColor="@color/flag_reviewer_green"
android:textSize="20sp" />
android:textSize="20sp"
tools:ignore="HardcodedText" />

</LinearLayout>

Expand Down
6 changes: 3 additions & 3 deletions AnkiDroid/src/main/res/values/08-widget.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@
<string name="deck_picker_widget_description">Deck Picker Widget</string>

<!-- Strings to explain usage in Deck Picker and Card Analysis Extra Widget Configuration screen -->
<string name="select_deck_title" comment="Title for Deck Selection Dialog">Mark as Favorite</string>
<string name="no_favourite_deck_placeholder_title" comment="Placeholder title when no decks are marked as favorites">No decks are marked as favorites</string>
<string name="no_favourite_deck_placeholder_description" comment="Description for starting to mark decks as favorites">Start marking decks as favorites using the + icon.</string>
<string name="select_deck_title" comment="Title for Deck Selection Dialog">Mark as Favorite.</string>
<string name="no_favourite_deck_placeholder_title" comment="Placeholder title when no decks are marked as favorites">No decks are marked as favorites.</string>
<string name="no_favourite_deck_placeholder_description" comment="Description for starting to mark decks as favorites">Start marking decks as favorites by using the + icon.</string>
<plurals name="deck_limit_reached">
<item quantity="one">Only %d deck can be marked favorite.</item>
<item quantity="other">Only %d decks can be marked favorite.</item>
Expand Down
10 changes: 0 additions & 10 deletions AnkiDroid/src/main/res/values/constants.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -320,16 +320,6 @@
<string name="show_onboarding_desc">Display feature tutorial to learn more about the app</string>
<string name="reset_onboarding_desc">Show all tutorials again</string>

<!-- sample properties for Deck Picker Widget layout in widget picker screen -->
<string name="deck1New_deck_picker_widget">50</string>
<string name="deck2New_deck_picker_widget">30</string>
<string name="deck3New_deck_picker_widget">25</string>
<string name="deck1Due_deck_picker_widget">52</string>
<string name="deck2Due_deck_picker_widget">20</string>
<string name="deck3Due_deck_picker_widget">15</string>
<string name="deck1Learn_deck_picker_widget">54</string>
<string name="deck2Learn_deck_picker_widget">10</string>
<string name="deck3Learn_deck_picker_widget">5</string>

<!-- Multimedia UI -->
<string name="new_multimedia_ui">New multimedia UI</string>
Expand Down

0 comments on commit 34b1b25

Please sign in to comment.