shihaam/GitNex
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updates to settings screen

Browse Source
This commit is contained in:
M M Arif 2020-04-02 20:49:26 +05:00
parent c6125f83c7
commit 70581cd330
5 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/org/mian/gitnex/fragments/SettingsFragment.java
View File

@ -148,29 +148,25 @@ public class SettingsFragment extends Fragment {
} }
// certs deletion // certs deletion
certsFrame.setOnClickListener(new View.OnClickListener() { certsFrame.setOnClickListener(v1 -> {
@Override
public void onClick(View v) {
AlertDialog.Builder builder = new AlertDialog.Builder(ctx); AlertDialog.Builder builder = new AlertDialog.Builder(ctx);
builder.setTitle(getResources().getString(R.string.settingsCertsPopupTitle)); builder.setTitle(getResources().getString(R.string.settingsCertsPopupTitle));
builder.setMessage(getResources().getString(R.string.settingsCertsPopupMessage)); builder.setMessage(getResources().getString(R.string.settingsCertsPopupMessage));
builder.setPositiveButton("YES", new DialogInterface.OnClickListener() { builder.setPositiveButton(R.string.menuDeleteText, (dialog, which) -> {
@Override
public void onClick(DialogInterface dialog, int which) {
ctx.getSharedPreferences(MemorizingTrustManager.KEYSTORE_NAME, Context.MODE_PRIVATE) ctx.getSharedPreferences(MemorizingTrustManager.KEYSTORE_NAME, Context.MODE_PRIVATE)
.edit() .edit()
.remove(MemorizingTrustManager.KEYSTORE_KEY) .remove(MemorizingTrustManager.KEYSTORE_KEY)
.apply(); .apply();
MainActivity.logout(Objects.requireNonNull(getActivity()), ctx); MainActivity.logout(Objects.requireNonNull(getActivity()), ctx);
}
}); });
builder.setNeutralButton("NO", (dialog, which) -> dialog.dismiss()); builder.setNeutralButton(R.string.cancelButton, (dialog, which) -> dialog.dismiss());
builder.create().show(); builder.create().show();
}
}); });
// issues badge switcher // issues badge switcher

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

@ -0,0 +1,5 @@
<vector android:autoMirrored="true" android:height="24dp"
android:tint="#368F73" 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="M12,1L3,5v6c0,5.55 3.84,10.74 9,12 5.16,-1.26 9,-6.45 9,-12L21,5l-9,-4zM12,11.99h7c-0.53,4.12 -3.28,7.79 -7,8.94L12,12L5,12L5,6.3l7,-3.11v8.8z"/>
</vector>

8
app/src/main/res/layout/fragment_settings.xml
View File

@ -33,7 +33,7 @@
layout="@layout/layout_settings_fileview"/> layout="@layout/layout_settings_fileview"/>
<View <View
android:id="@+id/certsDivider" android:id="@+id/securityDivider"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginStart="44dp" android:layout_marginStart="44dp"
@ -43,8 +43,8 @@
android:layout_below="@id/fileViewLayout" /> android:layout_below="@id/fileViewLayout" />
<include <include
android:id="@+id/certsLayout" android:id="@+id/securityLayout"
layout="@layout/layout_settings_certs" /> layout="@layout/layout_settings_security" />
<View <View
android:id="@+id/translationDivider" android:id="@+id/translationDivider"
@ -54,7 +54,7 @@
android:layout_marginEnd="5dp" android:layout_marginEnd="5dp"
android:layout_marginTop="20dp" android:layout_marginTop="20dp"
android:layout_marginBottom="20dp" android:layout_marginBottom="20dp"
android:layout_below="@id/certsLayout" /> android:layout_below="@id/securityLayout" />
<include <include
android:id="@+id/langLayout" android:id="@+id/langLayout"

8
app/src/main/res/layout/layout_settings_certs.xml → app/src/main/res/layout/layout_settings_security.xml
View File

@ -5,16 +5,16 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/layoutSettingsCerts" android:id="@+id/layoutSettingsCerts"
android:orientation="vertical" android:orientation="vertical"
android:layout_below="@+id/certsDivider" android:layout_below="@+id/securityDivider"
android:background="?attr/primaryBackgroundColor"> android:background="?attr/primaryBackgroundColor">
<TextView <TextView
android:id="@+id/tvCert" android:id="@+id/tvSecurity"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:drawableStart="@drawable/ic_lock_open" android:drawableStart="@drawable/ic_security_24dp"
android:drawablePadding="20dp" android:drawablePadding="20dp"
android:text="@string/settingsCertsHeader" android:text="@string/settingsSecurityHeader"
android:textColor="@color/colorDarkGreen" android:textColor="@color/colorDarkGreen"
android:textSize="14sp" android:textSize="14sp"
android:textStyle="bold" /> android:textStyle="bold" />

8
app/src/main/res/values/strings.xml
View File

@ -246,10 +246,10 @@
<!-- settings --> <!-- settings -->
<string name="settingsLanguageHeaderText">Translation</string> <string name="settingsLanguageHeaderText">Translation</string>
<string name="settingsCertsHeader">Certificates</string> <string name="settingsSecurityHeader">Security</string>
<string name="settingsCertsSelectorHeader">Delete certificates</string> <string name="settingsCertsSelectorHeader">Delete Trusted Certificates</string>
<string name="settingsCertsPopupTitle">Delete trusted certificates?</string> <string name="settingsCertsPopupTitle">Delete Trusted Certificates?</string>
<string name="settingsCertsPopupMessage">Are you sure to delete any manually trusted certificate or hostname? You will also be logged out.</string> <string name="settingsCertsPopupMessage">Are you sure to delete any manually trusted certificate or hostname? \n\nYou will also be logged out.</string>
<string name="settingsDateTimeHeaderText">Date &amp; Time</string> <string name="settingsDateTimeHeaderText">Date &amp; Time</string>
<string name="settingsSave">Settings saved</string> <string name="settingsSave">Settings saved</string>
<string name="settingsLanguageSelectorHeader">Language</string> <string name="settingsLanguageSelectorHeader">Language</string>