diff --git a/.idea/misc.xml b/.idea/misc.xml index f797995..6f32454 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 9661ac7..c8397c9 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b5431ae..252ed8e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -6,9 +6,18 @@ android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" - android:roundIcon="@mipmap/ic_launcher_round" + android:roundIcon="@mipmap/ic_launcher" android:supportsRtl="true" android:theme="@style/AppTheme"> + + + { + override fun getPosts(context: Context): List { val postsDir = InternalStorage.getFileOrDir(context, "posts/facebook") - return postsDir?.listFiles()?.map { it.name }?.toList() ?: emptyList() + return postsDir?.listFiles()?.flatMap { + it.listFiles().map { + val dt = Date(it.lastModified()) + Post(this, it.readText(), DateFormat.getDateTimeInstance().format(dt)) + } + }?.toList() ?: emptyList() } } \ No newline at end of file diff --git a/app/src/main/java/pl/edu/amu/wmi/socialaggregator/socialplatforms/Post.kt b/app/src/main/java/pl/edu/amu/wmi/socialaggregator/socialplatforms/Post.kt new file mode 100644 index 0000000..99c7d36 --- /dev/null +++ b/app/src/main/java/pl/edu/amu/wmi/socialaggregator/socialplatforms/Post.kt @@ -0,0 +1,3 @@ +package pl.edu.amu.wmi.socialaggregator.socialplatforms + +data class Post(val social: SocialPlatform, val content: String, val dateTime: String) \ No newline at end of file diff --git a/app/src/main/java/pl/edu/amu/wmi/socialaggregator/socialplatforms/SocialPlatform.kt b/app/src/main/java/pl/edu/amu/wmi/socialaggregator/socialplatforms/SocialPlatform.kt index ce822f6..8ee7220 100644 --- a/app/src/main/java/pl/edu/amu/wmi/socialaggregator/socialplatforms/SocialPlatform.kt +++ b/app/src/main/java/pl/edu/amu/wmi/socialaggregator/socialplatforms/SocialPlatform.kt @@ -10,5 +10,6 @@ interface SocialPlatform { fun logout(context: Context) fun isLoggedIn(context: Context): Boolean fun addPost(context: Context, text: String, images: List) - fun getPosts(context: Context): List + fun getPosts(context: Context): List + fun getLogo(): Int } \ No newline at end of file diff --git a/app/src/main/java/pl/edu/amu/wmi/socialaggregator/viewholders/PostDetailsRecycler.kt b/app/src/main/java/pl/edu/amu/wmi/socialaggregator/viewholders/PostDetailsRecycler.kt new file mode 100644 index 0000000..527f77f --- /dev/null +++ b/app/src/main/java/pl/edu/amu/wmi/socialaggregator/viewholders/PostDetailsRecycler.kt @@ -0,0 +1,44 @@ +package pl.edu.amu.wmi.socialaggregator.viewholders + +import android.view.LayoutInflater +import android.view.ViewGroup +import android.widget.ImageView +import android.widget.TextView +import androidx.constraintlayout.widget.ConstraintLayout +import androidx.recyclerview.widget.RecyclerView +import pl.edu.amu.wmi.socialaggregator.R +import pl.edu.amu.wmi.socialaggregator.socialplatforms.Post + +class PostDetailsRecycler( + val posts: List) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder { + val layout = LayoutInflater.from(parent.context) + .inflate(R.layout.item_post, parent, false) as ConstraintLayout + + val dateTime = layout.findViewById(R.id.postDateTimeTextView) + val postContent = layout.findViewById(R.id.postContentTextView) + val imageView = layout.findViewById(R.id.postSocialImage) + + return ViewHolder(layout, dateTime, postContent, imageView) + } + + override fun getItemCount(): Int { + return posts.size + } + + override fun onBindViewHolder(holder: ViewHolder, position: Int) { + val post = posts[position] + holder.dateTime.text = post.dateTime + holder.postContent.text = post.content + + } + + class ViewHolder( + root: ConstraintLayout, + val dateTime: TextView, + val postContent: TextView, + val imageView: ImageView + ) : RecyclerView.ViewHolder(root) + +} \ No newline at end of file diff --git a/app/src/main/java/pl/edu/amu/wmi/socialaggregator/viewholders/PostTextRecycler.kt b/app/src/main/java/pl/edu/amu/wmi/socialaggregator/viewholders/PostSummaryRecycler.kt similarity index 69% rename from app/src/main/java/pl/edu/amu/wmi/socialaggregator/viewholders/PostTextRecycler.kt rename to app/src/main/java/pl/edu/amu/wmi/socialaggregator/viewholders/PostSummaryRecycler.kt index 8066cab..809aa75 100644 --- a/app/src/main/java/pl/edu/amu/wmi/socialaggregator/viewholders/PostTextRecycler.kt +++ b/app/src/main/java/pl/edu/amu/wmi/socialaggregator/viewholders/PostSummaryRecycler.kt @@ -6,22 +6,21 @@ import android.widget.ImageView import android.widget.TextView import androidx.constraintlayout.widget.ConstraintLayout import androidx.recyclerview.widget.RecyclerView -import com.jakewharton.rxbinding2.view.RxView -import io.reactivex.disposables.Disposable import pl.edu.amu.wmi.socialaggregator.R import pl.edu.amu.wmi.socialaggregator.socialplatforms.SocialPlatform -class PostTextRecycler( - val socials: List>) : RecyclerView.Adapter() { +class PostSummaryRecycler( + val socials: List>) : RecyclerView.Adapter() { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder { val layout = LayoutInflater.from(parent.context) .inflate(R.layout.previous_posts, parent, false) as ConstraintLayout val socialName = layout.findViewById(R.id.socialTextView) - val postCount = layout.findViewById(R.id.postCountTextView) + val postCount = layout.findViewById(R.id.post) + val imageView = layout.findViewById(R.id.postSocialImage) - return ViewHolder(layout, socialName, postCount) + return ViewHolder(layout, socialName, postCount, imageView) } override fun getItemCount(): Int { @@ -29,16 +28,17 @@ class PostTextRecycler( } override fun onBindViewHolder(holder: ViewHolder, position: Int) { - val pair = socials[position] - holder.socialName.text = pair.first.getName() - val count = pair.second + val (social, count) = socials[position] + holder.socialName.text = social.getName() holder.postCount.text = count.toString() + if (count > 1) " posts" else " post" + holder.imageView.setImageResource(social.getLogo()) } class ViewHolder( root: ConstraintLayout, val socialName: TextView, - val postCount: TextView + val postCount: TextView, + val imageView: ImageView ) : RecyclerView.ViewHolder(root) } \ No newline at end of file diff --git a/app/src/main/java/pl/edu/amu/wmi/socialaggregator/viewholders/SocialWithImageRecycler.kt b/app/src/main/java/pl/edu/amu/wmi/socialaggregator/viewholders/SocialWithImageRecycler.kt index e500063..ce26d2c 100644 --- a/app/src/main/java/pl/edu/amu/wmi/socialaggregator/viewholders/SocialWithImageRecycler.kt +++ b/app/src/main/java/pl/edu/amu/wmi/socialaggregator/viewholders/SocialWithImageRecycler.kt @@ -13,7 +13,7 @@ import pl.edu.amu.wmi.socialaggregator.socialplatforms.SocialPlatform class SocialWithImageRecycler( val availableSocials: List, - private val imageResource: Int, + private val imageResource: Int? = null, private val action: (SocialPlatform) -> Unit ) : RecyclerView.Adapter() { @@ -36,7 +36,7 @@ class SocialWithImageRecycler( override fun onBindViewHolder(holder: ViewHolder, position: Int) { val social = availableSocials[position] holder.text.text = social.getName() - holder.image.setImageResource(imageResource) + holder.image.setImageResource(imageResource ?: social.getLogo()) disposables[social] = RxView.clicks(holder.image) .map { social } diff --git a/app/src/main/res/drawable-hdpi/logo.png b/app/src/main/res/drawable-hdpi/logo.png new file mode 100644 index 0000000..3bf28ef Binary files /dev/null and b/app/src/main/res/drawable-hdpi/logo.png differ diff --git a/app/src/main/res/drawable-ldpi/logo.png b/app/src/main/res/drawable-ldpi/logo.png new file mode 100644 index 0000000..07ed07e Binary files /dev/null and b/app/src/main/res/drawable-ldpi/logo.png differ diff --git a/app/src/main/res/drawable-mdpi/logo.png b/app/src/main/res/drawable-mdpi/logo.png new file mode 100644 index 0000000..19e817a Binary files /dev/null and b/app/src/main/res/drawable-mdpi/logo.png differ diff --git a/app/src/main/res/drawable-xhdpi/logo.png b/app/src/main/res/drawable-xhdpi/logo.png new file mode 100644 index 0000000..ade87ff Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/logo.png differ diff --git a/app/src/main/res/drawable-xxhdpi/logo.png b/app/src/main/res/drawable-xxhdpi/logo.png new file mode 100644 index 0000000..526410a Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/logo.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/logo.png b/app/src/main/res/drawable-xxxhdpi/logo.png new file mode 100644 index 0000000..1c63b27 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/logo.png differ diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index e51cb25..315518b 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -14,7 +14,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - app:srcCompat="@mipmap/ic_launcher" /> + app:srcCompat="@drawable/logo" /> + app:srcCompat="@mipmap/ic_opaque_add" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_post_history.xml b/app/src/main/res/layout/activity_post_history.xml new file mode 100644 index 0000000..0e5c8c8 --- /dev/null +++ b/app/src/main/res/layout/activity_post_history.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/content_new_post.xml b/app/src/main/res/layout/content_new_post.xml index ba1e1a3..6a3170a 100644 --- a/app/src/main/res/layout/content_new_post.xml +++ b/app/src/main/res/layout/content_new_post.xml @@ -61,10 +61,11 @@ android:layout_marginEnd="8dp" android:layout_marginBottom="8dp" android:clickable="true" + android:tint="@android:color/background_light" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@+id/availableSocials" - app:srcCompat="@drawable/ic_add_circle" /> + app:srcCompat="@mipmap/ic_opaque_send" /> \ No newline at end of file diff --git a/app/src/main/res/layout/content_post_history.xml b/app/src/main/res/layout/content_post_history.xml new file mode 100644 index 0000000..0ad2000 --- /dev/null +++ b/app/src/main/res/layout/content_post_history.xml @@ -0,0 +1,23 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_post.xml b/app/src/main/res/layout/item_post.xml new file mode 100644 index 0000000..607f4a1 --- /dev/null +++ b/app/src/main/res/layout/item_post.xml @@ -0,0 +1,45 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/previous_posts.xml b/app/src/main/res/layout/previous_posts.xml index 80ab62d..7e074f9 100644 --- a/app/src/main/res/layout/previous_posts.xml +++ b/app/src/main/res/layout/previous_posts.xml @@ -13,32 +13,32 @@ android:layout_marginEnd="8dp" android:text="Bla bla bla" android:textColor="@android:color/primary_text_light" - app:layout_constraintBottom_toTopOf="@+id/postCountTextView" - app:layout_constraintEnd_toStartOf="@+id/imageView3" + app:layout_constraintBottom_toTopOf="@+id/post" + app:layout_constraintEnd_toStartOf="@+id/postSocialImage" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="@+id/imageView3" + app:layout_constraintTop_toTopOf="@+id/postSocialImage" app:layout_constraintVertical_chainStyle="packed" /> + app:srcCompat="@mipmap/ic_logo_facebook" /> \ No newline at end of file diff --git a/app/src/main/res/layout/social_platform_image.xml b/app/src/main/res/layout/social_platform_image.xml index f408ece..58b83a1 100644 --- a/app/src/main/res/layout/social_platform_image.xml +++ b/app/src/main/res/layout/social_platform_image.xml @@ -9,23 +9,23 @@ android:id="@+id/socialPlatformName" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="8dp" android:layout_marginEnd="8dp" + app:layout_constraintBottom_toBottomOf="@+id/socialPlatformImage" app:layout_constraintEnd_toStartOf="@+id/socialPlatformImage" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" + app:layout_constraintTop_toTopOf="@+id/socialPlatformImage" tools:text="Some Sample Text" /> \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index a26f6fb..0000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index a26f6fb..0000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png index 898f3ed..59e2e7f 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png deleted file mode 100644 index dffca36..0000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_logo_facebook.png b/app/src/main/res/mipmap-hdpi/ic_logo_facebook.png new file mode 100644 index 0000000..b619e89 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_logo_facebook.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_opaque_add.png b/app/src/main/res/mipmap-hdpi/ic_opaque_add.png new file mode 100644 index 0000000..6ccfad3 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_opaque_add.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_opaque_remove.png b/app/src/main/res/mipmap-hdpi/ic_opaque_remove.png new file mode 100644 index 0000000..ee4fac3 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_opaque_remove.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_opaque_send.png b/app/src/main/res/mipmap-hdpi/ic_opaque_send.png new file mode 100644 index 0000000..9bee16a Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_opaque_send.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png index 64ba76f..0def6f2 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index dae5e08..0000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_logo_facebook.png b/app/src/main/res/mipmap-mdpi/ic_logo_facebook.png new file mode 100644 index 0000000..787f46a Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_logo_facebook.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_opaque_add.png b/app/src/main/res/mipmap-mdpi/ic_opaque_add.png new file mode 100644 index 0000000..079b90f Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_opaque_add.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_opaque_remove.png b/app/src/main/res/mipmap-mdpi/ic_opaque_remove.png new file mode 100644 index 0000000..642a065 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_opaque_remove.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_opaque_send.png b/app/src/main/res/mipmap-mdpi/ic_opaque_send.png new file mode 100644 index 0000000..decbeef Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_opaque_send.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png index e5ed465..3f77731 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png deleted file mode 100644 index 14ed0af..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_logo_facebook.png b/app/src/main/res/mipmap-xhdpi/ic_logo_facebook.png new file mode 100644 index 0000000..e9e43b8 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_logo_facebook.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_opaque_add.png b/app/src/main/res/mipmap-xhdpi/ic_opaque_add.png new file mode 100644 index 0000000..bb4f8b6 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_opaque_add.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_opaque_remove.png b/app/src/main/res/mipmap-xhdpi/ic_opaque_remove.png new file mode 100644 index 0000000..3c1ff04 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_opaque_remove.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_opaque_send.png b/app/src/main/res/mipmap-xhdpi/ic_opaque_send.png new file mode 100644 index 0000000..f73a421 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_opaque_send.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index b0907ca..581d652 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png deleted file mode 100644 index d8ae031..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_logo_facebook.png b/app/src/main/res/mipmap-xxhdpi/ic_logo_facebook.png new file mode 100644 index 0000000..356491c Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_logo_facebook.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_opaque_add.png b/app/src/main/res/mipmap-xxhdpi/ic_opaque_add.png new file mode 100644 index 0000000..039a443 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_opaque_add.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_opaque_remove.png b/app/src/main/res/mipmap-xxhdpi/ic_opaque_remove.png new file mode 100644 index 0000000..d87a2d8 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_opaque_remove.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_opaque_send.png b/app/src/main/res/mipmap-xxhdpi/ic_opaque_send.png new file mode 100644 index 0000000..a3c7725 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_opaque_send.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index 2c18de9..779e8dd 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png deleted file mode 100644 index beed3cd..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_logo_facebook.png b/app/src/main/res/mipmap-xxxhdpi/ic_logo_facebook.png new file mode 100644 index 0000000..c378b62 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_logo_facebook.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_opaque_add.png b/app/src/main/res/mipmap-xxxhdpi/ic_opaque_add.png new file mode 100644 index 0000000..3f69a45 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_opaque_add.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_opaque_remove.png b/app/src/main/res/mipmap-xxxhdpi/ic_opaque_remove.png new file mode 100644 index 0000000..6cb0df9 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_opaque_remove.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_opaque_send.png b/app/src/main/res/mipmap-xxxhdpi/ic_opaque_send.png new file mode 100644 index 0000000..a600c5e Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_opaque_send.png differ diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 38f796d..d45d709 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,6 +1,6 @@ - #4267b2 - #4267b2 - #4267b2 + #845EC2 + #4E8397 + #D5CABD diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 59a0b0c..93eb459 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -1,3 +1,4 @@ 16dp + 32dp diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 59b4457..87d053a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2,4 +2,5 @@ Social Aggregator NewPostActivity AddSocialActivity + PostHistoryActivity