From 3e5e94790eb4b733c7c03e80f4bc6c33b7d4bcab Mon Sep 17 00:00:00 2001 From: M M Arif Date: Tue, 30 Jun 2020 20:59:11 +0200 Subject: [PATCH] Update libs, remove depricated libs (#566) proper decleration Merge branch 'update-libs-fix-deps' of codeberg.org:gitnex/GitNex into update-libs-fix-deps import searchview and other improvements Merge branch 'master' into update-libs-fix-deps Update libs, remove depricated libs Co-authored-by: M M Arif Reviewed-on: https://codeberg.org/gitnex/GitNex/pulls/566 Reviewed-by: opyale --- app/build.gradle | 15 +-- .../activities/AdminGetUsersActivity.java | 122 ++++++++---------- 2 files changed, 60 insertions(+), 77 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 02338130..f7157226 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -37,7 +37,7 @@ configurations { dependencies { def lifecycle_version = "2.3.0-alpha05" - def markwon_version = '4.3.1' + def markwon_version = '4.4.0' def acra = "5.5.0" implementation fileTree(include: ['*.jar'], dir: 'libs') @@ -45,18 +45,19 @@ dependencies { implementation "com.google.android.material:material:1.3.0-alpha01" implementation "androidx.constraintlayout:constraintlayout:1.1.3" implementation "androidx.legacy:legacy-support-v4:1.0.0" + implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version" testImplementation "junit:junit:4.13" androidTestImplementation "androidx.test:runner:1.2.0" androidTestImplementation "androidx.test.espresso:espresso-core:3.2.0" implementation "com.github.vihtarb:tooltip:0.2.0" - implementation 'com.squareup.okhttp3:okhttp:4.7.0' + implementation 'com.squareup.okhttp3:okhttp:4.7.2' implementation "com.google.code.gson:gson:2.8.6" implementation "com.squareup.picasso:picasso:2.71828" implementation "com.amulyakhare:com.amulyakhare.textdrawable:1.0.1" - implementation 'com.squareup.retrofit2:retrofit:2.8.1' - implementation 'com.squareup.retrofit2:converter-gson:2.8.1' - implementation 'com.squareup.retrofit2:converter-scalars:2.8.1' - implementation 'com.squareup.okhttp3:logging-interceptor:4.7.0' + implementation 'com.squareup.retrofit2:retrofit:2.9.0' + implementation 'com.squareup.retrofit2:converter-gson:2.9.0' + implementation 'com.squareup.retrofit2:converter-scalars:2.9.0' + implementation 'com.squareup.okhttp3:logging-interceptor:4.7.2' implementation 'org.ocpsoft.prettytime:prettytime:4.0.5.Final' implementation "com.vdurmont:emoji-java:5.1.1" implementation "com.pes.materialcolorpicker:library:1.2.5" @@ -77,8 +78,6 @@ dependencies { implementation "pl.droidsonroids.gif:android-gif-drawable:1.2.19" implementation "com.hendraanggrian.appcompat:socialview:0.2" implementation "com.hendraanggrian.appcompat:socialview-commons:0.2" - implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" // Deprecated (https://developer.android.com/jetpack/androidx/releases/lifecycle) - implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version" implementation "com.github.HamidrezaAmz:BreadcrumbsView:0.2.9" implementation "commons-io:commons-io:20030203.000550" implementation "com.github.chrisbanes:PhotoView:2.3.0" diff --git a/app/src/main/java/org/mian/gitnex/activities/AdminGetUsersActivity.java b/app/src/main/java/org/mian/gitnex/activities/AdminGetUsersActivity.java index 1973f97e..04b6a4e0 100644 --- a/app/src/main/java/org/mian/gitnex/activities/AdminGetUsersActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/AdminGetUsersActivity.java @@ -1,13 +1,5 @@ package org.mian.gitnex.activities; -import androidx.annotation.Nullable; -import androidx.appcompat.widget.Toolbar; -import androidx.lifecycle.Observer; -import androidx.lifecycle.ViewModelProviders; -import androidx.recyclerview.widget.DividerItemDecoration; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import android.content.Context; import android.content.Intent; import android.os.Bundle; @@ -19,15 +11,20 @@ import android.view.View; import android.view.inputmethod.EditorInfo; import android.widget.ImageView; import android.widget.TextView; +import androidx.appcompat.widget.SearchView; +import androidx.appcompat.widget.Toolbar; +import androidx.lifecycle.ViewModelProvider; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import org.mian.gitnex.R; import org.mian.gitnex.adapters.AdminGetUsersAdapter; import org.mian.gitnex.fragments.BottomSheetAdminUsersFragment; import org.mian.gitnex.helpers.Authorization; -import org.mian.gitnex.models.UserInfo; import org.mian.gitnex.util.AppUtil; import org.mian.gitnex.util.TinyDB; import org.mian.gitnex.viewmodels.AdminGetUsersViewModel; -import java.util.List; /** * Author M M Arif @@ -78,18 +75,12 @@ public class AdminGetUsersActivity extends BaseActivity implements BottomSheetAd DividerItemDecoration.VERTICAL); mRecyclerView.addItemDecoration(dividerItemDecoration); - swipeRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() { - @Override - public void onRefresh() { - new Handler().postDelayed(new Runnable() { - @Override - public void run() { - swipeRefresh.setRefreshing(false); - AdminGetUsersViewModel.loadUsersList(ctx, instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken)); - } - }, 500); - } - }); + swipeRefresh.setOnRefreshListener(() -> new Handler().postDelayed(() -> { + + swipeRefresh.setRefreshing(false); + AdminGetUsersViewModel.loadUsersList(ctx, instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken)); + + }, 500)); fetchDataAsync(ctx, instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken)); @@ -97,25 +88,24 @@ public class AdminGetUsersActivity extends BaseActivity implements BottomSheetAd private void fetchDataAsync(Context ctx, String instanceUrl, String instanceToken) { - AdminGetUsersViewModel usersModel = ViewModelProviders.of(this).get(AdminGetUsersViewModel.class); + AdminGetUsersViewModel usersModel = new ViewModelProvider(this).get(AdminGetUsersViewModel.class); - usersModel.getUsersList(ctx, instanceUrl, instanceToken).observe(this, new Observer>() { - @Override - public void onChanged(@Nullable List usersListMain) { - adapter = new AdminGetUsersAdapter(ctx, usersListMain); - if(adapter.getItemCount() > 0) { - mRecyclerView.setVisibility(View.VISIBLE); - mRecyclerView.setAdapter(adapter); - noDataUsers.setVisibility(View.GONE); - searchFilter = true; - } - else { - //adapter.notifyDataSetChanged(); - //mRecyclerView.setAdapter(adapter); - mRecyclerView.setVisibility(View.GONE); - noDataUsers.setVisibility(View.VISIBLE); - } + usersModel.getUsersList(ctx, instanceUrl, instanceToken).observe(this, usersListMain -> { + + adapter = new AdminGetUsersAdapter(ctx, usersListMain); + if(adapter.getItemCount() > 0) { + mRecyclerView.setVisibility(View.VISIBLE); + mRecyclerView.setAdapter(adapter); + noDataUsers.setVisibility(View.GONE); + searchFilter = true; } + else { + //adapter.notifyDataSetChanged(); + //mRecyclerView.setAdapter(adapter); + mRecyclerView.setVisibility(View.GONE); + noDataUsers.setVisibility(View.VISIBLE); + } + }); } @@ -126,37 +116,36 @@ public class AdminGetUsersActivity extends BaseActivity implements BottomSheetAd final MenuInflater inflater = getMenuInflater(); inflater.inflate(R.menu.generic_nav_dotted_menu, menu); - new Handler().postDelayed(new Runnable() { - @Override - public void run() { - if(searchFilter) { + new Handler().postDelayed(() -> { - boolean connToInternet = AppUtil.hasNetworkConnection(appCtx); + if(searchFilter) { - inflater.inflate(R.menu.search_menu, menu); + boolean connToInternet = AppUtil.hasNetworkConnection(appCtx); - MenuItem searchItem = menu.findItem(R.id.action_search); - androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView(); - searchView.setImeOptions(EditorInfo.IME_ACTION_DONE); + inflater.inflate(R.menu.search_menu, menu); - if(!connToInternet) { - return; + MenuItem searchItem = menu.findItem(R.id.action_search); + SearchView searchView = (SearchView) searchItem.getActionView(); + searchView.setImeOptions(EditorInfo.IME_ACTION_DONE); + + if(!connToInternet) { + return; + } + + searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() { + + @Override + public boolean onQueryTextSubmit(String query) { return true; } + + @Override + public boolean onQueryTextChange(String newText) { + adapter.getFilter().filter(newText); + return false; } - searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() { - @Override - public boolean onQueryTextSubmit(String query) { - return true; - } - - @Override - public boolean onQueryTextChange(String newText) { - adapter.getFilter().filter(newText); - return false; - } - }); - } + }); } + }, 500); return true; @@ -193,12 +182,7 @@ public class AdminGetUsersActivity extends BaseActivity implements BottomSheetAd } private void initCloseListener() { - onClickListener = new View.OnClickListener() { - @Override - public void onClick(View view) { - finish(); - } - }; + onClickListener = view -> finish(); } }