Skip to content
This repository was archived by the owner on May 5, 2020. It is now read-only.

Commit d7fe0fb

Browse files
committed
final
1 parent 7887c83 commit d7fe0fb

2 files changed

Lines changed: 20 additions & 4 deletions

File tree

PowerUp/app/src/main/res/layout/activity_vocab_match_game.xml

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,11 @@
6060
android:background="@drawable/vocab_clipboard_yellow"
6161
android:text="@string/pimples"
6262
android:gravity="center"
63+
android:autoSizeTextType="uniform"
64+
android:autoSizeMinTextSize="@dimen/vocab_match_minTextSize"
65+
android:autoSizeMaxTextSize="@dimen/vocab_match_maxTextSize"
66+
android:autoSizeStepGranularity="1dp"
67+
android:paddingLeft="@dimen/vocab_match_padding"
6368
/>
6469
<powerup.systers.com.vocab_match_game.VocabBoardTextView
6570
android:id="@+id/tv2"
@@ -68,17 +73,25 @@
6873
android:layout_weight="1"
6974
android:background="@drawable/vocab_clipboard_yellow"
7075
android:text="@string/bra"
71-
android:gravity="center"/>
76+
android:gravity="center"
77+
android:autoSizeTextType="uniform"
78+
android:autoSizeMinTextSize="@dimen/vocab_match_minTextSize"
79+
android:autoSizeMaxTextSize="@dimen/vocab_match_maxTextSize"
80+
android:autoSizeStepGranularity="1dp"
81+
android:paddingLeft="@dimen/vocab_match_padding"/>
7282
<powerup.systers.com.vocab_match_game.VocabBoardTextView
7383
android:id="@+id/tv3"
7484
android:layout_width="match_parent"
7585
android:layout_height="0dp"
7686
android:layout_weight="1"
7787
android:background="@drawable/vocab_clipboard_yellow"
7888
android:text="@string/periods"
79-
android:gravity="center"/>
89+
android:gravity="center"
90+
android:autoSizeTextType="uniform"
91+
android:autoSizeMinTextSize="@dimen/vocab_match_minTextSize"
92+
android:autoSizeMaxTextSize="@dimen/vocab_match_maxTextSize"
93+
android:autoSizeStepGranularity="1dp"
94+
android:paddingLeft="@dimen/vocab_match_padding"/>
8095
</LinearLayout>
8196
</LinearLayout>
82-
83-
8497
</FrameLayout>

PowerUp/app/src/main/res/values/dimens.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,7 @@
6565
<dimen name="margin_right_txt_msg2">125dp</dimen>
6666
<dimen name="btn_padding">4dp</dimen>
6767
<dimen name="btn_radius">3dp</dimen>
68+
<dimen name="vocab_match_padding">40dp</dimen>
69+
<dimen name="vocab_match_maxTextSize">20dp</dimen>
70+
<dimen name="vocab_match_minTextSize">10dp</dimen>
6871
</resources>

0 commit comments

Comments
 (0)