All buttons updated and hideble

This commit is contained in:
massimiliano 2020-01-17 21:43:42 +01:00
parent b359a079d1
commit c1183ffb44
28 changed files with 703 additions and 115 deletions

View File

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

View File

@ -4,7 +4,7 @@ android {
compileSdkVersion 28
defaultConfig {
applicationId "org.disroot.disrootapp"
minSdkVersion 15
minSdkVersion 16
targetSdkVersion 28
versionCode 23
versionName "1.9.0"

View File

@ -84,8 +84,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
WebChromeClient.FileChooserParams chooserParams;
ValueCallback<Uri[]> chooserPathUri;
Button button;
private Button MailBtn,CloudBtn,ForumBtn,ChatBtn,PadBtn,CalcBtn,BinBtn,UploadBtn,SearxBtn,PollsBtn,BoardBtn,NotesBtn,UserBtn,StateBtn,HowToBtn,AboutBtn;//all buttons
private 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};
private Button MailBtn,CloudBtn,ForumBtn,ChatBtn,PadBtn,CalcBtn,BinBtn,UploadBtn,SearxBtn,PollsBtn,BoardBtn,CallsBtn,NotesBtn,GitBtn,UserBtn,StateBtn,HowToBtn,AboutBtn;//all buttons
private CookieManager cookieManager;
private WebView webView;
private DisWebChromeClient disWebChromeClient;
@ -97,19 +96,8 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
private Snackbar snackbarExitApp;
private FragmentManager fm;
private String mCameraPhotoPath;
private String k9 = "com.fsck.k9";
private String nc = "com.nextcloud.client";
private String Diaspora = "com.github.dfa.diaspora_android";
private String Conversations = "eu.siacs.conversations";
private String PixArt = "de.pixart.messenger";
private String Padland = "com.mikifus.padland";
private String NotesApp = "it.niedermann.owncloud.notes";
private String loadUrl;
private int progressStatus = 0;
private static final int REQUEST_ID_MULTIPLE_PERMISSIONS = 1;//file upload
private static final int INPUT_FILE_REQUEST_CODE = 1;//file upload
private static final int FILECHOOSER_RESULTCODE = 1;//file upload
public static final String TAG = MainActivity.class.getSimpleName();
@Override
public void onCreate(Bundle savedInstanceState) {
@ -133,7 +121,13 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
BtnPreference = getSharedPreferences( "UploadBtn", Context.MODE_PRIVATE );//upload
BtnPreference = getSharedPreferences( "SearxBtn", Context.MODE_PRIVATE );//search
BtnPreference = getSharedPreferences( "PollsBtn", Context.MODE_PRIVATE );//polls
BtnPreference = getSharedPreferences( "BoardBtn", Context.MODE_PRIVATE );//board
BtnPreference = getSharedPreferences( "CallsBtn", Context.MODE_PRIVATE );//calls
BtnPreference = getSharedPreferences( "NotesBtn", Context.MODE_PRIVATE );//notes
BtnPreference = getSharedPreferences( "GitBtn", Context.MODE_PRIVATE );//git
BtnPreference = getSharedPreferences( "UserBtn", Context.MODE_PRIVATE );//user
BtnPreference = getSharedPreferences( "HowToBtn", Context.MODE_PRIVATE );//howTo
BtnPreference = getSharedPreferences( "AboutBtn", Context.MODE_PRIVATE );//about
//Status service
Intent intent = new Intent( MainActivity.this, StatusService.class);
startService(intent);
@ -210,7 +204,9 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
SearxBtn = findViewById( R.id.SearxBtn );
PollsBtn = findViewById( R.id.PollsBtn );
BoardBtn = findViewById( R.id.BoardBtn );
CallsBtn = findViewById( R.id.CallsBtn );
NotesBtn = findViewById( R.id.NotesBtn );
GitBtn = findViewById( R.id.GitBtn );
UserBtn = findViewById( R.id.UserBtn );
StateBtn = findViewById( R.id.StateBtn );
HowToBtn = findViewById( R.id.HowToBtn );
@ -220,8 +216,8 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
for (Map.Entry<String, ?> entry : allEntries.entrySet()) {
if (entry.getValue().equals( false )){
ViewGroup viewGroup =((ViewGroup)findViewById( R.id.StateBtn ).getParent());
for(int i=0; i<buttonIDs.length; i++) {
Button b = (Button) findViewById(buttonIDs[i]);
for(int i=0; i<Constants.buttonIDs.length; i++) {
Button b = (Button) findViewById(Constants.buttonIDs[i]);
int resID = getResources().getIdentifier(entry.getKey(),
"id", getPackageName());
if(findViewById(resID)==b) {
@ -247,7 +243,9 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
SearxBtn.setOnLongClickListener( this );
PollsBtn.setOnLongClickListener( this );
BoardBtn.setOnLongClickListener( this );
CallsBtn.setOnLongClickListener( this );
NotesBtn.setOnLongClickListener( this );
GitBtn.setOnLongClickListener( this );
UserBtn.setOnLongClickListener( this );
StateBtn.setOnLongClickListener( this );
HowToBtn.setOnLongClickListener( this );
@ -266,7 +264,9 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
SearxBtn.setOnClickListener( this );
PollsBtn.setOnClickListener( this );
BoardBtn.setOnClickListener( this );
CallsBtn.setOnClickListener( this );
NotesBtn.setOnClickListener( this );
GitBtn.setOnClickListener( this );
UserBtn.setOnClickListener( this );
StateBtn.setOnClickListener( this );
HowToBtn.setOnClickListener( this );
@ -292,14 +292,14 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
else {
switch (view.getId()) {
case R.id.MailBtn:
Intent mail = getPackageManager().getLaunchIntentForPackage( k9 );
Intent mail = getPackageManager().getLaunchIntentForPackage( Constants.k9 );
if (mail == null) {
showMailDialog();
break;
} else startActivity(mail);
break;
case R.id.CloudBtn:
Intent cloud = getPackageManager().getLaunchIntentForPackage(nc);
Intent cloud = getPackageManager().getLaunchIntentForPackage(Constants.nc);
if(cloud == null) {
showCloudDialog();
break;
@ -320,8 +320,8 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
break;
case R.id.ChatBtn:
Intent xmpp1 = getPackageManager().getLaunchIntentForPackage(Conversations);
Intent xmpp2 = getPackageManager().getLaunchIntentForPackage(PixArt);
Intent xmpp1 = getPackageManager().getLaunchIntentForPackage(Constants.Conversations);
Intent xmpp2 = getPackageManager().getLaunchIntentForPackage(Constants.PixArt);
if((xmpp1 == null)&&(xmpp2 == null)) {
showChatDialog();
break;
@ -347,7 +347,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
startActivity(xmpp1);
break;
case R.id.PadBtn:
Intent pad = getPackageManager().getLaunchIntentForPackage(Padland);
Intent pad = getPackageManager().getLaunchIntentForPackage(Constants.Padland);
if(pad == null) {
showPAdDialog();
break;
@ -378,14 +378,30 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
webView.loadUrl(Constants.URL_DisApp_BOARD);
hideDashboard();
break;
case R.id.CallsBtn:
Intent board = getPackageManager().getLaunchIntentForPackage(Constants.CallsApp);
if(board == null) {
showBoardDialog();
break;
}
else startActivity(board);
break;
case R.id.NotesBtn:
Intent notes = getPackageManager().getLaunchIntentForPackage(NotesApp);
Intent notes = getPackageManager().getLaunchIntentForPackage(Constants.NotesApp);
if(notes == null) {
showNotesDialog();
break;
}
else startActivity(notes);
break;
case R.id.GitBtn:
Intent git = getPackageManager().getLaunchIntentForPackage(Constants.GitApp);
if(git == null) {
showGitDialog();
break;
}
else startActivity(git);
break;
case R.id.UserBtn:
webView.loadUrl(Constants.URL_DisApp_USER);
hideDashboard();
@ -447,9 +463,15 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
case R.id.BoardBtn:
showBoardInfo();
break;
case R.id.CallsBtn:
showCallsInfo();
break;
case R.id.NotesBtn:
showNotesInfo();
break;
case R.id.GitBtn:
showGitInfo();
break;
case R.id.UserBtn:
showUserInfo();
break;
@ -491,7 +513,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
}
});
builder.setPositiveButton(R.string.Conversations, new DialogInterface.OnClickListener() {
Intent xmpp1 = getPackageManager().getLaunchIntentForPackage(Conversations);
Intent xmpp1 = getPackageManager().getLaunchIntentForPackage(Constants.Conversations);
@Override
public void onClick(DialogInterface dialog, int which) {
if (((CheckBox) checkChat).isChecked()) {
@ -505,7 +527,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
}
});
builder.setNegativeButton(R.string.PixArt, new DialogInterface.OnClickListener() {
Intent xmpp2 = getPackageManager().getLaunchIntentForPackage(PixArt);
Intent xmpp2 = getPackageManager().getLaunchIntentForPackage(Constants.PixArt);
@Override
public void onClick(DialogInterface dialog, int which) {
if (((CheckBox) checkChat).isChecked()) {
@ -577,7 +599,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
hideDashboard();
}
});
builder.setNeutralButton( R.string.remove , new DialogInterface.OnClickListener() {
builder.setNeutralButton( R.string.hide, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
ViewGroup viewGroup =((ViewGroup)findViewById( R.id.StateBtn ).getParent());
@ -595,10 +617,10 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
builder.setTitle(R.string.DiaInstallTitle);
builder.setMessage(getString(R.string.MailDialog));
builder.setPositiveButton(R.string.global_install, new DialogInterface.OnClickListener() {
Intent mail = getPackageManager().getLaunchIntentForPackage(k9);
Intent mail = getPackageManager().getLaunchIntentForPackage(Constants.k9);
@Override
public void onClick(DialogInterface dialog, int which) {
mail = new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=" + k9));
mail = new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=" + Constants.k9));
startActivity(mail);
}
});
@ -620,7 +642,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
hideDashboard();
}
});
builder.setNeutralButton( R.string.remove , new DialogInterface.OnClickListener() {
builder.setNeutralButton( R.string.hide, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
ViewGroup viewGroup =((ViewGroup)findViewById( R.id.StateBtn ).getParent());
@ -638,10 +660,10 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
builder.setTitle(R.string.DiaInstallTitle);
builder.setMessage(getString(R.string.CloudDialog));
builder.setPositiveButton(R.string.global_install, new DialogInterface.OnClickListener() {
Intent cloud = getPackageManager().getLaunchIntentForPackage(nc);
Intent cloud = getPackageManager().getLaunchIntentForPackage(Constants.nc);
@Override
public void onClick(DialogInterface dialog, int which) {
cloud = new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=" + nc));
cloud = new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=" + Constants.nc));
startActivity(cloud);
}
});
@ -696,7 +718,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
hideDashboard();
}
});
builder.setNeutralButton( R.string.remove , new DialogInterface.OnClickListener() {
builder.setNeutralButton( R.string.hide, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
ViewGroup viewGroup =((ViewGroup)findViewById( R.id.StateBtn ).getParent());
@ -754,7 +776,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
hideDashboard();
}
});
builder.setNeutralButton( R.string.remove , new DialogInterface.OnClickListener() {
builder.setNeutralButton( R.string.hide, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
ViewGroup viewGroup =((ViewGroup)findViewById( R.id.StateBtn ).getParent());
@ -772,10 +794,10 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
builder.setTitle(R.string.DiaInstallTitle);
builder.setMessage(getString(R.string.ChatDialog));
builder.setPositiveButton(R.string.global_install, new DialogInterface.OnClickListener() {
Intent xmpp1 = getPackageManager().getLaunchIntentForPackage(Conversations);
Intent xmpp1 = getPackageManager().getLaunchIntentForPackage(Constants.Conversations);
@Override
public void onClick(DialogInterface dialog, int which) {
xmpp1 = new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=" + Conversations));
xmpp1 = new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=" + Constants.Conversations));
startActivity(xmpp1);
}
});
@ -796,7 +818,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
hideDashboard();
}
});
builder.setNeutralButton( R.string.remove , new DialogInterface.OnClickListener() {
builder.setNeutralButton( R.string.hide, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
ViewGroup viewGroup =((ViewGroup)findViewById( R.id.StateBtn ).getParent());
@ -814,10 +836,10 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
builder.setTitle(R.string.DiaInstallTitle);
builder.setMessage(getString(R.string.PadDialog));
builder.setPositiveButton(R.string.global_install, new DialogInterface.OnClickListener() {
Intent pad = getPackageManager().getLaunchIntentForPackage(Padland);
Intent pad = getPackageManager().getLaunchIntentForPackage(Constants.Padland);
@Override
public void onClick(DialogInterface dialog, int which) {
pad = new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=" + Padland));
pad = new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=" + Constants.Padland));
startActivity(pad);
}
});
@ -838,7 +860,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
hideDashboard();
}
});
builder.setNeutralButton( R.string.remove , new DialogInterface.OnClickListener() {
builder.setNeutralButton( R.string.hide, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
ViewGroup viewGroup =((ViewGroup)findViewById( R.id.StateBtn ).getParent());
@ -864,7 +886,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
hideDashboard();
}
});
builder.setNeutralButton( R.string.remove , new DialogInterface.OnClickListener() {
builder.setNeutralButton( R.string.hide, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
ViewGroup viewGroup =((ViewGroup)findViewById( R.id.StateBtn ).getParent());
@ -891,7 +913,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
findViewById(R.id.dashboard).setVisibility(View.GONE);
}
});
builder.setNeutralButton( R.string.remove , new DialogInterface.OnClickListener() {
builder.setNeutralButton( R.string.hide, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
ViewGroup viewGroup =((ViewGroup)findViewById( R.id.StateBtn ).getParent());
@ -917,7 +939,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
hideDashboard();
}
});
builder.setNeutralButton( R.string.remove , new DialogInterface.OnClickListener() {
builder.setNeutralButton( R.string.hide, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
ViewGroup viewGroup =((ViewGroup)findViewById( R.id.StateBtn ).getParent());
@ -943,7 +965,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
hideDashboard();
}
});
builder.setNeutralButton( R.string.remove , new DialogInterface.OnClickListener() {
builder.setNeutralButton( R.string.hide, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
ViewGroup viewGroup =((ViewGroup)findViewById( R.id.StateBtn ).getParent());
@ -969,6 +991,58 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
hideDashboard();
}
});
builder.setNeutralButton( R.string.hide, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
ViewGroup viewGroup =((ViewGroup)findViewById( R.id.StateBtn ).getParent());
if (findViewById( R.id.BoardBtn).getParent()!=null){
viewGroup.removeView(BoardBtn);
BtnPreference.edit().putBoolean( "BoardBtn", false ).apply();
return;}
}
});
builder.show();
}
private void showCallsInfo() {
AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
builder.setCancelable(false);
builder.setTitle(R.string.CallsTitle);
builder.setMessage(getString(R.string.CallsInfo));
builder.setPositiveButton(R.string.global_ok, null);
builder.setNegativeButton(R.string.more_help, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
webView.loadUrl(Constants.URL_DisApp_CALLSHELP);
hideDashboard();
}
});
builder.setNeutralButton( R.string.hide, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
ViewGroup viewGroup =((ViewGroup)findViewById( R.id.StateBtn ).getParent());
if (findViewById( R.id.CallsBtn).getParent()!=null){
viewGroup.removeView(CallsBtn);
BtnPreference.edit().putBoolean( "CallsBtn", false ).apply();
return;}
}
});
builder.show();
}
private void showBoardDialog(){
AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
builder.setCancelable(false);
builder.setTitle(R.string.DiaInstallTitle);
builder.setMessage(getString(R.string.CallsDialog));
builder.setPositiveButton(R.string.global_install, new DialogInterface.OnClickListener() {
Intent calls = getPackageManager().getLaunchIntentForPackage(Constants.CallsApp);
@Override
public void onClick(DialogInterface dialog, int which) {
calls = new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=" + Constants.CallsApp));
startActivity(calls);
}
});
builder.setNegativeButton(R.string.global_cancel , null);
builder.show();
}
@ -986,6 +1060,16 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
hideDashboard();
}
});
builder.setNeutralButton( R.string.hide, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
ViewGroup viewGroup =((ViewGroup)findViewById( R.id.StateBtn ).getParent());
if (findViewById( R.id.NotesBtn).getParent()!=null){
viewGroup.removeView(NotesBtn);
BtnPreference.edit().putBoolean( "NotesBtn", false ).apply();
return;}
}
});
builder.show();
}
private void showNotesDialog(){
@ -994,10 +1078,10 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
builder.setTitle(R.string.DiaInstallTitle);
builder.setMessage(getString(R.string.NotesDialog));
builder.setPositiveButton(R.string.global_install, new DialogInterface.OnClickListener() {
Intent notes = getPackageManager().getLaunchIntentForPackage(NotesApp);
Intent notes = getPackageManager().getLaunchIntentForPackage(Constants.NotesApp);
@Override
public void onClick(DialogInterface dialog, int which) {
notes = new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=" + NotesApp));
notes = new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=" + Constants.NotesApp));
startActivity(notes);
}
});
@ -1005,12 +1089,65 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
builder.show();
}
private void showGitInfo() {
AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
builder.setCancelable(false);
builder.setTitle(R.string.GitTitle);
builder.setMessage(getString(R.string.GitInfo));
builder.setPositiveButton(R.string.global_ok, null);
builder.setNegativeButton(R.string.tell_more, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
webView.loadUrl(Constants.URL_DisApp_GITHELP);
hideDashboard();
}
});
builder.setNeutralButton( R.string.hide, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
ViewGroup viewGroup =((ViewGroup)findViewById( R.id.StateBtn ).getParent());
if (findViewById( R.id.GitBtn).getParent()!=null){
viewGroup.removeView(GitBtn);
BtnPreference.edit().putBoolean( "GitBtn", false ).apply();
return;}
}
});
builder.show();
}
private void showGitDialog(){
AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
builder.setCancelable(false);
builder.setTitle(R.string.DiaInstallTitle);
builder.setMessage(getString(R.string.GitsDialog));
builder.setPositiveButton(R.string.global_install, new DialogInterface.OnClickListener() {
Intent git = getPackageManager().getLaunchIntentForPackage(Constants.GitApp);
@Override
public void onClick(DialogInterface dialog, int which) {
git = new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=" + Constants.GitApp));
startActivity(git);
}
});
builder.setNegativeButton(R.string.global_cancel , null);
builder.show();
}
private void showUserInfo() {
AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
builder.setCancelable(false)
.setTitle(R.string.UserTitle)
.setMessage(getString(R.string.UserInfo))
.setPositiveButton(R.string.global_ok, null);
builder.setNeutralButton( R.string.hide, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
ViewGroup viewGroup =((ViewGroup)findViewById( R.id.StateBtn ).getParent());
if (findViewById( R.id.UserBtn).getParent()!=null){
viewGroup.removeView(UserBtn);
BtnPreference.edit().putBoolean( "UserBtn", false ).apply();
return;}
}
});
builder.show();
}
@ -1081,6 +1218,16 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
builder.setTitle(R.string.HowToTitle);
builder.setMessage(getString(R.string.HowToInfo));
builder.setPositiveButton(R.string.global_ok, null);
builder.setNeutralButton( R.string.hide, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
ViewGroup viewGroup =((ViewGroup)findViewById( R.id.StateBtn ).getParent());
if (findViewById( R.id.HowToBtn).getParent()!=null){
viewGroup.removeView(HowToBtn);
BtnPreference.edit().putBoolean( "HowToBtn", false ).apply();
return;}
}
});
builder.show();
}
@ -1090,6 +1237,16 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
builder.setTitle(R.string.AboutTitle);
builder.setMessage(getString(R.string.AboutInfo));
builder.setPositiveButton(R.string.global_ok, null);
builder.setNeutralButton( R.string.hide, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
ViewGroup viewGroup =((ViewGroup)findViewById( R.id.StateBtn ).getParent());
if (findViewById( R.id.AboutBtn).getParent()!=null){
viewGroup.removeView(AboutBtn);
BtnPreference.edit().putBoolean( "AboutBtn", false ).apply();
return;}
}
});
builder.show();
}
@ -1237,7 +1394,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
m.setAccessible(true);
m.invoke(menu, true);
} catch (NoSuchMethodException e) {
Log.e(TAG, "onMenuOpened", e);
Log.e(Constants.TAG, "onMenuOpened", e);
} catch (Exception e) {
throw new RuntimeException(e);
}
@ -1446,20 +1603,20 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
listPermissionsNeeded.add(Manifest.permission.CAMERA);
}
if (!listPermissionsNeeded.isEmpty()) {
ActivityCompat.requestPermissions(this, listPermissionsNeeded.toArray(new String[listPermissionsNeeded.size()]),REQUEST_ID_MULTIPLE_PERMISSIONS);
Log.e(TAG, "Returned falseeeee-------");
ActivityCompat.requestPermissions(this, listPermissionsNeeded.toArray(new String[listPermissionsNeeded.size()]),Constants.REQUEST_ID_MULTIPLE_PERMISSIONS);
Log.e(Constants.TAG, "Returned falseeeee-------");
return false;
}
Log.d(TAG, "Permission returned trueeeee-------");
Log.d(Constants.TAG, "Permission returned trueeeee-------");
return true;
}
@Override
public void onRequestPermissionsResult(int requestCode, @NonNull String permissions[], @NonNull int[] grantResults) {
Log.d(TAG, "Permission callback called-------");
Log.d(Constants.TAG, "Permission callback called-------");
switch (requestCode) {
case REQUEST_ID_MULTIPLE_PERMISSIONS: {
case Constants.REQUEST_ID_MULTIPLE_PERMISSIONS: {
Map<String, Integer> perms = new HashMap<>();
// Initialize the map with both permissions
@ -1472,13 +1629,13 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
// Check for both permissions
if (perms.get(Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED
&& perms.get(Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) {
Log.d(TAG, "camera & Storage permission granted");
Log.d(Constants.TAG, "camera & Storage permission granted");
Toast.makeText(this, "Permissions granted! Try now.", Toast.LENGTH_SHORT).show();
//chromClt.openChooser(WebView, chooserPathUri, chooserParams);
// process the normal flow
//else any one or both the permissions are not granted
} else {
Log.d(TAG, "Some permissions are not granted ask again ");
Log.d(Constants.TAG, "Some permissions are not granted ask again ");
//permission is denied (this is the first time, when "never ask again" is not checked) so ask again explaining the usage of permission
// shouldShowRequestPermissionRationale will return true
//show the dialog or snackbar saying its necessary and try again otherwise proceed with setup.
@ -1523,7 +1680,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
@Override
public void onActivityResult(int requestCode, int resultCode, Intent data) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
if (requestCode != INPUT_FILE_REQUEST_CODE || mFilePathCallback == null) {
if (requestCode != Constants.INPUT_FILE_REQUEST_CODE || mFilePathCallback == null) {
super.onActivityResult(requestCode, resultCode, data);
return;
}
@ -1555,7 +1712,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
mFilePathCallback.onReceiveValue(results);
mFilePathCallback = null;
} else if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.KITKAT) {
if (requestCode != FILECHOOSER_RESULTCODE || mUploadMessage == null) {
if (requestCode != Constants.FILECHOOSER_RESULTCODE || mUploadMessage == null) {
super.onActivityResult(requestCode, resultCode, data);
return;
}
@ -1606,7 +1763,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
public void onGeolocationPermissionsShowPrompt(String origin, GeolocationPermissions.Callback callback) {
// callback.invoke(String origin, boolean allow, boolean remember);
Log.e(TAG, "onGeolocationPermissionsShowPrompt: " );
Log.e(Constants.TAG, "onGeolocationPermissionsShowPrompt: " );
callback.invoke(origin, true, false);
}
@ -1640,7 +1797,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
takePictureIntent.putExtra("PhotoPath", mCameraPhotoPath);
} catch (IOException ex) {
// Error occurred while creating the File
Log.e(TAG, "Unable to create Image File", ex);
Log.e(Constants.TAG, "Unable to create Image File", ex);
}
// Continue only if the File was successfully created
if (photoFile != null) {
@ -1666,7 +1823,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
chooserIntent.putExtra(Intent.EXTRA_INTENT, contentSelectionIntent);
chooserIntent.putExtra(Intent.EXTRA_TITLE, "Image Chooser");
chooserIntent.putExtra(Intent.EXTRA_INITIAL_INTENTS, intentArray);
startActivityForResult(chooserIntent, INPUT_FILE_REQUEST_CODE);
startActivityForResult(chooserIntent, Constants.INPUT_FILE_REQUEST_CODE);
}
/* openFileChooser for Android 3.0+ */
@ -1702,7 +1859,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
chooserIntent.putExtra(Intent.EXTRA_INITIAL_INTENTS, new Parcelable[]{captureIntent});
// On select image call onActivityResult method of activity
chooserIntent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true);
startActivityForResult(chooserIntent, FILECHOOSER_RESULTCODE);
startActivityForResult(chooserIntent, Constants.FILECHOOSER_RESULTCODE);
}
// openFileChooser for Android < 3.0

View File

@ -62,6 +62,13 @@ public class SettingsActivity extends AppCompatActivity {
BtnPreference = getSharedPreferences( "UploadBtn", Context.MODE_PRIVATE );//upload
BtnPreference = getSharedPreferences( "SearxBtn", Context.MODE_PRIVATE );//search
BtnPreference = getSharedPreferences( "PollsBtn", Context.MODE_PRIVATE );//polls
BtnPreference = getSharedPreferences( "BoardBtn", Context.MODE_PRIVATE );//Board
BtnPreference = getSharedPreferences( "CallsBtn", Context.MODE_PRIVATE );//calls
BtnPreference = getSharedPreferences( "NotesBtn", Context.MODE_PRIVATE );//notes
BtnPreference = getSharedPreferences( "GitBtn", Context.MODE_PRIVATE );//git
BtnPreference = getSharedPreferences( "UserBtn", Context.MODE_PRIVATE );//user
BtnPreference = getSharedPreferences( "HowToBtn", Context.MODE_PRIVATE );//howTo
BtnPreference = getSharedPreferences( "AboutBtn", Context.MODE_PRIVATE );//about
//checkboxlist
checkPrefBox();
@ -80,7 +87,14 @@ public class SettingsActivity extends AppCompatActivity {
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
final CheckBox checkpollsBtn = iconSettings.findViewById( R.id.pollsBtnPreference );//polls
final CheckBox checkPollsBtn = iconSettings.findViewById( R.id.pollsBtnPreference );//polls
final CheckBox checkBoardBtn = iconSettings.findViewById( R.id.boardBtnPreference );//board
final CheckBox checkCallsBtn = iconSettings.findViewById( R.id.callsBtnPreference );//calls
final CheckBox checkNotesBtn = iconSettings.findViewById( R.id.notesBtnPreference );//notes
final CheckBox checkGitBtn = iconSettings.findViewById( R.id.gitBtnPreference );//git
final CheckBox checkUserBtn = iconSettings.findViewById( R.id.userBtnPreference );//user
final CheckBox checkHowToBtn = iconSettings.findViewById( R.id.howToBtnPreference );//howTo
final CheckBox checkAboutBtn = iconSettings.findViewById( R.id.aboutBtnPreference );//about
//Set checked if visibility is true
if (BtnPreference.getBoolean( "MailBtn", true )) checkMailBtn.setChecked( true );//mail
@ -92,7 +106,14 @@ public class SettingsActivity extends AppCompatActivity {
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
if (BtnPreference.getBoolean( "pollsBtn", true )) checkSearxBtn.setChecked( true );//polls
if (BtnPreference.getBoolean( "PollsBtn", true )) checkPollsBtn.setChecked( true );//polls
if (BtnPreference.getBoolean( "BoardBtn", true )) checkBoardBtn.setChecked( true );//board
if (BtnPreference.getBoolean( "CallsBtn", true )) checkCallsBtn.setChecked( true );//calls
if (BtnPreference.getBoolean( "NotesBtn", true )) checkNotesBtn.setChecked( true );//notes
if (BtnPreference.getBoolean( "GitBtn", true )) checkGitBtn.setChecked( true );//git
if (BtnPreference.getBoolean( "UserBtn", true )) checkUserBtn.setChecked( true );//user
if (BtnPreference.getBoolean( "HowToBtn", true )) checkHowToBtn.setChecked( true );//howTo
if (BtnPreference.getBoolean( "AboutBtn", true )) checkAboutBtn.setChecked( true );//about
//Mail
checkMailBtn.setOnCheckedChangeListener( new CompoundButton.OnCheckedChangeListener() {
@ -203,17 +224,100 @@ public class SettingsActivity extends AppCompatActivity {
} );
//polls
checkpollsBtn.setOnCheckedChangeListener( new CompoundButton.OnCheckedChangeListener() {
checkPollsBtn.setOnCheckedChangeListener( new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton view, boolean isChecked) {
if (checkpollsBtn.isChecked()) {
if (checkPollsBtn.isChecked()) {
BtnPreference.edit().putBoolean( "PollsBtn", true ).apply();
} else {
BtnPreference.edit().putBoolean( "pollsBtn", false ).apply();
BtnPreference.edit().putBoolean( "PollsBtn", false ).apply();
}
}
} );
//board
checkBoardBtn.setOnCheckedChangeListener( new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton view, boolean isChecked) {
if (checkBoardBtn.isChecked()) {
BtnPreference.edit().putBoolean( "BoardBtn", true ).apply();
} else {
BtnPreference.edit().putBoolean( "BoardBtn", false ).apply();
}
}
} );
//board
checkCallsBtn.setOnCheckedChangeListener( new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton view, boolean isChecked) {
if (checkCallsBtn.isChecked()) {
BtnPreference.edit().putBoolean( "CallsBtn", true ).apply();
} else {
BtnPreference.edit().putBoolean( "CallsBtn", false ).apply();
}
}
} );
//notes
checkNotesBtn.setOnCheckedChangeListener( new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton view, boolean isChecked) {
if (checkNotesBtn.isChecked()) {
BtnPreference.edit().putBoolean( "NotesBtn", true ).apply();
} else {
BtnPreference.edit().putBoolean( "NotesBtn", false ).apply();
}
}
} );
//git
checkGitBtn.setOnCheckedChangeListener( new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton view, boolean isChecked) {
if (checkGitBtn.isChecked()) {
BtnPreference.edit().putBoolean( "GitBtn", true ).apply();
} else {
BtnPreference.edit().putBoolean( "GitBtn", false ).apply();
}
}
} );
//user
checkUserBtn.setOnCheckedChangeListener( new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton view, boolean isChecked) {
if (checkUserBtn.isChecked()) {
BtnPreference.edit().putBoolean( "UserBtn", true ).apply();
} else {
BtnPreference.edit().putBoolean( "UserBtn", false ).apply();
}
}
} );
//howTo
checkHowToBtn.setOnCheckedChangeListener( new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton view, boolean isChecked) {
if (checkHowToBtn.isChecked()) {
BtnPreference.edit().putBoolean( "HowToBtn", true ).apply();
} else {
BtnPreference.edit().putBoolean( "HowToBtn", false ).apply();
}
}
} );
//about
checkAboutBtn.setOnCheckedChangeListener( new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton view, boolean isChecked) {
if (checkAboutBtn.isChecked()) {
BtnPreference.edit().putBoolean( "AboutBtn", true ).apply();
} else {
BtnPreference.edit().putBoolean( "AboutBtn", false ).apply();
}
}
} );
}
@Override //make sure changes are applyed when going back

View File

@ -1,5 +1,8 @@
package org.disroot.disrootapp.utils;
import org.disroot.disrootapp.R;
import org.disroot.disrootapp.ui.MainActivity;
/**
* Created by jackson on 02/11/15.
*/
@ -47,4 +50,24 @@ public class Constants {
public static final String URL_DisApp_POLLHELP = "https://howto.disroot.org/en/tutorials/office/polls";
public static final String URL_DisApp_BOARDHELP = "https://howto.disroot.org/en/tutorials/project_board";
public static final String URL_DisApp_NOTESHELP = "https://howto.disroot.org/en/tutorials/cloud/clients/mobile/android/using-notes";
public static final String URL_DisApp_CALLSHELP = "https://disroot.org/en/services/calls";
public static final String URL_DisApp_GITHELP = "https://howto.disroot.org/en/contribute/git";//need url
public static final String k9 = "com.fsck.k9";
public static final String nc = "com.nextcloud.client";
public static final String Diaspora = "com.github.dfa.diaspora_android";
public static final String Conversations = "eu.siacs.conversations";
public static final String PixArt = "de.pixart.messenger";
public static final String Padland = "com.mikifus.padland";
public static final String NotesApp = "it.niedermann.owncloud.notes";
public static final String CallsApp = "org.jitsi.meet";
public static final String GitApp = "org.mian.gitnex";
public static final 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.CallsBtn,R.id.NotesBtn,R.id.GitBtn,R.id.UserBtn,R.id.StateBtn,R.id.HowToBtn,R.id.AboutBtn};
public static final int REQUEST_ID_MULTIPLE_PERMISSIONS = 1;//file upload
public static final int INPUT_FILE_REQUEST_CODE = 1;//file upload
public static final int FILECHOOSER_RESULTCODE = 1;//file upload
public static final String TAG = MainActivity.class.getSimpleName();
}

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: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 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="m7.9134,8.8515v0.6254c0,0.171 -0.1417,0.3127 -0.3127,0.3127L5.0992,9.7896c-0.171,0 -0.3127,-0.1417 -0.3127,-0.3127v-0.6254c0,-0.171 0.1417,-0.3127 0.3127,-0.3127h0.3127v-1.8761L5.0992,6.6627c-0.171,0 -0.3127,-0.1417 -0.3127,-0.3127v-0.6254c0,-0.171 0.1417,-0.3127 0.3127,-0.3127L6.9754,5.412c0.171,0 0.3127,0.1417 0.3127,0.3127v2.8142h0.3127c0.171,0 0.3127,0.1417 0.3127,0.3127zM7.2881,3.2231v0.9381c0,0.171 -0.1417,0.3127 -0.3127,0.3127L5.7246,4.4738c-0.171,0 -0.3127,-0.1417 -0.3127,-0.3127v-0.9381c0,-0.171 0.1417,-0.3127 0.3127,-0.3127L6.9754,2.9104c0.171,0 0.3127,0.1417 0.3127,0.3127z"
android:strokeWidth="0.00488577"
android:fillColor="#808080"
android:fillAlpha="1"/>
</vector>

