TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-25 01:07:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into audio-view-design-update

Browse Source
This commit is contained in:
Anton Chekulaev 2020-10-26 17:53:39 +11:00
commit 82c5df48e7
4 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@ -182,8 +182,8 @@ dependencies {
testImplementation 'org.robolectric:shadows-multidex:4.2' testImplementation 'org.robolectric:shadows-multidex:4.2'
} }
def canonicalVersionCode = 110 def canonicalVersionCode = 111
def canonicalVersionName = "1.6.1" def canonicalVersionName = "1.6.2"
def postFixSize = 10 def postFixSize = 10
def abiPostFix = ['armeabi-v7a' : 1, def abiPostFix = ['armeabi-v7a' : 1,

9
res/layout-sw400dp/activity_restore.xml
View File

@ -34,12 +34,15 @@
style="@style/SessionEditText" style="@style/SessionEditText"
android:id="@+id/mnemonicEditText" android:id="@+id/mnemonicEditText"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="80dp"
android:paddingTop="28dp"
android:paddingBottom="28dp"
android:layout_marginLeft="@dimen/very_large_spacing" android:layout_marginLeft="@dimen/very_large_spacing"
android:layout_marginTop="12dp" android:layout_marginTop="12dp"
android:layout_marginRight="@dimen/very_large_spacing" android:layout_marginRight="@dimen/very_large_spacing"
android:paddingTop="0dp"
android:paddingBottom="0dp"
android:gravity="center_vertical"
android:inputType="textMultiLine"
android:maxLines="2"
android:hint="@string/activity_restore_seed_edit_text_hint" /> android:hint="@string/activity_restore_seed_edit_text_hint" />
<View <View

7
res/layout/activity_restore.xml
View File

@ -34,10 +34,15 @@
style="@style/SmallSessionEditText" style="@style/SmallSessionEditText"
android:id="@+id/mnemonicEditText" android:id="@+id/mnemonicEditText"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="80dp"
android:layout_marginLeft="@dimen/very_large_spacing" android:layout_marginLeft="@dimen/very_large_spacing"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:layout_marginRight="@dimen/very_large_spacing" android:layout_marginRight="@dimen/very_large_spacing"
android:paddingTop="0dp"
android:paddingBottom="0dp"
android:gravity="center_vertical"
android:inputType="textMultiLine"
android:maxLines="2"
android:hint="@string/activity_restore_seed_edit_text_hint" /> android:hint="@string/activity_restore_seed_edit_text_hint" />
<View <View

4
src/org/thoughtcrime/securesms/loki/views/FakeChatView.kt
View File

@ -18,8 +18,8 @@ class FakeChatView : ScrollView {
// region Settings // region Settings
private val spacing = context.resources.getDimension(R.dimen.medium_spacing) private val spacing = context.resources.getDimension(R.dimen.medium_spacing)
private val startDelay: Long = 2000 private val startDelay: Long = 1000
private val delayBetweenMessages: Long = 3000 private val delayBetweenMessages: Long = 1500
private val animationDuration: Long = 400 private val animationDuration: Long = 400
// endregion // endregion