Skip to content

Commit 92af1ef

Browse files
wax911wax911
authored
Merge branch 'release/1.10.0' into patch-67
2 parents 2ec947d + e0ef89f commit 92af1ef

File tree

14 files changed

+30
-15
lines changed

14 files changed

+30
-15
lines changed

‎app/.meta/version.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"code": 1009012000,
2+
"code": 1010000000,
33
"migration": false,
44
"minSdk": 17,
55
"releaseNotes": "",
6-
"version": "1.9.12",
6+
"version": "1.10.0",
77
"appId": "com.mxt.anitrend"
88
}

‎app/src/main/java/com/mxt/anitrend/adapter/pager/index/TrendingPageAdapter.java

+4
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ public Fragment getItem(int position) {
3535
.putVariable(KeyUtil.arg_mediaType, KeyUtil.ANIME)
3636
.putVariable(KeyUtil.arg_sort, KeyUtil.TRENDING + KeyUtil.DESC));
3737
case 1:
38+
return MediaLatestList.newInstance(getParams(), GraphUtil.INSTANCE.getDefaultQuery(true)
39+
.putVariable(KeyUtil.arg_mediaType, KeyUtil.MANGA)
40+
.putVariable(KeyUtil.arg_sort, KeyUtil.TRENDING + KeyUtil.DESC));
41+
case 2:
3842
return MediaLatestList.newInstance(getParams(), GraphUtil.INSTANCE.getDefaultQuery(true)
3943
.putVariable(KeyUtil.arg_mediaType, KeyUtil.ANIME)
4044
.putVariable(KeyUtil.arg_sort, KeyUtil.ID + KeyUtil.DESC));

‎app/src/main/res/values-ar/string_array_items.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
<string name="seasons_title_summer">الصيف</string>
1111
<string name="seasons_title_fall">الخريف</string>
1212

13-
<string name="trending_title_being_watched">تجري مشاهدته</string>
13+
<string name="trending_title_anime">trending anime</string>
14+
<string name="trending_title_manga">trending manga</string>
1415
<string name="trending_title_recently_added">اضيف مؤخرًا</string>
1516

1617
<string name="airing_title_anime">قيد العرض</string>

‎app/src/main/res/values-de/string_array_items.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
<string name="seasons_title_spring">Frühling</string>
88
<string name="seasons_title_summer">Sommer</string>
99
<string name="seasons_title_fall">Herbst</string>
10-
<string name="trending_title_being_watched">Momentan Beliebt</string>
10+
<string name="trending_title_anime">trending anime</string>
11+
<string name="trending_title_manga">trending manga</string>
1112
<string name="trending_title_recently_added">Kürzlich Hinzugefügt</string>
1213
<string name="airing_title_anime">Laufende Anime</string>
1314
<string name="airing_title_latest_episodes">Neueste Folgen</string>

‎app/src/main/res/values-es/string_array_items.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
<string name="seasons_title_summer">verano</string>
1111
<string name="seasons_title_fall">otoño</string>
1212

13-
<string name="trending_title_being_watched">más vistos</string>
13+
<string name="trending_title_anime">trending anime</string>
14+
<string name="trending_title_manga">trending manga</string>
1415
<string name="trending_title_recently_added">nuevos</string>
1516

1617
<string name="airing_title_anime">anime en emisión</string>

‎app/src/main/res/values-fr/string_array_items.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
<string name="seasons_title_summer">été</string>
1111
<string name="seasons_title_fall">automne</string>
1212

13-
<string name="trending_title_being_watched">en visionnage</string>
13+
<string name="trending_title_anime">trending anime</string>
14+
<string name="trending_title_manga">trending manga</string>
1415
<string name="trending_title_recently_added">ajouté récemment</string>
1516

1617
<string name="airing_title_anime">anime en diffusion</string>

‎app/src/main/res/values-it/string_array_items.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
<string name="seasons_title_summer">Estate</string>
1111
<string name="seasons_title_fall">Autunno</string>
1212

13-
<string name="trending_title_being_watched">Di tendenza</string>
13+
<string name="trending_title_anime">trending anime</string>
14+
<string name="trending_title_manga">trending manga</string>
1415
<string name="trending_title_recently_added">Aggiunti di recente</string>
1516

1617
<string name="airing_title_anime">Anime in corso</string>

‎app/src/main/res/values-nl/string_array_items.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
<string name="seasons_title_summer">zomer</string>
1111
<string name="seasons_title_fall">herfst</string>
1212

13-
<string name="trending_title_being_watched">worden bekeken</string>
13+
<string name="trending_title_anime">trending anime</string>
14+
<string name="trending_title_manga">trending manga</string>
1415
<string name="trending_title_recently_added">recentelijk toegevoegd</string>
1516

1617
<string name="airing_title_anime">opkomende afleveringen</string>

‎app/src/main/res/values-pl/string_array_items.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
<string name="seasons_title_summer">lato</string>
1111
<string name="seasons_title_fall">jesień</string>
1212

13-
<string name="trending_title_being_watched">oglądane</string>
13+
<string name="trending_title_anime">trending anime</string>
14+
<string name="trending_title_manga">trending manga</string>
1415
<string name="trending_title_recently_added">ostatnio dodane</string>
1516

1617
<string name="airing_title_anime">wychodzące anime</string>

‎app/src/main/res/values-pt/string_array_items.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
<string name="seasons_title_summer">verão</string>
1111
<string name="seasons_title_fall">outono</string>
1212

13-
<string name="trending_title_being_watched">assistindo</string>
13+
<string name="trending_title_anime">trending anime</string>
14+
<string name="trending_title_manga">trending manga</string>
1415
<string name="trending_title_recently_added">adicionado recentemente</string>
1516

1617
<string name="airing_title_anime">em lançamento</string>

‎app/src/main/res/values-sv/string_array_items.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
<string name="seasons_title_summer">sommar</string>
1111
<string name="seasons_title_fall">höst</string>
1212

13-
<string name="trending_title_being_watched">tittas på</string>
13+
<string name="trending_title_anime">trending anime</string>
14+
<string name="trending_title_manga">trending manga</string>
1415
<string name="trending_title_recently_added">nyligen tillagd</string>
1516

1617
<string name="airing_title_anime">vädring anime</string>

‎app/src/main/res/values/string_array_items.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
<string name="seasons_title_summer">summer</string>
1111
<string name="seasons_title_fall">fall</string>
1212

13-
<string name="trending_title_being_watched">being watched</string>
13+
<string name="trending_title_anime">trending anime</string>
14+
<string name="trending_title_manga">trending manga</string>
1415
<string name="trending_title_recently_added">recently added</string>
1516

1617
<string name="airing_title_anime">airing anime</string>

‎app/src/main/res/values/string_arrays.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818

1919
<!--Try to keep all titles short-->
2020
<string-array name="trending_title">
21-
<item>@string/trending_title_being_watched</item>
21+
<item>@string/trending_title_anime</item>
22+
<item>@string/trending_title_manga</item>
2223
<item>@string/trending_title_recently_added</item>
2324
</string-array>
2425

‎buildSrc/src/main/java/com/mxt/anitrend/buildsrc/common/Configuration.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ package com.mxt.anitrend.buildsrc.common
2020
object Configuration {
2121

2222
private const val major = 1
23-
private const val minor = 9
24-
private const val patch = 12
23+
private const val minor = 10
24+
private const val patch = 0
2525
private const val candidate = 0
2626

2727
const val compileSdk = 33

0 commit comments

Comments
 (0)