View File

@ -0,0 +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="#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,5 +1,13 @@
<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="m13.7143,35.9857v5.1429c0,1.4196 -1.1518,2.5714 -2.5714,2.5714L2.5714,43.7C1.1518,43.7 0,42.5482 0,41.1286v-5.1429c0,-1.4196 1.1518,-2.5714 2.5714,-2.5714h8.5714c1.4196,0 2.5714,1.1518 2.5714,2.5714zM13.7143,22.2714v5.1429c0,1.4196 -1.1518,2.5714 -2.5714,2.5714L2.5714,29.9857C1.1518,29.9857 0,28.8339 0,27.4143L0,22.2714C0,20.8518 1.1518,19.7 2.5714,19.7h8.5714c1.4196,0 2.5714,1.1518 2.5714,2.5714zM30.8571,35.9857v5.1429c0,1.4196 -1.1518,2.5714 -2.5714,2.5714h-8.5714c-1.4196,0 -2.5714,-1.1518 -2.5714,-2.5714v-5.1429c0,-1.4196 1.1518,-2.5714 2.5714,-2.5714h8.5714c1.4196,0 2.5714,1.1518 2.5714,2.5714zM13.7143,8.5571L13.7143,13.7c0,1.4196 -1.1518,2.5714 -2.5714,2.5714L2.5714,16.2714C1.1518,16.2714 0,15.1196 0,13.7L0,8.5571C0,7.1375 1.1518,5.9857 2.5714,5.9857h8.5714c1.4196,0 2.5714,1.1518 2.5714,2.5714zM30.8571,22.2714v5.1429c0,1.4196 -1.1518,2.5714 -2.5714,2.5714h-8.5714c-1.4196,0 -2.5714,-1.1518 -2.5714,-2.5714v-5.1429c0,-1.4196 1.1518,-2.5714 2.5714,-2.5714h8.5714c1.4196,0 2.5714,1.1518 2.5714,2.5714zM48,35.9857v5.1429C48,42.5482 46.8482,43.7 45.4286,43.7h-8.5714c-1.4196,0 -2.5714,-1.1518 -2.5714,-2.5714v-5.1429c0,-1.4196 1.1518,-2.5714 2.5714,-2.5714h8.5714C46.8482,33.4143 48,34.5661 48,35.9857ZM30.8571,8.5571L30.8571,13.7c0,1.4196 -1.1518,2.5714 -2.5714,2.5714h-8.5714c-1.4196,0 -2.5714,-1.1518 -2.5714,-2.5714L17.1429,8.5571c0,-1.4196 1.1518,-2.5714 2.5714,-2.5714h8.5714c1.4196,0 2.5714,1.1518 2.5714,2.5714zM48,22.2714v5.1429c0,1.4196 -1.1518,2.5714 -2.5714,2.5714h-8.5714c-1.4196,0 -2.5714,-1.1518 -2.5714,-2.5714v-5.1429c0,-1.4196 1.1518,-2.5714 2.5714,-2.5714h8.5714C46.8482,19.7 48,20.8518 48,22.2714ZM48,8.5571L48,13.7c0,1.4196 -1.1518,2.5714 -2.5714,2.5714h-8.5714c-1.4196,0 -2.5714,-1.1518 -2.5714,-2.5714L34.2857,8.5571c0,-1.4196 1.1518,-2.5714 2.5714,-2.5714h8.5714C46.8482,5.9857 48,7.1375 48,8.5571Z" android:strokeWidth="0.02678571"/>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp"
android:height="48dp"
android:viewportWidth="48"
android:viewportHeight="48">
<path
android:pathData="M24.1406,7.4727L19.6426,13.457L22.6973,13.9766L23.6758,20.8555L22.416,22.1094L17.8086,15.9805L19.5625,13.5078L12.1602,12.459L13.2188,19.9043L7.1895,24.4395L13.1875,28.918L13.6953,25.957L20.6641,24.9648L21.9063,26.2109L15.7637,30.8398L13.2109,29.0469L12.1602,36.4238L19.6289,35.3613L24.1563,41.3828L28.6836,35.3613L36.1367,36.418L35.0762,28.9316L41.0898,24.4102L35.1738,19.9609L34.6992,22.9668L27.707,23.9609L26.4648,22.7207L32.6543,18.0664L35.1211,19.6875L36.1484,12.4414L28.9316,13.4688L30.5527,15.9805L25.9063,22.1602L24.6992,20.9551L25.6914,13.9648L28.6055,13.4141L24.1406,7.4727zM15.7051,18.0957L21.8379,22.6836L20.5508,23.9629L13.6953,22.9902L13.2324,19.8887L15.7051,18.0957zM27.6484,24.9512L34.6875,25.9453L34.7852,29.1055L32.6543,30.8105L26.4512,26.1484L27.6484,24.9512zM25.8887,26.7109L30.5703,32.9355L29.1777,35.1016L25.6797,34.959L24.6777,27.9219L25.8887,26.7109zM22.4609,26.7695L23.6875,28.0039L22.6973,34.959L19.627,35.3555L17.8262,32.9355L22.4609,26.7695z"
android:strokeAlpha="0.99215686"
android:strokeWidth="0.75590551"
android:fillColor="#ffffff"
android:strokeColor="#00000000"
android:fillAlpha="1"/>
</vector>

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1,13 @@
<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="m3.6387,3.122c0.006,0.0123 0.163,0.3557 0.3485,0.7637 0.2859,0.6286 0.3681,0.7462 0.5394,0.7705 0.1111,0.0158 0.2622,0.0793 0.3356,0.141 0.0999,0.0841 0.2292,0.0659 0.7918,-0.1833 0.4134,-0.1831 0.9399,-0.3463 1.1699,-0.3625 0.7998,-0.0564 1.1875,0.3284 1.9526,1.938 0.3879,0.8162 0.5345,1.0492 0.6793,1.0797 0.3772,0.0796 0.7523,0.4136 0.7872,0.8178 0.0292,0.338 0.0015,0.5035 -0.2454,0.7279 -0.5675,0.8001 -1.9866,-0.1096 -1.5169,-0.9805 0.1036,-0.1921 0.0557,-0.3581 -0.3617,-1.2523 -0.5517,-1.1819 -0.8612,-1.6309 -1.2414,-1.6176 -0.1372,0.005 -0.5728,0.1474 -0.9682,0.317 -0.6282,0.261 -0.628,0.1941 -0.6506,0.4142 -0.0447,0.1302 -0.0443,0.2122 -0.1606,0.3732 -0.0518,0.0892 0.116,0.5767 0.4845,1.407 0.5003,1.1276 0.5868,1.2721 0.7688,1.2845 0.2756,0.0187 0.6426,0.34 0.7331,0.6416 0.1043,0.3478 -0.0951,0.8112 -0.4221,0.981 -0.3488,0.1811 -0.7458,0.1733 -1.0824,-0.1099 -0.2344,-0.1971 -0.2846,-0.3024 -0.2846,-0.5963 -0,-0.1963 0.0455,-0.4111 0.1011,-0.4772 0.142,-0.1689 -1.0213,-2.7487 -1.2624,-2.7996 -0.3877,-0.0275 -0.6137,-0.3919 -0.6803,-0.6419 -0.0329,-0.1236 -0.0055,-0.3607 0.0609,-0.5268 0.1031,-0.2577 0.0742,-0.4146 -0.1972,-1.0699L2.9994,3.3935C2.8473,3.0376 3.4788,2.7271 3.6387,3.122Z"
android:strokeAlpha="1"
android:strokeWidth="0.15984261"
android:fillColor="#fefdfd"
android:strokeColor="#fefdfd"
android:fillAlpha="1"/>
</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="m47.2757,12.0962c0.721,1.0382 0.9229,2.3937 0.5191,3.7203L39.8639,41.9452C39.1429,44.3966 36.605,46.3 34.1248,46.3L7.5059,46.3c-2.9416,0 -6.0852,-2.336 -7.1522,-5.3353 -0.4614,-1.2978 -0.4614,-2.5667 -0.0577,-3.6626 0.0577,-0.5768 0.173,-1.1536 0.2019,-1.8457 0.0288,-0.4614 -0.2307,-0.8363 -0.173,-1.1824 0.1154,-0.6921 0.721,-1.1824 1.1824,-1.9611 0.8652,-1.442 1.8457,-3.778 2.163,-5.2776 0.1442,-0.548 -0.1442,-1.1824 0,-1.6727 0.1442,-0.548 0.6922,-0.9517 0.9805,-1.4708C5.4294,22.565 6.4388,19.9983 6.583,18.6428 6.6407,18.0372 6.3523,17.3739 6.5253,16.9124 6.7272,16.2491 7.3617,15.9607 7.7943,15.3839 8.4864,14.4322 9.64,11.6925 9.813,10.164 9.8707,9.6737 9.5823,9.1834 9.6688,8.6643 9.7842,8.1164 10.4763,7.5396 10.9378,6.8763 12.149,5.0882 12.3798,1.1372 16.0424,2.1754l-0.0288,0.0865c0.4903,-0.1154 0.9805,-0.2596 1.4708,-0.2596h21.9469c1.3555,0 2.5667,0.6056 3.2877,1.615 0.7498,1.0382 0.9229,2.3937 0.5191,3.7491L35.3361,33.4952c-1.3555,4.4413 -2.1053,5.4218 -5.7679,5.4218L4.5065,38.9171c-0.3749,0 -0.8363,0.0865 -1.0959,0.4326 -0.2307,0.3461 -0.2596,0.6056 -0.0288,1.2401 0.5768,1.6727 2.5667,2.0188 4.1529,2.0188L34.1537,42.6085c1.0671,0 2.3072,-0.6056 2.6244,-1.6439L45.43,12.5c0.173,-0.548 0.173,-1.1247 0.1442,-1.6439 0.6633,0.2596 1.2689,0.6633 1.7015,1.2401zM16.5903,12.1539c-0.173,0.5191 0.1154,0.9229 0.6345,0.9229h17.5345c0.4903,0 1.0382,-0.4038 1.2113,-0.9229l0.6056,-1.8457C36.7492,9.7891 36.4608,9.3853 35.9417,9.3853L18.4072,9.3853c-0.4903,0 -1.0382,0.4038 -1.2113,0.9229zM14.1967,19.5368c-0.173,0.5191 0.1154,0.9229 0.6345,0.9229h17.5345c0.4903,0 1.0382,-0.4038 1.2113,-0.9229l0.6056,-1.8457c0.173,-0.5191 -0.1154,-0.9229 -0.6345,-0.9229L16.0136,16.7682c-0.4903,0 -1.0382,0.4038 -1.2113,0.9229z" android:strokeWidth="0.02883961"/>
<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="M3.746,1.3017L3.6964,1.3891C3.0807,2.4827 2.7482,3.626 2.7482,4.6493C2.7482,4.7357 2.7491,4.8092 2.7513,4.8142C2.7531,4.8182 2.7706,4.7361 2.79,4.6312C2.951,3.7618 3.3735,2.8513 3.9098,2.2185L4.0416,2.0629L3.8938,1.6821L3.746,1.3017zM5.1041,1.45C5.0864,1.4571 4.859,1.7229 4.6591,1.9699C3.6945,3.1619 3.1333,4.1721 3.0696,4.8317L3.0567,4.9697L3.1574,4.7418C3.5286,3.9041 4.2524,3.0172 5.1676,2.2789L5.378,2.1094L5.2452,1.7782C5.172,1.5961 5.1081,1.448 5.1041,1.45zM6.3851,1.802C6.3617,1.8114 6.0029,2.0731 5.8389,2.2004C4.7233,3.0662 3.8754,3.9732 3.4644,4.7403C3.4116,4.8388 3.3614,4.9388 3.3528,4.9625C3.3422,4.9916 3.3986,4.9402 3.5274,4.8038C4.366,3.9163 5.389,3.1839 6.427,2.728L6.7236,2.5978L6.5624,2.1968C6.4538,1.9266 6.3959,1.798 6.3851,1.802zM7.8357,2.5492L7.5613,2.6463C7.0454,2.8289 6.2253,3.2156 5.6519,3.5471C4.8406,4.016 4.0063,4.6615 3.6375,5.1056C3.604,5.1458 3.5932,5.167 3.6127,5.1537C4.1244,4.8055 4.3644,4.6536 4.7289,4.4483C5.7307,3.884 6.8032,3.4597 7.7401,3.2566C7.8922,3.2236 8.0338,3.1951 8.0548,3.1931L8.093,3.189L7.9644,2.8691L7.8357,2.5492zM8.5509,3.4484L8.2842,3.5C7.6412,3.624 7.0586,3.794 6.2306,4.1C5.5395,4.3554 4.3393,4.9198 3.6876,5.2958L3.5657,5.3661L4.7206,8.2522C5.3559,9.8395 5.8825,11.141 5.8911,11.144C5.8997,11.1472 5.968,11.1144 6.043,11.0712C6.5813,10.7616 7.2813,10.4241 8.0429,10.1064C9.0717,9.6772 9.8731,9.4242 10.6324,9.2894C10.755,9.2677 10.8603,9.2495 10.867,9.2475C10.8737,9.246 10.3556,7.9403 9.7152,6.3464L8.5509,3.4484zM2.8169,5.1909C2.8207,5.2406 3.0262,5.7567 3.9269,8.0011C4.7612,10.0797 5.0968,10.9027 5.1325,10.9559C5.2413,11.118 5.4019,11.2168 5.5811,11.2314L5.5816,11.2314C5.6427,11.2364 5.6948,11.2396 5.6978,11.2386C5.7009,11.2374 5.179,9.9331 4.5387,8.3401L3.3745,5.4436L3.2763,5.4405C3.1056,5.436 2.9394,5.3447 2.8262,5.194C2.8199,5.1857 2.8163,5.1838 2.8169,5.1909zM5.3692,5.5247C5.872,5.5323 6.3649,5.6306 6.8533,5.7418C7.9404,6.0738 7.9861,6.1404 8.8734,6.7071C9.0743,6.8778 9.2732,7.061 9.4149,7.2864C9.4961,7.455 9.506,7.6965 9.4506,7.8905C9.1778,8.7874 7.698,9.319 6.4182,9.5824C6.044,9.6254 5.8174,9.7348 5.7573,9.3953C5.6731,9.1635 6.3349,9.0274 6.1883,8.5602L5.3981,6.6017C5.2777,6.4141 4.9835,6.4428 4.6529,6.4378C4.3828,6.4539 4.1582,6.5875 4.1868,6.2358C4.2494,5.8855 4.9495,5.4913 5.3692,5.5247zM6.9107,6.9283C7.0157,7.2555 7.1266,7.5805 7.243,7.9039C7.3089,8.1797 7.5474,8.4487 7.3995,8.7354L7.7525,8.6641C7.9713,8.6069 8.1787,8.5564 8.3173,8.3504C8.4187,8.1338 8.4115,7.9417 8.2501,7.7752C7.8701,7.4279 7.4654,7.0624 6.9107,6.9283z"
android:strokeWidth="0.06201547"
android:fillColor="#ffffff"
android:fillAlpha="0.99215686"/>
</vector>

