Commit 5245e73c authored by Sumit Pundir's avatar Sumit Pundir

Merge remote-tracking branch 'bitfireAT/master' into sprint

parents 7d42d90f 1488e39a
buildscript {
ext.versions = [
kotlin: '1.3.50',
kotlin: '1.3.61',
dokka: '0.10.0',
conscrypt: '2.2.1'
]
......@@ -12,7 +12,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:3.5.2'
classpath 'com.android.tools.build:gradle:3.5.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
classpath "org.jetbrains.dokka:dokka-gradle-plugin:${versions.dokka}"
}
......@@ -69,6 +69,7 @@ dependencies {
implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0'
implementation 'androidx.lifecycle:lifecycle-livedata:2.1.0'
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.1.0'
implementation 'com.google.android.material:material:1.2.0-alpha03'
implementation "org.conscrypt:conscrypt-android:${versions.conscrypt}"
androidTestImplementation 'androidx.test:runner:1.2.0'
......
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="foundation.e.cert4android">
<application>
......
......@@ -25,21 +25,22 @@
android:text="@string/trust_certificate_unknown_certificate_found"
android:textAppearance="?android:attr/textAppearanceMedium"/>
<androidx.cardview.widget.CardView
<com.google.android.material.card.MaterialCardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:cardElevation="8dp">
style="@style/Widget.MaterialComponents.CardView">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_margin="8dp">
android:layout_margin="8dp"
android:padding="8dp">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/TextView.Heading"
style="@style/TextAppearance.MaterialComponents.Headline5"
android:layout_marginBottom="16dp"
android:text="@string/trust_certificate_x509_certificate_details"/>
......@@ -106,30 +107,32 @@
android:checked="@={model.verifiedByUser}"
android:text="@string/trust_certificate_fingerprint_verified"/>
<androidx.appcompat.widget.ButtonBarLayout
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:orientation="horizontal">
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/Widget.AppCompat.Button.Borderless.Colored"
android:layout_marginRight="16dp"
style="@style/Widget.MaterialComponents.Button"
android:text="@string/trust_certificate_accept"
android:onClick="acceptCertificate"
android:enabled="@{model.verifiedByUser}"/>
android:enabled="@{model.verifiedByUser}" />
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/Widget.AppCompat.Button.Borderless"
style="@style/Widget.MaterialComponents.Button.TextButton"
android:text="@string/trust_certificate_reject"
android:onClick="rejectCertificate"/>
</androidx.appcompat.widget.ButtonBarLayout>
</LinearLayout>
</LinearLayout>
</androidx.cardview.widget.CardView>
</com.google.android.material.card.MaterialCardView>
<TextView
android:layout_width="match_parent"
......
<?xml version="1.0" encoding="utf-8"?>
<resources>
</resources>
\ No newline at end of file
<string name="certificate_notification_connection_security">امنیت اتصال</string>
<string name="certificate_notification_user_interaction">لطفا گواهی‌نامه‌ی خود را بازبینی کنید</string>
<string name="service_rejected_temporarily">گواهی‌نامه موقتاً رد شده‌است</string>
<string name="trust_certificate_unknown_certificate_found">cert4android با یک گواهی‌نامه‌ی ناشناخته مواجه‌شده‌است. آیا به آن اعتماد می‌کنید؟</string>
<string name="trust_certificate_x509_certificate_details">جزئیات گواهی‌نامه‌ی X509</string>
<string name="trust_certificate_issued_for">مشکل برای</string>
<string name="trust_certificate_issued_by">مشکل از</string>
<string name="trust_certificate_validity_period">دوره‌ی اعتبار</string>
<string name="trust_certificate_fingerprints">اثر انگشت‌ها</string>
<string name="trust_certificate_fingerprint_verified">به صورت دستی تمام اثر انگشت را تایید می‌کنم</string>
<string name="trust_certificate_accept">قبول</string>
<string name="trust_certificate_reject">رد</string>
<string name="trust_certificate_reset_info">شما می‌توانید تمام گواهی‌نامه‌های سفارشی را در تنظیمات برنامه مجدداً تنظیم کنید.</string>
</resources>
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment