TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-02-21 11:18:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move ExpirationTimerView

Browse Source
This commit is contained in:
Niels Andriesse 2021-06-30 14:47:35 +10:00
parent e91b84f694
commit 24b5fca7f8
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemFooter.java
View File

@ -14,6 +14,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import org.thoughtcrime.securesms.ApplicationContext; import org.thoughtcrime.securesms.ApplicationContext;
import org.thoughtcrime.securesms.conversation.v2.components.ExpirationTimerView;
import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.DatabaseFactory;
import org.thoughtcrime.securesms.database.model.MessageRecord; import org.thoughtcrime.securesms.database.model.MessageRecord;
import org.thoughtcrime.securesms.service.ExpiringMessageManager; import org.thoughtcrime.securesms.service.ExpiringMessageManager;

3
app/src/main/java/org/thoughtcrime/securesms/components/ExpirationTimerView.java → app/src/main/java/org/thoughtcrime/securesms/conversation/v2/components/ExpirationTimerView.java
View File

@ -1,4 +1,4 @@
package org.thoughtcrime.securesms.components; package org.thoughtcrime.securesms.conversation.v2.components;
import android.content.Context; import android.content.Context;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
@ -118,5 +118,4 @@ public class ExpirationTimerView extends androidx.appcompat.widget.AppCompatImag
Util.runOnMainDelayed(this, timerView.calculateAnimationDelay(timerView.startedAt, timerView.expiresIn)); Util.runOnMainDelayed(this, timerView.calculateAnimationDelay(timerView.startedAt, timerView.expiresIn));
} }
} }
} }

2
app/src/main/res/layout/conversation_item_footer.xml
View File

@ -26,7 +26,7 @@
android:textAllCaps="true" android:textAllCaps="true"
tools:text="30 mins"/> tools:text="30 mins"/>
<org.thoughtcrime.securesms.components.ExpirationTimerView <org.thoughtcrime.securesms.conversation.v2.components.ExpirationTimerView
android:id="@+id/footer_expiration_timer" android:id="@+id/footer_expiration_timer"
android:layout_gravity="center_vertical|end" android:layout_gravity="center_vertical|end"
android:layout_marginStart="6dp" android:layout_marginStart="6dp"