View File

@ -1,5 +1,24 @@
<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.625,30.625c1.5833,1.5833 3.1667,3.1667 4.75,4.75C16.7225,35.8675 16.2613,36.8221 15.4785,37 14.5298,37.0938 13.6445,37.1243 14,35.9139 13.7931,35.3018 14.5052,33.7707 13.4569,34 12.638,34 11.819,34 11,34c0.0717,-0.8252 -0.2959,-1.8323 0.576,-2.326 0.3497,-0.3497 0.6993,-0.6993 1.049,-1.049zM25.5625,18.4375c0.4404,1.0323 -1.0119,1.6236 -1.5338,2.3775 -2.6393,2.5957 -5.1984,5.2858 -7.8881,7.8222 -1.765,0.1116 -0.1326,-1.6613 0.5426,-2.1643 2.7353,-2.6917 5.3904,-5.4778 8.1761,-8.1102 0.2171,-0.112 0.5279,-0.1278 0.7031,0.0748zM17,40C22.6667,34.3333 28.3333,28.6667 34,23 31,20 28,17 25,14 19.3333,19.6667 13.6667,25.3333 8,31c0,3 0,6 0,9 3,0 6,0 9,0zM36,21c1.1623,-1.2963 2.6604,-2.3418 3.5254,-3.8643C40.299,15.4271 39.0538,13.8707 37.819,12.819 36.3312,11.431 35.0305,9.8131 33.4025,8.5966 31.787,7.6805 30.0358,8.6954 29.011,9.989 28.3407,10.6593 27.6703,11.3297 27,12c3,3 6,6 9,9zM48,9c-0.0078,10.1543 0.0155,20.3089 -0.0117,30.463 -0.1188,4.9069 -4.8029,8.9754 -9.6671,8.537 -9.928,-0.0078 -19.8564,0.0155 -29.7842,-0.0117C3.6301,47.8695 -0.4383,43.1854 0,38.3212 0.0078,28.3932 -0.0155,18.4648 0.0117,8.537 0.1305,3.6301 4.8146,-0.4383 9.6788,0 19.6068,0.0078 29.5352,-0.0155 39.463,0.0117 44.1261,0.1593 48.0932,4.3318 48,9Z" android:strokeWidth="0.03125"/>
<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="m8.1184,2.9665c-0.2604,-0.0086 -0.5113,0.165 -0.6751,0.3717l-0.4287,0.4283 1.918,1.918c0.2477,-0.2762 0.567,-0.4989 0.7513,-0.8233 0.1649,-0.3641 -0.1002,-0.6957 -0.3634,-0.9199 -0.3171,-0.2958 -0.5942,-0.6406 -0.9411,-0.8999 -0.0861,-0.0488 -0.1742,-0.0721 -0.261,-0.0749z"
android:strokeAlpha="1"
android:strokeLineJoin="miter"
android:strokeWidth="1"
android:fillColor="#ffffff"
android:fillAlpha="1"
android:strokeColor="#00000000"
android:strokeLineCap="butt"/>
<path
android:pathData="m6.5881,4.1929c-1.2076,1.2076 -2.4153,2.4153 -3.6229,3.6229l0,1.918l1.918,0c1.2076,-1.2076 2.4153,-2.4153 3.6229,-3.6229zM6.6364,5.1057c0.027,0.0016 0.0529,0.0113 0.0716,0.0329 0.0938,0.22 -0.2155,0.3463 -0.3267,0.507 -0.5625,0.5532 -1.108,1.1265 -1.6812,1.667 -0.3761,0.0238 -0.0282,-0.354 0.1157,-0.4612 0.5829,-0.5736 1.1487,-1.1676 1.7424,-1.7286 0.0231,-0.0119 0.0512,-0.0186 0.0783,-0.0171zM3.9508,7.7359c0.3374,0.3374 0.6749,0.6749 1.0123,1.0123 -0.1391,0.105 -0.2373,0.3084 -0.4042,0.3463 -0.2022,0.02 -0.3909,0.0265 -0.3151,-0.2314 -0.0441,-0.1304 0.1077,-0.4568 -0.1157,-0.4079l-0.5236,0c0.0153,-0.1758 -0.063,-0.3905 0.1228,-0.4957 0.0745,-0.0745 0.149,-0.149 0.2235,-0.2235z"
android:strokeAlpha="1"
android:strokeLineJoin="miter"
android:strokeWidth="3.77952766"
android:fillColor="#ffffff"
android:fillAlpha="1"
android:strokeColor="#00000000"
android:strokeLineCap="butt"/>
</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="#fbfbfb"
android:pathData="m34.2857,27.4571h8.1696c-0.3214,0.3482 -0.5357,0.5357 -0.5893,0.5893l-16.6875,16.0714C24.8571,44.4393 24.4286,44.6 24,44.6c-0.4286,0 -0.8571,-0.1607 -1.1786,-0.4821l-16.7143,-16.125c-0.0536,-0.0268 -0.2679,-0.2143 -0.5625,-0.5357h9.8839c0.7768,0 1.4732,-0.5357 1.6607,-1.2857l1.875,-7.5268 5.0893,17.8661c0.2143,0.7232 0.8839,1.2321 1.6607,1.2321 0.75,0 1.4196,-0.5089 1.6339,-1.2321l3.9107,-12.9911 1.5,3c0.2946,0.5625 0.8839,0.9375 1.5268,0.9375zM48,15.9929c0,3.0804 -1.3393,5.8929 -2.7589,8.0357h-9.8839l-2.9732,-5.9196c-0.2946,-0.6161 -0.9911,-0.9911 -1.6607,-0.9375 -0.7232,0.0804 -1.3125,0.5357 -1.5,1.2321l-3.4554,11.5179 -5.25,-18.375c-0.2143,-0.7232 -0.8839,-1.2321 -1.6875,-1.2321 -0.7768,0 -1.4464,0.5357 -1.6339,1.2857L14.0893,24.0286H2.7589C1.3393,21.8857 0,19.0732 0,15.9929 0,8.1446 4.7946,3.4571 12.8036,3.4571 17.4911,3.4571 21.8839,7.1536 24,9.2429 26.1161,7.1536 30.5089,3.4571 35.1964,3.4571 43.2054,3.4571 48,8.1446 48,15.9929Z" 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.0154,5.5724h-1.2896c-0.1119,0 -0.2027,-0.0907 -0.2027,-0.2027 0,-0.1119 0.0907,-0.2027 0.2027,-0.2027h1.4015c0.0696,0 0.1344,0.0357 0.1715,0.0946l0.4037,0.6407 0.6216,-1.5867c0.0314,-0.0801 0.1101,-0.1311 0.1957,-0.1286 0.0859,0.003 0.1606,0.0599 0.1864,0.1418l0.5912,1.8828 0.2143,-0.8894c0.022,-0.091 0.1034,-0.1552 0.1971,-0.1552h1.0062c0.1119,0 0.2027,0.0907 0.2027,0.2027 0,0.1119 -0.0907,0.2027 -0.2027,0.2027L6.8684,5.5723l-0.3483,1.4452c-0.0213,0.0886 -0.0991,0.152 -0.1902,0.1551 -0.0023,0.0001 -0.0046,0.0001 -0.0069,0.0001 -0.0883,0 -0.1667,-0.0572 -0.1933,-0.142l-0.638,-2.0318 -0.5582,1.4247c-0.0279,0.0712 -0.0935,0.1207 -0.1696,0.1279 -0.076,0.007 -0.1499,-0.029 -0.1906,-0.0937zM9.6494,3.6414c-0.4355,-0.4213 -1.0047,-0.6533 -1.6026,-0.6533 -0.5256,0 -1.0283,0.1778 -1.4342,0.504 -0.4059,-0.3262 -0.9086,-0.504 -1.4342,-0.504 -0.598,0 -1.1672,0.232 -1.6027,0.6533 -0.2592,0.2507 -0.4248,0.55 -0.4924,0.8895 -0.1656,0.7752 0.1754,1.3963 0.3717,1.8109 0.5897,1.1536 1.6502,2.1973 2.0787,2.5925 0.0578,0.0534 0.1121,0.1037 0.1633,0.1513 0.424,0.3937 0.6368,0.5913 0.8892,0.6245 0.0088,0.002 0.0176,0.002 0.0264,0.002 0.0088,0 0.0176,-0.0006 0.0264,-0.002 0.2525,-0.0332 0.4652,-0.2307 0.889,-0.6242 0.0512,-0.0476 0.1056,-0.0981 0.1635,-0.1514 0.5781,-0.5332 2.466,-2.3983 2.4853,-4.0126 0.0061,-0.5052 -0.1714,-0.936 -0.5273,-1.2803z"
android:strokeWidth="0.0202692"
android:fillColor="#ffffff"
android:fillAlpha="0.99215686"/>
</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="M43.8,39.7188C43.8,44.2813 40.8,48 37.1437,48H10.4563C6.8,48 3.8,44.2813 3.8,39.7188 3.8,31.5 5.8313,22 14.0188,22 16.55,24.4688 19.9875,26 23.8,26 27.6125,26 31.05,24.4688 33.5812,22 41.7687,22 43.8,31.5 43.8,39.7188ZM35.8,12c0,6.625 -5.375,12 -12,12 -6.625,0 -12,-5.375 -12,-12 0,-6.625 5.375,-12 12,-12 6.625,0 12,5.375 12,12z" android:strokeWidth="0.03125"/>
<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="m5.9624,9.8649c-0.8623,-0.0564 -2.2522,-0.3549 -2.5175,-0.5407 -0.1144,-0.0801 -0.1308,-0.2485 -0.0826,-0.8442 0.0774,-0.9564 0.2725,-1.5972 0.551,-1.8096 0.0613,-0.0467 0.2988,-0.1561 0.5277,-0.2429l0.4163,-0.1579 0.146,0.1001c0.5267,0.361 1.161,0.4971 1.7557,0.3766 0.3112,-0.0631 0.7119,-0.2314 0.91,-0.3823l0.1161,-0.0884 0.2603,0.0803c0.5783,0.1784 0.852,0.3988 1.0058,0.8098 0.1735,0.4637 0.3748,1.8743 0.2931,2.0536 -0.0521,0.1144 -0.179,0.1741 -0.6709,0.3157 -0.8381,0.2412 -1.9673,0.3787 -2.7111,0.3301zM5.8669,5.9868c-0.2847,-0.091 -0.4784,-0.2135 -0.6879,-0.435 -0.3115,-0.3293 -0.4409,-0.6589 -0.4398,-1.1203 0.002,-0.9026 0.7082,-1.6062 1.6121,-1.6062 0.9039,0 1.6101,0.7036 1.6121,1.6062 0.0007,0.311 -0.0424,0.5023 -0.17,0.7539 -0.1094,0.2158 -0.401,0.5287 -0.6034,0.6473 -0.3769,0.2209 -0.9173,0.2838 -1.3231,0.154z"
android:strokeWidth="0.03534844"
android:fillColor="#ffffff"/>
</vector>

