Skip to content

Commit 41f9513

Browse files
committed
Add a fragment for about screen
1 parent 28c69bf commit 41f9513

File tree

3 files changed

+33
-8
lines changed

3 files changed

+33
-8
lines changed

res/layout/about.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
>
2222
<TextView
2323
android:id = "@+id/about_details"
24-
android:text = "Details"
24+
android:text = "@+string/about_text"
2525
android:layout_width = "match_parent"
2626
android:layout_height = "wrap_content"
2727
android:layout_gravity="right"
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
package eu.pulsation.ephedra
2+
3+
import android.app.Fragment
4+
import android.os.Bundle
5+
import android.view.View
6+
import android.util.Log
7+
import android.widget.{TextView, Button}
8+
import android.webkit.WebView
9+
import android.text.Html
10+
import android.text.method.LinkMovementMethod
11+
import android.net.Uri
12+
13+
import android.content.Intent
14+
import android.view.{LayoutInflater, ViewGroup}
15+
16+
import scala.util.matching.Regex
17+
18+
class AboutFragment extends Fragment {
19+
20+
final private val TAG="eu.pulsation.ephedra.AboutFragment"
21+
22+
// Needed to be converted in a Runnable called by runOnUiThread()
23+
override def onCreateView(inflater: LayoutInflater, container: ViewGroup, savedInstanceState: Bundle):View = {
24+
inflater.inflate(R.layout.about, container, false)
25+
}
26+
27+
override def onCreate(savedInstanceState: Bundle) {
28+
super.onCreate(savedInstanceState)
29+
}
30+
}

src/eu/pulsation/ephedra/EphedraMainActivity.scala

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -97,20 +97,15 @@ class EphedraMainActivity extends Activity with Subscriber[RSSItemSelectedEvent,
9797
override def notify(pub: Publisher[RSSItemSelectedEvent], event: RSSItemSelectedEvent): Unit = {
9898

9999
val rssItem = event.rssItem
100-
101-
// Replace list fragment by details fragment
102-
val transaction: FragmentTransaction = this.getFragmentManager().beginTransaction()
103-
104100
val args = new Bundle()
101+
105102
args.putString("title", rssItem.title)
106103
args.putString("content", rssItem.content)
107104
args.putString("description", rssItem.description)
108105
args.putString("link", rssItem.link)
109106
alertDetailsFragment.setArguments(args)
110-
transaction.replace(R.id.fragment_container, alertDetailsFragment)
111-
transaction.addToBackStack(null)
112107

113-
transaction.commit()
108+
switchToFragment(alertDetailsFragment)
114109

115110
readRSSItems.add(rssItem)
116111
}

0 commit comments

Comments
 (0)