TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-23 18:15:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #145 from loki-project/ui

Browse Source 
Various UI Improvements
This commit is contained in:
gmbnt 2020-03-17 11:58:12 +11:00 committed by GitHub
commit 23b5b9526c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
res/layout/activity_home.xml
View File

@ -56,7 +56,9 @@
<android.support.v7.widget.RecyclerView <android.support.v7.widget.RecyclerView
android:id="@+id/recyclerView" android:id="@+id/recyclerView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" /> android:layout_height="match_parent"
android:paddingBottom="172dp"
android:clipToPadding="false" />
<View <View
android:id="@+id/gradientView" android:id="@+id/gradientView"

2
res/layout/conversation_activity.xml
View File

@ -102,7 +102,7 @@
android:progressBackgroundTint="@color/transparent" android:progressBackgroundTint="@color/transparent"
android:alpha="0" android:alpha="0"
android:indeterminate="false" android:indeterminate="false"
android:progress="80" /> android:progress="0" />
<org.thoughtcrime.securesms.loki.redesign.views.SessionRestoreBannerView <org.thoughtcrime.securesms.loki.redesign.views.SessionRestoreBannerView
android:id="@+id/sessionRestoreBannerView" android:id="@+id/sessionRestoreBannerView"

6
src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
View File

@ -2369,6 +2369,12 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
} catch (InvalidMessageException ex) { } catch (InvalidMessageException ex) {
Log.w(TAG, ex); Log.w(TAG, ex);
} }
if (messageStatus == null) {
messageStatus = "calculatingPoW";
updateSubtitleTextView();
updateMessageStatusProgressBar();
}
} }
private void sendMediaMessage(final boolean forceSms, final long expiresIn, final int subscriptionId, boolean initiating) private void sendMediaMessage(final boolean forceSms, final long expiresIn, final int subscriptionId, boolean initiating)

7
src/org/thoughtcrime/securesms/loki/redesign/utilities/ActivityUtilities.kt
View File

@ -21,9 +21,12 @@ fun AppCompatActivity.setUpActionBarSessionLogo() {
supportActionBar!!.setDisplayShowCustomEnabled(true) supportActionBar!!.setDisplayShowCustomEnabled(true)
} }
val AppCompatActivity.defaultSessionRequestCode: Int
get() = 42
fun AppCompatActivity.push(intent: Intent, isForResult: Boolean = false) { fun AppCompatActivity.push(intent: Intent, isForResult: Boolean = false) {
if (isForResult) { if (isForResult) {
startActivityForResult(intent, 42) startActivityForResult(intent, defaultSessionRequestCode)
} else { } else {
startActivity(intent) startActivity(intent)
} }
@ -32,7 +35,7 @@ fun AppCompatActivity.push(intent: Intent, isForResult: Boolean = false) {
fun AppCompatActivity.show(intent: Intent, isForResult: Boolean = false) { fun AppCompatActivity.show(intent: Intent, isForResult: Boolean = false) {
if (isForResult) { if (isForResult) {
startActivityForResult(intent, 42) startActivityForResult(intent, defaultSessionRequestCode)
} else { } else {
startActivity(intent) startActivity(intent)
} }