pew
This commit is contained in:
parent
88bb4ddb8a
commit
4a98f6e031
5 changed files with 17 additions and 18 deletions
|
@ -137,7 +137,6 @@ public class EventEditActivity extends AppCompatActivity {
|
||||||
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
|
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
|
||||||
getSupportActionBar().setDisplayShowHomeEnabled(true);
|
getSupportActionBar().setDisplayShowHomeEnabled(true);
|
||||||
|
|
||||||
|
|
||||||
if (this.eventContainer.timestamp != 0)
|
if (this.eventContainer.timestamp != 0)
|
||||||
binding.eventEditContent.eventEditTimestamp.setText(Utils.formatTs(this.eventContainer.timestamp));
|
binding.eventEditContent.eventEditTimestamp.setText(Utils.formatTs(this.eventContainer.timestamp));
|
||||||
if (this.eventContainer.comment != null)
|
if (this.eventContainer.comment != null)
|
||||||
|
@ -250,7 +249,7 @@ public class EventEditActivity extends AppCompatActivity {
|
||||||
String[] tags = EventEditActivity.this.binding.eventEditContent.eventEditTags.getText().toString().split(",");
|
String[] tags = EventEditActivity.this.binding.eventEditContent.eventEditTags.getText().toString().split(",");
|
||||||
tags = Utils.orderedDeduplicateIgnoreCaseAndTrim(tags);
|
tags = Utils.orderedDeduplicateIgnoreCaseAndTrim(tags);
|
||||||
|
|
||||||
EventEditActivity.this.binding.eventEditContent.eventEditTags.setText(String.join(", ", tags));
|
EventEditActivity.this.binding.eventEditContent.eventEditTags.setText(String.join(", ", tags) + ", ");
|
||||||
EventEditActivity.this.binding.eventEditContent.eventEditTags.setSelection(EventEditActivity.this.binding.eventEditContent.eventEditTags.getText().length());
|
EventEditActivity.this.binding.eventEditContent.eventEditTags.setSelection(EventEditActivity.this.binding.eventEditContent.eventEditTags.getText().length());
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -116,8 +116,9 @@ public class EventListActivity extends AppCompatActivity {
|
||||||
|
|
||||||
/* FAB Listeners */
|
/* FAB Listeners */
|
||||||
binding.fab.setOnLongClickListener((View view) -> {
|
binding.fab.setOnLongClickListener((View view) -> {
|
||||||
Snackbar.make(view, "Create Event", Snackbar.LENGTH_LONG).setAnchorView(R.id.fab).setAction("Action",
|
Snackbar.make(view, "Create Event", Snackbar.LENGTH_LONG).setAnchorView(R.id.fab).setAction(
|
||||||
null
|
"Action",
|
||||||
|
null
|
||||||
).show();
|
).show();
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
|
|
@ -17,12 +17,12 @@
|
||||||
android:id="@+id/toolbar"
|
android:id="@+id/toolbar"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="?attr/actionBarSize"
|
android:layout_height="?attr/actionBarSize"
|
||||||
app:titleTextColor="@color/pegasko_white"
|
android:background="@color/pegasko_dark"
|
||||||
android:background="@color/pegasko_dark" />
|
app:titleTextColor="@color/pegasko_white" />
|
||||||
|
|
||||||
</com.google.android.material.appbar.AppBarLayout>
|
</com.google.android.material.appbar.AppBarLayout>
|
||||||
|
|
||||||
<include android:id="@+id/event_edit_content" layout="@layout/content_event_edit"/>
|
<include android:id="@+id/event_edit_content" layout="@layout/content_event_edit" />
|
||||||
|
|
||||||
<com.google.android.material.floatingactionbutton.FloatingActionButton
|
<com.google.android.material.floatingactionbutton.FloatingActionButton
|
||||||
android:id="@+id/fab"
|
android:id="@+id/fab"
|
||||||
|
|
|
@ -17,12 +17,12 @@
|
||||||
android:id="@+id/toolbar"
|
android:id="@+id/toolbar"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="?attr/actionBarSize"
|
android:layout_height="?attr/actionBarSize"
|
||||||
app:titleTextColor="@color/pegasko_white"
|
android:background="@color/pegasko_dark"
|
||||||
android:background="@color/pegasko_dark" />
|
app:titleTextColor="@color/pegasko_white" />
|
||||||
|
|
||||||
</com.google.android.material.appbar.AppBarLayout>
|
</com.google.android.material.appbar.AppBarLayout>
|
||||||
|
|
||||||
<include layout="@layout/content_event_list"/>
|
<include android:id="@+id/event_list_content" layout="@layout/content_event_list"/>
|
||||||
|
|
||||||
<com.google.android.material.floatingactionbutton.FloatingActionButton
|
<com.google.android.material.floatingactionbutton.FloatingActionButton
|
||||||
android:id="@+id/fab"
|
android:id="@+id/fab"
|
||||||
|
|
|
@ -1,21 +1,20 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<androidx.constraintlayout.widget.ConstraintLayout
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="wrap_content"
|
||||||
android:background="@color/pegasko_black"
|
android:background="@color/pegasko_black"
|
||||||
android:orientation="vertical">
|
app:layout_behavior="@string/appbar_scrolling_view_behavior" >
|
||||||
|
|
||||||
<ScrollView
|
<ScrollView
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent">
|
android:layout_height="match_parent">
|
||||||
|
|
||||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<LinearLayout
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="wrap_content"
|
||||||
android:background="@color/pegasko_black"
|
android:background="@color/pegasko_black"
|
||||||
android:orientation="vertical">
|
android:orientation="vertical">
|
||||||
|
|
||||||
|
@ -125,4 +124,4 @@
|
||||||
|
|
||||||
</ScrollView>
|
</ScrollView>
|
||||||
|
|
||||||
</LinearLayout>
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
Loading…
Reference in a new issue