Merge branch 'dev'

oxen-io · May 26, 2020 · 4001714 · 4001714
2 parents 0db96d2 + 23cd5b9
commit 4001714
Show file tree

Hide file tree

Showing 245 changed files with 3,475 additions and 4,326 deletions.
diff --git a/.gitignore b/.gitignore
@@ -26,3 +26,4 @@ jni/libspeex/.deps/
 pkcs11.password
 fabric.properties
 play
+google-services.json
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -16,12 +16,6 @@
     <uses-feature
         android:name="android.hardware.bluetooth"
         android:required="false" />
-    <!--
- Loki - Enable again once we have location sharing
-    <uses-feature android:name="android.hardware.location" android:required="false"/>
-    <uses-feature android:name="android.hardware.location.network" android:required="false"/>
-    <uses-feature android:name="android.hardware.location.gps" android:required="false"/>
-    -->
     <uses-feature
         android:name="android.hardware.microphone"
         android:required="false" />
@@ -56,8 +50,6 @@
     <!-- For conversation 'shortcuts' on the desktop -->
     <uses-permission android:name="android.permission.INSTALL_SHORTCUT" />
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
-    <!-- Set image as wallpaper -->
-    <uses-permission android:name="android.permission.SET_WALLPAPER" />
 
     <uses-permission android:name="android.permission.BROADCAST_STICKY" />
     <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
@@ -96,62 +88,62 @@
 
         <!-- Session -->
         <activity
-            android:name="org.thoughtcrime.securesms.loki.redesign.activities.LandingActivity"
+            android:name="org.thoughtcrime.securesms.loki.activities.LandingActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name="org.thoughtcrime.securesms.loki.redesign.activities.RegisterActivity"
+            android:name="org.thoughtcrime.securesms.loki.activities.RegisterActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name="org.thoughtcrime.securesms.loki.redesign.activities.RestoreActivity"
+            android:name="org.thoughtcrime.securesms.loki.activities.RestoreActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustResize" />
         <activity
-            android:name="org.thoughtcrime.securesms.loki.redesign.activities.LinkDeviceActivity"
+            android:name="org.thoughtcrime.securesms.loki.activities.LinkDeviceActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustResize" />
         <activity
-            android:name="org.thoughtcrime.securesms.loki.redesign.activities.DisplayNameActivity"
+            android:name="org.thoughtcrime.securesms.loki.activities.DisplayNameActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustResize" />
         <activity
-            android:name="org.thoughtcrime.securesms.loki.redesign.activities.PNModeActivity"
+            android:name="org.thoughtcrime.securesms.loki.activities.PNModeActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name="org.thoughtcrime.securesms.loki.redesign.activities.HomeActivity"
+            android:name="org.thoughtcrime.securesms.loki.activities.HomeActivity"
             android:screenOrientation="portrait"
             android:launchMode="singleTask"
             android:theme="@style/Session.DarkTheme.NoActionBar" />
         <activity
-            android:name="org.thoughtcrime.securesms.loki.redesign.activities.SettingsActivity"
+            android:name="org.thoughtcrime.securesms.loki.activities.SettingsActivity"
             android:screenOrientation="portrait"
             android:theme="@style/Session.DarkTheme.NoActionBar" />
         <activity
-            android:name="org.thoughtcrime.securesms.loki.redesign.activities.QRCodeActivity"
+            android:name="org.thoughtcrime.securesms.loki.activities.QRCodeActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name="org.thoughtcrime.securesms.loki.redesign.activities.CreatePrivateChatActivity"
+            android:name="org.thoughtcrime.securesms.loki.activities.CreatePrivateChatActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name="org.thoughtcrime.securesms.loki.redesign.activities.CreateClosedGroupActivity"
+            android:name="org.thoughtcrime.securesms.loki.activities.CreateClosedGroupActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name="org.thoughtcrime.securesms.loki.redesign.activities.JoinPublicChatActivity"
+            android:name="org.thoughtcrime.securesms.loki.activities.JoinPublicChatActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustResize" />
         <activity
-            android:name="org.thoughtcrime.securesms.loki.redesign.activities.SeedActivity"
+            android:name="org.thoughtcrime.securesms.loki.activities.SeedActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name="org.thoughtcrime.securesms.loki.redesign.activities.PrivacySettingsActivity"
+            android:name="org.thoughtcrime.securesms.loki.activities.PrivacySettingsActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name="org.thoughtcrime.securesms.loki.redesign.activities.NotificationSettingsActivity"
+            android:name="org.thoughtcrime.securesms.loki.activities.NotificationSettingsActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name="org.thoughtcrime.securesms.loki.redesign.activities.ChatSettingsActivity"
+            android:name="org.thoughtcrime.securesms.loki.activities.ChatSettingsActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name="org.thoughtcrime.securesms.loki.redesign.activities.LinkedDevicesActivity"
+            android:name="org.thoughtcrime.securesms.loki.activities.LinkedDevicesActivity"
             android:screenOrientation="portrait" />
         <!-- Session -->
         <activity
