Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
c12c20e65d
|
@ -87,8 +87,7 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:gravity="center_horizontal"
|
android:gravity="center_horizontal"
|
||||||
android:textColor="@color/foreground2"
|
android:textColor="@color/foreground2"/>
|
||||||
android:text="Date"/>
|
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/eventTime"
|
android:id="@+id/eventTime"
|
||||||
|
@ -97,7 +96,6 @@
|
||||||
android:layout_alignBaseline="@id/eventDate"
|
android:layout_alignBaseline="@id/eventDate"
|
||||||
android:layout_toRightOf="@id/eventDate"
|
android:layout_toRightOf="@id/eventDate"
|
||||||
android:layout_marginLeft="10dp"
|
android:layout_marginLeft="10dp"
|
||||||
android:text="TIme"
|
|
||||||
android:textColor="@color/foreground2" />
|
android:textColor="@color/foreground2" />
|
||||||
|
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
|
|
|
@ -30,7 +30,6 @@
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:textColor="@color/foreground1"
|
android:textColor="@color/foreground1"
|
||||||
android:textStyle="italic"
|
|
||||||
android:textSize="16sp"
|
android:textSize="16sp"
|
||||||
android:layout_marginLeft="7dip" >
|
android:layout_marginLeft="7dip" >
|
||||||
</TextView>
|
</TextView>
|
||||||
|
@ -40,10 +39,33 @@
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:textColor="@color/foreground1"
|
android:textColor="@color/foreground1"
|
||||||
android:textStyle="italic"
|
|
||||||
android:textSize="16sp"
|
android:textSize="16sp"
|
||||||
android:layout_marginLeft="7dip" />
|
android:layout_marginLeft="7dip" />
|
||||||
|
|
||||||
|
<RelativeLayout
|
||||||
|
android:id="@+id/notifDateAndTime"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content" >
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/notifDate"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:gravity="center_horizontal"
|
||||||
|
android:layout_marginLeft="7dp"
|
||||||
|
android:textColor="@color/foreground2"/>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/notifTime"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_alignBaseline="@id/notifDate"
|
||||||
|
android:layout_toRightOf="@id/notifDate"
|
||||||
|
android:layout_marginLeft="7dp"
|
||||||
|
android:textColor="@color/foreground2" />
|
||||||
|
|
||||||
|
</RelativeLayout>
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/summaryText"
|
android:id="@+id/summaryText"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
|
|
|
@ -28,6 +28,16 @@
|
||||||
android:key="ratePref"
|
android:key="ratePref"
|
||||||
android:summary="@string/marketTitle"
|
android:summary="@string/marketTitle"
|
||||||
android:title="@string/rateTitle_menu" />
|
android:title="@string/rateTitle_menu" />
|
||||||
|
<Preference
|
||||||
|
android:defaultValue=""
|
||||||
|
android:key="sharePref"
|
||||||
|
android:summary="@string/shareBodyMsg"
|
||||||
|
android:title="@string/shareTitle_menu" />
|
||||||
|
<Preference
|
||||||
|
android:defaultValue=""
|
||||||
|
android:key="blogPref"
|
||||||
|
android:summary="@string/blogURL"
|
||||||
|
android:title="@string/blogTitle" />
|
||||||
<Preference
|
<Preference
|
||||||
android:defaultValue=""
|
android:defaultValue=""
|
||||||
android:key="twitterPref"
|
android:key="twitterPref"
|
||||||
|
@ -48,16 +58,6 @@
|
||||||
android:key="mailingListPref"
|
android:key="mailingListPref"
|
||||||
android:summary="@string/mailingListURL"
|
android:summary="@string/mailingListURL"
|
||||||
android:title="@string/mailingListTitle" />
|
android:title="@string/mailingListTitle" />
|
||||||
<Preference
|
|
||||||
android:defaultValue=""
|
|
||||||
android:key="blogPref"
|
|
||||||
android:summary="@string/blogURL"
|
|
||||||
android:title="@string/blogTitle" />
|
|
||||||
<Preference
|
|
||||||
android:defaultValue=""
|
|
||||||
android:key="sharePref"
|
|
||||||
android:summary="@string/shareBodyMsg"
|
|
||||||
android:title="@string/shareTitle_menu" />
|
|
||||||
<Preference
|
<Preference
|
||||||
android:defaultValue=""
|
android:defaultValue=""
|
||||||
android:hint=""
|
android:hint=""
|
||||||
|
|
|
@ -45,6 +45,8 @@ public class NotificationItem extends MenuActivity {
|
||||||
String course;
|
String course;
|
||||||
String summary;
|
String summary;
|
||||||
String content;
|
String content;
|
||||||
|
String date;
|
||||||
|
String time;
|
||||||
|
|
||||||
private String fixLinks(String body) {
|
private String fixLinks(String body) {
|
||||||
String regex = "(https?|ftp|file)://[-a-zA-Z0-9+&@#/%?=~_|!:,.;]*[-a-zA-Z0-9+&@#/%=~_|]";
|
String regex = "(https?|ftp|file)://[-a-zA-Z0-9+&@#/%?=~_|!:,.;]*[-a-zA-Z0-9+&@#/%=~_|]";
|
||||||
|
@ -54,7 +56,7 @@ public class NotificationItem extends MenuActivity {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
TextView text, senderTextView, courseTextView, summaryTextView;
|
TextView text, senderTextView, courseTextView, summaryTextView, dateTextView, timeTextView;
|
||||||
ImageView image, imageSep, userPhotoView;
|
ImageView image, imageSep, userPhotoView;
|
||||||
ImageButton replyButton;
|
ImageButton replyButton;
|
||||||
WebView webview;
|
WebView webview;
|
||||||
|
@ -67,6 +69,8 @@ public class NotificationItem extends MenuActivity {
|
||||||
summaryTextView = (TextView)this.findViewById(R.id.summaryText);
|
summaryTextView = (TextView)this.findViewById(R.id.summaryText);
|
||||||
userPhotoView = (ImageView) this.findViewById(R.id.notifUserPhoto);
|
userPhotoView = (ImageView) this.findViewById(R.id.notifUserPhoto);
|
||||||
webview = (WebView)this.findViewById(R.id.contentWebView);
|
webview = (WebView)this.findViewById(R.id.contentWebView);
|
||||||
|
dateTextView = (TextView)this.findViewById(R.id.notifDate);
|
||||||
|
timeTextView = (TextView)this.findViewById(R.id.notifTime);
|
||||||
|
|
||||||
image = (ImageView)this.findViewById(R.id.moduleIcon);
|
image = (ImageView)this.findViewById(R.id.moduleIcon);
|
||||||
image.setBackgroundResource(R.drawable.notif);
|
image.setBackgroundResource(R.drawable.notif);
|
||||||
|
@ -85,10 +89,14 @@ public class NotificationItem extends MenuActivity {
|
||||||
course = this.getIntent().getStringExtra("course");
|
course = this.getIntent().getStringExtra("course");
|
||||||
summary = this.getIntent().getStringExtra("summary");
|
summary = this.getIntent().getStringExtra("summary");
|
||||||
content = this.getIntent().getStringExtra("content");
|
content = this.getIntent().getStringExtra("content");
|
||||||
|
date = this.getIntent().getStringExtra("date");
|
||||||
|
time = this.getIntent().getStringExtra("time");
|
||||||
|
|
||||||
senderTextView.setText(sender);
|
senderTextView.setText(sender);
|
||||||
courseTextView.setText(course);
|
courseTextView.setText(course);
|
||||||
summaryTextView.setText(summary);
|
summaryTextView.setText(summary);
|
||||||
|
dateTextView.setText(date);
|
||||||
|
timeTextView.setText(time);
|
||||||
|
|
||||||
//If the user photo exists and is public, download and show it
|
//If the user photo exists and is public, download and show it
|
||||||
if(userPhoto != null)
|
if(userPhoto != null)
|
||||||
|
|
|
@ -151,6 +151,8 @@ public class Notifications extends Module {
|
||||||
TextView course = (TextView) v.findViewById(R.id.eventLocation);
|
TextView course = (TextView) v.findViewById(R.id.eventLocation);
|
||||||
TextView summary = (TextView) v.findViewById(R.id.eventSummary);
|
TextView summary = (TextView) v.findViewById(R.id.eventSummary);
|
||||||
TextView content = (TextView) v.findViewById(R.id.eventText);
|
TextView content = (TextView) v.findViewById(R.id.eventText);
|
||||||
|
TextView date = (TextView) v.findViewById(R.id.eventDate);
|
||||||
|
TextView time = (TextView) v.findViewById(R.id.eventTime);
|
||||||
|
|
||||||
Intent activity = new Intent(getApplicationContext(), NotificationItem.class);
|
Intent activity = new Intent(getApplicationContext(), NotificationItem.class);
|
||||||
activity.putExtra("notificationCode", code.getText().toString());
|
activity.putExtra("notificationCode", code.getText().toString());
|
||||||
|
@ -159,6 +161,8 @@ public class Notifications extends Module {
|
||||||
activity.putExtra("course", course.getText().toString());
|
activity.putExtra("course", course.getText().toString());
|
||||||
activity.putExtra("summary", summary.getText().toString());
|
activity.putExtra("summary", summary.getText().toString());
|
||||||
activity.putExtra("content", content.getText().toString());
|
activity.putExtra("content", content.getText().toString());
|
||||||
|
activity.putExtra("date", date.getText().toString());
|
||||||
|
activity.putExtra("time", time.getText().toString());
|
||||||
startActivity(activity);
|
startActivity(activity);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue
Block a user