visibility for bin,upload and searx+ simplified preferences part

This commit is contained in:
massimiliano 2020-01-14 19:17:45 +01:00
parent 9744e24678
commit cb5bbe961e
25 changed files with 433 additions and 148 deletions

View File

@ -14,8 +14,8 @@
<option name="values">
<map>
<entry key="assetSourceType" value="FILE" />
<entry key="outputName" value="ic_app_logo" />
<entry key="sourceFile" value="$PROJECT_DIR$/../DisIcons/v2/ic_app_logo.svg" />
<entry key="outputName" value="ic_searx" />
<entry key="sourceFile" value="$PROJECT_DIR$/../DisIcons/v2/ic_searx.svg" />
</map>
</option>
</PersistentState>

View File

@ -122,10 +122,15 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
firstStart = getSharedPreferences("org.disroot.disrootap", MODE_PRIVATE);//fisrt start
check = getSharedPreferences("org.disroot.disrootapp", MODE_PRIVATE);
//buttons visiblility preference
BtnPreference = getSharedPreferences( "mailBtnVisibility", Context.MODE_PRIVATE );//mail
BtnPreference = getSharedPreferences( "cloudBtnVisibility", Context.MODE_PRIVATE );//cloud
BtnPreference = getSharedPreferences( "forumBtnVisibility", Context.MODE_PRIVATE );//forum
BtnPreference = getSharedPreferences( "chatBtnVisibility", Context.MODE_PRIVATE );//chat
BtnPreference = getSharedPreferences( "MailBtn", Context.MODE_PRIVATE );//mail
BtnPreference = getSharedPreferences( "CloudBtn", Context.MODE_PRIVATE );//cloud
BtnPreference = getSharedPreferences( "ForumBtn", Context.MODE_PRIVATE );//forum
BtnPreference = getSharedPreferences( "ChatBtn", Context.MODE_PRIVATE );//chat
BtnPreference = getSharedPreferences( "PadBtn", Context.MODE_PRIVATE );//pad
BtnPreference = getSharedPreferences( "CalcBtn", Context.MODE_PRIVATE );//calc
BtnPreference = getSharedPreferences( "BinBtn", Context.MODE_PRIVATE );//bin
BtnPreference = getSharedPreferences( "UploadBtn", Context.MODE_PRIVATE );//upload
BtnPreference = getSharedPreferences( "SearxBtn", Context.MODE_PRIVATE );//search
//Status service
Intent intent = new Intent( MainActivity.this, StatusService.class);
@ -209,23 +214,29 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
HowToBtn = findViewById( R.id.HowToBtn );
AboutBtn = findViewById( R.id.AboutBtn );
Map<String, ?> allEntries = BtnPreference.getAll();
for (Map.Entry<String, ?> entry : allEntries.entrySet()) {
if (entry.getValue().equals( false )){
ViewGroup viewGroup =((ViewGroup)findViewById( R.id.StateBtn ).getParent());
int[] buttonIDs = new int[] {R.id.MailBtn, R.id.CloudBtn, R.id.ForumBtn,R.id.ChatBtn,R.id.PadBtn,R.id.CalcBtn,R.id.BinBtn,R.id.UploadBtn,R.id.SearxBtn,R.id.PollsBtn,R.id.BoardBtn,R.id.NotesBtn,R.id.UserBtn,R.id.StateBtn,R.id.HowToBtn,R.id.AboutBtn};
for(int i=0; i<buttonIDs.length; i++) {
Button b = (Button) findViewById(buttonIDs[i]);
int resID = getResources().getIdentifier(entry.getKey(),
"id", getPackageName());
if(findViewById(resID)==b) {
viewGroup.removeView(b);
}
Log.e("button values", entry.getKey() + ": "+resID);
}
}
Log.e("map values", entry.getKey() + ": " + entry.getValue().toString());
}
//get preferences
if (BtnPreference.getBoolean( "mailBtnVisibility", true)==false){
ViewGroup viewGroup =((ViewGroup)findViewById( R.id.StateBtn ).getParent());
viewGroup.removeView(MailBtn);
}
if (BtnPreference.getBoolean( "cloudBtnVisibility", true)==false){
ViewGroup viewGroup =((ViewGroup)findViewById( R.id.StateBtn ).getParent());
viewGroup.removeView(CloudBtn);
}
if (BtnPreference.getBoolean( "forumBtnVisibility", true)==false){
ViewGroup viewGroup =((ViewGroup)findViewById( R.id.StateBtn ).getParent());
viewGroup.removeView(ForumBtn);
}
if (BtnPreference.getBoolean( "chatBtnVisibility", true)==false){
ViewGroup viewGroup =((ViewGroup)findViewById( R.id.StateBtn ).getParent());
viewGroup.removeView(ChatBtn);
}
//Set longclick buttons
MailBtn.setOnLongClickListener( this );
@ -576,7 +587,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
ViewGroup viewGroup =((ViewGroup)findViewById( R.id.StateBtn ).getParent());
if (findViewById( R.id.MailBtn).getParent()!=null){
viewGroup.removeView(MailBtn);
BtnPreference.edit().putBoolean( "mailBtnVisibility", false ).apply();
BtnPreference.edit().putBoolean( "MailBtn", false ).apply();
return;}
}
});
@ -619,7 +630,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
ViewGroup viewGroup =((ViewGroup)findViewById( R.id.StateBtn ).getParent());
if (findViewById( R.id.CloudBtn).getParent()!=null){
viewGroup.removeView(CloudBtn);
BtnPreference.edit().putBoolean( "cloudBtnVisibility", false ).apply();
BtnPreference.edit().putBoolean( "CloudBtn", false ).apply();
return;}
}
});
@ -695,7 +706,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
ViewGroup viewGroup =((ViewGroup)findViewById( R.id.StateBtn ).getParent());
if (findViewById( R.id.ForumBtn).getParent()!=null){
viewGroup.removeView(ForumBtn);
BtnPreference.edit().putBoolean( "forumBtnVisibility", false ).apply();
BtnPreference.edit().putBoolean( "ForumBtn", false ).apply();
return;}
}
});
@ -753,7 +764,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
ViewGroup viewGroup =((ViewGroup)findViewById( R.id.StateBtn ).getParent());
if (findViewById( R.id.ChatBtn).getParent()!=null){
viewGroup.removeView(ChatBtn);
BtnPreference.edit().putBoolean( "chatBtnVisibility", false ).apply();
BtnPreference.edit().putBoolean( "ChatBtn", false ).apply();
return;}
}
});
@ -789,6 +800,16 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
hideDashboard();
}
});
builder.setNeutralButton( R.string.remove , new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
ViewGroup viewGroup =((ViewGroup)findViewById( R.id.StateBtn ).getParent());
if (findViewById( R.id.PadBtn).getParent()!=null){
viewGroup.removeView(PadBtn);
BtnPreference.edit().putBoolean( "PadBtn", false ).apply();
return;}
}
});
builder.show();
}
private void showPAdDialog(){
@ -821,6 +842,16 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
hideDashboard();
}
});
builder.setNeutralButton( R.string.remove , new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
ViewGroup viewGroup =((ViewGroup)findViewById( R.id.StateBtn ).getParent());
if (findViewById( R.id.CalcBtn).getParent()!=null){
viewGroup.removeView(CalcBtn);
BtnPreference.edit().putBoolean( "CalcBtn", false ).apply();
return;}
}
});
builder.show();
}
@ -837,6 +868,16 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
hideDashboard();
}
});
builder.setNeutralButton( R.string.remove , new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
ViewGroup viewGroup =((ViewGroup)findViewById( R.id.StateBtn ).getParent());
if (findViewById( R.id.BinBtn).getParent()!=null){
viewGroup.removeView(BinBtn);
BtnPreference.edit().putBoolean( "BinBtn", false ).apply();
return;}
}
});
builder.show();
}
@ -854,6 +895,16 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
findViewById(R.id.dashboard).setVisibility(View.GONE);
}
});
builder.setNeutralButton( R.string.remove , new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
ViewGroup viewGroup =((ViewGroup)findViewById( R.id.StateBtn ).getParent());
if (findViewById( R.id.UploadBtn).getParent()!=null){
viewGroup.removeView(UploadBtn);
BtnPreference.edit().putBoolean( "UploadBtn", false ).apply();
return;}
}
});
builder.show();
}
@ -870,6 +921,16 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
hideDashboard();
}
});
builder.setNeutralButton( R.string.remove , new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
ViewGroup viewGroup =((ViewGroup)findViewById( R.id.StateBtn ).getParent());
if (findViewById( R.id.SearxBtn).getParent()!=null){
viewGroup.removeView(SearxBtn);
BtnPreference.edit().putBoolean( "SearxBtn", false ).apply();
return;}
}
});
builder.show();
}