View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"

View File

@ -61,8 +61,8 @@
style="?android:attr/borderlessButtonStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:layout_marginBottom="30dp"
android:layout_marginTop="10dp"
android:layout_marginBottom="5dp"
android:contentDescription="@string/logo"
android:src="@drawable/ic_logo" />
@ -190,11 +190,22 @@
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxWidth="@dimen/extra_margin"
android:drawableTop="@drawable/ic_board"
android:text="@string/action_board"
android:textColor="@color/white"
app:fontFamily="@font/open_sans_regular" />
<Button
android:id="@+id/CallsBtn"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableTop="@drawable/ic_calls"
android:text="@string/action_calls"
android:textColor="@color/white"
app:fontFamily="@font/open_sans_regular" />
<Button
android:id="@+id/NotesBtn"
style="?android:attr/borderlessButtonStyle"
@ -205,6 +216,16 @@
android:textColor="@color/white"
app:fontFamily="@font/open_sans_regular" />
<Button
android:id="@+id/GitBtn"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableTop="@drawable/ic_git"
android:text="@string/action_git"
android:textColor="@color/white"
app:fontFamily="@font/open_sans_regular" />
<Button
android:id="@+id/UserBtn"
style="?android:attr/borderlessButtonStyle"

View File

@ -2,6 +2,7 @@
<LinearLayout xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".ui.SettingsActivity"
@ -54,7 +55,7 @@
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="@dimen/activity_horizontal_margin">
style="@style/DisTheme.Settings">
<TextView
android:id="@+id/mailView"
android:layout_width="wrap_content"
@ -75,7 +76,7 @@
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="@dimen/activity_horizontal_margin">
style="@style/DisTheme.Settings">
<TextView
android:id="@+id/cloudView"
android:layout_width="wrap_content"
@ -96,7 +97,7 @@
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="@dimen/activity_horizontal_margin">
style="@style/DisTheme.Settings">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -116,7 +117,7 @@
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="@dimen/activity_horizontal_margin">
style="@style/DisTheme.Settings">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -135,7 +136,7 @@
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="@dimen/activity_horizontal_margin">
style="@style/DisTheme.Settings">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -154,7 +155,7 @@
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="@dimen/activity_horizontal_margin">
style="@style/DisTheme.Settings">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -173,7 +174,7 @@
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="@dimen/activity_horizontal_margin">
style="@style/DisTheme.Settings">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -192,7 +193,7 @@
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="@dimen/activity_horizontal_margin">
style="@style/DisTheme.Settings">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -211,7 +212,7 @@
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="@dimen/activity_horizontal_margin">
style="@style/DisTheme.Settings">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -230,7 +231,7 @@
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="@dimen/activity_horizontal_margin">
style="@style/DisTheme.Settings">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -246,6 +247,139 @@
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"/>
</FrameLayout>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/DisTheme.Settings">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="?android:attr/borderlessButtonStyle"
android:text="@string/action_board"
android:textColor="@color/gray"
android:drawableTint="@color/gray"
android:drawableStart="@drawable/ic_board"
android:drawableLeft="@drawable/ic_board"/>
<CheckBox
android:id="@+id/boardBtnPreference"
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"
style="@style/DisTheme.Settings">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="?android:attr/borderlessButtonStyle"
android:text="@string/action_calls"
android:textColor="@color/gray"
android:drawableTint="@color/gray"
android:drawableStart="@drawable/ic_calls"
android:drawableLeft="@drawable/ic_calls"/>
<CheckBox
android:id="@+id/callsBtnPreference"
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"
style="@style/DisTheme.Settings">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="?android:attr/borderlessButtonStyle"
android:text="@string/action_notes"
android:textColor="@color/gray"
android:drawableTint="@color/gray"
android:drawableStart="@drawable/ic_notes"
android:drawableLeft="@drawable/ic_notes"/>
<CheckBox
android:id="@+id/notesBtnPreference"
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"
style="@style/DisTheme.Settings">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="?android:attr/borderlessButtonStyle"
android:text="@string/action_git"
android:textColor="@color/gray"
android:drawableTint="@color/gray"
android:drawableStart="@drawable/ic_git"
android:drawableLeft="@drawable/ic_git"/>
<CheckBox
android:id="@+id/gitBtnPreference"
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"
style="@style/DisTheme.Settings">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="?android:attr/borderlessButtonStyle"
android:text="@string/action_user"
android:textColor="@color/gray"
android:drawableTint="@color/gray"
android:drawableStart="@drawable/ic_user"
android:drawableLeft="@drawable/ic_user"/>
<CheckBox
android:id="@+id/userBtnPreference"
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"
style="@style/DisTheme.Settings">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="?android:attr/borderlessButtonStyle"
android:text="@string/action_howto"
android:textColor="@color/gray"
android:drawableTint="@color/gray"
android:drawableStart="@drawable/ic_howto"
android:drawableLeft="@drawable/ic_howto"/>
<CheckBox
android:id="@+id/howToBtnPreference"
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"
style="@style/DisTheme.Settings">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="?android:attr/borderlessButtonStyle"
android:text="@string/action_about"
android:textColor="@color/gray"
android:drawableTint="@color/gray"
android:drawableStart="@drawable/ic_about"
android:drawableLeft="@drawable/ic_about"/>
<CheckBox
android:id="@+id/aboutBtnPreference"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"/>
</FrameLayout>
</GridLayout>
</ScrollView>
</LinearLayout>

