gmbnt
6 years ago
committed by
GitHub
commit
2a7e07c34d
@ -0,0 +1,9 @@
|
|||||||
|
<vector android:height="24dp" android:viewportHeight="512"
|
||||||
|
android:viewportWidth="448" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<group
|
||||||
|
android:scaleX="0.88"
|
||||||
|
android:scaleY="0.88"
|
||||||
|
android:translateX="64">
|
||||||
|
<path android:fillColor="?attr/pref_icon_tint" android:pathData="M0,224h192L192,32L0,32v192zM64,96h64v64L64,160L64,96zM256,32v192h192L448,32L256,32zM384,160h-64L320,96h64v64zM0,480h192L192,288L0,288v192zM64,352h64v64L64,416v-64zM416,288h32v128h-96v-32h-32v96h-64L256,288h96v32h64v-32zM416,448h32v32h-32v-32zM352,448h32v32h-32v-32z"/>
|
||||||
|
</group>
|
||||||
|
</vector>
|
||||||
@ -0,0 +1,32 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<ScrollView
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent">
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="32dp"
|
||||||
|
android:layout_marginEnd="32dp"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:gravity="center_horizontal">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/explanationTextView"
|
||||||
|
style="@style/Signal.Text.Body"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="32dp"
|
||||||
|
android:text="@string/fragment_qr_code_explanation" />
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/qrCodeImageView"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="24dp"
|
||||||
|
android:background="@color/white" />
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
</ScrollView>
|
||||||
@ -0,0 +1,38 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<FrameLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||||
|
|
||||||
|
<org.thoughtcrime.securesms.components.camera.CameraView
|
||||||
|
android:id="@+id/cameraView"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
app:camera="0" />
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/overlayView"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:weightSum="2" >
|
||||||
|
|
||||||
|
<org.thoughtcrime.securesms.components.ShapeScrim
|
||||||
|
android:layout_weight="1"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"/>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:layout_weight="1"
|
||||||
|
android:padding="32dp"
|
||||||
|
android:gravity="center"
|
||||||
|
android:background="@color/loki_darkest_gray"
|
||||||
|
android:text="@string/fragment_scan_qr_code_explanation"
|
||||||
|
android:textColor="?android:textColorPrimary" />
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
</FrameLayout>
|
||||||
@ -0,0 +1,35 @@
|
|||||||
|
package org.thoughtcrime.securesms.loki
|
||||||
|
|
||||||
|
import android.os.Bundle
|
||||||
|
import android.support.v4.app.Fragment
|
||||||
|
import android.view.LayoutInflater
|
||||||
|
import android.view.View
|
||||||
|
import android.view.ViewGroup
|
||||||
|
import kotlinx.android.synthetic.main.fragment_new_conversation.*
|
||||||
|
import network.loki.messenger.R
|
||||||
|
|
||||||
|
class NewConversationFragment() : Fragment() {
|
||||||
|
|
||||||
|
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
|
||||||
|
return inflater.inflate(R.layout.fragment_new_conversation, container, false)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
||||||
|
super.onViewCreated(view, savedInstanceState)
|
||||||
|
qrCodeButton.setOnClickListener {
|
||||||
|
val activity = activity as NewConversationActivity
|
||||||
|
activity.scanQRCode()
|
||||||
|
}
|
||||||
|
nextButton.setOnClickListener {
|
||||||
|
val activity = activity as NewConversationActivity
|
||||||
|
val hexEncodedPublicKey = publicKeyEditText.text.toString().trim()
|
||||||
|
activity.startNewConversationIfPossible(hexEncodedPublicKey)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onResume() {
|
||||||
|
super.onResume()
|
||||||
|
val activity = activity as NewConversationActivity
|
||||||
|
activity.supportActionBar!!.setTitle(R.string.fragment_new_conversation_title)
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,32 @@
|
|||||||
|
package org.thoughtcrime.securesms.loki
|
||||||
|
|
||||||
|
import android.os.Bundle
|
||||||
|
import android.support.v4.app.Fragment
|
||||||
|
import android.view.LayoutInflater
|
||||||
|
import android.view.View
|
||||||
|
import android.view.ViewGroup
|
||||||
|
import kotlinx.android.synthetic.main.fragment_qr_code.*
|
||||||
|
import network.loki.messenger.R
|
||||||
|
import org.thoughtcrime.securesms.ApplicationPreferencesActivity
|
||||||
|
import org.thoughtcrime.securesms.qr.QrCode
|
||||||
|
import org.thoughtcrime.securesms.util.TextSecurePreferences
|
||||||
|
|
||||||
|
class QRCodeFragment : Fragment() {
|
||||||
|
|
||||||
|
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
|
||||||
|
return inflater.inflate(R.layout.fragment_qr_code, container, false)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
||||||
|
super.onViewCreated(view, savedInstanceState)
|
||||||
|
val hexEncodedPublicKey = TextSecurePreferences.getLocalNumber(context)
|
||||||
|
val qrCode = QrCode.create(hexEncodedPublicKey)
|
||||||
|
qrCodeImageView.setImageBitmap(qrCode)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onResume() {
|
||||||
|
super.onResume()
|
||||||
|
val activity = activity as ApplicationPreferencesActivity
|
||||||
|
activity.supportActionBar!!.setTitle(R.string.fragment_qr_code_title)
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,58 @@
|
|||||||
|
package org.thoughtcrime.securesms.loki
|
||||||
|
|
||||||
|
import android.content.res.Configuration
|
||||||
|
import android.os.Bundle
|
||||||
|
import android.support.v4.app.Fragment
|
||||||
|
import android.view.LayoutInflater
|
||||||
|
import android.view.View
|
||||||
|
import android.view.ViewGroup
|
||||||
|
import android.widget.LinearLayout
|
||||||
|
import kotlinx.android.synthetic.main.fragment_scan_qr_code.*
|
||||||
|
import network.loki.messenger.R
|
||||||
|
import org.thoughtcrime.securesms.qr.ScanListener
|
||||||
|
import org.thoughtcrime.securesms.qr.ScanningThread
|
||||||
|
|
||||||
|
class ScanQRCodeFragment : Fragment() {
|
||||||
|
private val scanningThread = ScanningThread()
|
||||||
|
var scanListener: ScanListener? = null
|
||||||
|
set(value) { field = value; scanningThread.setScanListener(scanListener) }
|
||||||
|
|
||||||
|
override fun onCreateView(layoutInflater: LayoutInflater, viewGroup: ViewGroup?, bundle: Bundle?): View? {
|
||||||
|
return layoutInflater.inflate(R.layout.fragment_scan_qr_code, viewGroup, false)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onViewCreated(view: View, bundle: Bundle?) {
|
||||||
|
super.onViewCreated(view, bundle)
|
||||||
|
when (resources.configuration.orientation) {
|
||||||
|
Configuration.ORIENTATION_LANDSCAPE -> overlayView.orientation = LinearLayout.HORIZONTAL
|
||||||
|
else -> overlayView.orientation = LinearLayout.VERTICAL
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onResume() {
|
||||||
|
super.onResume()
|
||||||
|
this.scanningThread.setScanListener(scanListener)
|
||||||
|
this.cameraView.onResume()
|
||||||
|
this.cameraView.setPreviewCallback(scanningThread)
|
||||||
|
this.scanningThread.start()
|
||||||
|
val activity = activity as NewConversationActivity
|
||||||
|
activity.supportActionBar!!.setTitle(R.string.fragment_scan_qr_code_title)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onPause() {
|
||||||
|
super.onPause()
|
||||||
|
this.cameraView.onPause()
|
||||||
|
this.scanningThread.stopScanning()
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onConfigurationChanged(newConfiguration: Configuration) {
|
||||||
|
super.onConfigurationChanged(newConfiguration)
|
||||||
|
this.cameraView.onPause()
|
||||||
|
when (newConfiguration.orientation) {
|
||||||
|
Configuration.ORIENTATION_LANDSCAPE -> overlayView.orientation = LinearLayout.HORIZONTAL
|
||||||
|
else -> overlayView.orientation = LinearLayout.VERTICAL
|
||||||
|
}
|
||||||
|
cameraView.onResume()
|
||||||
|
cameraView.setPreviewCallback(scanningThread)
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue