mirrors/nextcloud-notes-android
1
0
Fork 0
mirror of https://github.com/nextcloud/notes-android.git synced 2024-10-25 14:15:48 +03:00
Code Issues Projects Releases Packages Wiki Activity

Migrate to androidx

Browse source
This commit is contained in:
stefan-niedermann 2019-02-06 17:47:20 +01:00
parent 3733ada12f
commit 2b7ee5886c
2 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/src/main/java/it/niedermann/owncloud/notes/android/fragment/BaseNoteFragment.java
View file

@ -6,16 +6,8 @@ import android.app.FragmentManager;
import android.content.Intent; import android.content.Intent;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.view.MenuItemCompat;
import android.support.v4.view.ViewCompat;
import android.support.v7.widget.SearchView;
import android.support.v7.widget.ShareActionProvider;
import android.text.SpannableString; import android.text.SpannableString;
import android.text.TextUtils; import android.text.TextUtils;
import androidx.annotation.Nullable;
import androidx.core.view.MenuItemCompat;
import androidx.appcompat.widget.ShareActionProvider;
import android.util.Log; import android.util.Log;
import android.view.Menu; import android.view.Menu;
import android.view.MenuInflater; import android.view.MenuInflater;
@ -25,6 +17,11 @@ import android.view.ViewTreeObserver;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import androidx.annotation.Nullable;
import androidx.appcompat.widget.SearchView;
import androidx.appcompat.widget.ShareActionProvider;
import androidx.core.view.MenuItemCompat;
import androidx.core.view.ViewCompat;
import it.niedermann.owncloud.notes.R; import it.niedermann.owncloud.notes.R;
import it.niedermann.owncloud.notes.model.CloudNote; import it.niedermann.owncloud.notes.model.CloudNote;
import it.niedermann.owncloud.notes.model.DBNote; import it.niedermann.owncloud.notes.model.DBNote;
@ -158,7 +155,7 @@ public abstract class BaseNoteFragment extends Fragment implements CategoryDialo
prepareFavoriteOption(itemFavorite); prepareFavoriteOption(itemFavorite);
searchMenuItem = menu.findItem(R.id.search); searchMenuItem = menu.findItem(R.id.search);
searchView = (android.support.v7.widget.SearchView) searchMenuItem.getActionView(); searchView = (SearchView) searchMenuItem.getActionView();
if (!TextUtils.isEmpty(searchQuery) && isNew) { if (!TextUtils.isEmpty(searchQuery) && isNew) {
searchMenuItem.expandActionView(); searchMenuItem.expandActionView();
@ -169,7 +166,7 @@ public abstract class BaseNoteFragment extends Fragment implements CategoryDialo
} }
final LinearLayout searchEditFrame = searchView.findViewById(android.support.v7.appcompat.R.id final LinearLayout searchEditFrame = searchView.findViewById(R.id
.search_edit_frame); .search_edit_frame);
searchEditFrame.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() { searchEditFrame.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {

3
app/src/main/java/it/niedermann/owncloud/notes/util/DisplayUtils.java
View file

@ -20,7 +20,6 @@
package it.niedermann.owncloud.notes.util; package it.niedermann.owncloud.notes.util;
import android.graphics.Typeface; import android.graphics.Typeface;
import android.support.annotation.ColorInt;
import android.text.Spannable; import android.text.Spannable;
import android.text.TextUtils; import android.text.TextUtils;
import android.text.style.CharacterStyle; import android.text.style.CharacterStyle;
@ -30,6 +29,8 @@ import android.text.style.StyleSpan;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import androidx.annotation.ColorInt;
public class DisplayUtils { public class DisplayUtils {
public static Spannable searchAndColor(String text, Spannable spannable, String searchText, @ColorInt int color) { public static Spannable searchAndColor(String text, Spannable spannable, String searchText, @ColorInt int color) {