View File

@ -40,7 +40,7 @@
android:id="@+id/action_set_icons"
android:title="@string/settings" />
<item
android:icon="@drawable/ic_about"
android:icon="@drawable/ic_about_menu"
android:id="@+id/action_about"
android:title="@string/action_about" />
<item

View File

@ -207,7 +207,15 @@
<string name="MailBtnPref">show/hide Mail icon</string>
<string name="settings">Show/Hide Icons</string>
<string name="CloudBtnPref">Show/hide Cloud icon</string>
<string name="remove">Remove this</string>
<string name="hide">Hide app</string>
<string name="dashboard">Dashboard</string>
<string name="action_calls">Calls</string>
<string name="CallsTitle">Calls Info</string>
<string name="CallsInfo">Disroot\'s Calls service is a videoconferencing software, powered by Jitsi-Meet. It provides you high quality video and audio conferences, with as many partners as you want. It also allows to stream your desktop or only some windows to other participants in the call.</string>
<string name="CallsDialog">To continue you need to install Jitsi-Meet first.\nPlease select install to continue with the installation on F-Droid.</string>
<string name="action_git">Git</string>
<string name="GitTitle">Gitea Info</string>
<string name="GitInfo">Git with a cup of tea A painless, self-hosted Git service</string>
<string name="GitsDialog">To continue you need to install GitNex first.Please select install to continue with the installation on F-Droid.</string>
</resources>

