Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Tomáš Soukal committed Dec 1, 2019
2 parents 4871ac5 + 262ba34 commit 652550b
Show file tree
Hide file tree
Showing 5 changed files with 50 additions and 78 deletions.
3 changes: 3 additions & 0 deletions .idea/codeStyles/Project.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 2 additions & 6 deletions app/src/main/java/com/sirionrazzer/diary/history/HistoryActivity.kt
View file
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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() {

Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/com/sirionrazzer/diary/history/TrackItemsWithTextAdapter.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -17,7 +17,7 @@ class TrackItemsWithTextAdapter(
private val clickListener: (String) -> Boolean
) : RecyclerView.Adapter<TrackItemsWithTextAdapter.ViewHolder>() {

class ViewHolder(val templateItemLayout: LinearLayout) :
class ViewHolder(val templateItemLayout: ConstraintLayout) :
RecyclerView.ViewHolder(templateItemLayout) {
fun bind(trackItemName: String, clickListener: (String) -> Boolean) {
templateItemLayout.setOnLongClickListener { clickListener(trackItemName) }
Expand All @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/sirionrazzer/diary/models/TrackItemDao.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class TrackItemDao(val realm: Realm) {
}

fun getAllTrackItemsSortByDate(): List<TrackItem> {
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 }
}

Expand Down
109 changes: 41 additions & 68 deletions app/src/main/res/layout/template_item_with_text.xml
View file
Original file line number Diff line number Diff line change
@@ -1,72 +1,45 @@
<?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"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingTop="10dp">

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">

<ImageView
android:id="@+id/ivTrackItemImage"
android:layout_width="25dp"
android:layout_height="25dp"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:src="@drawable/ic_mail_outline_black_24dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<TextView
android:id="@+id/trackItemName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="4dp">

<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:padding="6dp">

<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="vertical">

<ImageView
android:id="@+id/ivTrackItemImage"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_centerHorizontal="true"
android:layout_marginEnd="15dp"
android:src="@drawable/ic_mail_outline_black_24dp" />

<TextView
android:id="@+id/trackItemName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/ivTrackItemImage"
android:layout_centerHorizontal="true"
android:text="item name"
android:textColor="@color/colorPrimary"
android:textSize="16sp"
android:textStyle="bold" />

</RelativeLayout>

<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:baselineAligned="true"
android:minHeight="50dp"
android:paddingStart="10dp">

<TextView
android:id="@+id/tvTrackItemText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:textSize="16sp" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:textSize="16sp" />
</RelativeLayout>

</LinearLayout>

</LinearLayout>

</LinearLayout>
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" />

<TextView
android:id="@+id/tvTrackItemText"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="16dp"
android:text="text of activity"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/trackItemName"
app:layout_constraintTop_toTopOf="@id/trackItemName" />

</androidx.constraintlayout.widget.ConstraintLayout>

0 comments on commit 652550b

Please sign in to comment.