diff --git a/app/src/main/java/sushi/hardcore/aira/MainActivity.kt b/app/src/main/java/sushi/hardcore/aira/MainActivity.kt index 6cca1c8..7cde35b 100644 --- a/app/src/main/java/sushi/hardcore/aira/MainActivity.kt +++ b/app/src/main/java/sushi/hardcore/aira/MainActivity.kt @@ -77,12 +77,11 @@ class MainActivity : ServiceBoundActivity() { super.onCreate(savedInstanceState) binding = ActivityMainBinding.inflate(layoutInflater) setContentView(binding.root) + setSupportActionBar(binding.toolbar.toolbar) val identityName = intent.getStringExtra("identityName") identityName?.let { - setSupportActionBar(binding.toolbar.toolbar) - binding.toolbar.textAvatar.setLetterFrom(it) - binding.toolbar.title.text = it + initToolbar(it) } val openedToShareFile = intent.action == Intent.ACTION_SEND || intent.action == Intent.ACTION_SEND_MULTIPLE @@ -140,7 +139,7 @@ class MainActivity : ServiceBoundActivity() { airaService.isAppInBackground = false refreshSessions() if (AIRAService.isServiceRunning) { - title = airaService.identityName + airaService.identityName?.let { initToolbar(it) } } else { airaService.identityName = identityName startService(serviceIntent) @@ -253,6 +252,11 @@ class MainActivity : ServiceBoundActivity() { } } + private fun initToolbar(identityName: String) { + binding.toolbar.textAvatar.setLetterFrom(identityName) + binding.toolbar.title.text = identityName + } + private fun refreshSessions() { onlineSessionAdapter.reset() offlineSessionAdapter?.reset() diff --git a/app/src/main/java/sushi/hardcore/aira/adapters/SessionAdapter.kt b/app/src/main/java/sushi/hardcore/aira/adapters/SessionAdapter.kt index 16e17d9..2039da0 100644 --- a/app/src/main/java/sushi/hardcore/aira/adapters/SessionAdapter.kt +++ b/app/src/main/java/sushi/hardcore/aira/adapters/SessionAdapter.kt @@ -5,14 +5,12 @@ import android.graphics.Color import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.BaseAdapter -import android.widget.ImageView -import android.widget.TextView +import android.widget.* import androidx.core.content.ContextCompat import sushi.hardcore.aira.R import sushi.hardcore.aira.widgets.TextAvatar -class SessionAdapter(val context: Context): BaseAdapter() { +class SessionAdapter(private val context: Context): BaseAdapter() { private val sessions = mutableListOf() private val inflater: LayoutInflater = LayoutInflater.from(context) val selectedItems = mutableListOf() @@ -52,11 +50,16 @@ class SessionAdapter(val context: Context): BaseAdapter() { setImageDrawable(null) } } - view.findViewById(R.id.image_seen).visibility = if (currentSession.seen) { + view.findViewById(R.id.marker_not_seen).visibility = if (currentSession.seen) { View.GONE } else { View.VISIBLE } + view.findViewById(R.id.image_arrow).setColorFilter(ContextCompat.getColor(context, if (currentSession.seen) { + R.color.sessionArrow + } else { + R.color.secondary + })) view.setBackgroundColor(ContextCompat.getColor(context, if (selectedItems.contains(position)) { R.color.itemSelected } else { diff --git a/app/src/main/res/drawable/ic_arrow_forward.xml b/app/src/main/res/drawable/ic_arrow_forward.xml new file mode 100644 index 0000000..301c7cd --- /dev/null +++ b/app/src/main/res/drawable/ic_arrow_forward.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/layout/adapter_session.xml b/app/src/main/res/layout/adapter_session.xml index 40e6d06..05f8487 100644 --- a/app/src/main/res/layout/adapter_session.xml +++ b/app/src/main/res/layout/adapter_session.xml @@ -1,45 +1,62 @@ + android:layout_height="match_parent"> - + app:layout_constraintStart_toStartOf="parent" + android:background="@color/secondary"/> - + - + - + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 482336b..98fe8ef 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -11,4 +11,5 @@ #ffffff #66666666 #00000000 + #777777 \ No newline at end of file