@@ -166,7 +158,7 @@
         <activity
             android:name="org.thoughtcrime.securesms.InviteActivity"
             android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-            android:parentActivityName="org.thoughtcrime.securesms.loki.redesign.activities.HomeActivity"
+            android:parentActivityName="org.thoughtcrime.securesms.loki.activities.HomeActivity"
             android:theme="@style/TextSecure.HighlightTheme"
             android:windowSoftInputMode="stateHidden">
             <meta-data
@@ -225,7 +217,7 @@
         <activity-alias
             android:name=".RoutingActivity"
             android:exported="true"
-            android:targetActivity="org.thoughtcrime.securesms.loki.redesign.activities.HomeActivity">
+            android:targetActivity="org.thoughtcrime.securesms.loki.activities.HomeActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -264,7 +256,7 @@
             android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
             android:label="@string/AndroidManifest_archived_conversations"
             android:launchMode="singleTask"
-            android:parentActivityName="org.thoughtcrime.securesms.loki.redesign.activities.HomeActivity">
+            android:parentActivityName="org.thoughtcrime.securesms.loki.activities.HomeActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="PsiClass:HomeActivity" />
@@ -275,7 +267,7 @@
             android:launchMode="singleTask"
             android:screenOrientation="portrait"
             android:theme="@style/Session.DarkTheme.NoActionBar"
-            android:parentActivityName="org.thoughtcrime.securesms.loki.redesign.activities.HomeActivity"
+            android:parentActivityName="org.thoughtcrime.securesms.loki.activities.HomeActivity"
             android:windowSoftInputMode="stateUnchanged">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
@@ -514,7 +506,7 @@
             android:exported="true"
             android:theme="@style/TextSecure.LightNoActionBar" />
         <service
-            android:name="org.thoughtcrime.securesms.service.PushNotificationService"
+            android:name="org.thoughtcrime.securesms.loki.api.PushNotificationService"
             android:enabled="true"
             android:exported="true">
             <intent-filter>
@@ -673,12 +665,12 @@
             </intent-filter>
         </receiver>
         <!-- Session -->
-        <receiver android:name="org.thoughtcrime.securesms.loki.redesign.messaging.BackgroundPollWorker">
+        <receiver android:name="org.thoughtcrime.securesms.loki.api.BackgroundPollWorker">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
             </intent-filter>
         </receiver>
-        <receiver android:name="org.thoughtcrime.securesms.loki.redesign.messaging.BackgroundOpenGroupPollWorker">
+        <receiver android:name="org.thoughtcrime.securesms.loki.api.BackgroundOpenGroupPollWorker">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
             </intent-filter>

diff --git a/build.gradle b/build.gradle
@@ -190,8 +190,8 @@ dependencies {
     implementation "com.github.ybq:Android-SpinKit:1.4.0"
 }
 
