diff options
Diffstat (limited to 'org.fox.ttrss/src/main/java/org/fox/ttrss/offline')
10 files changed, 57 insertions, 48 deletions
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java index 1123ca12..185f8fb7 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java @@ -14,8 +14,6 @@ import android.net.Uri; import android.os.Bundle; import android.preference.PreferenceManager; import android.provider.BaseColumns; -import android.support.v7.view.ActionMode; -import android.support.v7.widget.Toolbar; import android.util.Log; import android.view.KeyEvent; import android.view.Menu; @@ -28,6 +26,9 @@ import org.fox.ttrss.OnlineActivity; import org.fox.ttrss.PreferencesActivity; import org.fox.ttrss.R; +import androidx.appcompat.view.ActionMode; +import androidx.appcompat.widget.Toolbar; + public class OfflineActivity extends CommonActivity { private final String TAG = this.getClass().getSimpleName(); @@ -154,7 +155,7 @@ public class OfflineActivity extends CommonActivity { setContentView(R.layout.activity_login); - Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + Toolbar toolbar = findViewById(R.id.toolbar); setSupportActionBar(toolbar); invalidateOptionsMenu(); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java index 46f3a98d..a0d25be4 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java @@ -10,8 +10,6 @@ import android.os.Build; import android.os.Bundle; import android.preference.PreferenceManager; import android.provider.BaseColumns; -import android.support.v4.app.Fragment; -import android.support.v7.app.ActionBar; import android.util.Log; import android.util.TypedValue; import android.view.ContextMenu; @@ -49,6 +47,9 @@ import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; +import androidx.appcompat.app.ActionBar; +import androidx.fragment.app.Fragment; + public class OfflineArticleFragment extends Fragment { private final String TAG = this.getClass().getSimpleName(); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticlePager.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticlePager.java index 0b9f98e9..4957b0b7 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticlePager.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticlePager.java @@ -7,10 +7,6 @@ import android.os.Bundle; import android.os.Parcelable; import android.preference.PreferenceManager; import android.provider.BaseColumns; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentStatePagerAdapter; -import android.support.v4.view.ViewPager; import android.util.Log; import android.view.LayoutInflater; import android.view.View; @@ -20,6 +16,11 @@ import com.viewpagerindicator.UnderlinePageIndicator; import org.fox.ttrss.R; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentStatePagerAdapter; +import androidx.viewpager.widget.ViewPager; + public class OfflineArticlePager extends Fragment { private final String TAG = this.getClass().getSimpleName(); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineDetailActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineDetailActivity.java index d0637692..3106ab20 100644..100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineDetailActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineDetailActivity.java @@ -8,11 +8,6 @@ import android.database.sqlite.SQLiteStatement; import android.os.Bundle; import android.preference.PreferenceManager; import android.provider.BaseColumns; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentTransaction; -import android.support.v4.widget.DrawerLayout; -import android.support.v7.app.ActionBarDrawerToggle; -import android.support.v7.widget.Toolbar; import android.util.Log; import android.view.MenuItem; import android.view.View; @@ -20,6 +15,12 @@ import android.view.View; import org.fox.ttrss.Application; import org.fox.ttrss.R; +import androidx.appcompat.app.ActionBarDrawerToggle; +import androidx.appcompat.widget.Toolbar; +import androidx.drawerlayout.widget.DrawerLayout; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentTransaction; + public class OfflineDetailActivity extends OfflineActivity implements OfflineHeadlinesEventListener { private final String TAG = this.getClass().getSimpleName(); @@ -40,10 +41,10 @@ public class OfflineDetailActivity extends OfflineActivity implements OfflineHea setContentView(R.layout.activity_detail); - Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + Toolbar toolbar = findViewById(R.id.toolbar); setSupportActionBar(toolbar); - m_drawerLayout = (DrawerLayout) findViewById(R.id.headlines_drawer); + m_drawerLayout = findViewById(R.id.headlines_drawer); if (m_drawerLayout != null) { diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineDownloadService.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineDownloadService.java index ad4b2241..9c8b05db 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineDownloadService.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineDownloadService.java @@ -17,7 +17,6 @@ import android.os.Build; import android.os.IBinder; import android.preference.PreferenceManager; import android.provider.BaseColumns; -import android.support.v4.app.NotificationCompat; import android.util.Log; import com.google.gson.Gson; @@ -43,6 +42,8 @@ import java.lang.reflect.Type; import java.util.HashMap; import java.util.List; +import androidx.core.app.NotificationCompat; + public class OfflineDownloadService extends Service { private final String TAG = this.getClass().getSimpleName(); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java index d8c7cfff..40674bb8 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java @@ -8,8 +8,6 @@ import android.database.Cursor; import android.os.Bundle; import android.preference.PreferenceManager; import android.provider.BaseColumns; -import android.support.v4.widget.SimpleCursorAdapter; -import android.support.v4.widget.SwipeRefreshLayout; import android.util.Log; import android.util.TypedValue; import android.view.ContextMenu; @@ -28,6 +26,9 @@ import android.widget.TextView; import org.fox.ttrss.BaseFeedlistFragment; import org.fox.ttrss.R; +import androidx.cursoradapter.widget.SimpleCursorAdapter; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; + public class OfflineFeedCategoriesFragment extends BaseFeedlistFragment implements OnItemClickListener, OnSharedPreferenceChangeListener { private final String TAG = this.getClass().getSimpleName(); private SharedPreferences m_prefs; @@ -132,7 +133,7 @@ public class OfflineFeedCategoriesFragment extends BaseFeedlistFragment implemen View view = inflater.inflate(R.layout.fragment_feeds, container, false); - m_swipeLayout = (SwipeRefreshLayout) view.findViewById(R.id.feeds_swipe_container); + m_swipeLayout = view.findViewById(R.id.feeds_swipe_container); m_swipeLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() { @Override @@ -141,7 +142,7 @@ public class OfflineFeedCategoriesFragment extends BaseFeedlistFragment implemen } }); - m_list = (ListView)view.findViewById(R.id.feeds); + m_list = view.findViewById(R.id.feeds); m_cursor = createCursor(); @@ -184,7 +185,7 @@ public class OfflineFeedCategoriesFragment extends BaseFeedlistFragment implemen @Override public void onItemClick(AdapterView<?> av, View view, int position, long id) { - ListView list = (ListView)getActivity().findViewById(R.id.feeds); + ListView list = getActivity().findViewById(R.id.feeds); if (list != null) { Cursor cursor = (Cursor) list.getItemAtPosition(position); @@ -263,7 +264,7 @@ public class OfflineFeedCategoriesFragment extends BaseFeedlistFragment implemen } - ImageView icon = (ImageView) v.findViewById(R.id.icon); + ImageView icon = v.findViewById(R.id.icon); if (icon != null) { TypedValue tv = new TypedValue(); @@ -273,13 +274,13 @@ public class OfflineFeedCategoriesFragment extends BaseFeedlistFragment implemen } - TextView tt = (TextView) v.findViewById(R.id.title); + TextView tt = v.findViewById(R.id.title); if (tt != null) { tt.setText(cursor.getString(cursor.getColumnIndex("title"))); } - TextView tu = (TextView) v.findViewById(R.id.unread_counter); + TextView tu = v.findViewById(R.id.unread_counter); if (tu != null) { tu.setText(String.valueOf(cursor.getInt(cursor.getColumnIndex("unread")))); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsFragment.java index 5e771d7b..6dd85a87 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsFragment.java @@ -7,8 +7,6 @@ import android.content.SharedPreferences.OnSharedPreferenceChangeListener; import android.database.Cursor; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.v4.widget.SimpleCursorAdapter; -import android.support.v4.widget.SwipeRefreshLayout; import android.util.Log; import android.view.ContextMenu; import android.view.ContextMenu.ContextMenuInfo; @@ -26,6 +24,9 @@ import android.widget.TextView; import org.fox.ttrss.BaseFeedlistFragment; import org.fox.ttrss.R; +import androidx.cursoradapter.widget.SimpleCursorAdapter; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; + public class OfflineFeedsFragment extends BaseFeedlistFragment implements OnItemClickListener, OnSharedPreferenceChangeListener { private final String TAG = this.getClass().getSimpleName(); private SharedPreferences m_prefs; @@ -85,7 +86,7 @@ public class OfflineFeedsFragment extends BaseFeedlistFragment implements OnItem menu.findItem(R.id.create_shortcut).setEnabled(false); AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuInfo; - Cursor cursor = (Cursor)getFeedAtPosition(info.position); + Cursor cursor = getFeedAtPosition(info.position); if (cursor != null) menu.setHeaderTitle(cursor.getString(cursor.getColumnIndex("title"))); @@ -138,7 +139,7 @@ public class OfflineFeedsFragment extends BaseFeedlistFragment implements OnItem View view = inflater.inflate(R.layout.fragment_feeds, container, false); - m_swipeLayout = (SwipeRefreshLayout) view.findViewById(R.id.feeds_swipe_container); + m_swipeLayout = view.findViewById(R.id.feeds_swipe_container); m_swipeLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() { @Override @@ -147,7 +148,7 @@ public class OfflineFeedsFragment extends BaseFeedlistFragment implements OnItem } }); - m_list = (ListView)view.findViewById(R.id.feeds); + m_list = view.findViewById(R.id.feeds); initDrawerHeader(inflater, view, m_list, m_activity, m_prefs, !m_enableParentBtn); @@ -210,7 +211,7 @@ public class OfflineFeedsFragment extends BaseFeedlistFragment implements OnItem @Override public void onItemClick(AdapterView<?> av, View view, int position, long id) { - ListView list = (ListView)getActivity().findViewById(R.id.feeds); + ListView list = getActivity().findViewById(R.id.feeds); if (list != null) { Cursor cursor = (Cursor) list.getItemAtPosition(position); @@ -248,7 +249,7 @@ public class OfflineFeedsFragment extends BaseFeedlistFragment implements OnItem @Override public boolean isEmpty() { - return m_enableParentBtn ? false : super.isEmpty(); + return !m_enableParentBtn && super.isEmpty(); } @Override @@ -282,13 +283,13 @@ public class OfflineFeedsFragment extends BaseFeedlistFragment implements OnItem } - TextView tt = (TextView) v.findViewById(R.id.title); + TextView tt = v.findViewById(R.id.title); if (tt != null) { tt.setText(cursor.getString(cursor.getColumnIndex("title"))); } - TextView tu = (TextView) v.findViewById(R.id.unread_counter); + TextView tu = v.findViewById(R.id.unread_counter); if (tu != null) { tu.setText(String.valueOf(cursor.getInt(cursor.getColumnIndex("unread")))); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java index e188f69a..06a86cec 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java @@ -17,12 +17,6 @@ import android.net.Uri; import android.os.Bundle; import android.preference.PreferenceManager; import android.provider.BaseColumns; -import android.support.v4.app.ActivityCompat; -import android.support.v4.app.ActivityOptionsCompat; -import android.support.v4.app.Fragment; -import android.support.v4.view.ViewCompat; -import android.support.v4.widget.SimpleCursorAdapter; -import android.support.v4.widget.SwipeRefreshLayout; import android.text.Html; import android.util.Log; import android.util.TypedValue; @@ -76,6 +70,12 @@ import java.util.HashMap; import java.util.List; import java.util.TimeZone; +import androidx.core.app.ActivityCompat; +import androidx.core.app.ActivityOptionsCompat; +import androidx.core.view.ViewCompat; +import androidx.cursoradapter.widget.SimpleCursorAdapter; +import androidx.fragment.app.Fragment; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import jp.wasabeef.glide.transformations.CropCircleTransformation; public class OfflineHeadlinesFragment extends Fragment implements OnItemClickListener, AbsListView.OnScrollListener { diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineMasterActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineMasterActivity.java index b1f4d88f..4e40ca27 100644..100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineMasterActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineMasterActivity.java @@ -11,11 +11,6 @@ import android.os.Bundle; import android.os.Handler; import android.preference.PreferenceManager; import android.provider.BaseColumns; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentTransaction; -import android.support.v4.widget.DrawerLayout; -import android.support.v7.app.ActionBarDrawerToggle; -import android.support.v7.widget.Toolbar; import android.util.Log; import android.view.Gravity; import android.view.MenuItem; @@ -24,6 +19,12 @@ import android.view.View; import org.fox.ttrss.Application; import org.fox.ttrss.R; +import androidx.appcompat.app.ActionBarDrawerToggle; +import androidx.appcompat.widget.Toolbar; +import androidx.drawerlayout.widget.DrawerLayout; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentTransaction; + public class OfflineMasterActivity extends OfflineActivity implements OfflineHeadlinesEventListener { private final String TAG = this.getClass().getSimpleName(); @@ -49,14 +50,14 @@ public class OfflineMasterActivity extends OfflineActivity implements OfflineHea setContentView(R.layout.activity_master); - Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + Toolbar toolbar = findViewById(R.id.toolbar); setSupportActionBar(toolbar); setSmallScreen(findViewById(R.id.sw600dp_anchor) == null); Application.getInstance().load(savedInstanceState); - m_drawerLayout = (DrawerLayout) findViewById(R.id.headlines_drawer); + m_drawerLayout = findViewById(R.id.headlines_drawer); if (m_drawerLayout != null) { diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineUploadService.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineUploadService.java index 1ff3521d..8f3b11fa 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineUploadService.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineUploadService.java @@ -11,7 +11,6 @@ import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; import android.graphics.BitmapFactory; import android.os.Build; -import android.support.v4.app.NotificationCompat; import android.util.Log; import com.google.gson.JsonElement; @@ -26,6 +25,8 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import androidx.core.app.NotificationCompat; + public class OfflineUploadService extends IntentService { private final String TAG = this.getClass().getSimpleName(); |