MISP
/
misp-bump
mirror of https://github.com/MISP/misp-bump
2
0
Fork 0
Code Issues Releases Wiki Activity

new screen

pull/5/head
Felix Prahl-Kamps 2018-06-05 18:30:05 +02:00
parent e4330f7100
commit 3eb0d68750
6 changed files with 181 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Screenshots/upload-screen.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 77 KiB

1
app/build.gradle
View File

@ -30,5 +30,4 @@ dependencies {
implementation 'com.android.volley:volley:1.1.0'
implementation 'com.github.kenglxn.QRGen:android:2.4.0'
implementation 'com.kofigyan.stateprogressbar:stateprogressbar:0.0.9'
}

4
app/src/main/java/de/overview/wg/its/misp_authentificator/activity/SyncActivity.java
View File

@ -36,13 +36,13 @@ public class SyncActivity extends AppCompatActivity {
}
private void generateMyQR() {
ImageView qrImageView = findViewById(R.id.sync_my_qr);
// ImageView qrImageView = findViewById(R.id.sync_my_qr);
Bitmap myBitmap = QRCode.from("This is my organisation information!")
.withColor(0xFF000000, 0x00000000)
.withSize(512,512)
.bitmap();
qrImageView.setImageBitmap(myBitmap);
// qrImageView.setImageBitmap(myBitmap);
}
}

5
app/src/main/res/drawable/ic_check.xml Normal file
View File

@ -0,0 +1,5 @@
<vector android:height="24dp" android:tint="#FFFFFF"
android:viewportHeight="24.0" android:viewportWidth="24.0"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>
</vector>

196
app/src/main/res/layout/activity_sync.xml
View File

@ -63,11 +63,11 @@
android:background="@color/colorPrimary"
android:indeterminate="false"
android:max="100"
android:progress="100"
android:paddingBottom="8dp"
android:paddingEnd="60dp"
android:paddingStart="60dp"
android:paddingTop="8dp"
android:progress="2"
android:progressTint="@color/colorAccent"
android:visibility="visible" />
</android.support.design.widget.AppBarLayout>
@ -85,32 +85,184 @@
<!--android:orientation="vertical">-->
<!--<FrameLayout-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="match_parent">-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="match_parent">-->
<!--<ImageView-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="match_parent"-->
<!--android:adjustViewBounds="true"-->
<!--android:cropToPadding="true"-->
<!--android:scaleType="centerCrop"-->
<!--android:src="@drawable/test_image_low_res" />-->
<!--<ImageView-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="match_parent"-->
<!--android:adjustViewBounds="true"-->
<!--android:cropToPadding="true"-->
<!--android:scaleType="centerCrop"-->
<!--android:src="@drawable/test_image_low_res" />-->
<!--<ImageView-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="match_parent"-->
<!--android:src="@drawable/ic_qr_aim"-->
<!--android:tint="@color/colorPrimary" />-->
<!--<ImageView-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="match_parent"-->
<!--android:src="@drawable/ic_qr_aim"-->
<!--android:tint="@color/colorPrimary" />-->
<!--</FrameLayout>-->
<ImageView
android:id="@+id/sync_my_qr"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:adjustViewBounds="false"
android:cropToPadding="false"
android:scaleType="center"/>
<!--<ImageView-->
<!--android:id="@+id/sync_my_qr"-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="match_parent"-->
<!--android:adjustViewBounds="false"-->
<!--android:cropToPadding="false"-->
<!--android:scaleType="center"/>-->
<android.support.v7.widget.CardView
android:layout_margin="16dp"
android:id="@+id/cardView_0"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
app:contentPadding="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:text="Test connection to server"
android:textStyle="bold" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:src="@drawable/ic_check"
android:tint="@color/colorPrimary" />
</RelativeLayout>
</android.support.v7.widget.CardView>
<android.support.v7.widget.CardView
android:id="@+id/cardView_1"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="32dp"
app:contentPadding="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/cardView_0">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:text="Add organisation"
android:textStyle="bold" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:src="@drawable/ic_check"
android:tint="@color/colorPrimary" />
</RelativeLayout>
</android.support.v7.widget.CardView>
<android.support.v7.widget.CardView
android:layout_margin="16dp"
android:id="@+id/cardView_2"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="24dp"
app:contentPadding="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/cardView_1">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:text="Add user to organisation"
android:textStyle="bold" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:src="@drawable/ic_check"
android:tint="@color/colorPrimary" />
</RelativeLayout>
</android.support.v7.widget.CardView>
<android.support.v7.widget.CardView
android:layout_margin="16dp"
android:id="@+id/cardView_3"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="24dp"
app:contentPadding="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/cardView_2">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:text="Add sync server"
android:textStyle="bold" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:src="@drawable/ic_check"
android:tint="@color/colorPrimary" />
</RelativeLayout>
</android.support.v7.widget.CardView>
<Button
android:id="@+id/button3"
style="@style/CustomButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:background="@drawable/background_rounded_main"
android:backgroundTint="@color/colorPrimary"
android:text="finish"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<!--</LinearLayout>-->
</android.support.constraint.ConstraintLayout>

1
app/src/main/res/values/styles.xml
View File

@ -19,7 +19,6 @@
</style>
<style name="CustomButton" parent="Widget.AppCompat.Button">
<item name="background">@color/colorPrimary</item>
<item name="android:background">@color/colorPrimary</item>
<item name="android:textColor">@color/color_text_foreground</item>
</style>