Skip to content

Commit 9969e98

Browse files
author
Dmitry Tretyakov
committed
build(debug): 40
1 parent 8fce4ae commit 9969e98

File tree

5 files changed

+21
-17
lines changed

5 files changed

+21
-17
lines changed

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ android {
3737
applicationId "uk.openvk.android.refresh"
3838
minSdk 21
3939
targetSdk 36
40-
versionCode 39
41-
versionName "0.9.39.alpha"
40+
versionCode 40
41+
versionName "0.9.40.alpha"
4242
}
4343

4444
buildTypes {

app/src/main/java/uk/openvk/android/refresh/api/models/Friends.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,14 @@ public class Friends implements Parcelable {
4242

4343
public Friends() {
4444
jsonParser = new JSONParser();
45-
friends = new ArrayList<Friend>();
46-
requests = new ArrayList<Friend>();
45+
friends = new ArrayList<>();
46+
requests = new ArrayList<>();
4747
}
4848

4949
public Friends(String response, DownloadManager downloadManager, boolean downloadPhoto) {
5050
jsonParser = new JSONParser();
51-
friends = new ArrayList<Friend>();
52-
requests = new ArrayList<Friend>();
51+
friends = new ArrayList<>();
52+
requests = new ArrayList<>();
5353
parse(response, downloadManager, downloadPhoto, true);
5454
}
5555

@@ -106,7 +106,7 @@ public void parseRequests(String response, DownloadManager downloadManager, bool
106106
count = json.getInt("count");
107107
JSONArray users = json.getJSONArray("items");
108108
ArrayList<PhotoAttachment> avatars;
109-
avatars = new ArrayList<PhotoAttachment>();
109+
avatars = new ArrayList<>();
110110
for (int i = 0; i < users.length(); i++) {
111111
Friend friend = new Friend(users.getJSONObject(i));
112112
PhotoAttachment photoAttachment = new PhotoAttachment();

app/src/main/res/layout-night/activity_app.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
android:name="androidx.navigation.fragment.NavHostFragment"
4747
android:layout_width="match_parent"
4848
android:layout_height="0dp"
49+
android:fitsSystemWindows="true"
4950
app:defaultNavHost="true"
5051
app:layout_constraintBottom_toTopOf="@id/bottom_nav_view"
5152
app:layout_constraintEnd_toEndOf="parent"
@@ -91,11 +92,11 @@
9192
android:layout_width="wrap_content"
9293
android:layout_height="match_parent"
9394
android:layout_gravity="start"
94-
android:fitsSystemWindows="true"
95+
android:fitsSystemWindows="false"
9596
android:theme="@style/ApplicationTheme.Navigation"
96-
app:menu="@menu/app_nav_drawer"
9797
app:headerLayout="@layout/drawer_header"
9898
app:itemIconTint="@color/nv_items"
99-
app:itemTextColor="@color/nv_items" />
99+
app:itemTextColor="@color/nv_items"
100+
app:menu="@menu/app_nav_drawer" />
100101

101102
</androidx.drawerlayout.widget.DrawerLayout>

app/src/main/res/layout-night/activity_search.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
xmlns:app="http://schemas.android.com/apk/res-auto"
44
xmlns:tools="http://schemas.android.com/tools"
55
android:layout_width="match_parent"
6-
android:layout_height="match_parent">
6+
android:layout_height="match_parent"
7+
android:fitsSystemWindows="true">
78

89
<com.google.android.material.card.MaterialCardView
910
android:id="@+id/materialCardView"

app/src/main/res/layout/activity_app.xml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99

1010
<androidx.constraintlayout.widget.ConstraintLayout
1111
android:layout_width="match_parent"
12-
android:layout_height="match_parent">
12+
android:layout_height="match_parent"
13+
android:fitsSystemWindows="true">
1314

1415
<com.google.android.material.appbar.AppBarLayout
1516
android:id="@+id/app_bar"
@@ -45,6 +46,7 @@
4546
android:name="androidx.navigation.fragment.NavHostFragment"
4647
android:layout_width="match_parent"
4748
android:layout_height="0dp"
49+
android:fitsSystemWindows="true"
4850
app:defaultNavHost="true"
4951
app:layout_constraintBottom_toTopOf="@id/bottom_nav_view"
5052
app:layout_constraintEnd_toEndOf="parent"
@@ -59,12 +61,12 @@
5961
android:layout_height="wrap_content"
6062
app:itemIconTint="@color/bnv_items"
6163
app:itemTextColor="@color/bnv_items"
64+
app:labelVisibilityMode="labeled"
6265
app:layout_constraintBottom_toBottomOf="parent"
6366
app:layout_constraintEnd_toEndOf="parent"
6467
app:layout_constraintStart_toStartOf="parent"
6568
app:layout_constraintTop_toBottomOf="@+id/fragment_screen"
66-
app:menu="@menu/app_bottom_nav"
67-
app:labelVisibilityMode="labeled" />
69+
app:menu="@menu/app_bottom_nav" />
6870

6971
<com.google.android.material.floatingactionbutton.FloatingActionButton
7072
android:id="@+id/fab_newpost"
@@ -87,11 +89,11 @@
8789
android:layout_width="wrap_content"
8890
android:layout_height="match_parent"
8991
android:layout_gravity="start"
90-
android:fitsSystemWindows="true"
92+
android:fitsSystemWindows="false"
9193
android:theme="@style/ApplicationTheme.Navigation"
92-
app:menu="@menu/app_nav_drawer"
9394
app:headerLayout="@layout/drawer_header"
9495
app:itemIconTint="@color/nv_items"
95-
app:itemTextColor="@color/nv_items" />
96+
app:itemTextColor="@color/nv_items"
97+
app:menu="@menu/app_nav_drawer" />
9698

9799
</androidx.drawerlayout.widget.DrawerLayout>

0 commit comments

Comments
 (0)