diff --git a/res/layout/headlines_fragment.xml b/res/layout/headlines_fragment.xml new file mode 100644 index 00000000..05281162 --- /dev/null +++ b/res/layout/headlines_fragment.xml @@ -0,0 +1,13 @@ + + + + + + + + diff --git a/res/layout/main.xml b/res/layout/main.xml index c91f2a76..63cdbda7 100644 --- a/res/layout/main.xml +++ b/res/layout/main.xml @@ -1,9 +1,15 @@ - + + - + + + + \ No newline at end of file diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml index 8552cfcd..5b87eed0 100644 --- a/res/menu/main_menu.xml +++ b/res/menu/main_menu.xml @@ -6,7 +6,8 @@ android:showAsAction="ifRoom|withText"/> + android:title="@string/logout" + android:icon="@android:drawable/presence_offline" + android:showAsAction="ifRoom|withText"/> diff --git a/res/values/attrs.xml b/res/values/attrs.xml index fa4748c5..2e1278de 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -3,4 +3,5 @@ + \ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index 76ff7d7e..e4ac1e8a 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -23,4 +23,5 @@ Login failed: API disabled. Login failed: username or password incorrect. Logged in. + No unread feeds. diff --git a/res/values/style.xml b/res/values/style.xml index b9c13774..ba0bca29 100644 --- a/res/values/style.xml +++ b/res/values/style.xml @@ -3,12 +3,22 @@ @android:drawable/divider_horizontal_bright #fafafa #0000ff + #ffffff + + + + \ No newline at end of file diff --git a/src/org/fox/ttrss/FeedsFragment.java b/src/org/fox/ttrss/FeedsFragment.java index d19739d0..92244c69 100644 --- a/src/org/fox/ttrss/FeedsFragment.java +++ b/src/org/fox/ttrss/FeedsFragment.java @@ -3,18 +3,23 @@ package org.fox.ttrss; import java.lang.reflect.Type; import java.util.ArrayList; import java.util.Collections; +import java.util.Date; import java.util.HashMap; import java.util.List; import android.app.Activity; import android.app.Fragment; +import android.app.FragmentTransaction; import android.content.Context; import android.content.SharedPreferences; import android.os.Bundle; import android.preference.PreferenceManager; +import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.AdapterView; +import android.widget.AdapterView.OnItemClickListener; import android.widget.ArrayAdapter; import android.widget.ListView; import android.widget.TextView; @@ -24,25 +29,25 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.reflect.TypeToken; -public class FeedsFragment extends Fragment { +public class FeedsFragment extends Fragment implements OnItemClickListener { private final String TAG = this.getClass().getSimpleName(); protected ArrayList m_feeds = new ArrayList(); protected FeedsListAdapter m_adapter; protected SharedPreferences m_prefs; protected String m_sessionId; + protected int m_activeFeedId; + protected long m_lastUpdate; protected Gson m_gson = new Gson(); - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - } - @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { if (savedInstanceState != null) { m_sessionId = savedInstanceState.getString("sessionId"); + m_sessionId = savedInstanceState.getString("sessionId"); + m_activeFeedId = savedInstanceState.getInt("activeFeedId"); + m_lastUpdate = savedInstanceState.getLong("lastUpdate"); } View view = inflater.inflate(R.layout.feeds_fragment, container, false); @@ -52,19 +57,34 @@ public class FeedsFragment extends Fragment { ListView list = (ListView) view.findViewById(R.id.feeds); if (list != null) { - list.setAdapter(m_adapter); + list.setAdapter(m_adapter); + list.setOnItemClickListener(this); } - + return view; } + @Override + public void onStart() { + super.onStart(); + + if (new Date().getTime() - m_lastUpdate > 30*1000) { + refresh(); + } else { + // + } + } + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + } + @Override public void onAttach(Activity activity) { super.onAttach(activity); m_prefs = PreferenceManager.getDefaultSharedPreferences(getActivity().getApplicationContext()); - - refresh(); } public void initialize(String sessionId) { @@ -77,7 +97,9 @@ public class FeedsFragment extends Fragment { @Override protected void onPostExecute(JsonElement result) { if (result != null) { - try { + try { + m_lastUpdate = new Date().getTime(); + JsonObject rv = result.getAsJsonObject(); int status = rv.get("status").getAsInt(); @@ -98,9 +120,20 @@ public class FeedsFragment extends Fragment { m_adapter.notifyDataSetChanged(); - View v = getView().findViewById(R.id.loading_progress); + /* if (getView() != null) { + View v = getView().findViewById(R.id.loading_progress); - if (v != null) v.setVisibility(View.GONE); + if (v != null) v.setVisibility(View.GONE); + + v = getView().findViewById(R.id.no_unread_feeds); + + if (v != null) { + if (m_feeds.size() > 0) + v.setVisibility(View.INVISIBLE); + else + v.setVisibility(View.VISIBLE); + } + } */ return; } @@ -119,9 +152,8 @@ public class FeedsFragment extends Fragment { } } catch (Exception e) { e.printStackTrace(); - } - } - + } + } } }; @@ -141,6 +173,8 @@ public class FeedsFragment extends Fragment { super.onSaveInstanceState(out); out.putString("sessionId", m_sessionId); + out.putInt("activeFeedId", m_activeFeedId); + out.putLong("lastUpdate", m_lastUpdate); } private class FeedsListAdapter extends ArrayAdapter { @@ -156,7 +190,7 @@ public class FeedsFragment extends Fragment { View v = convertView; - Feed item = items.get(position); + Feed feed = items.get(position); if (v == null) { LayoutInflater vi = (LayoutInflater)getActivity().getSystemService(Context.LAYOUT_INFLATER_SERVICE); @@ -166,13 +200,19 @@ public class FeedsFragment extends Fragment { TextView title = (TextView) v.findViewById(R.id.title); if (title != null) { - title.setText(item.title); + title.setText(feed.title); + + if (feed.id == m_activeFeedId) { + title.setTextAppearance(getContext(), R.style.SelectedFeed); + } else { + title.setTextAppearance(getContext(), R.style.Feed); + } } TextView unread = (TextView) v.findViewById(R.id.unread_counter); if (unread != null) { - unread.setText(String.valueOf(item.unread)); + unread.setText(String.valueOf(feed.unread)); } return v; @@ -190,7 +230,42 @@ public class FeedsFragment extends Fragment { @Override public int compareTo(Feed feed) { - return feed.unread - this.unread; + if (feed.unread != this.unread) + return feed.unread - this.unread; + else + return this.title.compareTo(feed.title); } } + + @Override + public void onItemClick(AdapterView av, View view, int position, long id) { + ListView list = (ListView)getActivity().findViewById(R.id.feeds); + + if (list != null) { + Feed feed = (Feed) list.getItemAtPosition(position); + + if (feed != null) { + Log.d(TAG, "clicked on feed " + feed.id); + + viewFeed(feed.id); + + } + } + } + + private void viewFeed(int feedId) { + m_activeFeedId = feedId; + + FragmentTransaction ft = getFragmentManager().beginTransaction(); + HeadlinesFragment frag = new HeadlinesFragment(); + + frag.initialize(m_sessionId, feedId); + + ft.setCustomAnimations(android.R.animator.fade_in, android.R.animator.fade_out); + ft.replace(R.id.headlines_container, frag); + ft.commit(); + + m_adapter.notifyDataSetChanged(); + + } } diff --git a/src/org/fox/ttrss/HeadlinesFragment.java b/src/org/fox/ttrss/HeadlinesFragment.java new file mode 100644 index 00000000..a1dc5111 --- /dev/null +++ b/src/org/fox/ttrss/HeadlinesFragment.java @@ -0,0 +1,51 @@ +package org.fox.ttrss; + +import android.app.Activity; +import android.app.Fragment; +import android.content.SharedPreferences; +import android.os.Bundle; +import android.preference.PreferenceManager; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +public class HeadlinesFragment extends Fragment { + private final String TAG = this.getClass().getSimpleName(); + protected String m_sessionId; + protected int m_feedId; + protected SharedPreferences m_prefs; + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + + if (savedInstanceState != null) { + m_sessionId = savedInstanceState.getString("sessionId"); + } + + View view = inflater.inflate(R.layout.headlines_fragment, container, false); + + /* m_adapter = new FeedsListAdapter(getActivity(), R.id.feeds_row, m_feeds); + + ListView list = (ListView) view.findViewById(R.id.feeds); + + if (list != null) { + list.setAdapter(m_adapter); + list.setOnItemClickListener(this); + } */ + + return view; + } + + @Override + public void onAttach(Activity activity) { + super.onAttach(activity); + + m_prefs = PreferenceManager.getDefaultSharedPreferences(getActivity().getApplicationContext()); + } + + public void initialize(String sessionId, int feedId) { + m_sessionId = sessionId; + m_feedId = feedId; + } + +} diff --git a/src/org/fox/ttrss/MainActivity.java b/src/org/fox/ttrss/MainActivity.java index c5318f82..f28556b8 100644 --- a/src/org/fox/ttrss/MainActivity.java +++ b/src/org/fox/ttrss/MainActivity.java @@ -6,14 +6,18 @@ import android.content.Intent; import android.content.SharedPreferences; import android.os.Bundle; import android.preference.PreferenceManager; +import android.util.Log; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; public class MainActivity extends Activity { + private final String TAG = this.getClass().getSimpleName(); + private SharedPreferences m_prefs; private String m_themeName = ""; private String m_sessionId; + private boolean m_feedsOpened = false; /** Called when the activity is first created. */ @Override @@ -34,20 +38,30 @@ public class MainActivity extends Activity { if (extras != null) { m_sessionId = extras.getString("sessionId"); - } else if (savedInstanceState != null) { + } + + if (savedInstanceState != null) { m_sessionId = savedInstanceState.getString("sessionId"); + m_feedsOpened = savedInstanceState.getBoolean("feedsOpened"); + Log.d(TAG, "FU: " + m_feedsOpened); } setContentView(R.layout.main); - FragmentTransaction ft = getFragmentManager().beginTransaction(); - FeedsFragment frag = new FeedsFragment(); + if (!m_feedsOpened) { + Log.d(TAG, "Opening feeds fragment..."); + + FragmentTransaction ft = getFragmentManager().beginTransaction(); + FeedsFragment frag = new FeedsFragment(); - frag.initialize(m_sessionId); + frag.initialize(m_sessionId); - ft.setCustomAnimations(android.R.animator.fade_in, android.R.animator.fade_out); - ft.replace(R.id.feeds_container, frag); - ft.commit(); + ft.setCustomAnimations(android.R.animator.fade_in, android.R.animator.fade_out); + ft.replace(R.id.feeds_container, frag); + ft.commit(); + + m_feedsOpened = true; + } } @@ -56,6 +70,7 @@ public class MainActivity extends Activity { super.onSaveInstanceState(out); out.putString("sessionId", m_sessionId); + out.putBoolean("feedsOpened", m_feedsOpened); } @Override