View File

@ -168,6 +168,14 @@
<string name="MailBtnPref">show/hide Mail icon</string>
<string name="settings">Show/Hide Icons</string>
<string name="CloudBtnPref">Show/hide Cloud icon</string>
<string name="remove">Remove this</string>
<string name="hide">Hide app</string>
<string name="dashboard">Dashboard</string>
<string name="action_calls">Calls</string>
<string name="CallsTitle">Calls Info</string>
<string name="CallsInfo">Disroot\'s Calls service is a videoconferencing software, powered by Jitsi-Meet. It provides you high quality video and audio conferences, with as many partners as you want. It also allows to stream your desktop or only some windows to other participants in the call.</string>
<string name="CallsDialog">To continue you need to install Jitsi-Meet first.\nPlease select install to continue with the installation on F-Droid.</string>
<string name="action_git">Git</string>
<string name="GitTitle">Gitea Info</string>
<string name="GitInfo">Git with a cup of tea A painless, self-hosted Git service</string>
<string name="GitsDialog">To continue you need to install GitNex first.Please select install to continue with the installation on F-Droid.</string>
</resources>

View File

@ -205,6 +205,14 @@
<string name="MailBtnPref">show/hide Mail icon</string>
<string name="settings">Show/Hide Icons</string>
<string name="CloudBtnPref">Show/hide Cloud icon</string>
<string name="remove">Remove this</string>
<string name="hide">Hide app</string>
<string name="dashboard">Dashboard</string>
<string name="action_calls">Calls</string>
<string name="CallsTitle">Calls Info</string>
<string name="CallsInfo">Disroot\'s Calls service is a videoconferencing software, powered by Jitsi-Meet. It provides you high quality video and audio conferences, with as many partners as you want. It also allows to stream your desktop or only some windows to other participants in the call.</string>
<string name="CallsDialog">To continue you need to install Jitsi-Meet first.\nPlease select install to continue with the installation on F-Droid.</string>
<string name="action_git">Git</string>
<string name="GitTitle">Gitea Info</string>
<string name="GitInfo">Git with a cup of tea A painless, self-hosted Git service</string>
<string name="GitsDialog">To continue you need to install GitNex first.Please select install to continue with the installation on F-Droid.</string>
</resources>

