From 60484645823b82ed8a1db7764643e97320147141 Mon Sep 17 00:00:00 2001 From: SirionRazzer Date: Sun, 1 Dec 2019 10:12:06 +0100 Subject: [PATCH 1/2] Activity with text has new layout --- .idea/codeStyles/Project.xml | 3 + .../history/TrackItemsWithTextAdapter.kt | 6 +- .../res/layout/template_item_with_text.xml | 109 +++++++----------- 3 files changed, 47 insertions(+), 71 deletions(-) diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 88ea3aa..45b5654 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -1,5 +1,8 @@ + + diff --git a/app/src/main/java/com/sirionrazzer/diary/history/TrackItemsWithTextAdapter.kt b/app/src/main/java/com/sirionrazzer/diary/history/TrackItemsWithTextAdapter.kt index 4d9755f..7cc4dd2 100644 --- a/app/src/main/java/com/sirionrazzer/diary/history/TrackItemsWithTextAdapter.kt +++ b/app/src/main/java/com/sirionrazzer/diary/history/TrackItemsWithTextAdapter.kt @@ -6,7 +6,7 @@ import android.view.LayoutInflater import android.widget.TextView import android.view.ViewGroup import android.widget.ImageView -import android.widget.LinearLayout +import androidx.constraintlayout.widget.ConstraintLayout import com.sirionrazzer.diary.R import com.sirionrazzer.diary.models.TrackItem import com.squareup.picasso.Picasso @@ -17,7 +17,7 @@ class TrackItemsWithTextAdapter( private val clickListener: (String) -> Boolean ) : RecyclerView.Adapter() { - class ViewHolder(val templateItemLayout: LinearLayout) : + class ViewHolder(val templateItemLayout: ConstraintLayout) : RecyclerView.ViewHolder(templateItemLayout) { fun bind(trackItemName: String, clickListener: (String) -> Boolean) { templateItemLayout.setOnLongClickListener { clickListener(trackItemName) } @@ -33,7 +33,7 @@ class TrackItemsWithTextAdapter( ): TrackItemsWithTextAdapter.ViewHolder { val templateItemLayout = - inflater.inflate(R.layout.template_item_with_text, parent, false) as LinearLayout + inflater.inflate(R.layout.template_item_with_text, parent, false) as ConstraintLayout return TrackItemsWithTextAdapter.ViewHolder(templateItemLayout) } diff --git a/app/src/main/res/layout/template_item_with_text.xml b/app/src/main/res/layout/template_item_with_text.xml index 0fa89cd..28afbc2 100644 --- a/app/src/main/res/layout/template_item_with_text.xml +++ b/app/src/main/res/layout/template_item_with_text.xml @@ -1,72 +1,45 @@ - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - + android:layout_marginStart="8dp" + android:text="activity name" + android:textColor="@color/colorPrimary" + android:textSize="16sp" + android:textStyle="bold" + app:layout_constraintBottom_toBottomOf="@id/ivTrackItemImage" + app:layout_constraintStart_toEndOf="@id/ivTrackItemImage" + app:layout_constraintTop_toTopOf="@id/ivTrackItemImage" /> + + + + \ No newline at end of file From 262ba34ad29ba6202eaaa0822e5f2c047c4dc251 Mon Sep 17 00:00:00 2001 From: SirionRazzer Date: Sun, 1 Dec 2019 10:25:44 +0100 Subject: [PATCH 2/2] Sort days in descending order --- .../com/sirionrazzer/diary/history/HistoryActivity.kt | 8 ++------ .../java/com/sirionrazzer/diary/models/TrackItemDao.kt | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/sirionrazzer/diary/history/HistoryActivity.kt b/app/src/main/java/com/sirionrazzer/diary/history/HistoryActivity.kt index e9dd359..9f9269f 100644 --- a/app/src/main/java/com/sirionrazzer/diary/history/HistoryActivity.kt +++ b/app/src/main/java/com/sirionrazzer/diary/history/HistoryActivity.kt @@ -1,15 +1,13 @@ package com.sirionrazzer.diary.history import android.content.Intent -import android.net.Uri import android.os.Bundle import android.view.Menu import android.view.MenuItem -import android.widget.PopupMenu import android.widget.Toast import androidx.appcompat.app.AppCompatActivity import androidx.lifecycle.ViewModelProviders -import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.GridLayoutManager import com.google.firebase.auth.FirebaseAuth import com.google.firebase.storage.FirebaseStorage import com.sirionrazzer.diary.R @@ -18,12 +16,10 @@ import com.sirionrazzer.diary.main.MainActivity import com.sirionrazzer.diary.settings.SettingsActivity import com.sirionrazzer.diary.stats.ChooseTrackItemStatActivity import com.sirionrazzer.diary.util.DateUtils -import io.realm.Realm import kotlinx.android.synthetic.main.activity_history.* import kotlinx.android.synthetic.main.toolbar.* import org.jetbrains.anko.startActivity import org.threeten.bp.LocalDate -import java.io.File class HistoryActivity : AppCompatActivity() { @@ -39,7 +35,7 @@ class HistoryActivity : AppCompatActivity() { toolbar.setTitle(R.string.title_history_activity) setSupportActionBar(toolbar) - val viewManager = LinearLayoutManager(this) + val viewManager = GridLayoutManager(this, 1) viewAdapter = HistoryAdapter(this, historyViewModel) rvHistoryItems.adapter = viewAdapter diff --git a/app/src/main/java/com/sirionrazzer/diary/models/TrackItemDao.kt b/app/src/main/java/com/sirionrazzer/diary/models/TrackItemDao.kt index 713be5f..4aebdef 100644 --- a/app/src/main/java/com/sirionrazzer/diary/models/TrackItemDao.kt +++ b/app/src/main/java/com/sirionrazzer/diary/models/TrackItemDao.kt @@ -60,7 +60,7 @@ class TrackItemDao(val realm: Realm) { } fun getAllTrackItemsSortByDate(): List { - var items = realm.where(TrackItem::class.java).findAll().sort("date") + var items = realm.where(TrackItem::class.java).findAll().sort("date", Sort.DESCENDING) return items.map { item -> item as TrackItem } }