diff --git a/app/build.gradle b/app/build.gradle index 29de85ea..fceb25dd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,5 +1,5 @@ plugins { - id "com.diffplug.spotless" version "8.2.1" + id "com.diffplug.spotless" version "8.3.0" } apply plugin: 'com.android.application' @@ -76,7 +76,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') implementation 'androidx.appcompat:appcompat:1.7.1' - implementation 'com.google.android.material:material:1.13.0' + implementation 'com.google.android.material:material:1.14.0-alpha10' implementation 'androidx.compose.material3:material3:1.4.0' implementation 'androidx.compose.material3:material3-window-size-class:1.4.0' implementation 'androidx.viewpager2:viewpager2:1.1.0' @@ -114,7 +114,7 @@ dependencies { implementation "com.github.bumptech.glide:okhttp3-integration:5.0.5" annotationProcessor 'com.github.bumptech.glide:compiler:5.0.5' implementation "com.caverock:androidsvg-aar:1.4" - implementation "pl.droidsonroids.gif:android-gif-drawable:1.2.30" + implementation "pl.droidsonroids.gif:android-gif-drawable:1.2.31" implementation 'com.google.guava:guava:33.5.0-jre' //noinspection NewerVersionAvailable,GradleDependency implementation 'commons-io:commons-io:2.5' @@ -127,7 +127,7 @@ dependencies { annotationProcessor 'androidx.room:room-compiler:2.8.4' implementation "androidx.work:work-runtime:2.11.1" implementation "io.mikael:urlbuilder:2.0.9" - implementation "org.codeberg.gitnex-garage:emoji-java:v5.1.2" + //implementation "org.codeberg.gitnex-garage:emoji-java:v5.1.2" //noinspection GradleDependency coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:2.1.5" implementation 'androidx.biometric:biometric:1.1.0' @@ -135,9 +135,9 @@ dependencies { implementation 'com.github.chrisvest:stormpot:2.4.2' implementation 'androidx.browser:browser:1.9.0' implementation 'com.google.android.flexbox:flexbox:3.0.0' - implementation('org.codeberg.gitnex:tea4j-autodeploy:fa90c7d20a') { - exclude module: 'org.apache.oltu.oauth2.common' - } + //implementation('org.codeberg.gitnex:tea4j-autodeploy:a91978be6a') { + // exclude module: 'org.apache.oltu.oauth2.common' + // } implementation 'io.github.amrdeveloper:codeview:1.3.9' constraints { diff --git a/app/libs/emoji-java-5.1.2.jar b/app/libs/emoji-java-5.1.2.jar new file mode 100644 index 00000000..057a025b Binary files /dev/null and b/app/libs/emoji-java-5.1.2.jar differ diff --git a/app/libs/tea4j-autodeploy-1.0.0.jar b/app/libs/tea4j-autodeploy-1.0.0.jar new file mode 100644 index 00000000..63bb98b7 Binary files /dev/null and b/app/libs/tea4j-autodeploy-1.0.0.jar differ diff --git a/app/src/main/java/org/mian/gitnex/viewmodels/AdminGetUsersViewModel.java b/app/src/main/java/org/mian/gitnex/viewmodels/AdminGetUsersViewModel.java index 49bcae6d..b7208813 100644 --- a/app/src/main/java/org/mian/gitnex/viewmodels/AdminGetUsersViewModel.java +++ b/app/src/main/java/org/mian/gitnex/viewmodels/AdminGetUsersViewModel.java @@ -33,7 +33,21 @@ public class AdminGetUsersViewModel extends ViewModel { public void loadUsersList(int page, int resultLimit, Context ctx) { Call> call = - RetrofitClient.getApiInterface(ctx).adminSearchUsers(null, null, page, resultLimit); + RetrofitClient.getApiInterface(ctx) + .adminSearchUsers( + null, + null, + page, + resultLimit, + null, + null, + null, + null, + null, + null, + null, + null, + null); call.enqueue( new Callback<>() { @@ -61,7 +75,21 @@ public class AdminGetUsersViewModel extends ViewModel { int page, int resultLimit, Context ctx, AdminGetUsersAdapter adapter) { Call> call = - RetrofitClient.getApiInterface(ctx).adminSearchUsers(null, null, page, resultLimit); + RetrofitClient.getApiInterface(ctx) + .adminSearchUsers( + null, + null, + page, + resultLimit, + null, + null, + null, + null, + null, + null, + null, + null, + null); call.enqueue( new Callback<>() { diff --git a/app/src/main/java/org/mian/gitnex/viewmodels/IssuesViewModel.java b/app/src/main/java/org/mian/gitnex/viewmodels/IssuesViewModel.java index 60b97ecb..40144249 100644 --- a/app/src/main/java/org/mian/gitnex/viewmodels/IssuesViewModel.java +++ b/app/src/main/java/org/mian/gitnex/viewmodels/IssuesViewModel.java @@ -53,7 +53,6 @@ public class IssuesViewModel extends ViewModel { null, null, searchKeyword, - null, type, null, null, @@ -107,7 +106,6 @@ public class IssuesViewModel extends ViewModel { null, null, searchKeyword, - null, type, null, null, diff --git a/app/src/main/res/layout/fragment_repo_info.xml b/app/src/main/res/layout/fragment_repo_info.xml index 6f417772..bb939644 100644 --- a/app/src/main/res/layout/fragment_repo_info.xml +++ b/app/src/main/res/layout/fragment_repo_info.xml @@ -386,11 +386,9 @@ android:id="@+id/repo_fork_frame" android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="horizontal" - android:background="?android:attr/selectableItemBackground" android:layout_marginBottom="@dimen/dimen16dp" - android:paddingStart="@dimen/dimen16dp" - android:paddingEnd="@dimen/dimen16dp"> + android:orientation="horizontal" + tools:ignore="UseCompoundDrawables">