From 3c5876f6bcb5f2c1aa57306c145e698bd2e797c5 Mon Sep 17 00:00:00 2001
From: akaessens <24660231+akaessens@users.noreply.github.com>
Date: Sun, 20 Sep 2020 23:03:43 +0200
Subject: [PATCH] update card design
---
.../akdev/nofbeventscraper/EventAdapter.java | 13 +-
.../akdev/nofbeventscraper/MainActivity.java | 23 +---
app/src/main/res/layout/activity_main.xml | 111 +--------------
app/src/main/res/layout/content_main.xml | 78 +++++------
app/src/main/res/layout/item_event.xml | 126 ++++++++++--------
5 files changed, 126 insertions(+), 225 deletions(-)
diff --git a/app/src/main/java/com/akdev/nofbeventscraper/EventAdapter.java b/app/src/main/java/com/akdev/nofbeventscraper/EventAdapter.java
index f5db101..7429e21 100644
--- a/app/src/main/java/com/akdev/nofbeventscraper/EventAdapter.java
+++ b/app/src/main/java/com/akdev/nofbeventscraper/EventAdapter.java
@@ -100,10 +100,15 @@ public class EventAdapter extends
holder.edit_text_event_description.setText(event.description);
}
- Picasso.get()
- .load(event.image_url)
- .placeholder(R.drawable.ic_banner_foreground)
- .into(holder.image_view_event_image);
+ if (event.image_url == null) {
+ holder.image_view_event_image.setVisibility(View.GONE);
+ }
+ else {
+ Picasso.get()
+ .load(event.image_url).into(holder.image_view_event_image);
+ }
+ //.placeholder(R.drawable.ic_banner_foreground)*/
+
}
// Returns the total count of items in the list
diff --git a/app/src/main/java/com/akdev/nofbeventscraper/MainActivity.java b/app/src/main/java/com/akdev/nofbeventscraper/MainActivity.java
index 8c0ad96..a399f63 100644
--- a/app/src/main/java/com/akdev/nofbeventscraper/MainActivity.java
+++ b/app/src/main/java/com/akdev/nofbeventscraper/MainActivity.java
@@ -6,40 +6,30 @@ import android.content.Context;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
-import android.provider.CalendarContract;
import android.view.KeyEvent;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.widget.Button;
-import android.widget.ImageView;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.view.menu.MenuBuilder;
import androidx.appcompat.widget.Toolbar;
import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.LinearSnapHelper;
import androidx.recyclerview.widget.RecyclerView;
-import androidx.recyclerview.widget.SnapHelper;
-import com.google.android.material.appbar.AppBarLayout;
-import com.google.android.material.appbar.CollapsingToolbarLayout;
import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton;
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
import com.google.android.material.textfield.TextInputEditText;
import com.google.android.material.textfield.TextInputLayout;
-import com.squareup.picasso.Picasso;
import java.lang.ref.WeakReference;
import java.util.List;
import java.util.Objects;
import static com.akdev.nofbeventscraper.FbEvent.createEventList;
-import static com.akdev.nofbeventscraper.FbEvent.dateTimeToEpoch;
public class MainActivity extends AppCompatActivity {
- protected Button ok_button;
protected ExtendedFloatingActionButton paste_button;
protected TextInputEditText edit_text_uri_input;
@@ -81,9 +71,9 @@ public class MainActivity extends AppCompatActivity {
Toolbar toolbar = findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
- ok_button = (Button) findViewById(R.id.ok_button);
+ //ok_button = (Button) findViewById(R.id.ok_button);
paste_button = (ExtendedFloatingActionButton) findViewById(R.id.paste_button);
- ok_button.setEnabled(false);
+ //ok_button.setEnabled(false);
/*
* initialize recycler view with empty list of events
@@ -109,8 +99,7 @@ public class MainActivity extends AppCompatActivity {
try {
ClipboardManager clipboard = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
- String str = Objects.requireNonNull(clipboard.getPrimaryClip())
- .getItemAt(0).getText().toString();
+ String str = clipboard.getPrimaryClip().getItemAt(0).getText().toString();
clear(true);
edit_text_uri_input.setText(str);
@@ -139,7 +128,7 @@ public class MainActivity extends AppCompatActivity {
/*
* Add to calendar button: launch calendar application with current event
*/
- ok_button.setOnClickListener(new View.OnClickListener() {
+ /*ok_button.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
@@ -241,7 +230,7 @@ public class MainActivity extends AppCompatActivity {
this.events.clear();
adapter.notifyDataSetChanged();
- ok_button.setEnabled(false);
+ //ok_button.setEnabled(false);
}
/**
@@ -262,7 +251,7 @@ public class MainActivity extends AppCompatActivity {
.placeholder(R.drawable.ic_banner_foreground)
.into(image_view_toolbar);*/
- ok_button.setEnabled(true);
+ //ok_button.setEnabled(true);
}
@SuppressLint("RestrictedApi")
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index cb9b6df..b5e2013 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -8,21 +8,6 @@
android:fitsSystemWindows="true"
tools:context=".MainActivity">
-
-
-
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
index 0d689cf..02eaa7f 100644
--- a/app/src/main/res/layout/content_main.xml
+++ b/app/src/main/res/layout/content_main.xml
@@ -3,52 +3,54 @@
-
-
+ app:layout_behavior="@string/appbar_scrolling_view_behavior"
+ tools:context=".MainActivity"
+ tools:showIn="@layout/activity_main">
-
- android:layout_marginStart="16dp"
- android:layout_marginTop="32dp"
- android:layout_marginEnd="16dp"
-
-
- app:endIconCheckable="false"
- app:endIconDrawable="@drawable/ic_backspace_black"
- app:endIconMode="custom"
- app:errorIconDrawable="@drawable/ic_backspace_black"
- app:helperText="@string/helper_add_link"
- app:helperTextEnabled="true">
-
-
-
+
+ android:layout_marginStart="16dp"
+ android:layout_marginTop="32dp"
+ android:layout_marginEnd="16dp"
+ android:layout_marginBottom="16dp"
-
+ app:endIconCheckable="false"
+ app:endIconDrawable="@drawable/ic_backspace_black"
+ app:endIconMode="custom"
+ app:errorIconDrawable="@drawable/ic_backspace_black"
+ app:helperText="@string/helper_add_link"
+ app:helperTextEnabled="true">
-
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_event.xml b/app/src/main/res/layout/item_event.xml
index a8502ec..0139988 100644
--- a/app/src/main/res/layout/item_event.xml
+++ b/app/src/main/res/layout/item_event.xml
@@ -1,97 +1,111 @@
-
-
+ android:layout_height="match_parent"
+ android:layout_margin="16dp">
-
-
-
+ android:gravity="center_vertical"
+ android:orientation="horizontal">
-
-
+
+
+ android:orientation="vertical">
+
+
+
+
+
+
+
+
+
+
+
+ android:text="@string/hint_event_start"
+ android:textAppearance="?attr/textAppearanceBody2" />
+
-
+ android:text="@string/hint_event_end"
+ android:textAppearance="?attr/textAppearanceBody2" />
+
+ android:textColor="?android:attr/textColorSecondary" />
-
-
+
+
+
-
+ android:gravity="end"
+ android:maxWidth="10dp"
+ android:src="@drawable/ic_add_location"
+ android:tint="@color/material_on_surface_emphasis_high_type" />
+