View File

@ -167,6 +167,14 @@
<string name="MailBtnPref">show/hide Mail icon</string>
<string name="settings">Show/Hide Icons</string>
<string name="CloudBtnPref">Show/hide Cloud icon</string>
<string name="remove">Remove this</string>
<string name="hide">Hide app</string>
<string name="dashboard">Dashboard</string>
<string name="action_calls">Calls</string>
<string name="CallsTitle">Calls Info</string>
<string name="CallsInfo">Disroot\'s Calls service is a videoconferencing software, powered by Jitsi-Meet. It provides you high quality video and audio conferences, with as many partners as you want. It also allows to stream your desktop or only some windows to other participants in the call.</string>
<string name="CallsDialog">To continue you need to install Jitsi-Meet first.\\nPlease select install to continue with the installation on F-Droid.</string>
<string name="action_git">Git</string>
<string name="GitTitle">Gitea Info</string>
<string name="GitInfo">Git with a cup of tea A painless, self-hosted Git service</string>
<string name="GitsDialog">To continue you need to install GitNex first.Please select install to continue with the installation on F-Droid.</string>
</resources>

View File

@ -169,6 +169,14 @@
<string name="MailBtnPref">show/hide Mail icon</string>
<string name="settings">Show/Hide Icons</string>
<string name="CloudBtnPref">Show/hide Cloud icon</string>
<string name="remove">Remove this</string>
<string name="hide">Hide app</string>
<string name="dashboard">Dashboard</string>
<string name="action_calls">Calls</string>
<string name="CallsTitle">Calls Info</string>
<string name="CallsInfo">Disroot\'s Calls service is a videoconferencing software, powered by Jitsi-Meet. It provides you high quality video and audio conferences, with as many partners as you want. It also allows to stream your desktop or only some windows to other participants in the call.</string>
<string name="CallsDialog">To continue you need to install Jitsi-Meet first.\nPlease select install to continue with the installation on F-Droid.</string>
<string name="action_git">Git</string>
<string name="GitTitle">Gitea Info</string>
<string name="GitInfo">Git with a cup of tea A painless, self-hosted Git service</string>
<string name="GitsDialog">To continue you need to install GitNex first.Please select install to continue with the installation on F-Droid.</string>
</resources>

View File

@ -167,6 +167,14 @@
<string name="MailBtnPref">Mail</string>
<string name="settings">Show/Hide Icons</string>
<string name="CloudBtnPref">Show/hide Cloud icon</string>
<string name="remove">Remove this</string>
<string name="hide">Hide app</string>
<string name="dashboard">Dashboard</string>
<string name="action_calls">Calls</string>
<string name="CallsTitle">Calls Info</string>
<string name="CallsInfo">Disroot\'s Calls service is a videoconferencing software, powered by Jitsi-Meet. It provides you high quality video and audio conferences, with as many partners as you want. It also allows to stream your desktop or only some windows to other participants in the call.</string>
<string name="CallsDialog">To continue you need to install Jitsi-Meet first.\nPlease select install to continue with the installation on F-Droid.</string>
<string name="action_git">Git</string>
<string name="GitTitle">Gitea Info</string>
<string name="GitInfo">Git with a cup of tea A painless, self-hosted Git service</string>
<string name="GitsDialog">To continue you need to install GitNex first.Please select install to continue with the installation on F-Droid.</string>
</resources>

View File

@ -168,6 +168,14 @@
<string name="MailBtnPref">show/hide Mail icon</string>
<string name="settings">Show/Hide Icons</string>
<string name="CloudBtnPref">Show/hide Cloud icon</string>
<string name="remove">Remove this</string>
<string name="hide">Hide app</string>
<string name="dashboard">Dashboard</string>
<string name="action_calls">Calls</string>
<string name="CallsTitle">Calls Info</string>
<string name="CallsInfo">Disroot\'s Calls service is a videoconferencing software, powered by Jitsi-Meet. It provides you high quality video and audio conferences, with as many partners as you want. It also allows to stream your desktop or only some windows to other participants in the call.</string>
<string name="CallsDialog">To continue you need to install Jitsi-Meet first.\nPlease select install to continue with the installation on F-Droid.</string>
<string name="action_git">Git</string>
<string name="GitTitle">Gitea Info</string>
<string name="GitInfo">Git with a cup of tea A painless, self-hosted Git service</string>
<string name="GitsDialog">To continue you need to install GitNex first.Please select install to continue with the installation on F-Droid.</string>
</resources>

View File

@ -12,7 +12,7 @@
<string name="action_upload">Upload</string>
<string name="action_searx">Search</string>
<string name="action_poll">Polls</string>
<string name="action_board">Taiga</string>
<string name="action_board">Project board</string>
<string name="action_user">Account</string>
<string name="action_state">State</string>
<string name="action_howto">How to</string>
@ -168,6 +168,14 @@
<string name="MailBtnPref">Mail</string>
<string name="settings">Settings</string>
<string name="CloudBtnPref">Cloud</string>
<string name="remove">Remove this</string>
<string name="hide">Hide app</string>
<string name="dashboard">Dashboard</string>
<string name="action_calls">Calls</string>
<string name="CallsTitle">Calls Info</string>
<string name="CallsInfo">Disroot\'s Calls service is a videoconferencing software, powered by Jitsi-Meet. It provides you high quality video and audio conferences, with as many partners as you want. It also allows to stream your desktop or only some windows to other participants in the call.</string>
<string name="CallsDialog">To continue you need to install Jitsi-Meet first.\nPlease select install to continue with the installation on F-Droid.</string>
<string name="action_git">Git</string>
<string name="GitTitle">Gitea Info</string>
<string name="GitInfo">Git with a cup of tea.\n A painless, self-hosted Git service</string>
<string name="GitsDialog">To continue you need to install GitNex first.\nPlease select install to continue with the installation on F-Droid.</string>
</resources>

View File

@ -10,11 +10,18 @@
<item name="windowActionModeOverlay">true</item>
<item name="toolbarStyle">@style/Widget.MyApp.ActionBar</item>
<item name="android:textAllCaps">false</item>
<item name="cardViewStyle">@style/CardView</item>
<!--i<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="DisTheme.Settings" parent="Theme.AppCompat.Light.NoActionBar">
<item name="android:paddingStart">@dimen/activity_horizontal_margin</item>
<item name="android:paddingLeft">@dimen/activity_horizontal_margin</item>
<item name="android:paddingEnd">@dimen/activity_horizontal_margin</item>
<item name="android:paddingRight">@dimen/activity_horizontal_margin</item>
</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-->
@ -35,7 +42,7 @@
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<!-- Customize your theme here. -->
<item name="cardViewStyle">@style/CardView</item>
<!--i<item name="cardViewStyle">@style/CardView</item>-->
</style>
</resources>