mozilla
/
Jisort
зеркало из https://github.com/mozilla/Jisort.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge pull request #184 from secretrobotron/icon-quiz-layout-fixes 

Fixes to the layout of the icon fragment.
This commit is contained in:
Brian Mwadime 2016-07-19 07:19:53 +03:00 коммит произвёл GitHub
Родитель 7c80d53c8d 2c31c92d01
Коммит 7663d9f2f7
2 изменённых файлов: 47 добавлений и 36 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

80
app/src/main/res/layout/fragment_icons_layout.xml
Просмотреть файл

@ -10,40 +10,50 @@
android:paddingTop="@dimen/activity_vertical_margin"
android:paddingBottom="@dimen/activity_vertical_margin"
android:layout_height="match_parent">
<LinearLayout
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:layout_marginTop="5dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="@string/quiz_challenge_text"
android:id="@+id/textView"
android:layout_gravity="center_horizontal"
android:textColor="@color/colorTextPrimary" />
<Button
android:layout_marginTop="5dp"
android:id="@+id/icons_button"
android:text="@string/play_icon_quiz_text"
android:textColor="@color/colorTextPrimary"
android:background="@color/colorAccent"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
android:layout_marginTop="15dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"
android:text="@string/quiz_learn_text"
android:id="@+id/textView"
android:layout_gravity="center_horizontal"
android:textColor="@color/colorTextPrimary" />
<GridView
android:layout_marginTop="@dimen/activity_vertical_margin"
android:verticalSpacing="10dp"
android:horizontalSpacing="10dp"
android:id="@+id/icons_gridview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<GridView
android:layout_marginTop="@dimen/activity_vertical_margin"
android:verticalSpacing="10dp"
android:horizontalSpacing="10dp"
android:id="@+id/icons_gridview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/activity_vertical_margin"
android:numColumns="4"
android:columnWidth="50dp">
</GridView>
<TextView
android:layout_marginTop="5dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="@string/quiz_challenge_text"
android:id="@+id/textView"
android:layout_gravity="center_horizontal"
android:textColor="@color/colorTextPrimary" />
<Button
android:layout_marginTop="5dp"
android:id="@+id/icons_button"
android:text="@string/play_icon_quiz_text"
android:textColor="@color/colorTextPrimary"
android:background="@color/colorAccent"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
</ScrollView>
android:layout_marginBottom="@dimen/activity_vertical_margin"
android:numColumns="4"
android:columnWidth="50dp">
</GridView>
</LinearLayout>
</ScrollView>

3
app/src/main/res/values/strings.xml
Просмотреть файл

@ -39,11 +39,12 @@
<string name="quiz_result_score">Score: <xliff:g id="quiz_score">%1$d</xliff:g> / <xliff:g id="quiz_total">%2$d</xliff:g></string>
<string name="placeholder_quiz_score"><xliff:g id="quiz_score">%1$d</xliff:g> / <xliff:g id="quiz_total">%2$d</xliff:g></string>
<string name="quiz_challenge_text">Ready for a challenge?</string>
<string name="quiz_learn_text">Or, tap icons below to learn more:</string>
<string name="quiz_title_text">Choose the icon&#8230;</string>
<string name="title_activity_iconquiz">Icon Quiz</string>
<string name="title_activity_topiclist">Phone Usage</string>
<string name="title_activity_quizresult">Icon Quiz</string>
<string name="play_icon_quiz_text">Play the Icon Quiz!</string>
<string name="play_icon_quiz_text">Tap here to play the Icon Quiz!</string>
<string name="app_name_actions">Jisort - View Settings</string>
<string name="app_name_tutorials">Jisort - View Tutorial</string>
<string name="enable_funmode_description">Enable FUN MODE</string>