Add pitch help screen
app/src/main/AndroidManifest.xml
13 | 13 | android:roundIcon="@mipmap/ic_launcher_round" | |
14 | 14 | android:supportsRtl="true" | |
15 | 15 | android:theme="@style/AppTheme"> | |
16 | - | <activity android:name=".HelpRadicalActivity" | |
16 | + | <activity | |
17 | + | android:name=".HelpPitchActivity" | |
18 | + | android:label="@string/help_title_pitch" | |
19 | + | android:parentActivityName=".HelpActivity" | |
20 | + | tools:ignore="UnusedAttribute"> | |
21 | + | <meta-data | |
22 | + | android:name="android.support.PARENT_ACTIVITY" | |
23 | + | android:value=".HelpActivity" /></activity> | |
24 | + | <activity | |
25 | + | android:name=".HelpRadicalActivity" | |
17 | 26 | android:label="@string/help_title_radicals" | |
18 | 27 | android:parentActivityName=".HelpActivity" | |
19 | 28 | tools:ignore="UnusedAttribute"> | |
… | |||
21 | 30 | android:name="android.support.PARENT_ACTIVITY" | |
22 | 31 | android:value=".HelpActivity" /> | |
23 | 32 | </activity> | |
24 | - | <activity android:name=".HelpRomajiActivity" | |
33 | + | <activity | |
34 | + | android:name=".HelpRomajiActivity" | |
25 | 35 | android:label="@string/help_title_romaji" | |
26 | 36 | android:parentActivityName=".HelpActivity" | |
27 | 37 | tools:ignore="UnusedAttribute"> |
app/src/main/java/eu/lepiller/nani/HelpActivity.java
16 | 16 | ||
17 | 17 | Button romaji_button = findViewById(R.id.help_topic_romaji); | |
18 | 18 | Button radical_button = findViewById(R.id.help_topic_radicals); | |
19 | + | Button pitch_button = findViewById(R.id.help_topic_pitch); | |
19 | 20 | ||
21 | + | pitch_button.setOnClickListener(getOpenListener(HelpPitchActivity.class)); | |
20 | 22 | romaji_button.setOnClickListener(getOpenListener(HelpRomajiActivity.class)); | |
21 | 23 | radical_button.setOnClickListener(getOpenListener(HelpRadicalActivity.class)); | |
22 | 24 | } |
app/src/main/java/eu/lepiller/nani/HelpPitchActivity.java unknown status 1
1 | + | package eu.lepiller.nani; | |
2 | + | ||
3 | + | import androidx.appcompat.app.AppCompatActivity; | |
4 | + | ||
5 | + | import android.content.Intent; | |
6 | + | import android.net.Uri; | |
7 | + | import android.os.Bundle; | |
8 | + | import android.view.View; | |
9 | + | import android.widget.Button; | |
10 | + | ||
11 | + | public class HelpPitchActivity extends AppCompatActivity { | |
12 | + | ||
13 | + | @Override | |
14 | + | protected void onCreate(Bundle savedInstanceState) { | |
15 | + | super.onCreate(savedInstanceState); | |
16 | + | setContentView(R.layout.activity_help_pitch); | |
17 | + | ||
18 | + | Button wikiButton = findViewById(R.id.wiki_button); | |
19 | + | wikiButton.setOnClickListener(new View.OnClickListener() { | |
20 | + | @Override | |
21 | + | public void onClick(View v) { | |
22 | + | Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.help_pitch_wiki_link))); | |
23 | + | startActivity(browserIntent); | |
24 | + | } | |
25 | + | }); | |
26 | + | } | |
27 | + | } | |
27 | < | ||
0 | 28 | < | \ No newline at end of file |
app/src/main/res/layout/activity_help.xml
28 | 28 | android:text="@string/help_info" | |
29 | 29 | android:layout_marginBottom="16dp" /> | |
30 | 30 | ||
31 | - | <Button android:id="@+id/help_topic_romaji" | |
32 | - | android:layout_width="match_parent" | |
33 | - | android:layout_height="wrap_content" | |
34 | - | android:layout_marginBottom="8dp" | |
35 | - | android:background="@color/colorAccent" | |
36 | - | android:text="@string/help_topic_romaji" | |
37 | - | android:textColor="@color/colorGrey"/> | |
31 | + | <Button android:id="@+id/help_topic_romaji" | |
32 | + | android:layout_width="match_parent" | |
33 | + | android:layout_height="wrap_content" | |
34 | + | android:layout_marginBottom="8dp" | |
35 | + | android:background="@color/colorAccent" | |
36 | + | android:text="@string/help_topic_romaji" | |
37 | + | android:textColor="@color/colorGrey"/> | |
38 | 38 | ||
39 | - | <Button android:id="@+id/help_topic_radicals" | |
40 | - | android:layout_width="match_parent" | |
41 | - | android:layout_height="wrap_content" | |
42 | - | android:background="@color/colorAccent" | |
43 | - | android:text="@string/help_topic_radicals" | |
44 | - | android:textColor="@color/colorGrey" /> | |
39 | + | <Button android:id="@+id/help_topic_radicals" | |
40 | + | android:layout_width="match_parent" | |
41 | + | android:layout_height="wrap_content" | |
42 | + | android:layout_marginBottom="8dp" | |
43 | + | android:background="@color/colorAccent" | |
44 | + | android:text="@string/help_topic_radicals" | |
45 | + | android:textColor="@color/colorGrey" /> | |
46 | + | ||
47 | + | <Button android:id="@+id/help_topic_pitch" | |
48 | + | android:layout_width="match_parent" | |
49 | + | android:layout_height="wrap_content" | |
50 | + | android:background="@color/colorAccent" | |
51 | + | android:text="@string/help_topic_pitch" | |
52 | + | android:textColor="@color/colorGrey" /> | |
45 | 53 | </LinearLayout> | |
46 | 54 | </ScrollView> | |
46 | 54 | = | |
47 | 55 | = | \ No newline at end of file |
app/src/main/res/layout/activity_help_pitch.xml unknown status 1
1 | + | <?xml version="1.0" encoding="utf-8"?> | |
2 | + | <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" | |
3 | + | xmlns:app="http://schemas.android.com/apk/res-auto" | |
4 | + | xmlns:tools="http://schemas.android.com/tools" | |
5 | + | android:layout_width="match_parent" | |
6 | + | android:layout_height="match_parent" | |
7 | + | tools:context=".HelpPitchActivity" | |
8 | + | android:padding="8dp"> | |
9 | + | ||
10 | + | <LinearLayout | |
11 | + | android:layout_width="match_parent" | |
12 | + | android:layout_height="wrap_content" | |
13 | + | android:orientation="vertical"> | |
14 | + | ||
15 | + | <TextView | |
16 | + | android:id="@+id/textView1" | |
17 | + | android:layout_width="match_parent" | |
18 | + | android:layout_height="wrap_content" | |
19 | + | android:textSize="@dimen/subtitle_size" | |
20 | + | android:layout_gravity="center" | |
21 | + | android:textAlignment="center" | |
22 | + | android:text="@string/help_topic_pitch" | |
23 | + | android:layout_marginBottom="16dp" /> | |
24 | + | ||
25 | + | <TextView | |
26 | + | android:layout_width="match_parent" | |
27 | + | android:layout_height="wrap_content" | |
28 | + | android:text="@string/help_pitch_intro" | |
29 | + | android:layout_marginBottom="16dp"/> | |
30 | + | ||
31 | + | <Button | |
32 | + | android:id="@+id/wiki_button" | |
33 | + | android:layout_width="wrap_content" | |
34 | + | android:layout_height="wrap_content" | |
35 | + | android:layout_gravity="center" | |
36 | + | android:layout_marginBottom="16dp" | |
37 | + | android:padding="8dp" | |
38 | + | android:background="@color/colorAccent" | |
39 | + | android:textColor="@color/colorGrey" | |
40 | + | android:text="@string/help_pitch_learn_more" /> | |
41 | + | ||
42 | + | <TextView | |
43 | + | android:layout_width="match_parent" | |
44 | + | android:layout_height="wrap_content" | |
45 | + | android:text="@string/help_pitch_table_intro" | |
46 | + | android:layout_marginBottom="8dp"/> | |
47 | + | ||
48 | + | <HorizontalScrollView | |
49 | + | android:layout_width="match_parent" | |
50 | + | android:layout_height="wrap_content" | |
51 | + | android:layout_marginBottom="8dp"> | |
52 | + | <TableLayout | |
53 | + | android:layout_width="wrap_content" | |
54 | + | android:layout_height="wrap_content"> | |
55 | + | <TableRow> | |
56 | + | <TextView /> | |
57 | + | <TextView | |
58 | + | android:layout_gravity="center" | |
59 | + | android:background="@drawable/ic_pitch_border" | |
60 | + | android:padding="8dp" | |
61 | + | android:layout_marginBottom="8dp" | |
62 | + | android:layout_marginTop="8dp" | |
63 | + | android:text="@string/pitch_0" /> | |
64 | + | <TextView | |
65 | + | android:layout_gravity="center" | |
66 | + | android:background="@drawable/ic_pitch_border" | |
67 | + | android:padding="8dp" | |
68 | + | android:layout_marginBottom="8dp" | |
69 | + | android:layout_marginTop="8dp" | |
70 | + | android:text="@string/pitch_1" /> | |
71 | + | <TextView | |
72 | + | android:layout_gravity="center" | |
73 | + | android:background="@drawable/ic_pitch_border" | |
74 | + | android:padding="8dp" | |
75 | + | android:layout_marginBottom="8dp" | |
76 | + | android:layout_marginTop="8dp" | |
77 | + | android:text="@string/pitch_2" /> | |
78 | + | <TextView | |
79 | + | android:layout_gravity="center" | |
80 | + | android:background="@drawable/ic_pitch_border" | |
81 | + | android:padding="8dp" | |
82 | + | android:layout_marginBottom="8dp" | |
83 | + | android:layout_marginTop="8dp" | |
84 | + | android:text="@string/pitch_3" /> | |
85 | + | <TextView | |
86 | + | android:layout_gravity="center" | |
87 | + | android:background="@drawable/ic_pitch_border" | |
88 | + | android:padding="8dp" | |
89 | + | android:layout_marginBottom="8dp" | |
90 | + | android:layout_marginTop="8dp" | |
91 | + | android:text="@string/pitch_4" /> | |
92 | + | </TableRow> | |
93 | + | <TableRow> | |
94 | + | <TextView | |
95 | + | android:layout_gravity="center" | |
96 | + | android:padding="8dp" | |
97 | + | android:text="@string/pitch_1" /> | |
98 | + | ||
99 | + | <LinearLayout | |
100 | + | android:orientation="vertical" | |
101 | + | android:layout_width="wrap_content" | |
102 | + | android:layout_height="wrap_content" | |
103 | + | android:background="@android:color/white"> | |
104 | + | ||
105 | + | <eu.lepiller.nani.PitchView | |
106 | + | android:layout_width="wrap_content" | |
107 | + | android:layout_height="wrap_content" | |
108 | + | android:layout_gravity="center" | |
109 | + | android:layout_margin="8dp" | |
110 | + | app:text="???" | |
111 | + | app:pitch="0" | |
112 | + | app:textSize="16sp" /> | |
113 | + | <TextView | |
114 | + | android:layout_width="wrap_content" | |
115 | + | android:layout_height="wrap_content" | |
116 | + | android:layout_gravity="center" | |
117 | + | android:layout_margin="8dp" | |
118 | + | android:textSize="@dimen/subtitle_size" | |
119 | + | android:text="???" | |
120 | + | tools:ignore="HardcodedText" /> | |
121 | + | </LinearLayout> | |
122 | + | ||
123 | + | <LinearLayout | |
124 | + | android:orientation="vertical" | |
125 | + | android:layout_width="wrap_content" | |
126 | + | android:layout_height="wrap_content" | |
127 | + | android:background="@color/colorGrey"> | |
128 | + | ||
129 | + | <eu.lepiller.nani.PitchView | |
130 | + | android:layout_width="wrap_content" | |
131 | + | android:layout_height="wrap_content" | |
132 | + | android:layout_gravity="center" | |
133 | + | android:layout_margin="8dp" | |
134 | + | app:text="???" | |
135 | + | app:pitch="1" | |
136 | + | app:textSize="16sp" /> | |
137 | + | <TextView | |
138 | + | android:layout_width="wrap_content" | |
139 | + | android:layout_height="wrap_content" | |
140 | + | android:layout_gravity="center" | |
141 | + | android:layout_margin="8dp" | |
142 | + | android:textSize="@dimen/subtitle_size" | |
143 | + | android:text="???" | |
144 | + | tools:ignore="HardcodedText" /> | |
145 | + | </LinearLayout> | |
146 | + | ||
147 | + | ||
148 | + | </TableRow> | |
149 | + | <TableRow> | |
150 | + | <TextView | |
151 | + | android:layout_gravity="center" | |
152 | + | android:padding="8dp" | |
153 | + | android:text="@string/pitch_2" /> | |
154 | + | ||
155 | + | <LinearLayout | |
156 | + | android:orientation="vertical" | |
157 | + | android:layout_width="wrap_content" | |
158 | + | android:layout_height="wrap_content" | |
159 | + | android:background="@android:color/white"> | |
160 | + | ||
161 | + | <eu.lepiller.nani.PitchView | |
162 | + | android:layout_width="wrap_content" | |
163 | + | android:layout_height="wrap_content" | |
164 | + | android:layout_gravity="center" | |
165 | + | android:layout_margin="8dp" | |
166 | + | app:text="??????" | |
167 | + | app:pitch="0" | |
168 | + | app:textSize="16sp" /> | |
169 | + | <TextView | |
170 | + | android:layout_width="wrap_content" | |
171 | + | android:layout_height="wrap_content" | |
172 | + | android:layout_gravity="center" | |
173 | + | android:layout_margin="8dp" | |
174 | + | android:textSize="@dimen/subtitle_size" | |
175 | + | android:text="???" | |
176 | + | tools:ignore="HardcodedText" /> | |
177 | + | </LinearLayout> | |
178 | + | ||
179 | + | <LinearLayout | |
180 | + | android:orientation="vertical" | |
181 | + | android:layout_width="wrap_content" | |
182 | + | android:layout_height="wrap_content" | |
183 | + | android:background="@color/colorGrey"> | |
184 | + | ||
185 | + | <eu.lepiller.nani.PitchView | |
186 | + | android:layout_width="wrap_content" | |
187 | + | android:layout_height="wrap_content" | |
188 | + | android:layout_gravity="center" | |
189 | + | android:layout_margin="8dp" | |
190 | + | app:text="??????" | |
191 | + | app:pitch="1" | |
192 | + | app:textSize="16sp" /> | |
193 | + | <TextView | |
194 | + | android:layout_width="wrap_content" | |
195 | + | android:layout_height="wrap_content" | |
196 | + | android:layout_gravity="center" | |
197 | + | android:layout_margin="8dp" | |
198 | + | android:textSize="@dimen/subtitle_size" | |
199 | + | android:text="???" | |
200 | + | tools:ignore="HardcodedText" /> | |
201 | + | </LinearLayout> | |
202 | + | ||
203 | + | <LinearLayout | |
204 | + | android:orientation="vertical" | |
205 | + | android:layout_width="wrap_content" | |
206 | + | android:layout_height="wrap_content" | |
207 | + | android:background="@color/colorDarkerGrey"> | |
208 | + | ||
209 | + | <eu.lepiller.nani.PitchView | |
210 | + | android:layout_width="wrap_content" | |
211 | + | android:layout_height="wrap_content" | |
212 | + | android:layout_gravity="center" | |
213 | + | android:layout_margin="8dp" | |
214 | + | app:text="??????" | |
215 | + | app:pitch="2" | |
216 | + | app:textSize="16sp" /> | |
217 | + | <TextView | |
218 | + | android:layout_width="wrap_content" | |
219 | + | android:layout_height="wrap_content" | |
220 | + | android:layout_gravity="center" | |
221 | + | android:layout_margin="8dp" | |
222 | + | android:textSize="@dimen/subtitle_size" | |
223 | + | android:text="???" | |
224 | + | tools:ignore="HardcodedText" /> | |
225 | + | </LinearLayout> | |
226 | + | </TableRow> | |
227 | + | <TableRow> | |
228 | + | <TextView | |
229 | + | android:layout_gravity="center" | |
230 | + | android:padding="8dp" | |
231 | + | android:text="@string/pitch_3" /> | |
232 | + | ||
233 | + | <LinearLayout | |
234 | + | android:orientation="vertical" | |
235 | + | android:layout_width="wrap_content" | |
236 | + | android:layout_height="wrap_content" | |
237 | + | android:background="@android:color/white"> | |
238 | + | ||
239 | + | <eu.lepiller.nani.PitchView | |
240 | + | android:layout_width="wrap_content" | |
241 | + | android:layout_height="wrap_content" | |
242 | + | android:layout_gravity="center" | |
243 | + | android:layout_margin="8dp" | |
244 | + | app:text="?????????" | |
245 | + | app:pitch="0" | |
246 | + | app:textSize="16sp" /> | |
247 | + | <TextView | |
248 | + | android:layout_width="wrap_content" | |
249 | + | android:layout_height="wrap_content" | |
250 | + | android:layout_gravity="center" | |
251 | + | android:layout_margin="8dp" | |
252 | + | android:textSize="@dimen/subtitle_size" | |
253 | + | android:text="?????????" | |
254 | + | tools:ignore="HardcodedText" /> | |
255 | + | </LinearLayout> | |
256 | + | ||
257 | + | <LinearLayout | |
258 | + | android:orientation="vertical" | |
259 | + | android:layout_width="wrap_content" | |
260 | + | android:layout_height="wrap_content" | |
261 | + | android:background="@color/colorGrey"> | |
262 | + | ||
263 | + | <eu.lepiller.nani.PitchView | |
264 | + | android:layout_width="wrap_content" | |
265 | + | android:layout_height="wrap_content" | |
266 | + | android:layout_gravity="center" | |
267 | + | android:layout_margin="8dp" | |
268 | + | app:text="?????????" | |
269 | + | app:pitch="1" | |
270 | + | app:textSize="16sp" /> | |
271 | + | <TextView | |
272 | + | android:layout_width="wrap_content" | |
273 | + | android:layout_height="wrap_content" | |
274 | + | android:layout_gravity="center" | |
275 | + | android:layout_margin="8dp" | |
276 | + | android:textSize="@dimen/subtitle_size" | |
277 | + | android:text="???" | |
278 | + | tools:ignore="HardcodedText" /> | |
279 | + | </LinearLayout> | |
280 | + | ||
281 | + | <LinearLayout | |
282 | + | android:orientation="vertical" | |
283 | + | android:layout_width="wrap_content" | |
284 | + | android:layout_height="wrap_content" | |
285 | + | android:background="@color/colorDarkGrey"> | |
286 | + | ||
287 | + | <eu.lepiller.nani.PitchView | |
288 | + | android:layout_width="wrap_content" | |
289 | + | android:layout_height="wrap_content" | |
290 | + | android:layout_gravity="center" | |
291 | + | android:layout_margin="8dp" | |
292 | + | app:text="?????????" | |
293 | + | app:pitch="2" | |
294 | + | app:textSize="16sp" /> | |
295 | + | <TextView | |
296 | + | android:layout_width="wrap_content" | |
297 | + | android:layout_height="wrap_content" | |
298 | + | android:layout_gravity="center" | |
299 | + | android:layout_margin="8dp" | |
300 | + | android:textSize="@dimen/subtitle_size" | |
301 | + | android:text="???" | |
302 | + | tools:ignore="HardcodedText" /> | |
303 | + | </LinearLayout> | |
304 | + | ||
305 | + | <LinearLayout | |
306 | + | android:orientation="vertical" | |
307 | + | android:layout_width="wrap_content" | |
308 | + | android:layout_height="wrap_content" | |
309 | + | android:background="@color/colorDarkerGrey"> | |
310 | + | ||
311 | + | <eu.lepiller.nani.PitchView | |
312 | + | android:layout_width="wrap_content" | |
313 | + | android:layout_height="wrap_content" | |
314 | + | android:layout_gravity="center" | |
315 | + | android:layout_margin="8dp" | |
316 | + | app:text="?????????" | |
317 | + | app:pitch="3" | |
318 | + | app:textSize="16sp" /> | |
319 | + | <TextView | |
320 | + | android:layout_width="wrap_content" | |
321 | + | android:layout_height="wrap_content" | |
322 | + | android:layout_gravity="center" | |
323 | + | android:layout_margin="8dp" | |
324 | + | android:textSize="@dimen/subtitle_size" | |
325 | + | android:text="??????" | |
326 | + | tools:ignore="HardcodedText" /> | |
327 | + | </LinearLayout> | |
328 | + | </TableRow> | |
329 | + | <TableRow> | |
330 | + | <TextView | |
331 | + | android:layout_gravity="center" | |
332 | + | android:padding="8dp" | |
333 | + | android:text="@string/pitch_4" /> | |
334 | + | ||
335 | + | <LinearLayout | |
336 | + | android:layout_width="wrap_content" | |
337 | + | android:layout_height="wrap_content" | |
338 | + | android:background="@android:color/white" | |
339 | + | android:orientation="vertical"> | |
340 | + | ||
341 | + | <eu.lepiller.nani.PitchView | |
342 | + | android:layout_width="wrap_content" | |
343 | + | android:layout_height="wrap_content" | |
344 | + | android:layout_gravity="center" | |
345 | + | android:layout_margin="8dp" | |
346 | + | app:pitch="0" | |
347 | + | app:text="????????????" | |
348 | + | app:textSize="16sp" /> | |
349 | + | ||
350 | + | <TextView | |
351 | + | android:layout_width="wrap_content" | |
352 | + | android:layout_height="wrap_content" | |
353 | + | android:layout_gravity="center" | |
354 | + | android:layout_margin="8dp" | |
355 | + | android:text="??????" | |
356 | + | android:textSize="@dimen/subtitle_size" | |
357 | + | tools:ignore="HardcodedText" /> | |
358 | + | </LinearLayout> | |
359 | + | ||
360 | + | <LinearLayout | |
361 | + | android:orientation="vertical" | |
362 | + | android:layout_width="wrap_content" | |
363 | + | android:layout_height="wrap_content" | |
364 | + | android:background="@color/colorGrey"> | |
365 | + | ||
366 | + | <eu.lepiller.nani.PitchView | |
367 | + | android:layout_width="wrap_content" | |
368 | + | android:layout_height="wrap_content" | |
369 | + | android:layout_gravity="center" | |
370 | + | android:layout_margin="8dp" | |
371 | + | app:text="???????????????" | |
372 | + | app:pitch="1" | |
373 | + | app:textSize="16sp" /> | |
374 | + | <TextView | |
375 | + | android:layout_width="wrap_content" | |
376 | + | android:layout_height="wrap_content" | |
377 | + | android:layout_gravity="center" | |
378 | + | android:layout_margin="8dp" | |
379 | + | android:textSize="@dimen/subtitle_size" | |
380 | + | android:text="??????" | |
381 | + | tools:ignore="HardcodedText" /> | |
382 | + | </LinearLayout> | |
383 | + | ||
384 | + | <LinearLayout | |
385 | + | android:orientation="vertical" | |
386 | + | android:layout_width="wrap_content" | |
387 | + | android:layout_height="wrap_content" | |
388 | + | android:background="@color/colorDarkGrey"> | |
389 | + | ||
390 | + | <eu.lepiller.nani.PitchView | |
391 | + | android:layout_width="wrap_content" | |
392 | + | android:layout_height="wrap_content" | |
393 | + | android:layout_gravity="center" | |
394 | + | android:layout_margin="8dp" | |
395 | + | app:text="???????????????" | |
396 | + | app:pitch="2" | |
397 | + | app:textSize="16sp" /> | |
398 | + | <TextView | |
399 | + | android:layout_width="wrap_content" | |
400 | + | android:layout_height="wrap_content" | |
401 | + | android:layout_gravity="center" | |
402 | + | android:layout_margin="8dp" | |
403 | + | android:textSize="@dimen/subtitle_size" | |
404 | + | android:text="?????????" | |
405 | + | tools:ignore="HardcodedText" /> | |
406 | + | </LinearLayout> | |
407 | + | ||
408 | + | <LinearLayout | |
409 | + | android:orientation="vertical" | |
410 | + | android:layout_width="wrap_content" | |
411 | + | android:layout_height="wrap_content" | |
412 | + | android:background="@color/colorDarkGrey"> | |
413 | + | ||
414 | + | <eu.lepiller.nani.PitchView | |
415 | + | android:layout_width="wrap_content" | |
416 | + | android:layout_height="wrap_content" | |
417 | + | android:layout_gravity="center" | |
418 | + | android:layout_margin="8dp" | |
419 | + | app:text="????????????" | |
420 | + | app:pitch="3" | |
421 | + | app:textSize="16sp" /> | |
422 | + | <TextView | |
423 | + | android:layout_width="wrap_content" | |
424 | + | android:layout_height="wrap_content" | |
425 | + | android:layout_gravity="center" | |
426 | + | android:layout_margin="8dp" | |
427 | + | android:textSize="@dimen/subtitle_size" | |
428 | + | android:text="??????" | |
429 | + | tools:ignore="HardcodedText" /> | |
430 | + | </LinearLayout> | |
431 | + | ||
432 | + | <LinearLayout | |
433 | + | android:orientation="vertical" | |
434 | + | android:layout_width="wrap_content" | |
435 | + | android:layout_height="wrap_content" | |
436 | + | android:background="@color/colorDarkerGrey"> | |
437 | + | ||
438 | + | <eu.lepiller.nani.PitchView | |
439 | + | android:layout_width="wrap_content" | |
440 | + | android:layout_height="wrap_content" | |
441 | + | android:layout_gravity="center" | |
442 | + | android:layout_margin="8dp" | |
443 | + | app:text="????????????" | |
444 | + | app:pitch="4" | |
445 | + | app:textSize="16sp" /> | |
446 | + | <TextView | |
447 | + | android:layout_width="wrap_content" | |
448 | + | android:layout_height="wrap_content" | |
449 | + | android:layout_gravity="center" | |
450 | + | android:layout_margin="8dp" | |
451 | + | android:textSize="@dimen/subtitle_size" | |
452 | + | android:text="???" | |
453 | + | tools:ignore="HardcodedText" /> | |
454 | + | </LinearLayout> | |
455 | + | </TableRow> | |
456 | + | </TableLayout> | |
457 | + | </HorizontalScrollView> | |
458 | + | ||
459 | + | </LinearLayout> | |
460 | + | ||
461 | + | </ScrollView> | |
461 | < | ||
0 | 462 | < | \ No newline at end of file |
app/src/main/res/values-fr/strings.xml
76 | 76 | <string name="nani_why">J?????tudie le japonais mais je n???ai jamais r??ussi ?? trouver l???appli | |
77 | 77 | ad??quate pour servir de dictionnaire. Mon but est ici de pouvoir acc??der ?? un dictionnaire | |
78 | 78 | japonais dans diff??rents contextes : lorsque je lis, lorsque je cherche un mot que je ne | |
79 | - | connais pas en japonais, lorsque je veux en apprendre plus sur an kanji, etc.\n\nCette | |
79 | + | connais pas en japonais, lorsque je veux en apprendre plus sur un kanji, etc.\n\nCette | |
80 | 80 | appli vous permet de t??l??charger diff??rents types de dictionnaires qui activent certaines | |
81 | 81 | de ces fonctionnalit??s. | |
82 | 82 | </string> | |
… | |||
144 | 144 | </string> | |
145 | 145 | <string name="help_topic_radicals">Saisir des kanji ?? partir de leurs composants (radicaux)</string> | |
146 | 146 | <string name="help_topic_romaji">Utiliser des romaji dans le champ de recherche</string> | |
147 | + | <string name="help_topic_pitch">Comprendre l\'accent de hauteur</string> | |
147 | 148 | ||
148 | 149 | <!-- Help Activity: romaji --> | |
149 | - | <string name="help_title_romaji">Aide : Romaji</string> | |
150 | + | <string name="help_title_romaji">Aide : romaji</string> | |
150 | 151 | <string name="help_romaji1">?? l\'??crit, le japonais utilise couramment quatre syst??mes | |
151 | 152 | d\'??criture diff??rents : les kanji (les caract??res chinois), les hiragana (un syllabaire utilis?? | |
152 | 153 | surtout pour les mots japonais et la grammaire), les katakana (un syllabaire utilis?? surtout pour | |
… | |||
174 | 175 | <string name="help_romaji_hiragana">Hiragana</string> | |
175 | 176 | ||
176 | 177 | <!-- Help Activity: radicals --> | |
177 | - | <string name="help_title_radicals">Aide : Radicaux</string> | |
178 | + | <string name="help_title_radicals">Aide : radicaux</string> | |
178 | 179 | <string name="help_radical1">Les kanji japonais peuvent avoir de nombreux traits et ??tre tr??s | |
179 | 180 | difficile ?? se rappeler. Il est aussi compliqu?? de saisir un kanji japonais si vous ne connaissez | |
180 | 181 | la prononciation d\'aucun mot qui le contient. Heureusement, la plupart des kanji peuvent ??tre | |
… | |||
190 | 191 | <string name="help_radical3">Voici quelques exemples de d??composition :</string> | |
191 | 192 | <string name="help_radical_kanji">Kanji</string> | |
192 | 193 | <string name="help_radical_components">Composants</string> | |
194 | + | ||
195 | + | <!-- Help Activity: pitch --> | |
196 | + | <string name="help_title_pitch">Aide : accent de hauteur</string> | |
197 | + | <string name="pitch_0">0</string> | |
198 | + | <string name="pitch_1">1</string> | |
199 | + | <string name="pitch_2">2</string> | |
200 | + | <string name="pitch_3">3</string> | |
201 | + | <string name="pitch_4">4</string> | |
202 | + | <string name="help_pitch_intro">Le japonais a plusieurs dialectes avec diff??rentes phonologies. | |
203 | + | Certains dictionnaires sont des dictionnaires d\'accent de hauteur, qui fournissent plus d\'informations | |
204 | + | sur la phonologie des mots dans le dialecte de Tokyo (le japonais standard). Dans ce dialecte, | |
205 | + | chaque mot et la particule associ??e a un accent de hauteur particulier. Un accent de hauteur est | |
206 | + | assez diff??rent d\'un accent tonique comme en anglais, parce qu\'il ne fait varier que la hauteur | |
207 | + | du son, mais pas son volume. Dans chaque mot, chaque mora (unit?? de son) est soit bas soit haut. | |
208 | + | Il y a quatre motifs distincts: heiban (pas d\'accent) commence bas sur le premier mora puis devient | |
209 | + | haut sur le reste du mot. Atamadaka est haut sur le premier mora puis bas sur le reste du mot. | |
210 | + | Les motifs nakadaka et odaka sont bas sur le premier mora, haut sur le second, le troisi??me, | |
211 | + | etc, jusqu\'?? un abaissement de la hauteur, puis reste bas sur la fin du mot et la particule. | |
212 | + | Odaka est tr??s semblable ?? heiban, mais le ton baisse juste avant la particule, alors que heiban | |
213 | + | reste haut sur la particule. Le motif atamadaka a un abaissement ?? l\'int??rieur du mot, alors | |
214 | + | que odaka ne l\'a que sur la particule.</string> | |
215 | + | <string name="help_pitch_table_intro">Le tableau ci-dessous pr??sente des exemples de mots | |
216 | + | avec leur accent de hauteur. En haut se trouve le num??ro que vous trouverez dans les r??sultats | |
217 | + | de recherche et chaque ligne contient des mots qui ont le m??me nombre de mora. ?? 0 ?? repr??sente | |
218 | + | toujours un mot heiban, ?? 1 ?? repr??sente toujours un mot atamadaka, et les autres nombres peuvent | |
219 | + | ??tre nakadaka ou odaka, en fonction de la position de l\'abaissement du ton. Remarquez que le | |
220 | + | num??ro correspond ?? l\'emplacement de cet abaissement et qu\'il ne peut y en avoir qu\'un seul par | |
221 | + | mot.</string> | |
222 | + | <string name="help_pitch_learn_more">En apprendre plus sur Wikipedia</string> | |
223 | + | <string name="help_pitch_wiki_link">https://fr.wikipedia.org/wiki/Accent_chromatique_japonais</string> | |
193 | 224 | </resources> |
app/src/main/res/values/attrs.xml
1 | 1 | <?xml version="1.0" encoding="utf-8"?> | |
2 | - | <resources></resources> | |
2 | > | ||
3 | 0 | > | \ No newline at end of file |
2 | + | <resources> | |
3 | + | <declare-styleable name="PitchView"> | |
4 | + | <attr name="textColor" format="color" /> | |
5 | + | <attr name="pitchColor" format="color" /> | |
6 | + | <attr name="text" format="string" /> | |
7 | + | <attr name="pitch" format="integer" /> | |
8 | + | <attr name="textSize" format="dimension" /> | |
9 | + | </declare-styleable> | |
10 | + | </resources> | |
10 | < | ||
0 | 11 | < | \ No newline at end of file |
app/src/main/res/values/colors.xml
6 | 6 | <color name="colorGrey">#EEF2EE</color> | |
7 | 7 | <color name="colorUpdate">#F4DE96</color> | |
8 | 8 | <color name="colorDarkerGrey">#e0e3e0</color> | |
9 | + | <color name="colorDarkGrey">#d2d5d2</color> | |
10 | + | <color name="colorBlack">#505050</color> | |
9 | 11 | </resources> |
app/src/main/res/values/strings.xml
143 | 143 | Nani in a more efficient way. You should take the time to read the help topics. Click on the | |
144 | 144 | topic you are interested in today: | |
145 | 145 | </string> | |
146 | + | <string name="help_topic_pitch">Understanding pitch accent</string> | |
146 | 147 | <string name="help_topic_radicals">Entering kanji by components (radicals)</string> | |
147 | 148 | <string name="help_topic_romaji">Using romaji in search input</string> | |
148 | 149 | ||
… | |||
186 | 187 | <string name="help_radical3">Here are some examples of decompositions:</string> | |
187 | 188 | <string name="help_radical_kanji">Kanji</string> | |
188 | 189 | <string name="help_radical_components">Components</string> | |
190 | + | ||
191 | + | <!-- Help Activity: pitch --> | |
192 | + | <string name="help_title_pitch">Help: Pitch Accent</string> | |
193 | + | <string name="pitch_0">0</string> | |
194 | + | <string name="pitch_1">1</string> | |
195 | + | <string name="pitch_2">2</string> | |
196 | + | <string name="pitch_3">3</string> | |
197 | + | <string name="pitch_4">4</string> | |
198 | + | <string name="help_pitch_intro">Japanese has many dialects with different phonology. Some of | |
199 | + | the dictionaries are pitch accent dictionaries, that provide more information on the phonology | |
200 | + | of words in the Tokyo dialect (standard Japanese). In this dialect, each word and following particle | |
201 | + | has a particular pitch accent. A pitch accent is quite different from a stress accent as in English, | |
202 | + | because it only varies the height of sound, not the volume. In each word, each mora (unit of sound) | |
203 | + | is either low pitch or high pitch. There are four distinguishable patterns: heiban (no accent) | |
204 | + | starts low on the first mora and becomes high on the rest of the word, atamadaka is high on the | |
205 | + | first mora and low on the rest of the word, nakadaka and odaka patterns are low on the first mora, | |
206 | + | high on the second, third, etc until a drop in pitch, then stay low. odaka is similar to heiban | |
207 | + | but the drop in pitch occurs before the particle, whereas heiban has no pitch drop (stepdown). | |
208 | + | Atamadaka has a drop in the word, so the last mora of the word is always low</string> | |
209 | + | <string name="help_pitch_table_intro">The table below shows examples of words with their pitch | |
210 | + | accent pattern. On top is the number you will find with search results, each row has words | |
211 | + | of the same mora count. ???0??? always represents a heiban word, ???1??? is always an atamadaka word, | |
212 | + | other numbers can be nakadaka or odaka, depending on where the stepdown occurs. Not that the number | |
213 | + | records the position of the stepdown: there can only be one stepdown in a word. </string> | |
214 | + | <string name="help_pitch_learn_more">Learn more on Wikipedia</string> | |
215 | + | <string name="help_pitch_wiki_link">https://en.wikipedia.org/wiki/Japanese_pitch_accent</string> | |
189 | 216 | </resources> |