View File

@ -52,10 +52,15 @@ public class SettingsActivity extends AppCompatActivity {
} );
////buttons visiblility preference list
BtnPreference = getSharedPreferences( "mailBtnVisibility", Context.MODE_PRIVATE );//mail
BtnPreference = getSharedPreferences( "cloudBtnVisibility", Context.MODE_PRIVATE );//cloud
BtnPreference = getSharedPreferences( "forumBtnVisibility", Context.MODE_PRIVATE );//forum
BtnPreference = getSharedPreferences( "chatBtnVisibility", Context.MODE_PRIVATE );//chat
BtnPreference = getSharedPreferences( "MailBtn", Context.MODE_PRIVATE );//mail
BtnPreference = getSharedPreferences( "CloudBtn", Context.MODE_PRIVATE );//cloud
BtnPreference = getSharedPreferences( "ForumBtn", Context.MODE_PRIVATE );//forum
BtnPreference = getSharedPreferences( "ChatBtn", Context.MODE_PRIVATE );//chat
BtnPreference = getSharedPreferences( "PadBtn", Context.MODE_PRIVATE );//pad
BtnPreference = getSharedPreferences( "CalcBtn", Context.MODE_PRIVATE );//calc
BtnPreference = getSharedPreferences( "BinBtn", Context.MODE_PRIVATE );//bin
BtnPreference = getSharedPreferences( "UploadBtn", Context.MODE_PRIVATE );//upload
BtnPreference = getSharedPreferences( "SearxBtn", Context.MODE_PRIVATE );//search
//checkboxlist
checkPrefBox();
@ -69,21 +74,31 @@ public class SettingsActivity extends AppCompatActivity {
final CheckBox checkCloudBtn = iconSettings.findViewById( R.id.cloudBtnPreference );//cloud
final CheckBox checkForumBtn = iconSettings.findViewById( R.id.foumBtnPreference );//forum
final CheckBox checkChatBtn = iconSettings.findViewById( R.id.chatBtnPreference );//chat
final CheckBox checkPadBtn = iconSettings.findViewById( R.id.padBtnPreference );//pad
final CheckBox checkCalcBtn = iconSettings.findViewById( R.id.calcBtnPreference );//calc
final CheckBox checkBinBtn = iconSettings.findViewById( R.id.binBtnPreference );//bin
final CheckBox checkUploadBtn = iconSettings.findViewById( R.id.uploadBtnPreference );//upload
final CheckBox checkSearxBtn = iconSettings.findViewById( R.id.searxBtnPreference );//search
//Set checked if visibility is true
if (BtnPreference.getBoolean( "mailBtnVisibility", true )) checkMailBtn.setChecked( true );//mail
if (BtnPreference.getBoolean( "cloudBtnVisibility", true )) checkCloudBtn.setChecked( true );//cloud
if (BtnPreference.getBoolean( "forumBtnVisibility", true )) checkForumBtn.setChecked( true );//forum
if (BtnPreference.getBoolean( "chatBtnVisibility", true )) checkChatBtn.setChecked( true );//chat
if (BtnPreference.getBoolean( "MailBtn", true )) checkMailBtn.setChecked( true );//mail
if (BtnPreference.getBoolean( "CloudBtn", true )) checkCloudBtn.setChecked( true );//cloud
if (BtnPreference.getBoolean( "ForumBtn", true )) checkForumBtn.setChecked( true );//forum
if (BtnPreference.getBoolean( "ChatBtn", true )) checkChatBtn.setChecked( true );//chat
if (BtnPreference.getBoolean( "PadBtn", true )) checkPadBtn.setChecked( true );//pad
if (BtnPreference.getBoolean( "CalcBtn", true )) checkCalcBtn.setChecked( true );//calc
if (BtnPreference.getBoolean( "BinBtn", true )) checkBinBtn.setChecked( true );//bin
if (BtnPreference.getBoolean( "UploadBtn", true )) checkUploadBtn.setChecked( true );//upload
if (BtnPreference.getBoolean( "SearxBtn", true )) checkSearxBtn.setChecked( true );//search
//Mail
checkMailBtn.setOnCheckedChangeListener( new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton view, boolean isChecked) {
if (checkMailBtn.isChecked()) {
BtnPreference.edit().putBoolean( "mailBtnVisibility", true ).apply();
BtnPreference.edit().putBoolean( "MailBtn", true ).apply();
} else {
BtnPreference.edit().putBoolean( "mailBtnVisibility", false ).apply();
BtnPreference.edit().putBoolean( "MailBtn", false ).apply();
}
}
} );
@ -93,9 +108,9 @@ public class SettingsActivity extends AppCompatActivity {
@Override
public void onCheckedChanged(CompoundButton view, boolean isChecked) {
if (checkCloudBtn.isChecked()) {
BtnPreference.edit().putBoolean( "cloudBtnVisibility", true ).apply();
BtnPreference.edit().putBoolean( "CloudBtn", true ).apply();
} else {
BtnPreference.edit().putBoolean( "cloudBtnVisibility", false ).apply();
BtnPreference.edit().putBoolean( "CloudBtn", false ).apply();
}
}
} );
@ -105,9 +120,9 @@ public class SettingsActivity extends AppCompatActivity {
@Override
public void onCheckedChanged(CompoundButton view, boolean isChecked) {
if (checkForumBtn.isChecked()) {
BtnPreference.edit().putBoolean( "forumBtnVisibility", true ).apply();
BtnPreference.edit().putBoolean( "ForumBtn", true ).apply();
} else {
BtnPreference.edit().putBoolean( "forumBtnVisibility", false ).apply();
BtnPreference.edit().putBoolean( "ForumBtn", false ).apply();
}
}
} );
@ -117,17 +132,76 @@ public class SettingsActivity extends AppCompatActivity {
@Override
public void onCheckedChanged(CompoundButton view, boolean isChecked) {
if (checkChatBtn.isChecked()) {
BtnPreference.edit().putBoolean( "chatBtnVisibility", true ).apply();
BtnPreference.edit().putBoolean( "ChatBtn", true ).apply();
} else {
BtnPreference.edit().putBoolean( "chatBtnVisibility", false ).apply();
BtnPreference.edit().putBoolean( "ChatBtn", false ).apply();
}
}
} );
//pad
checkPadBtn.setOnCheckedChangeListener( new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton view, boolean isChecked) {
if (checkPadBtn.isChecked()) {
BtnPreference.edit().putBoolean( "PadBtn", true ).apply();
} else {
BtnPreference.edit().putBoolean( "PadBtn", false ).apply();
}
}
} );
//calc
checkCalcBtn.setOnCheckedChangeListener( new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton view, boolean isChecked) {
if (checkCalcBtn.isChecked()) {
BtnPreference.edit().putBoolean( "CalcBtn", true ).apply();
} else {
BtnPreference.edit().putBoolean( "CalcBtn", false ).apply();
}
}
} );
//bin
checkBinBtn.setOnCheckedChangeListener( new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton view, boolean isChecked) {
if (checkBinBtn.isChecked()) {
BtnPreference.edit().putBoolean( "BinBtn", true ).apply();
} else {
BtnPreference.edit().putBoolean( "BinBtn", false ).apply();
}
}
} );
//upload
checkUploadBtn.setOnCheckedChangeListener( new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton view, boolean isChecked) {
if (checkUploadBtn.isChecked()) {
BtnPreference.edit().putBoolean( "UploadBtn", true ).apply();
} else {
BtnPreference.edit().putBoolean( "UploadBtn", false ).apply();
}
}
} );
//search
checkSearxBtn.setOnCheckedChangeListener( new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton view, boolean isChecked) {
if (checkSearxBtn.isChecked()) {
BtnPreference.edit().putBoolean( "SearxBtn", true ).apply();
} else {
BtnPreference.edit().putBoolean( "SearxBtn", false ).apply();
}
}
} );
}
@Override
@Override //make sure changes are applyed when going back
public void onBackPressed() {
Intent goHome = new Intent( SettingsActivity.this, MainActivity.class );
SettingsActivity.this.startActivity( goHome );

View File

@ -1,5 +1,5 @@
<vector android:height="24dp" android:viewportHeight="48"
android:viewportWidth="48" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#ffffff"
<path android:fillColor="#808080"
android:pathData="m34.9091,41.4545v4.3636C34.9091,47.0114 33.9205,48 32.7273,48H15.2727c-1.1932,0 -2.1818,-0.9886 -2.1818,-2.1818v-4.3636c0,-1.1932 0.9886,-2.1818 2.1818,-2.1818h2.1818V26.1818h-2.1818c-1.1932,0 -2.1818,-0.9886 -2.1818,-2.1818v-4.3636c0,-1.1932 0.9886,-2.1818 2.1818,-2.1818h13.0909c1.1932,0 2.1818,0.9886 2.1818,2.1818v19.6364h2.1818c1.1932,0 2.1818,0.9886 2.1818,2.1818zM30.5455,2.1818v6.5455c0,1.1932 -0.9886,2.1818 -2.1818,2.1818h-8.7273c-1.1932,0 -2.1818,-0.9886 -2.1818,-2.1818V2.1818c0,-1.1932 0.9886,-2.1818 2.1818,-2.1818h8.7273c1.1932,0 2.1818,0.9886 2.1818,2.1818z" android:strokeWidth="0.03409091"/>
</vector>

View File

@ -1,6 +1,6 @@
<vector android:height="24dp" android:viewportHeight="48"
android:viewportWidth="48" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillAlpha="1" android:fillColor="#ffffff"
<path android:fillAlpha="1" android:fillColor="#808080"
android:pathData="M19.8066,0C18.3843,0 17.2383,1.1599 17.2383,2.6016L17.2383,2.6758L13.7988,2.6758C11.9279,2.6758 10.4219,4.2053 10.4219,6.1016L10.4219,44.5781C10.4219,46.4744 11.9279,48 13.7988,48L33.7129,48C35.5838,48 37.0898,46.4744 37.0898,44.5781L37.0898,6.1016C37.0898,4.2053 35.5838,2.6758 33.7129,2.6758L30.3418,2.6758L30.3418,2.6016C30.3418,1.1599 29.1977,0 27.7754,0L19.8066,0zM20.3926,11.2773L26.252,11.2773C26.6985,11.2773 27.0566,11.6165 27.0566,12.0273C27.0566,12.1345 27.0204,12.2405 26.9668,12.3477L23.9121,20.6191L30.9863,18.8672C31.0578,18.8493 31.1297,18.832 31.2012,18.832C31.4334,18.832 31.6478,18.9388 31.8086,19.0996C32.0051,19.314 32.0586,19.6188 31.9336,19.8867L22.2871,40.5527C22.1442,40.8207 21.8586,41 21.5371,41C21.4657,41 21.3764,40.9828 21.2871,40.9648C20.8941,40.8398 20.6607,40.465 20.75,40.0898L24.2695,25.6563L17.0176,27.4609C16.9461,27.4788 16.8742,27.4785 16.8027,27.4785C16.6062,27.4785 16.3929,27.4063 16.25,27.2813C16.0357,27.1026 15.964,26.8341 16.0176,26.584L19.6074,11.8477C19.6967,11.5083 20.0175,11.2773 20.3926,11.2773z"
android:strokeAlpha="1" android:strokeColor="#00000000" android:strokeWidth="0.99062097"/>
</vector>

View File

@ -1,5 +1,11 @@
<vector android:height="24dp" android:viewportHeight="48"
android:viewportWidth="48" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillAlpha="1" android:fillColor="#ffffff"
android:pathData="M5.2286,44.5714L42.9429,44.5714L42.9429,17.1429L5.2286,17.1429ZM15.5143,12L15.5143,4.2857c0,-0.4821 -0.375,-0.8571 -0.8571,-0.8571h-1.7143c-0.4821,0 -0.8571,0.375 -0.8571,0.8571L12.0857,12c0,0.4821 0.375,0.8571 0.8571,0.8571h1.7143c0.4821,0 0.8571,-0.375 0.8571,-0.8571zM36.0857,12L36.0857,4.2857c0,-0.4821 -0.375,-0.8571 -0.8571,-0.8571h-1.7143c-0.4821,0 -0.8571,0.375 -0.8571,0.8571L32.6571,12c0,0.4821 0.375,0.8571 0.8571,0.8571h1.7143c0.4821,0 0.8571,-0.375 0.8571,-0.8571zM46.3714,10.2857v34.2857c0,1.875 -1.5536,3.4286 -3.4286,3.4286L5.2286,48C3.3536,48 1.8,46.4464 1.8,44.5714L1.8,10.2857C1.8,8.4107 3.3536,6.8571 5.2286,6.8571L8.6571,6.8571L8.6571,4.2857C8.6571,1.9286 10.5857,0 12.9429,0h1.7143c2.3571,0 4.2857,1.9286 4.2857,4.2857L18.9429,6.8571L29.2286,6.8571L29.2286,4.2857C29.2286,1.9286 31.1571,0 33.5143,0h1.7143c2.3571,0 4.2857,1.9286 4.2857,4.2857v2.5714h3.4286c1.875,0 3.4286,1.5536 3.4286,3.4286z" android:strokeWidth="0.02678571"/>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp"
android:height="48dp"
android:viewportWidth="12.7"
android:viewportHeight="12.7">
<path
android:pathData="m4.6781,8.9782 l-1.5598,-0.8472 -0.0189,-1.7507c-0.0146,-1.3467 0.0018,-1.7674 0.0709,-1.8234 0.129,-0.1045 3.1136,-1.689 3.1813,-1.689 0.064,0 3.0284,1.5831 3.1653,1.6903 0.0666,0.0522 0.0886,0.4995 0.0886,1.8021 0,1.7201 -0.0011,1.7333 -0.1595,1.8346 -0.347,0.2219 -3.0707,1.6432 -3.1372,1.637 -0.039,-0.0036 -0.7728,-0.3878 -1.6307,-0.8538zM6.946,6.9673 L6.7535,6.2916 7.0131,5.9801c0.3463,-0.4155 0.401,-0.8814 0.1635,-1.1149 -0.0974,-0.0957 -0.3062,-0.2121 -0.4641,-0.2586 -0.2515,-0.0741 -0.6037,-0.0677 -0.8371,0.0514 -0.153,0.0781 -0.3221,0.2413 -0.3971,0.3834 -0.155,0.2936 -0.0997,0.5029 0.2303,0.8724 0.1156,0.1295 0.2102,0.2743 0.2102,0.3218 0,0.0476 -0.0957,0.4718 -0.2127,0.9429 -0.117,0.471 -0.2127,0.8859 -0.2127,0.9219 0,0.0365 0.6007,0.0655 1.0006,0.0655l0.717,0c-0.0799,-0.4233 -0.1821,-0.8468 -0.265,-1.1986z"
android:strokeWidth="0.38939726"
android:fillColor="#ffffff"
android:strokeColor="#00000000"/>
</vector>

View File

@ -1,5 +1,10 @@
<vector android:height="24dp" android:viewportHeight="48"
android:viewportWidth="48" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillAlpha="1" android:fillColor="#ffffff"
android:pathData="m12.1857,41.1429c0,-1.9018 -1.5268,-3.4286 -3.4286,-3.4286 -1.9018,0 -3.4286,1.5268 -3.4286,3.4286 0,1.9018 1.5268,3.4286 3.4286,3.4286 1.9018,0 3.4286,-1.5268 3.4286,-3.4286zM22.4714,41.1429c0,-1.9018 -1.5268,-3.4286 -3.4286,-3.4286 -1.9018,0 -3.4286,1.5268 -3.4286,3.4286 0,1.9018 1.5268,3.4286 3.4286,3.4286 1.9018,0 3.4286,-1.5268 3.4286,-3.4286zM12.1857,30.8571c0,-1.9018 -1.5268,-3.4286 -3.4286,-3.4286 -1.9018,0 -3.4286,1.5268 -3.4286,3.4286 0,1.9018 1.5268,3.4286 3.4286,3.4286 1.9018,0 3.4286,-1.5268 3.4286,-3.4286zM32.7571,41.1429c0,-1.9018 -1.5268,-3.4286 -3.4286,-3.4286 -1.9018,0 -3.4286,1.5268 -3.4286,3.4286 0,1.9018 1.5268,3.4286 3.4286,3.4286 1.9018,0 3.4286,-1.5268 3.4286,-3.4286zM22.4714,30.8571c0,-1.9018 -1.5268,-3.4286 -3.4286,-3.4286 -1.9018,0 -3.4286,1.5268 -3.4286,3.4286 0,1.9018 1.5268,3.4286 3.4286,3.4286 1.9018,0 3.4286,-1.5268 3.4286,-3.4286zM12.1857,20.5714c0,-1.9018 -1.5268,-3.4286 -3.4286,-3.4286 -1.9018,0 -3.4286,1.5268 -3.4286,3.4286 0,1.9018 1.5268,3.4286 3.4286,3.4286 1.9018,0 3.4286,-1.5268 3.4286,-3.4286zM32.7571,30.8571c0,-1.9018 -1.5268,-3.4286 -3.4286,-3.4286 -1.9018,0 -3.4286,1.5268 -3.4286,3.4286 0,1.9018 1.5268,3.4286 3.4286,3.4286 1.9018,0 3.4286,-1.5268 3.4286,-3.4286zM22.4714,20.5714c0,-1.9018 -1.5268,-3.4286 -3.4286,-3.4286 -1.9018,0 -3.4286,1.5268 -3.4286,3.4286 0,1.9018 1.5268,3.4286 3.4286,3.4286 1.9018,0 3.4286,-1.5268 3.4286,-3.4286zM43.0429,41.1429L43.0429,30.8571c0,-1.875 -1.5536,-3.4286 -3.4286,-3.4286 -1.875,0 -3.4286,1.5536 -3.4286,3.4286v10.2857c0,1.875 1.5536,3.4286 3.4286,3.4286 1.875,0 3.4286,-1.5536 3.4286,-3.4286zM32.7571,20.5714c0,-1.9018 -1.5268,-3.4286 -3.4286,-3.4286 -1.9018,0 -3.4286,1.5268 -3.4286,3.4286 0,1.9018 1.5268,3.4286 3.4286,3.4286 1.9018,0 3.4286,-1.5268 3.4286,-3.4286zM43.0429,12L43.0429,5.1429c0,-0.9375 -0.7768,-1.7143 -1.7143,-1.7143L7.0429,3.4286c-0.9375,0 -1.7143,0.7768 -1.7143,1.7143v6.8571c0,0.9375 0.7768,1.7143 1.7143,1.7143L41.3286,13.7143c0.9375,0 1.7143,-0.7768 1.7143,-1.7143zM43.0429,20.5714c0,-1.9018 -1.5268,-3.4286 -3.4286,-3.4286 -1.9018,0 -3.4286,1.5268 -3.4286,3.4286 0,1.9018 1.5268,3.4286 3.4286,3.4286 1.9018,0 3.4286,-1.5268 3.4286,-3.4286zM46.4714,3.4286L46.4714,44.5714C46.4714,46.4464 44.9179,48 43.0429,48L5.3286,48C3.4536,48 1.9,46.4464 1.9,44.5714L1.9,3.4286C1.9,1.5536 3.4536,0 5.3286,0L43.0429,0c1.875,0 3.4286,1.5536 3.4286,3.4286z" android:strokeWidth="0.02678571"/>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp"
android:height="48dp"
android:viewportWidth="12.7"
android:viewportHeight="12.7">
<path
android:pathData="m9.528,6.0876v-3.1248L3.1705,2.9628v3.1517,3.1517L6.3493,9.2663 9.528,9.2663ZM3.8633,8.0845v-0.5705h0.6113,0.6113v0.5705,0.5705L4.4746,8.655 3.8633,8.655ZM5.738,8.0845v-0.5705h1.5894,1.5894v0.5705,0.5705L7.3273,8.655 5.738,8.655ZM3.8633,6.1691v-0.5705h0.6113,0.6113v0.5705,0.5705L4.4746,6.7396 3.8633,6.7396ZM5.738,6.1691v-0.5705h1.5894,1.5894v0.5705,0.5705L7.3273,6.7396 5.738,6.7396ZM3.8633,4.2537v-0.5706h0.6113,0.6113v0.5706,0.5705L4.4746,4.8242 3.8633,4.8242ZM5.738,4.2537v-0.5706h1.5894,1.5894v0.5706,0.5705L7.3273,4.8242 5.738,4.8242Z"
android:strokeWidth="0.04075298"
android:fillColor="#ffffff"/>
</vector>

View File

@ -1,5 +1,5 @@
<vector android:height="24dp" android:viewportHeight="48"
android:viewportWidth="48" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#ffffff"
<path android:fillColor="#808080"
android:pathData="m22.3998,36.7995 l8.4013,-9.6014h-19.2029l-8.4013,9.6014zM47.7286,9.8705c0.5001,1.1502 0.3,2.4754 -0.5251,3.4255L24.8001,38.8998C24.2,39.5999 23.3249,40 22.3998,40H3.1969C1.9467,40 0.7965,39.2749 0.2714,38.1247 -0.2287,36.9745 -0.0286,35.6493 0.7965,34.6992L23.1999,9.0953C23.8,8.3952 24.6751,7.9952 25.6002,7.9952h19.2029c1.2502,0 2.4004,0.7251 2.9254,1.8753z" android:strokeWidth="0.02500378"/>
</vector>

View File

@ -1,5 +1,5 @@
<vector android:height="24dp" android:viewportHeight="48"
android:viewportWidth="48" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillAlpha="1" android:fillColor="#fffefe"
<path android:fillAlpha="1" android:fillColor="#808080"
android:pathData="m19.5918,40.6612c0,0.8572 0.398,2.9388 -0.9796,2.9388H8.8163C3.949,43.6 0,39.651 0,34.7836V13.2324C0,8.365 3.949,4.416 8.8163,4.416h9.7959c0.5204,0 0.9796,0.4592 0.9796,0.9796 0,0.8571 0.398,2.9388 -0.9796,2.9388H8.8163c-2.6939,0 -4.898,2.2041 -4.898,4.898v21.5512c0,2.6939 2.2041,4.898 4.898,4.898h8.8163c0.7653,0 1.9592,-0.1531 1.9592,0.9796zM48,24.008c0,0.5204 -0.2143,1.0102 -0.5816,1.3776L30.7653,42.0388c-0.3673,0.3673 -0.8571,0.5816 -1.3776,0.5816 -1.0714,0 -1.9592,-0.8878 -1.9592,-1.9592V31.8448H13.7143c-1.0714,0 -1.9592,-0.8878 -1.9592,-1.9592V18.1304c0,-1.0714 0.8878,-1.9592 1.9592,-1.9592H27.4286V7.3548c0,-1.0714 0.8878,-1.9592 1.9592,-1.9592 0.5204,0 1.0102,0.2143 1.3776,0.5816L47.4184,22.6304C47.7857,22.9978 48,23.4876 48,24.008Z" android:strokeWidth="0.03061238"/>
</vector>

View File

@ -1,5 +1,5 @@
<vector android:height="24dp" android:viewportHeight="48"
android:viewportWidth="48" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillAlpha="1" android:fillColor="#ffffff"
<path android:fillAlpha="1" android:fillColor="#808080"
android:pathData="m36.5938,21.4063 l-13.1875,13.1875c-0.7813,0.7813 -2.0313,0.7813 -2.8125,0l-9.1875,-9.1875c-0.7813,-0.7813 -0.7813,-2.0313 0,-2.8125l3.1875,-3.1875c0.7813,-0.7813 2.0313,-0.7813 2.8125,0L22,24 30.5938,15.4063c0.7813,-0.7813 2.0313,-0.7813 2.8125,0l3.1875,3.1875c0.7813,0.7813 0.7813,2.0313 0,2.8125zM41,24C41,14.625 33.375,7 24,7 14.625,7 7,14.625 7,24c0,9.375 7.625,17 17,17 9.375,0 17,-7.625 17,-17zM48,24C48,37.25 37.25,48 24,48 10.75,48 0,37.25 0,24 0,10.75 10.75,0 24,0 37.25,0 48,10.75 48,24Z" android:strokeWidth="0.03125"/>
</vector>

View File

@ -8,7 +8,7 @@
android:strokeAlpha="1"
android:strokeLineJoin="miter"
android:strokeWidth="1.0666666"
android:fillColor="#f2f2f2"
android:fillColor="#ffffff"
android:strokeColor="#00000000"
android:fillAlpha="1"
android:strokeLineCap="butt"/>
@ -17,7 +17,7 @@
android:strokeAlpha="1"
android:strokeLineJoin="miter"
android:strokeWidth="1.0666666"
android:fillColor="#f2f2f2"
android:fillColor="#ffffff"
android:strokeColor="#00000000"
android:fillAlpha="1"
android:strokeLineCap="butt"/>
@ -26,7 +26,7 @@
android:strokeAlpha="1"
android:strokeLineJoin="miter"
android:strokeWidth="1.0666666"
android:fillColor="#f2f2f2"
android:fillColor="#ffffff"
android:strokeColor="#00000000"
android:fillAlpha="1"
android:strokeLineCap="butt"/>
@ -35,7 +35,7 @@
android:strokeAlpha="1"
android:strokeLineJoin="miter"
android:strokeWidth="1.0666666"
android:fillColor="#f2f2f2"
android:fillColor="#ffffff"
android:strokeColor="#00000000"
android:fillAlpha="1"
android:strokeLineCap="butt"/>
@ -44,7 +44,7 @@
android:strokeAlpha="1"
android:strokeLineJoin="miter"
android:strokeWidth="1.0666666"
android:fillColor="#f2f2f2"
android:fillColor="#ffffff"
android:strokeColor="#00000000"
android:fillAlpha="1"
android:strokeLineCap="butt"/>
@ -53,7 +53,7 @@
android:strokeAlpha="1"
android:strokeLineJoin="miter"
android:strokeWidth="1.0666666"
android:fillColor="#f2f2f2"
android:fillColor="#808080"
android:strokeColor="#00000000"
android:fillAlpha="1"
android:strokeLineCap="butt"/>
@ -62,7 +62,7 @@
android:strokeAlpha="1"
android:strokeLineJoin="miter"
android:strokeWidth="0.93094134"
android:fillColor="#f2f2f2"
android:fillColor="#ffffff"
android:strokeColor="#00000000"
android:fillAlpha="1"
android:strokeLineCap="butt"/>
@ -71,7 +71,7 @@
android:strokeAlpha="1"
android:strokeLineJoin="miter"
android:strokeWidth="0.93094134"
android:fillColor="#f2f2f2"
android:fillColor="#ffffff"
android:strokeColor="#00000000"
android:fillAlpha="1"
android:strokeLineCap="butt"/>
@ -80,7 +80,7 @@
android:strokeAlpha="1"
android:strokeLineJoin="miter"
android:strokeWidth="1.0666666"
android:fillColor="#f2f2f2"
android:fillColor="#ffffff"
android:strokeColor="#00000000"
android:fillAlpha="1"
android:strokeLineCap="butt"/>
@ -89,7 +89,7 @@
android:strokeAlpha="0.99215686"
android:strokeLineJoin="miter"
android:strokeWidth="0.71840823"
android:fillColor="#f2f2f2"
android:fillColor="#ffffff"
android:strokeColor="#00000000"
android:fillAlpha="0.99215686"
android:strokeLineCap="butt"/>
@ -98,7 +98,7 @@
android:strokeAlpha="1"
android:strokeLineJoin="miter"
android:strokeWidth="0.37795275"
android:fillColor="#f2f2f2"
android:fillColor="#ffffff"
android:strokeColor="#00000000"
android:fillAlpha="1"
android:strokeLineCap="butt"/>

File diff suppressed because one or more lines are too long

View File

@ -1,5 +1,5 @@
<vector android:height="24dp" android:viewportHeight="48"
android:viewportWidth="48" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillAlpha="1" android:fillColor="#ffffff"
<path android:fillAlpha="1" android:fillColor="#808080"
android:pathData="m48,4v14c0,1.0938 -0.9063,2 -2,2H32C31.1875,20 30.4688,19.5 30.1563,18.75 29.8438,18.0313 30,17.1563 30.5938,16.5938l4.3125,-4.3125C31.9688,9.5625 28.0938,8 24,8 15.1875,8 8,15.1875 8,24c0,8.8125 7.1875,16 16,16 4.9688,0 9.5625,-2.25 12.625,-6.2188 0.1563,-0.2188 0.4375,-0.3438 0.7188,-0.375 0.2813,0 0.5625,0.0938 0.7813,0.2813L42.4063,38c0.375,0.3438 0.375,0.9375 0.0625,1.3438C37.9063,44.8438 31.1563,48 24,48 10.7813,48 0,37.2188 0,24 0,10.7813 10.7813,0 24,0 30.1563,0 36.125,2.4688 40.5313,6.625l4.0625,-4.0313C45.1563,2 46.0313,1.8438 46.7813,2.1563 47.5,2.4688 48,3.1875 48,4Z" android:strokeWidth="0.03125"/>
</vector>

View File

@ -1,5 +1,27 @@
<vector android:height="24dp" android:viewportHeight="48"
android:viewportWidth="48" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillAlpha="1" android:fillColor="#ffffff"
android:pathData="m33.2308,20.3077c0,-7.125 -5.7981,-12.9231 -12.9231,-12.9231 -7.125,0 -12.9231,5.7981 -12.9231,12.9231 0,7.125 5.7981,12.9231 12.9231,12.9231 7.125,0 12.9231,-5.7981 12.9231,-12.9231zM48,44.3077c0,2.0192 -1.6731,3.6923 -3.6923,3.6923 -0.9808,0 -1.9327,-0.4038 -2.5962,-1.0962l-9.8942,-9.8653c-3.375,2.3365 -7.4135,3.5769 -11.5096,3.5769C9.0865,40.6154 0,31.5288 0,20.3077 0,9.0865 9.0865,0 20.3077,0 31.5288,0 40.6154,9.0865 40.6154,20.3077c0,4.0961 -1.2404,8.1346 -3.5769,11.5096l9.8942,9.8942C47.5962,42.375 48,43.3269 48,44.3077Z" android:strokeWidth="0.02884615"/>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp"
android:height="48dp"
android:viewportWidth="12.7"
android:viewportHeight="12.7">
<path
android:pathData="M2.8536,2.7735C2.6855,3.1333 2.6132,3.5237 2.6593,3.9259C2.7051,4.3255 2.8633,4.6955 3.1073,5.0214A2.5396,2.5396 0,0 0,3.0722 5.4384A2.5396,2.5396 0,0 0,5.6121 7.9783A2.5396,2.5396 135,0 0,7.0363 7.5386L9.3007,9.5048C9.6701,9.8255 10.0447,9.9945 10.141,9.8836L10.4262,9.5555C10.5225,9.4446 10.3026,9.0969 9.9332,8.7762L7.7194,6.8538A2.5396,2.5396 0,0 0,8.1514 5.4384A2.5396,2.5396 45,0 0,8.1163 5.039C8.3542,4.7166 8.5084,4.3511 8.5535,3.9574C8.5996,3.5553 8.5278,3.1653 8.3597,2.8055C8.3064,3.243 8.0572,3.6349 7.6729,3.9589A2.5396,2.5396 45,0 0,5.6121 2.899A2.5396,2.5396 0,0 0,3.5621 3.9439C3.1659,3.6167 2.9078,3.2188 2.8536,2.7735zM5.6059,3.4318A2.0008,2.0008 0,0 1,7.6068 5.4327A2.0008,2.0008 0,0 1,5.6059 7.4337A2.0008,2.0008 0,0 1,3.6049 5.4327A2.0008,2.0008 0,0 1,5.6059 3.4318z"
android:strokeWidth="0.08921956"
android:fillColor="#ffffff"
android:strokeColor="#00000000"
android:fillType="nonZero"
android:fillAlpha="1"/>
<path
android:pathData="M5.6059,3.7228A1.7098,1.7098 0,0 0,3.8964 5.4327A1.7098,1.7098 0,0 0,5.6059 7.1427A1.7098,1.7098 0,0 0,7.3158 5.4327A1.7098,1.7098 0,0 0,5.6059 3.7228zM5.6348,4.8286A0.6438,0.6438 0,0 1,6.2782 5.4725A0.6438,0.6438 0,0 1,5.6348 6.1164A0.6438,0.6438 0,0 1,4.9909 5.4725A0.6438,0.6438 0,0 1,5.6348 4.8286z"
android:strokeWidth="0.06365409"
android:fillColor="#ffffff"
android:strokeColor="#00000000"
android:fillType="nonZero"
android:fillAlpha="0.99215686"/>
<path
android:pathData="M5.8974,5.2497m-0.1312,0a0.1312,0.1312 0,1 1,0.2623 0a0.1312,0.1312 0,1 1,-0.2623 0"
android:strokeWidth="0.02360601"
android:fillColor="#ffffff"
android:strokeColor="#00000000"
android:fillType="nonZero"
android:fillAlpha="1"/>
</vector>

View File

@ -1,5 +1,15 @@
<vector android:height="24dp" android:viewportHeight="48"
android:viewportWidth="48" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillAlpha="1" android:fillColor="#ffffff"
android:pathData="m47.2516,0.2946c0.5625,0.4018 0.8304,1.0446 0.7232,1.7143L41.1176,43.1518c-0.0804,0.5089 -0.4018,0.9375 -0.8571,1.2054 -0.2411,0.1339 -0.5357,0.2143 -0.8304,0.2143 -0.2143,0 -0.4286,-0.0536 -0.6429,-0.1339L26.6533,39.4821 20.1712,47.3839C19.8498,47.7857 19.3676,48 18.8587,48c-0.1875,0 -0.4018,-0.0268 -0.5893,-0.1071 -0.6696,-0.2411 -1.125,-0.8839 -1.125,-1.6071V36.9375L40.2873,8.5714 11.6533,33.3482 1.073,29.0089C0.4569,28.7679 0.0551,28.2054 0.0016,27.5357 -0.0252,26.8929 0.2962,26.2768 0.8587,25.9554L45.4301,0.2411C45.698,0.0804 45.9926,0 46.2873,0c0.3482,0 0.6964,0.1071 0.9643,0.2946z" android:strokeWidth="0.02678571"/>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp"
android:height="48dp"
android:viewportWidth="12.7"
android:viewportHeight="12.7">
<path
android:pathData="M10.3746,2.4691C10.356,2.4677 10.3359,2.4685 10.3141,2.4717C10.1704,2.4926 9.33,3.3777 6.3541,6.3536C2.5495,10.1582 2.473,10.2375 2.5017,10.3322C2.5414,10.4635 2.5781,10.4934 2.698,10.4934C2.7899,10.4934 3.1935,10.0997 6.6523,6.6409C10.1111,3.1822 10.435,2.825 10.5048,2.6867C10.5528,2.5915 10.5042,2.4787 10.3746,2.4691zM6.473,2.8882C5.4913,2.8862 4.6348,3.2542 3.8959,3.9956C3.1782,4.7158 2.8373,5.5024 2.8257,6.4647C2.8202,6.9115 2.9229,7.566 3.0122,7.6553C3.0484,7.6915 3.4025,7.3524 5.0576,5.6973C6.1585,4.5964 7.0548,3.6912 7.0492,3.6856C7.0086,3.645 6.4816,3.4891 6.3448,3.4773C6.1391,3.4596 6.0606,3.392 6.1464,3.3063C6.2891,3.1635 6.911,3.3062 7.0492,3.5135L7.1262,3.6287L7.3856,3.3693C7.5727,3.1822 7.6338,3.0981 7.6042,3.0685C7.5304,2.9947 6.8658,2.8889 6.473,2.8882zM7.9416,3.1388L5.5154,5.565L3.0892,7.9912L3.1538,8.1483C3.242,8.3632 3.4941,8.7411 3.5595,8.7566C3.6274,8.7726 8.662,3.7441 8.6863,3.636C8.7001,3.5746 8.6646,3.536 8.4879,3.4184C8.3696,3.3397 8.1982,3.2445 8.107,3.207L7.9416,3.1388zM6.0058,3.8427C6.0675,3.842 6.1537,3.8678 6.2513,3.9202C6.4822,4.0446 6.5392,4.2203 6.3422,4.2003L6.3422,4.2008C6.1956,4.1859 5.9071,4.0021 5.9071,3.9238C5.9071,3.8702 5.9442,3.8434 6.0058,3.8427zM4.2152,5.671C4.2717,5.6583 4.3513,5.7304 4.3832,5.8441C4.4258,5.9958 4.3609,6.1229 4.2628,6.0792C4.1852,6.0446 4.1251,5.8119 4.1687,5.7139C4.1797,5.6892 4.1964,5.6752 4.2152,5.671zM3.7889,5.8637C3.8676,5.8647 3.8925,5.9138 3.9636,6.2053C4.0476,6.5498 4.0281,6.6873 3.9031,6.6316C3.8254,6.597 3.6824,6.1564 3.6912,5.979C3.6963,5.8777 3.7093,5.8625 3.7889,5.8637zM3.3269,5.9573C3.3906,5.9486 3.4243,6.0612 3.4489,6.3298C3.467,6.528 3.4955,6.7345 3.5119,6.7887C3.5474,6.9059 3.4721,6.9976 3.3755,6.9546C3.2482,6.8979 3.1464,6.111 3.2525,6.0048C3.2811,5.9762 3.3057,5.9601 3.3269,5.9573z"
android:strokeAlpha="1"
android:strokeLineJoin="miter"
android:strokeWidth="0.1739749"
android:fillColor="#fdfcfd"
android:strokeColor="#00000000"
android:fillAlpha="1"
android:strokeLineCap="butt"/>
</vector>

View File

@ -81,7 +81,7 @@
android:layout_height="wrap_content"
android:drawableTop="@drawable/ic_mail"
android:text="@string/action_mail"
android:textColor="#ffffff"
android:textColor="@color/white"
app:fontFamily="@font/open_sans_regular" />
<Button
@ -91,7 +91,7 @@
android:layout_height="wrap_content"
android:drawableTop="@drawable/ic_cloud"
android:text="@string/action_cloud"
android:textColor="#ffffff"
android:textColor="@color/white"
app:fontFamily="@font/open_sans_regular" />
<!--end of Disroot's Dandelion
@ -112,7 +112,7 @@
android:layout_height="wrap_content"
android:drawableTop="@drawable/ic_forum"
android:text="@string/action_forum"
android:textColor="#ffffff"
android:textColor="@color/white"
app:fontFamily="@font/open_sans_regular" />
<Button
@ -122,7 +122,7 @@
android:layout_height="wrap_content"
android:drawableTop="@drawable/ic_chat"
android:text="@string/action_chat"
android:textColor="#ffffff"
android:textColor="@color/white"
app:fontFamily="@font/open_sans_regular" />
<Button
@ -132,7 +132,7 @@
android:layout_height="wrap_content"
android:drawableTop="@drawable/ic_pad"
android:text="@string/action_pad"
android:textColor="#ffffff"
android:textColor="@color/white"
app:fontFamily="@font/open_sans_regular" />
<Button
@ -142,7 +142,7 @@
android:layout_height="wrap_content"
android:drawableTop="@drawable/ic_calc"
android:text="@string/action_calc"
android:textColor="#ffffff"
android:textColor="@color/white"
app:fontFamily="@font/open_sans_regular" />
<Button
@ -152,7 +152,7 @@
android:layout_height="wrap_content"
android:drawableTop="@drawable/ic_bin"
android:text="@string/action_bin"
android:textColor="#ffffff"
android:textColor="@color/white"
app:fontFamily="@font/open_sans_regular" />
<Button
@ -162,7 +162,7 @@
android:layout_height="wrap_content"
android:drawableTop="@drawable/ic_upload"
android:text="@string/action_upload"
android:textColor="#ffffff"
android:textColor="@color/white"
app:fontFamily="@font/open_sans_regular" />
<Button
@ -172,7 +172,7 @@
android:layout_height="wrap_content"
android:drawableTop="@drawable/ic_searx"
android:text="@string/action_searx"
android:textColor="#ffffff"
android:textColor="@color/white"
app:fontFamily="@font/open_sans_regular" />
<Button
@ -182,7 +182,7 @@
android:layout_height="wrap_content"
android:drawableTop="@drawable/ic_poll"
android:text="@string/action_poll"
android:textColor="#ffffff"
android:textColor="@color/white"
app:fontFamily="@font/open_sans_regular" />
<Button
@ -192,7 +192,7 @@
android:layout_height="wrap_content"
android:drawableTop="@drawable/ic_board"
android:text="@string/action_board"
android:textColor="#ffffff"
android:textColor="@color/white"
app:fontFamily="@font/open_sans_regular" />
<Button
@ -202,7 +202,7 @@
android:layout_height="wrap_content"
android:drawableTop="@drawable/ic_notes"
android:text="@string/action_notes"
android:textColor="#ffffff"
android:textColor="@color/white"
app:fontFamily="@font/open_sans_regular" />
<Button
@ -210,9 +210,10 @@
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxWidth="@dimen/extra_margin"
android:drawableTop="@drawable/ic_user"
android:text="@string/action_user"
android:textColor="#ffffff"
android:textColor="@color/white"
app:fontFamily="@font/open_sans_regular" />
<Button
@ -220,9 +221,10 @@
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxWidth="@dimen/extra_margin"
android:drawableTop="@drawable/ic_state"
android:text="@string/action_state"
android:textColor="#ffffff"
android:textColor="@color/white"
app:fontFamily="@font/open_sans_regular" />
<Button
@ -232,7 +234,7 @@
android:layout_height="wrap_content"
android:drawableTop="@drawable/ic_howto"
android:text="@string/action_howto"
android:textColor="#ffffff"
android:textColor="@color/white"
app:fontFamily="@font/open_sans_regular" />
<Button
@ -241,8 +243,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableTop="@drawable/ic_about"
android:drawableTint="@color/white"
android:text="@string/action_about"
android:textColor="#ffffff"
android:textColor="@color/white"
app:fontFamily="@font/open_sans_regular" />
</GridLayout>
</LinearLayout>

View File

@ -6,7 +6,7 @@
android:layout_height="match_parent"
tools:context=".ui.SettingsActivity"
android:orientation="vertical"
android:background="@color/bg_primary_blue_dark"
android:background="@color/dark_grey"
android:id="@+id/iconSettings">
<android.support.design.widget.AppBarLayout
@ -24,118 +24,209 @@
android:layout_weight="1"
android:background="@color/bg_primary_blue"
app:layout_scrollFlags="scroll|enterAlways"
app:popupTheme="@style/DisTheme.PopupOverlay"
app:title="@string/settings">
</android.support.v7.widget.Toolbar>
</android.support.design.widget.AppBarLayout>
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content">
<GridLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:columnCount="1">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginVertical="@dimen/activity_vertical_margin"
android:layout_marginTop="@dimen/activity_vertical_margin"
android:layout_marginBottom="@dimen/activity_vertical_margin"
android:text="@string/edit_apps_title"
android:textColor="#ffffff"
android:textColor="@color/gray"
android:gravity="center"/>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@android:color/darker_gray"/>
<GridLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:columnCount="1">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:paddingHorizontal="@dimen/activity_horizontal_margin">
<TextView
android:id="@+id/mailView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/activity_horizontal_margin_half"
android:paddingRight="@dimen/activity_horizontal_margin_half"
style="?android:attr/borderlessButtonStyle"
android:text="@string/action_mail"
android:textColor="#ffffff"
android:textColor="@color/gray"
android:drawableStart="@drawable/ic_mail"
android:drawablePadding="@dimen/activity_horizontal_margin_half"
android:drawableTint="@color/gray"
android:drawableLeft="@drawable/ic_mail" />
<CheckBox
android:id="@+id/mailBtnPreference"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:layout_gravity="end|center_vertical"/>
</FrameLayout>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:paddingHorizontal="@dimen/activity_horizontal_margin">
<TextView
android:id="@+id/cloudView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/activity_horizontal_margin_half"
android:paddingRight="@dimen/activity_horizontal_margin_half"
style="?android:attr/borderlessButtonStyle"
android:text="@string/Cloud"
android:textColor="#ffffff"
android:textColor="@color/gray"
android:drawableTint="@color/gray"
android:drawableStart="@drawable/ic_cloud"
android:drawablePadding="@dimen/activity_horizontal_margin_half"
android:drawableLeft="@drawable/ic_cloud"/>
<CheckBox
android:id="@+id/cloudBtnPreference"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:layout_gravity="end|center_vertical"/>
</FrameLayout>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:paddingHorizontal="@dimen/activity_horizontal_margin">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/activity_horizontal_margin_half"
android:paddingRight="@dimen/activity_horizontal_margin_half"
style="?android:attr/borderlessButtonStyle"
android:text="@string/action_forum"
android:textColor="#ffffff"
android:textColor="@color/gray"
android:drawableTint="@color/gray"
android:drawableStart="@drawable/ic_forum"
android:drawablePadding="@dimen/activity_horizontal_margin_half"
android:drawableLeft="@drawable/ic_forum"/>
<CheckBox
android:id="@+id/foumBtnPreference"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:layout_gravity="end|center_vertical"/>
</FrameLayout>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:paddingHorizontal="@dimen/activity_horizontal_margin">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/activity_horizontal_margin_half"
android:paddingRight="@dimen/activity_horizontal_margin_half"
style="?android:attr/borderlessButtonStyle"
android:text="@string/action_chat"
android:textColor="#ffffff"
android:textColor="@color/gray"
android:drawableTint="@color/gray"
android:drawableStart="@drawable/ic_chat"
android:drawablePadding="@dimen/activity_horizontal_margin_half"
android:drawableLeft="@drawable/ic_chat"/>
<CheckBox
android:id="@+id/chatBtnPreference"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:layout_gravity="end|center_vertical"/>
</FrameLayout>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="@dimen/activity_horizontal_margin">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="?android:attr/borderlessButtonStyle"
android:text="@string/action_pad"
android:textColor="@color/gray"
android:drawableTint="@color/gray"
android:drawableStart="@drawable/ic_pad"
android:drawableLeft="@drawable/ic_pad"/>
<CheckBox
android:id="@+id/padBtnPreference"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"/>
</FrameLayout>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="@dimen/activity_horizontal_margin">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="?android:attr/borderlessButtonStyle"
android:text="@string/action_calc"
android:textColor="@color/gray"
android:drawableTint="@color/gray"
android:drawableStart="@drawable/ic_calc"
android:drawableLeft="@drawable/ic_calc"/>
<CheckBox
android:id="@+id/calcBtnPreference"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"/>
</FrameLayout>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="@dimen/activity_horizontal_margin">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="?android:attr/borderlessButtonStyle"
android:text="@string/action_bin"
android:textColor="@color/gray"
android:drawableTint="@color/gray"
android:drawableStart="@drawable/ic_bin"
android:drawableLeft="@drawable/ic_bin"/>
<CheckBox
android:id="@+id/binBtnPreference"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"/>
</FrameLayout>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="@dimen/activity_horizontal_margin">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="?android:attr/borderlessButtonStyle"
android:text="@string/action_upload"
android:textColor="@color/gray"
android:drawableTint="@color/gray"
android:drawableStart="@drawable/ic_upload"
android:drawableLeft="@drawable/ic_upload"/>
<CheckBox
android:id="@+id/uploadBtnPreference"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"/>
</FrameLayout>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="@dimen/activity_horizontal_margin">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="?android:attr/borderlessButtonStyle"
android:text="@string/action_searx"
android:textColor="@color/gray"
android:drawableTint="@color/gray"
android:drawableStart="@drawable/ic_searx"
android:drawableLeft="@drawable/ic_searx"/>
<CheckBox
android:id="@+id/searxBtnPreference"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"/>
</FrameLayout>
</GridLayout>
</ScrollView>
</LinearLayout>

View File

@ -30,7 +30,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center|top"
android:background="#203140">
android:background="@color/dark_grey">
<Button
android:id="@+id/StateBtn"
android:shadowColor="@color/bg_primary_blue"
@ -67,6 +67,6 @@
android:id="@+id/list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#203140"/>
android:background="@color/dark_grey"/>
</LinearLayout>

View File

@ -30,7 +30,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:background="#203140">
android:background="@color/dark_grey">
<Button
android:id="@+id/StateBtn"
android:shadowColor="@color/bg_primary_blue"
@ -67,6 +67,6 @@
android:id="@+id/list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#203140"/>
android:background="@color/dark_grey"/>
</LinearLayout>

View File

@ -22,7 +22,7 @@
android:icon="@drawable/ic_forget"
android:id="@+id/action_forget"
android:title="@string/Forget"
android:visible="false"/>
android:visible="false" />
<item
android:icon="@drawable/ic_reload"
android:id="@+id/action_reload"

View File

@ -13,7 +13,7 @@
<string name="action_searx">Searx</string>
<string name="action_poll">Poll</string>
<string name="action_board">Taiga</string>
<string name="action_user">Password</string>
<string name="action_user">Account</string>
<string name="action_state">Stato</string>
<string name="action_howto">Manuali</string>

View File

@ -13,7 +13,7 @@
<string name="action_searx">Searx</string>
<string name="action_poll">Poll</string>
<string name="action_board">Taiga</string>
<string name="action_user">Wachtwoord</string>
<string name="action_user">Account</string>
<string name="action_state">Status</string>
<string name="action_howto">How to</string>

View File

@ -2,5 +2,7 @@
<resources>
<color name="bg_primary_blue">#50162d</color>
<color name="bg_primary_blue_dark">#1f5c60</color>
<color name="gray">#1f5c60</color><!--808080 -->
</resources>
<color name="gray">#808080</color><!--808080 -->
<color name="dark_grey">#2c2c2c</color>
<color name="white">#ffffff</color>
</resources>

View File

@ -13,7 +13,7 @@
<string name="action_searx">Search</string>
<string name="action_poll">Polls</string>
<string name="action_board">Taiga</string>
<string name="action_user">Password</string>
<string name="action_user">Account</string>
<string name="action_state">State</string>
<string name="action_howto">How to</string>

View File

@ -11,21 +11,25 @@
<item name="toolbarStyle">@style/Widget.MyApp.ActionBar</item>
<item name="android:textAllCaps">false</item>
<item name="cardViewStyle">@style/CardView</item>
<item name="colorControlNormal">@color/gray</item><!--if checkbox is activated-->
<item name="colorControlActivated">@color/gray</item><!--if checkbox is activated-->
</style>
<style name="Widget.MyApp.ActionBar" parent="Widget.AppCompat.ActionBar">
<item name="theme">@style/ThemeOverlay.MyApp.ActionBar</item>
<item name="popupTheme">@style/ThemeOverlay.AppCompat.Dark
</item> <!--change theme for actionbar poupmenu-->
<item name="popupTheme">@style/ThemeOverlay.AppCompat.Dark</item> <!--change theme for actionbar poupmenu-->
</style>
<style name="ThemeOverlay.MyApp.ActionBar" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
<item name="android:textColor">@color/gray</item>
<item name="android:textColorPrimary">@android:color/white</item>
<item name="android:actionMenuTextColor">@android:color/white
</item><!--<item name="android:textSize">18sp</item>-->
<item name="android:actionMenuTextColor">@color/gray</item><!--<item name="android:textSize">18sp</item>-->
</style>
<style name="DisTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
<style name="DisTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
</style>
<style name="DisTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />