Skip to content

Commit 6e7ecb8

Browse files
committed
Fixed vcs build
1 parent c8d466d commit 6e7ecb8

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

app/src/main/java/com/example/chatfull/ShowInfoActivity.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
package com.example.chatfull;
22

33
import android.content.Intent;
4+
import android.graphics.Bitmap;
45
import android.os.Bundle;
56
import android.util.Log;
7+
import android.widget.ImageView;
68
import android.widget.TextView;
79

810
import androidx.appcompat.app.AppCompatActivity;
911

12+
import net.glxn.qrgen.android.QRCode;
13+
1014
import java.net.InetAddress;
1115
import java.net.NetworkInterface;
1216
import java.net.SocketException;
@@ -35,6 +39,10 @@ protected void onCreate(Bundle savedInstanceState) {
3539
String ip_address = getSelfIpAddress();
3640
ipView.setText(ip_address);
3741
portView.setText(Integer.toString(selfPort));
42+
43+
Bitmap myBitmap = QRCode.from(ip_address+":"+selfPort).bitmap();
44+
ImageView myImage = (ImageView) findViewById(R.id.qr_view);
45+
myImage.setImageBitmap(myBitmap);
3846
}
3947

4048
@Override

app/src/main/res/layout/activity_show_info.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,8 @@
8080
app:layout_constraintBottom_toBottomOf="parent"
8181
app:layout_constraintEnd_toEndOf="parent"
8282
app:layout_constraintStart_toStartOf="parent"
83-
app:layout_constraintTop_toBottomOf="@+id/linearLayout3" />
83+
app:layout_constraintTop_toBottomOf="@+id/linearLayout3"
84+
android:id="@+id/qr_view"/>
8485

8586

8687

barcode-reader/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ android {
1818
buildTypes {
1919
release {
2020
minifyEnabled false
21-
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
21+
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
2222
}
2323
}
2424

0 commit comments

Comments
 (0)