-def canonicalVersionCode = 49
-def canonicalVersionName = "1.1.0"
+def canonicalVersionCode = 50
+def canonicalVersionName = "1.2.0"
 
 def postFixSize = 10
 def abiPostFix = ['armeabi-v7a' : 1,

diff --git a/res/layout-sw400dp/activity_landing.xml b/res/layout-sw400dp/activity_landing.xml
@@ -21,7 +21,7 @@
         android:textColor="@color/text"
         android:text="Your Session begins here..." />
 
-    <org.thoughtcrime.securesms.loki.redesign.views.FakeChatView
+    <org.thoughtcrime.securesms.loki.views.FakeChatView
         android:id="@+id/fakeChatView"
         android:layout_width="match_parent"
         android:layout_height="@dimen/fake_chat_view_height"

diff --git a/res/layout-sw400dp/activity_seed.xml b/res/layout-sw400dp/activity_seed.xml
@@ -7,7 +7,7 @@
     android:gravity="center_horizontal"
     android:orientation="vertical">
 
-    <org.thoughtcrime.securesms.loki.redesign.views.SeedReminderView
+    <org.thoughtcrime.securesms.loki.views.SeedReminderView
         android:id="@+id/seedReminderView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />

diff --git a/res/layout-sw400dp/fragment_enter_public_key.xml b/res/layout-sw400dp/fragment_enter_public_key.xml
@@ -30,7 +30,7 @@
         android:textAlignment="center"
         android:text="Users can share their Session ID by going into their account settings and tapping &quot;Share Session ID&quot;, or by sharing their QR code." />
 
-    <org.thoughtcrime.securesms.loki.redesign.views.LabeledSeparatorView
+    <org.thoughtcrime.securesms.loki.views.LabeledSeparatorView
         android:id="@+id/separatorView"
         android:layout_width="match_parent"
         android:layout_height="32dp"

diff --git a/res/layout-sw400dp/view_seed_reminder.xml b/res/layout-sw400dp/view_seed_reminder.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/cell_background"
+    android:orientation="vertical">
+
+    <ProgressBar
+        style="@android:style/Widget.ProgressBar.Horizontal"
+        android:id="@+id/progressBar"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/accent_line_thickness"
+        android:paddingLeft="-2dp"
+        android:paddingRight="-2dp"
+        android:progressTint="@color/accent"
+        android:progressBackgroundTint="@color/progress_bar_background"
+        android:progress="80" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:padding="@dimen/medium_spacing"
+        android:orientation="horizontal">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/titleTextView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="@color/text"
+                android:textSize="@dimen/small_font_size"
+                android:textStyle="bold"
+                android:text="You're almost finished! 80%" />
+
+            <TextView
+                android:id="@+id/subtitleTextView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="4dp"
+                android:textColor="@color/text"
+                android:textSize="@dimen/very_small_font_size"
+                android:alpha="0.6"
+                android:text="Secure your account by saving your recovery phrase" />
+
+        </LinearLayout>
+
+        <View
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:layout_marginLeft="4dp" />
+
+        <Button
+            style="@style/MediumProminentOutlineButton"
+            android:id="@+id/button"
+            android:layout_width="wrap_content"
+            android:layout_height="28dp"
+            android:layout_marginLeft="4dp"
+            android:textStyle="normal"
+            android:text="Continue" />
+
+    </LinearLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="@color/separator" />
+
+</LinearLayout>
diff --git a/...out-sw400dp/fragment_enter_session_id.xml → ...out-sw420dp/fragment_enter_session_id.xml b/...out-sw400dp/fragment_enter_session_id.xml → ...out-sw420dp/fragment_enter_session_id.xml
diff --git a/res/layout/activity_display_name.xml b/res/layout/activity_display_name.xml
@@ -25,7 +25,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/very_large_spacing"
-        android:layout_marginTop="6dp"
+        android:layout_marginTop="4dp"
         android:layout_marginRight="@dimen/very_large_spacing"
         android:textSize="@dimen/small_font_size"
         android:textColor="@color/text"
@@ -37,7 +37,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/very_large_spacing"
-        android:layout_marginTop="12dp"
+        android:layout_marginTop="10dp"
         android:layout_marginRight="@dimen/very_large_spacing"
         android:hint="Enter a display name" />
 

diff --git a/res/layout/activity_home.xml b/res/layout/activity_home.xml
@@ -21,11 +21,11 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
-            <org.thoughtcrime.securesms.loki.redesign.views.ProfilePictureView
+            <org.thoughtcrime.securesms.loki.views.ProfilePictureView
                 android:id="@+id/profileButton"
                 android:layout_width="@dimen/small_profile_picture_size"
                 android:layout_height="@dimen/small_profile_picture_size"
-                android:layout_marginLeft="10dp"
+                android:layout_marginLeft="9dp"
                 android:layout_alignParentLeft="true"
                 android:layout_centerVertical="true" />
 
@@ -44,7 +44,7 @@
 
     </android.support.v7.widget.Toolbar>
 
-    <org.thoughtcrime.securesms.loki.redesign.views.SeedReminderView
+    <org.thoughtcrime.securesms.loki.views.SeedReminderView
         android:id="@+id/seedReminderView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
@@ -66,13 +66,39 @@
             android:layout_height="match_parent"
             android:background="@drawable/home_activity_gradient" />
 
-        <org.thoughtcrime.securesms.loki.redesign.views.NewConversationButtonSetView
+        <org.thoughtcrime.securesms.loki.views.NewConversationButtonSetView
             android:id="@+id/newConversationButtonSet"
             android:layout_width="252dp"
             android:layout_height="212dp"
             android:layout_centerHorizontal="true"
             android:layout_alignParentBottom="true" />
 
+        <LinearLayout
+            android:id="@+id/emptyStateContainer"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingBottom="32dp"
+            android:gravity="center_horizontal"
+            android:orientation="vertical"
+            android:layout_centerInParent="true">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="@dimen/medium_font_size"
+                android:textColor="@color/text"
+                android:text="You don't have any contacts yet" />
+
+            <Button
+                style="@style/MediumProminentOutlineButton"
+                android:id="@+id/createNewPrivateChatButton"
+                android:layout_width="196dp"
+                android:layout_height="@dimen/medium_button_height"
+                android:layout_marginTop="@dimen/medium_spacing"
+                android:text="Start a Session" />
+
+        </LinearLayout>
+
     </RelativeLayout>
 
 </LinearLayout>
diff --git a/res/layout/activity_landing.xml b/res/layout/activity_landing.xml
@@ -21,7 +21,7 @@
         android:textColor="@color/text"
         android:text="Your Session begins here..." />
 
-    <org.thoughtcrime.securesms.loki.redesign.views.FakeChatView
+    <org.thoughtcrime.securesms.loki.views.FakeChatView
         android:id="@+id/fakeChatView"
         android:layout_width="match_parent"
         android:layout_height="@dimen/fake_chat_view_height"

diff --git a/res/layout/activity_linked_devices.xml b/res/layout/activity_linked_devices.xml
@@ -31,7 +31,7 @@
             android:layout_width="196dp"
             android:layout_height="@dimen/medium_button_height"
             android:layout_marginTop="@dimen/medium_spacing"
-            android:text="Link a Device" />
+            android:text="Link a Device (Beta)" />
 
     </LinearLayout>