added new settings activity to make icons hideble+

Started with new theme+
corrected issue when going back after visibility change
This commit is contained in:
massimiliano 2020-01-13 03:26:44 +01:00
parent 8d22684cb3
commit 9744e24678
38 changed files with 873 additions and 327 deletions

View File

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

View File

@ -11,7 +11,7 @@ If you don't have a Disroot account you can still use this app to access all th
* Ethercalc
* Private bin
* Upload
* Poll
* Polls
* Searx
* Diaspora* (requires a Diaspora only account)

View File

@ -6,8 +6,8 @@ android {
applicationId "org.disroot.disrootapp"
minSdkVersion 15
targetSdkVersion 28
versionCode 22
versionName "1.2.3"
versionCode 23
versionName "1.9.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
buildTypes {
@ -48,3 +48,7 @@ repositories {
dependencies {
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
}
dependencies {
implementation 'com.android.support.constraint:constraint-layout:+'
}

View File

@ -13,16 +13,17 @@
android:allowBackup="true"
android:fullBackupContent="@xml/backup_descriptor"
android:hardwareAccelerated="true"
android:icon="@mipmap/ic_disroot"
android:icon="@drawable/ic_app_logo"
android:label="@string/app_name"
android:supportsRtl="true"
android:theme="@style/DisTheme">
<receiver
android:name=".StatusBroadcastReceiver"
android:enabled="true"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED"/>
<action android:name="android.intent.action.BOOT_COMPLETED" />
</intent-filter>
</receiver>
@ -45,7 +46,7 @@
android:name=".ui.MainActivity"
android:configChanges="orientation|screenSize"
android:hardwareAccelerated="true"
android:label="@string/app_name">
android:label="@string/dashboard">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
@ -70,6 +71,10 @@
android:name=".ui.StateMessagesActivity"
android:label="@string/title_activity_state"
android:theme="@style/DisTheme" />
<activity
android:name=".ui.SettingsActivity"
android:label="@string/settings"
android:theme="@style/DisTheme" />
<activity
android:name="wsdfhjxc.taponium.MainActivity"
android:label="@string/title_activity_tap"

View File

@ -80,10 +80,11 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
SharedPreferences firstStart = null;//first start
SharedPreferences check = null;
SharedPreferences BtnPreference;
WebChromeClient.FileChooserParams chooserParams;
ValueCallback<Uri[]> chooserPathUri;
Button button;
private Button MailBtn,CloudBtn,DiasporaBtn,ForumBtn,ChatBtn,PadBtn,CalcBtn,BinBtn,UploadBtn,SearxBtn,PollsBtn,BoardBtn,NotesBtn,UserBtn,StateBtn,HowToBtn,AboutBtn;//all buttons
private Button MailBtn,CloudBtn,ForumBtn,ChatBtn,PadBtn,CalcBtn,BinBtn,UploadBtn,SearxBtn,PollsBtn,BoardBtn,NotesBtn,UserBtn,StateBtn,HowToBtn,AboutBtn;//all buttons
private CookieManager cookieManager;
private WebView webView;
private DisWebChromeClient disWebChromeClient;
@ -107,7 +108,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
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
private static final String TAG = MainActivity.class.getSimpleName();
public static final String TAG = MainActivity.class.getSimpleName();
@Override
public void onCreate(Bundle savedInstanceState) {
@ -120,6 +121,11 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
//settings
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
//Status service
Intent intent = new Intent( MainActivity.this, StatusService.class);
@ -187,7 +193,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
// Link the button in activity_main.xml
MailBtn = findViewById( R.id.MailBtn );
CloudBtn = findViewById( R.id.CloudBtn );
DiasporaBtn = findViewById( R.id.DiasporaBtn );
//DiasporaBtn = findViewById( R.id.DiasporaBtn );//end of Disroot's Dandelion
ForumBtn = findViewById( R.id.ForumBtn );
ChatBtn = findViewById( R.id.ChatBtn );
PadBtn = findViewById( R.id.PadBtn );
@ -203,10 +209,28 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
HowToBtn = findViewById( R.id.HowToBtn );
AboutBtn = findViewById( R.id.AboutBtn );
//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 );
CloudBtn.setOnLongClickListener( this );
DiasporaBtn.setOnLongClickListener( this );
//DiasporaBtn.setOnLongClickListener( this );//end of Disroot's Dandelion
ForumBtn.setOnLongClickListener( this );
ChatBtn.setOnLongClickListener( this );
PadBtn.setOnLongClickListener( this );
@ -225,7 +249,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
//set clickbuttons
MailBtn.setOnClickListener( this );
CloudBtn.setOnClickListener( this );
DiasporaBtn.setOnClickListener( this );
//DiasporaBtn.setOnClickListener( this );//end of Disroot's Dandelion
ForumBtn.setOnClickListener( this );
ChatBtn.setOnClickListener( this );
PadBtn.setOnClickListener( this );
@ -275,14 +299,14 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
}
else startActivity(cloud);
break;
case R.id.DiasporaBtn:
/*case R.id.DiasporaBtn: //end ofDisroot's Dandelion
Intent pod = getPackageManager().getLaunchIntentForPackage(Diaspora);
if(getPackageManager().getLaunchIntentForPackage(Diaspora) == null) {
showDiaDialog();
break;
}
else startActivity(pod);
break;
break;*/
case R.id.ForumBtn:
webView.loadUrl(Constants.URL_DisApp_FORUM);
hideDashboard();
@ -332,8 +356,6 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
hideDashboard();
break;
case R.id.UploadBtn:
//startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.URL_DisApp_UPLOAD)));
//workaround for crashing app
webView.loadUrl(Constants.URL_DisApp_UPLOAD);
hideDashboard();
break;
@ -388,9 +410,9 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
case R.id.CloudBtn:
showCloudInfo();
break;
case R.id.DiasporaBtn:
/*case R.id.DiasporaBtn://end of Disroot's Dandelion
showDiaInfo();
break;
break;*/
case R.id.ForumBtn:
showForumInfo();
break;
@ -448,7 +470,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
dashboard.setVisibility( View.GONE );
}
//Show xmpp choice
//Show chat choice
private void showChoose() {
AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
builder.setTitle(R.string.ChooseChatTitle)
@ -548,6 +570,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.MailBtn).getParent()!=null){
viewGroup.removeView(MailBtn);
BtnPreference.edit().putBoolean( "mailBtnVisibility", false ).apply();
return;}
}
});
builder.show();
}
private void showMailDialog(){
@ -581,6 +613,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.CloudBtn).getParent()!=null){
viewGroup.removeView(CloudBtn);
BtnPreference.edit().putBoolean( "cloudBtnVisibility", false ).apply();
return;}
}
});
builder.show();
}
private void showCloudDialog(){
@ -600,6 +642,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
builder.show();
}
/*End of Disroot's Dandelion*
//Diaspora info
private void showDiaInfo() {
AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
@ -631,7 +674,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
});
builder.setNegativeButton(R.string.global_cancel , null);
builder.show();
}
}*/
private void showForumInfo() {
AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
@ -646,6 +689,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.ForumBtn).getParent()!=null){
viewGroup.removeView(ForumBtn);
BtnPreference.edit().putBoolean( "forumBtnVisibility", false ).apply();
return;}
}
});
builder.show();
}
@ -674,7 +727,6 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
builder.setCancelable(false);
builder.setTitle(R.string.ChatTitle);
builder.setMessage(getString(R.string.ChatInfo));
// ||check.getBoolean("checkPix", true)==true
if(check.getBoolean("checkConv", true)|| check.getBoolean("checkPix",true)) {
View view = View.inflate(this, R.layout.check_forget, null);
final CheckBox forgetChat = (CheckBox) view.findViewById(R.id.forgetChat);
@ -695,6 +747,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.ChatBtn).getParent()!=null){
viewGroup.removeView(ChatBtn);
BtnPreference.edit().putBoolean( "chatBtnVisibility", false ).apply();
return;}
}
});
builder.show();
}
private void showChatDialog(){
@ -1100,8 +1162,6 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
// Inflate the menu items for use in the action bar
MenuInflater inflater = getMenuInflater();
inflater.inflate(R.menu.menu_main, menu);
// To show icons in the actionbar's overflow menu:
// http://stackoverflow.com/questions/18374183/how-to-show-icons-in-overflow-menu-in-actionbar
if(menu.getClass().getSimpleName().equals("MenuBuilder")) try {
@ -1164,6 +1224,10 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
Intent goAbout = new Intent(MainActivity.this, AboutActivity.class);
MainActivity.this.startActivity(goAbout);
return true;
case R.id.action_set_icons:
Intent goBtnSettings = new Intent(MainActivity.this, SettingsActivity.class);
MainActivity.this.startActivity(goBtnSettings);
return true;
case R.id.action_clear_cookies: {
if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP){
CookieManager.getInstance().removeAllCookies(null);
@ -1198,6 +1262,9 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
webView.getSettings().setUseWideViewPort(true);
webView.getSettings().setRenderPriority(WebSettings.RenderPriority.HIGH);
webView.getSettings().setAllowContentAccess(true);
webView.getSettings().setJavaScriptCanOpenWindowsAutomatically(true);
webView.getSettings().setCacheMode(WebSettings.LOAD_DEFAULT);
webView.getSettings().setDatabaseEnabled(true);
webView.setOnLongClickListener(this);
//enable cookies
@ -1238,15 +1305,20 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
Log.e("Permission error","You have asked for permission");
ActivityCompat.requestPermissions(MainActivity.this, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, 1);
}
final String filename= URLUtil.guessFileName(url, contentDisposition, mimetype);
DownloadManager.Request request = new DownloadManager.Request(
Uri.parse(url));
request.allowScanningByMediaScanner();
request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED);
request.setDestinationInExternalPublicDir(Environment.DIRECTORY_DOWNLOADS, filename);
DownloadManager dm = (DownloadManager) getSystemService(DOWNLOAD_SERVICE);
assert dm != null;
dm.enqueue(request);
if (Uri.parse( url ).toString().startsWith( "blob" )){
webView.loadUrl("");
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.URL_DisApp_UPLOAD)));
} else {
final String filename = URLUtil.guessFileName( url, contentDisposition, mimetype );
DownloadManager.Request request = new DownloadManager.Request(
Uri.parse( url ) );
request.allowScanningByMediaScanner();
request.setNotificationVisibility( DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED );
request.setDestinationInExternalPublicDir( Environment.DIRECTORY_DOWNLOADS, filename );
DownloadManager dm = (DownloadManager) getSystemService( DOWNLOAD_SERVICE );
assert dm != null;
dm.enqueue( request );
}
}
});
@ -1273,7 +1345,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
}
@Override
public boolean shouldOverrideUrlLoading(WebView view, String url) {
if(url.startsWith("https")|url.startsWith("http")&&url.contains("disroot")) {//&!url.contains("upload.disroot.org")
if(url.startsWith("http")&&url.contains("disroot")&&!Uri.parse( url ).toString().startsWith( "blob" )) {
view.loadUrl(url);
return super.shouldOverrideUrlLoading(view, url);
}

View File

@ -0,0 +1,135 @@
package org.disroot.disrootapp.ui;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.widget.CheckBox;
import android.widget.CompoundButton;
import org.disroot.disrootapp.R;
public class SettingsActivity extends AppCompatActivity {
SharedPreferences BtnPreference;
@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate( R.menu.menu_about, menu );
return true;
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
int id = item.getItemId();
if (id == R.id.action_home) {
Intent goHome = new Intent( SettingsActivity.this, MainActivity.class );
SettingsActivity.this.startActivity( goHome );
return true;
}
return super.onOptionsItemSelected( item );
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate( savedInstanceState );
setContentView( R.layout.activity_settings );
Toolbar toolbar = findViewById( R.id.toolbar );
setSupportActionBar( toolbar );
toolbar.setNavigationIcon( R.drawable.ic_arrow_back );
toolbar.setNavigationOnClickListener( new View.OnClickListener() {
@Override
public void onClick(View v) {
onBackPressed();
}
} );
////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
//checkboxlist
checkPrefBox();
}
//Visibility preference functions
public void checkPrefBox() {
//define checkBoxes
View iconSettings =findViewById( R.id.iconSettings );
final CheckBox checkMailBtn = iconSettings.findViewById( R.id.mailBtnPreference );//mail
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
//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
//Mail
checkMailBtn.setOnCheckedChangeListener( new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton view, boolean isChecked) {
if (checkMailBtn.isChecked()) {
BtnPreference.edit().putBoolean( "mailBtnVisibility", true ).apply();
} else {
BtnPreference.edit().putBoolean( "mailBtnVisibility", false ).apply();
}
}
} );
//Cloud
checkCloudBtn.setOnCheckedChangeListener( new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton view, boolean isChecked) {
if (checkCloudBtn.isChecked()) {
BtnPreference.edit().putBoolean( "cloudBtnVisibility", true ).apply();
} else {
BtnPreference.edit().putBoolean( "cloudBtnVisibility", false ).apply();
}
}
} );
//forum
checkForumBtn.setOnCheckedChangeListener( new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton view, boolean isChecked) {
if (checkForumBtn.isChecked()) {
BtnPreference.edit().putBoolean( "forumBtnVisibility", true ).apply();
} else {
BtnPreference.edit().putBoolean( "forumBtnVisibility", false ).apply();
}
}
} );
//chat
checkChatBtn.setOnCheckedChangeListener( new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton view, boolean isChecked) {
if (checkChatBtn.isChecked()) {
BtnPreference.edit().putBoolean( "chatBtnVisibility", true ).apply();
} else {
BtnPreference.edit().putBoolean( "chatBtnVisibility", false ).apply();
}
}
} );
}
@Override
public void onBackPressed() {
Intent goHome = new Intent( SettingsActivity.this, MainActivity.class );
SettingsActivity.this.startActivity( goHome );
}
}

View File

@ -0,0 +1,20 @@
<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="M6.35,6.35m-6.35,0a6.35,6.35 0,1 1,12.7 0a6.35,6.35 0,1 1,-12.7 0"
android:strokeWidth="2.51155782"
android:fillColor="#50162d"
android:fillAlpha="0.98846154"/>
<path
android:pathData="m2.2268,4.5326c-0.0461,0.5661 0.3152,0.3505 0.7499,0.3246 0.5321,0.0083 1.0058,-0.0379 1.1996,0.264l1.2712,3.1525c0.236,0.7519 -0.8291,0.9706 -0.6936,1.3437 0.0967,0.5463 0.4617,0.3703 1.064,0.3011 2.0598,-0.4239 4.4416,-1.2796 4.8806,-2.7231 0.0892,-0.3122 0.0736,-0.7009 -0.0571,-0.9724 -0.2282,-0.3628 -0.5486,-0.6576 -0.872,-0.9324 -1.4281,-0.9121 -1.5014,-1.0189 -3.251,-1.5533 -0.786,-0.179 -1.58,-0.3371 -2.3892,-0.3493 -0.6755,-0.0538 -1.8017,0.5807 -1.9023,1.1446zM6.6109,5.6465c0.8928,0.2159 1.5441,0.8047 2.1557,1.3637 0.2596,0.2679 0.2714,0.5767 0.1082,0.9253 -0.223,0.3316 -0.5577,0.4127 -0.9098,0.5047l-0.5679,0.1154c0.2379,-0.4614 -0.1453,-0.8943 -0.2514,-1.3383 -0.1873,-0.5205 -0.3658,-1.0442 -0.5349,-1.5709z"
android:strokeAlpha="0.99215686"
android:strokeLineJoin="miter"
android:strokeWidth="1"
android:fillColor="#ffffff"
android:strokeColor="#00000000"
android:fillAlpha="0.99215686"
android:strokeLineCap="butt"/>
</vector>

View File

@ -1,5 +1,30 @@
<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="m37.7143,19.4946c0,7.5804 -8.4375,13.7143 -18.8571,13.7143 -1.6339,0 -3.2143,-0.1607 -4.7143,-0.4286 -2.2232,1.5804 -4.7411,2.7321 -7.4464,3.4286 -0.7232,0.1875 -1.5,0.3214 -2.3036,0.4286H4.3125c-0.4018,0 -0.7768,-0.3214 -0.8571,-0.7768C3.3482,35.3517 3.6964,35.0303 3.9911,34.6821 5.0357,33.5035 6.2143,32.4588 7.125,30.2356 2.7857,27.7178 0,23.8338 0,19.4946 0,11.9142 8.4375,5.7803 18.8571,5.7803c10.4196,0 18.8571,6.1339 18.8571,13.7143zM48,26.3517c0,4.3661 -2.7857,8.2232 -7.125,10.7411 0.9107,2.2232 2.0893,3.2679 3.1339,4.4464 0.2946,0.3482 0.6429,0.6696 0.5357,1.1786 -0.1071,0.4821 -0.5089,0.8304 -0.9375,0.7768 -0.8036,-0.1071 -1.5804,-0.2411 -2.3036,-0.4286 -2.7054,-0.6964 -5.2232,-1.8482 -7.4464,-3.4286 -1.5,0.2679 -3.0804,0.4286 -4.7143,0.4286 -4.8482,0 -9.2946,-1.3393 -12.6429,-3.5357 0.7768,0.0536 1.5804,0.1071 2.3571,0.1071 5.7589,0 11.1964,-1.6607 15.3482,-4.6607 4.4732,-3.2679 6.9375,-7.6875 6.9375,-12.4821 0,-1.3929 -0.2143,-2.7589 -0.6161,-4.0714C45.0536,17.9142 48,21.8785 48,26.3517Z" 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.9643,3.6263c-0.0637,2.49 -2.1825,4.9175 -4.7334,5.973 2.3859,-1.0905 3.9098,-3.6194 3.6849,-5.5478z"
android:strokeWidth="0.05213608"
android:fillColor="#ffffff"/>
<path
android:pathData="m9.0373,4.3276c-0.123,3.9776 -3.0188,5.3239 -4.8734,5.8454v-0.0428c2.3528,-0.5924 3.9534,-3.3009 3.9534,-5.3108 0,-0.0692 -0.0021,-0.1377 -0.006,-0.2062z"
android:strokeWidth="0.05213608"
android:fillColor="#ffffff"/>
<path
android:pathData="m9.6762,4.1258 l-0.3971,0.1419c-0.0512,2.5097 -1.2808,4.6654 -4.443,5.7667 3.1989,-0.8292 4.9737,-3.5139 4.8401,-5.9086z"
android:strokeWidth="0.05213608"
android:fillColor="#ffffff"/>
<path
android:pathData="m1.8431,3.6774c0.0637,2.49 2.1825,4.9175 4.7334,5.973C4.1906,8.56 2.7012,6.0125 2.9261,4.084Z"
android:strokeWidth="0.05213608"
android:fillColor="#ffffff"/>
<path
android:pathData="m3.7281,4.3834c0.123,3.9776 3.0609,5.3193 4.9155,5.8407v-0.0428C6.2908,9.5889 4.6901,6.8804 4.6901,4.8705c0,-0.0692 0.0021,-0.1377 0.006,-0.2062z"
android:strokeWidth="0.05213608"
android:fillColor="#ffffff"/>
<path
android:pathData="m3.1313,4.1769 l0.3971,0.1419c0.0512,2.5097 1.2808,4.6654 4.443,5.7667 -3.1989,-0.8292 -4.9737,-3.5139 -4.8401,-5.9086z"
android:strokeWidth="0.05213608"
android:fillColor="#ffffff"/>
</vector>

View File

@ -1,5 +1,16 @@
<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="m48,32.2c0,5.3 -4.3,9.6 -9.6,9.6H11.2C5.025,41.8 0,36.775 0,30.6 0,26.125 2.65,22.25 6.45,20.475 6.425,20.125 6.4,19.75 6.4,19.4 6.4,12.325 12.125,6.6 19.2,6.6c5.35,0 9.925,3.275 11.85,7.95 1.1,-0.975 2.55,-1.55 4.15,-1.55 3.525,0 6.4,2.875 6.4,6.4 0,1.275 -0.375,2.45 -1.025,3.45 4.25,1 7.425,4.8 7.425,9.35z" android:strokeWidth="0.025"/>
<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="m6.4048,4.0804c-1.0336,-0.0215 -1.9242,0.661 -2.2155,1.6047 -0.2255,-0.5085 -0.7295,-0.8719 -1.3186,-0.8841 -0.81,-0.0169 -1.4897,0.6352 -1.5066,1.4452 -0.0168,0.81 0.6352,1.49 1.4452,1.5069 0.589,0.0122 1.1077,-0.3301 1.3542,-0.8289 0.2518,0.9551 1.1133,1.6742 2.1468,1.6957 1.0259,0.0214 1.9119,-0.6509 2.2099,-1.5839 0.2301,0.4972 0.728,0.8509 1.3087,0.8629 0.81,0.0169 1.49,-0.6355 1.5069,-1.4455 0.0168,-0.81 -0.6355,-1.4898 -1.4455,-1.5066 -0.5806,-0.0121 -1.0928,0.3204 -1.3434,0.8075 -0.2589,-0.9445 -1.1162,-1.6527 -2.1421,-1.674zM6.3868,4.9467c0.7802,0.0162 1.3906,0.6522 1.3744,1.4324 -0.0162,0.7802 -0.6525,1.3906 -1.4327,1.3744 -0.7802,-0.0162 -1.3903,-0.6525 -1.3741,-1.4327 0.0162,-0.7802 0.6522,-1.3903 1.4324,-1.3741zM2.8528,5.6674c0.3418,0.007 0.6042,0.2803 0.5971,0.6222 -0.0071,0.3418 -0.2806,0.6042 -0.6225,0.5971 -0.3418,-0.007 -0.6039,-0.2806 -0.5968,-0.6225 0.0071,-0.3418 0.2803,-0.6039 0.6222,-0.5968zM9.8723,5.8133c0.3418,0.007 0.6042,0.2803 0.5971,0.6222 -0.0071,0.3418 -0.2806,0.6042 -0.6225,0.5971 -0.3418,-0.007 -0.6039,-0.2806 -0.5968,-0.6225 0.0071,-0.3419 0.2803,-0.604 0.6222,-0.5968z"
android:strokeAlpha="1"
android:strokeLineJoin="miter"
android:strokeWidth="0.4874177"
android:fillColor="#ffffff"
android:strokeColor="#00000000"
android:fillType="nonZero"
android:fillAlpha="0.99215686"
android:strokeLineCap="butt"/>
</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.1875,31.1563v2.0625c0,3.5312 -2.75,6.375 -6.125,6.375L35.2813,39.5938L27.1563,48L27.1563,39.5938L10.625,39.5938C7.25,39.5938 4.5,36.75 4.5,33.2188v-2.0625zM43.1875,20.9688v7.9687L4.5,28.9375v-7.9687zM43.1875,10.7188v7.9687L4.5,18.6875v-7.9687zM43.1875,6.3438L43.1875,8.4375L4.5,8.4375L4.5,6.3438C4.5,2.8438 7.25,0 10.625,0h26.4375c3.375,0 6.125,2.8438 6.125,6.3438z" 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="m6.6563,7.6693c0.4919,-0.009 0.9689,-0.1315 1.3504,-0.4381 1.2574,-1.0105 0.5227,-3.3312 -1.3778,-3.3512 -1.3007,0 -2.2533,1.2558 -1.7548,2.5019 0.1171,0.2926 0.1251,0.4382 0.0448,0.8126 -0.0538,0.2509 -0.2997,0.7218 -0.2997,0.7427 0,0.021 0.3748,-0.187 0.4856,-0.2255 0.6859,-0.2248 1.0467,-0.01 1.5515,-0.0424zM3.2338,7.1467c0.033,-2.1274 0.0509,-1.8935 0.3116,-2.7934 1.0775,-2.1284 3.9216,-2.1894 5.3289,-1.0946 1.4073,1.0948 1.5546,2.8514 0.8927,4.1418 -0.3871,0.7355 -0.9393,1.2703 -1.6616,1.6091 -0.5687,0.2667 -0.6805,0.2794 -2.7494,0.3124l-2.1566,0.0344c0,0 0.0229,-1.4732 0.0343,-2.2098z"
android:strokeWidth="0.08959338"
android:fillColor="#ffffff"/>
</vector>

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1,105 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="280dp"
android:height="35dp"
android:viewportWidth="74.08333"
android:viewportHeight="9.260417">
<path
android:pathData="m58.7853,5.7311c-0.4584,3.5247 -6.7246,2.4912 -6.6433,-0.9555 0.1038,-4.4013 7.1098,-2.6317 6.6433,0.9555zM57.4378,5.8516c0.5404,-3.4189 -6.454,-2.673 -3.3163,0.3361 1.0093,0.9679 3.0922,1.0817 3.3163,-0.3361z"
android:strokeAlpha="1"
android:strokeLineJoin="miter"
android:strokeWidth="1.0666666"
android:fillColor="#f2f2f2"
android:strokeColor="#00000000"
android:fillAlpha="1"
android:strokeLineCap="butt"/>
<path
android:pathData="m12.3633,5.5224c0.0156,0.6346 -0.3384,0.2307 -0.4295,0.5434 -0.0961,0.3461 0.0728,0.4876 -0.3924,0.5034 -0.4652,0.0158 -0.6008,-0.6817 -0.7313,-1.2475 -0.3572,-1.4285 -0.8737,-2.7515 -1.4158,-4.0151 -0.0298,-0.1442 -0.2538,-0.4661 -0.0317,-0.4332 0.6522,0.0469 0.8207,-0.678 1.2997,0 0.6789,2.0993 1.4017,3.0819 1.7012,4.6491z"
android:strokeAlpha="1"
android:strokeLineJoin="miter"
android:strokeWidth="1.0666666"
android:fillColor="#f2f2f2"
android:strokeColor="#00000000"
android:fillAlpha="1"
android:strokeLineCap="butt"/>
<path
android:pathData="m29.2649,7.3489c-0.0433,0.0304 -0.3033,-0.0687 -0.3033,-0.0687 -1.9181,-0.619 -4.7369,-1.1676 -6.7834,-1.5533 -0.3473,0.4817 0.1157,1.7392 0.074,2.3245 -0.0493,0.5758 -0.6265,0.2397 -0.7291,0.877 -0.1505,0.2487 -0.3324,0.4071 -0.4543,0.2958 -0.1297,-0.3016 -0.1634,-0.4176 -0.1691,-0.877 0.0231,-0.955 0.1945,-1.8461 0.0528,-2.8528 -0.0423,-0.3008 -0.6006,-0.3155 -0.5706,-0.5811 0.0699,-0.6179 0.5025,-1.3349 0.8453,-1.8068 0.0391,-0.0538 0.2608,0.0024 0.2895,0.0228 0.9294,0.665 3.073,-0.1151 3.4826,-0.5722 0,-0.0493 -0.0423,-0.0845 -0.1268,-0.1057 -2.6205,-0.4831 -4.6779,-0.4179 -5.452,-0.243 -0.7741,0.1749 -0.7082,-0.9955 0.0845,-1.4158 2.4405,-0.4117 5.8587,-0.1624 6.8996,0.6868 0.9705,1.357 -1.7981,2.4636 -2.8572,2.6224l1.1772,0.3678c1.3232,0.3648 2.62,0.624 3.8777,1.0989 0.4919,0.1857 1.2277,0.281 1.3524,0.7079 0.0948,0.3245 -0.5694,0.9878 -0.69,1.0725z"
android:strokeAlpha="1"
android:strokeLineJoin="miter"
android:strokeWidth="1.0666666"
android:fillColor="#f2f2f2"
android:strokeColor="#00000000"
android:fillAlpha="1"
android:strokeLineCap="butt"/>
<path
android:pathData="m35.404,6.5075c-0.7333,0.7194 -2.4201,0.9926 -4.0058,0.0362 -1.5857,-0.9564 -3.1549,-3.0012 -1.5844,-4.9475 0.6232,-0.7723 1.7377,-0.5642 3.1324,-0.1118 1.3947,0.4525 3.9035,3.6049 2.4578,5.0231zM30.5263,2.9436c-0.6285,1.3131 1.1379,2.5494 2.3245,2.8378 0.7707,0.1873 1.1229,0.2095 1.5032,-0.0932 0.3803,-0.3028 0.4017,-0.8852 -0.3115,-1.7674 -0.7132,-0.8823 -2.8878,-2.2902 -3.5162,-0.9771z"
android:strokeAlpha="1"
android:strokeLineJoin="miter"
android:strokeWidth="1.0666666"
android:fillColor="#f2f2f2"
android:strokeColor="#00000000"
android:fillAlpha="1"
android:strokeLineCap="butt"/>
<path
android:pathData="m51.1479,2.7767c-0.3726,0.3437 -3.0023,-0.1793 -4.2511,-0.1884 -0.0287,-0.0006 -0.0549,0.0289 -0.0659,0.0554 -0.5331,1.2876 0.1727,4.2023 0.309,4.907 0.4213,2.1781 -0.3505,1.5538 -1.2372,1.1441 -0.2538,-0.0985 -0.2141,-0.1962 -0.2786,-0.474 -0.2596,-1.9236 -0.5154,-4.8989 -0.4125,-5.7167 0.103,-0.8178 -2.5481,0.0875 -3.0382,-0.8357 -0.1402,-0.2642 -0.0777,-0.4504 -0.0472,-0.8959 0.0185,-0.2689 0.1347,-0.1882 0.2449,-0.1682 1.409,0.2554 6.7786,0.4698 9.0369,0.747 0.271,0.0656 0.1591,1.0388 -0.2601,1.4255z"
android:strokeAlpha="1"
android:strokeLineJoin="miter"
android:strokeWidth="1.0666666"
android:fillColor="#f2f2f2"
android:strokeColor="#00000000"
android:fillAlpha="1"
android:strokeLineCap="butt"/>
<path
android:pathData="m49.9287,7.1107c0,-0.5294 0.9911,-0.9086 1.4811,-0.6351 0.2338,0.1305 0.2633,0.4517 0.2224,0.6973 -0.0607,0.3651 -0.0542,0.8896 -0.5602,0.9206 -0.4492,0.0276 -1.1433,-0.6139 -1.1433,-0.9828z"
android:strokeAlpha="1"
android:strokeLineJoin="miter"
android:strokeWidth="1.0666666"
android:fillColor="#f2f2f2"
android:strokeColor="#00000000"
android:fillAlpha="1"
android:strokeLineCap="butt"/>
<path
android:pathData="m60.5327,0.7316c-0.4347,0.189 -0.6004,0.1959 -0.9247,0.368 -0.567,0.3414 -1.1039,0.3482 -0.3742,0.5384 1.6855,0.442 4.7508,0.7641 4.8698,1.2652 0.1477,0.4677 -1.1458,1.0091 -2.2128,0.8647 -0.9584,-0.0971 -1.4353,-0.7713 -1.5903,-0.4732 -0.1763,0.3389 -0.2162,0.8942 -0.5458,1.6557 -0.1641,0.3543 0.1199,0.2858 0.2743,0.3526 0.0848,0.1095 0.1171,0.0943 0.0806,0.4678 -0.09,0.9222 -0.0325,1.6388 -0.1774,2.4605 -0.0307,0.174 -0.0816,0.4362 0.4568,0.4685 0.7024,0.0421 0.4998,-0.2193 0.6231,-0.4246 0.0715,-0.4071 0.1688,-1.573 0.17,-2.454 1.8925,0.253 3.6899,0.942 5.5192,1.6844 0.0685,0.0631 0.369,-0.4255 0.4551,-0.5012 0.7566,-0.6661 -2.6843,-1.7775 -4.128,-2.0499 -1.6703,-0.3151 -0.0823,0.087 0.6595,0.021 1.5265,-0.1357 2.5788,-2.1996 1.6025,-2.979 -1.5681,-0.9337 -3.6313,-0.9464 -4.7576,-1.265z"
android:strokeAlpha="1"
android:strokeLineJoin="miter"
android:strokeWidth="0.93094134"
android:fillColor="#f2f2f2"
android:strokeColor="#00000000"
android:fillAlpha="1"
android:strokeLineCap="butt"/>
<path
android:pathData="m71.1051,0.5521c-1.7435,0.4791 -4.4168,1.2194 -4.5895,3.2077 -0.0572,0.7474 0.321,1.6372 1.0181,1.8691 1.4572,0.4847 1.8525,0.5582 2.4873,0.8576 0.8403,0.3963 0.4651,0.582 0.8315,0.7085 0.4427,0.1528 0.7803,-0.2599 0.9576,-0.6009 0.275,-0.529 0.4865,-1.0829 0.8237,-1.5873 0.5708,-0.854 1.7466,-2.1773 1.3802,-2.569 -0.2448,-0.2617 -0.7138,-0.0382 -1.0854,0.0926 -0.6898,0.2428 -1.4212,0.4257 -2.1705,0.3177 -0.483,-0.0697 -0.9526,-0.2078 -1.4351,-0.2753 -0.3039,-0.0425 -0.8566,1.2613 -0.1723,1.3645 0.6233,0.094 1.5013,0.075 1.7784,0.6575 0.1336,0.2807 -0.7817,0.1627 -1.1434,0.2066 -0.6369,0.0772 -1.2978,-0.0272 -1.9011,-0.2604 -0.3815,-0.1474 -0.477,-0.595 -0.4344,-0.9425 0.0702,-0.5733 0.5892,-0.9382 1.0892,-1.2004 1.3,-0.6815 2.8901,-1.1383 4.1771,-1.2054 0.0536,-0.0027 0.2179,-0.2211 0.0628,-0.3773 -0.8073,-0.8131 -0.5008,-0.5905 -1.6741,-0.2631z"
android:strokeAlpha="1"
android:strokeLineJoin="miter"
android:strokeWidth="0.93094134"
android:fillColor="#f2f2f2"
android:strokeColor="#00000000"
android:fillAlpha="1"
android:strokeLineCap="butt"/>
<path
android:pathData="m42.2278,6.5946c-0.9216,1.4245 -3.895,0.8979 -4.9096,-0.2392 -1.0146,-1.1371 -1.3696,-2.7592 -0.5629,-3.7457 1.7608,-2.1532 4.5487,-0.9455 5.255,0.3352 0.7064,1.2807 1.1391,2.2251 0.2175,3.6496zM41.7038,6.9757 L41.7079,6.973zM39.1016,2.5603c-0.8577,-0.1328 -1.6173,-0.0979 -1.6663,0.9806 -0.049,1.0785 1.2204,2.3689 1.9837,2.7241 1.5415,0.7173 1.8496,-0.6409 1.7543,-1.2855 -0.1563,-1.0567 -1.214,-2.2864 -2.0716,-2.4192z"
android:strokeAlpha="1"
android:strokeLineJoin="miter"
android:strokeWidth="1.0666666"
android:fillColor="#f2f2f2"
android:strokeColor="#00000000"
android:fillAlpha="1"
android:strokeLineCap="butt"/>
<path
android:pathData="m0.0041,1.2737c-0.0472,0.5793 0.3225,0.3587 0.7674,0.3322 0.5445,0.0085 1.0294,-0.0388 1.2277,0.2702l1.301,3.2263c0.2415,0.7695 -0.8485,0.9933 -0.7099,1.3751 0.099,0.5591 0.4725,0.379 1.0889,0.3082 2.108,-0.4338 4.5456,-1.3095 4.9949,-2.7869 0.0913,-0.3195 0.0753,-0.7173 -0.0584,-0.9951 -0.2335,-0.3713 -0.5614,-0.673 -0.8924,-0.9542 -1.4615,-0.9334 -1.5365,-1.0427 -3.3272,-1.5897 -0.8044,-0.1832 -1.617,-0.345 -2.4452,-0.3575 -0.6913,-0.055 -1.8438,0.5943 -1.9469,1.1714zM4.4907,2.4137c0.9137,0.221 1.5802,0.8235 2.2062,1.3956 0.2657,0.2742 0.2778,0.5902 0.1108,0.947 -0.2283,0.3394 -0.5707,0.4224 -0.9311,0.5165l-0.5812,0.1181c0.2435,-0.4722 -0.1487,-0.9153 -0.2573,-1.3696 -0.1916,-0.5327 -0.3744,-1.0686 -0.5474,-1.6077z"
android:strokeAlpha="0.99215686"
android:strokeLineJoin="miter"
android:strokeWidth="0.71840823"
android:fillColor="#f2f2f2"
android:strokeColor="#00000000"
android:fillAlpha="0.99215686"
android:strokeLineCap="butt"/>
<path
android:pathData="m12.9021,2.8648c0.5997,0.4664 2.0655,1.2127 2.5719,1.6657 0.4707,0.288 1.005,0.6635 1.0613,1.1927 0.0235,0.2208 -0.134,0.4722 -0.3284,0.5797 -0.5693,0.1438 -0.7689,-0.331 -1.5524,-0.3472 -0.7334,-0.0321 -1.3306,0.9302 -0.6234,1.5743 1.0005,0.9093 3.2569,0.2036 3.8415,-0.6142 0.3865,-0.5597 0.4186,-0.8378 0.4061,-1.2877 -0.1559,-1.0582 -0.8931,-1.7004 -1.8719,-2.4302 0,0 -1.1202,-0.555 -1.7661,-0.9438 -0.6459,-0.3888 -0.1535,-0.8177 0.9932,-0.2955 1.1467,0.5222 1.6407,1.0085 1.5858,0.4797 -0.0763,-0.7345 0.9128,-0.2715 0.7329,-1.106 -0.6879,-0.7255 -1.6493,-1.0381 -2.7451,-1.0927 -1.0959,-0.0546 -2.7437,0.1169 -2.945,0.8928 -0.2014,0.7759 0.1221,1.3176 0.6396,1.7324z"
android:strokeAlpha="1"
android:strokeLineJoin="miter"
android:strokeWidth="0.37795275"
android:fillColor="#f2f2f2"
android:strokeColor="#00000000"
android:fillAlpha="1"
android:strokeLineCap="butt"/>
</vector>

File diff suppressed because one or more lines are too long

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="M48,18.2464L48,39.5143C48,41.8714 46.0714,43.8 43.7143,43.8L4.2857,43.8C1.9286,43.8 0,41.8714 0,39.5143L0,18.2464c0.8036,0.8839 1.7143,1.6607 2.7054,2.3304 4.4464,3.0268 8.9464,6.0536 13.3125,9.2411 2.25,1.6607 5.0357,3.6964 7.9554,3.6964h0.0536c2.9196,0 5.7054,-2.0357 7.9554,-3.6964 4.3661,-3.1607 8.8661,-6.2143 13.3393,-9.2411 0.9643,-0.6696 1.875,-1.4464 2.6786,-2.3304zM48,10.3714c0,3 -2.2232,5.7054 -4.5804,7.3393 -4.1786,2.8929 -8.3839,5.7857 -12.5357,8.7054 -1.7411,1.2054 -4.6875,3.6696 -6.8571,3.6696h-0.0536c-2.1696,0 -5.1161,-2.4643 -6.8571,-3.6696C12.9643,23.4964 8.7589,20.6036 4.6071,17.7107 2.7054,16.425 0,13.3982 0,10.9607c0,-2.625 1.4196,-4.875 4.2857,-4.875L43.7143,6.0857C46.0446,6.0857 48,8.0143 48,10.3714Z" 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.0628,6.7956 l-1.3516,-0.6969 -0.1982,0.381c-0.1111,0.2137 -0.2216,0.4105 -0.2515,0.4482 -0.1454,0.1832 -0.3299,0.3158 -0.5513,0.3963 -0.1698,0.0617 -0.2831,0.082 -0.4476,0.0802 -0.2528,-0.003 -0.3646,-0.0399 -0.817,-0.2701l-0.3613,-0.1839 -0.6932,1.3443 -0.6932,1.3443 3.3581,-1.0732 3.3581,-1.0731zM4.8597,6.8406c0.0004,-0.004 -0.5872,-0.3104 -1.3056,-0.6809l-1.3062,-0.6735 0.636,1.9903 0.636,1.9903 0.6696,-1.3095c0.3683,-0.7202 0.6698,-1.3128 0.6702,-1.3168zM9.8178,5.2402 L9.1809,3.2471 8.502,4.5639 7.823,5.8806 9.1362,6.5578c0.7223,0.3725 1.3144,0.6768 1.3159,0.6763 0.0015,-0.0004 -0.2839,-0.8977 -0.6342,-1.9939zM6.7896,7.0247c0.1508,-0.0889 0.2597,-0.2006 0.3604,-0.3697 0.0356,-0.0597 0.4686,-0.8927 0.9624,-1.8511l0.8977,-1.7427 -3.3741,1.0783 -3.3741,1.0782 1.8121,0.9351c0.9966,0.5143 1.8474,0.9465 1.8906,0.9605 0.1548,0.0502 0.3352,0.0642 0.4879,0.0379 0.0916,-0.0158 0.2505,-0.0754 0.3371,-0.1265z"
android:strokeWidth="0.01117417"
android:fillColor="#ffffff"/>
</vector>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 56 KiB

Binary file not shown.

View File

@ -0,0 +1,18 @@
<?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"
android:background="@color/bg_primary_blue"
android:elevation="8dp"
android:minHeight="?attr/actionBarSize"
android:theme="@style/ThemeOverlay.MyApp.ActionBar">
<TextView
android:id="@+id/textview_toolbar_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@android:color/white"/>
<!--android:textSize="20sp" />-->
</android.support.v7.widget.Toolbar>

View File

@ -12,6 +12,7 @@
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/bg_primary_blue"
android:paddingTop="@dimen/appbar_padding_top"
android:theme="@style/DisTheme.AppBarOverlay">
@ -20,10 +21,9 @@
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:layout_weight="1"
android:background="?attr/colorPrimary"
app:layout_scrollFlags="scroll|enterAlways"
app:popupTheme="@style/DisTheme.PopupOverlay"
app:title="@string/app_name">
app:title="@string/action_about">
</android.support.v7.widget.Toolbar>

View File

@ -3,6 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical">
<include layout="@layout/item_toolbar" />
@ -35,196 +36,194 @@
<include layout="@layout/view_loading"/>
</android.support.v4.widget.SwipeRefreshLayout>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
<ScrollView
android:id="@+id/dashboard"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#203140"
android:background="@color/bg_primary_blue_dark"
android:fillViewport="true"
android:stackFromBottom="true"
android:transcriptMode="alwaysScroll"
android:visibility="visible">
android:visibility="visible"><!--android:background="@color/bg_primary_blue_dark" #203140 android:background="@drawable/bgimage"-->
<HorizontalScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fillViewport="true">
<RelativeLayout
<LinearLayout
android:id="@+id/dashLayout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="#203140">
android:orientation="vertical"
android:layout_gravity="top|center_horizontal">
<ImageButton
android:id="@+id/logo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:layout_marginBottom="30dp"
<ImageButton
android:id="@+id/logo"
style="?android:attr/borderlessButtonStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:layout_marginBottom="30dp"
android:contentDescription="@string/logo"
android:src="@drawable/ic_logo" />
<GridLayout
android:id="@+id/grid"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center"
android:columnCount="4"
android:animateLayoutChanges="true">
<Button
android:id="@+id/MailBtn"
style="?android:attr/borderlessButtonStyle"
android:src="@drawable/logo"
android:contentDescription="@string/logo" />
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableTop="@drawable/ic_mail"
android:text="@string/action_mail"
android:textColor="#ffffff"
app:fontFamily="@font/open_sans_regular" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:id="@+id/group1"
android:layout_below="@+id/logo">
<Button
android:id="@+id/MailBtn"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#ffffff"
android:text="@string/action_mail"
android:drawableTop="@drawable/ic_mail"/>
<Button
android:id="@+id/CloudBtn"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableTop="@drawable/ic_cloud"
android:text="@string/action_cloud"
android:textColor="#ffffff"
app:fontFamily="@font/open_sans_regular" />
<Button
android:id="@+id/CloudBtn"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableTop="@drawable/ic_cloud"
android:text="@string/action_cloud"
android:textColor="#ffffff" />
<!--end of Disroot's Dandelion
<Button
android:id="@+id/DiasporaBtn"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableTop="@drawable/ic_diaspora"
android:text="@string/action_diaspora"
android:textColor="#ffffff"
app:fontFamily="@font/open_sans_regular" />-->
<Button
android:id="@+id/DiasporaBtn"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableTop="@drawable/ic_diaspora"
android:text="@string/action_diaspora"
android:textColor="#ffffff" />
<Button
android:id="@+id/ForumBtn"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableTop="@drawable/ic_forum"
android:text="@string/action_forum"
android:textColor="#ffffff"
app:fontFamily="@font/open_sans_regular" />
<Button
android:id="@+id/ForumBtn"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableTop="@drawable/ic_forum"
android:text="@string/action_forum"
android:textColor="#ffffff" />
</LinearLayout>
<Button
android:id="@+id/ChatBtn"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableTop="@drawable/ic_chat"
android:text="@string/action_chat"
android:textColor="#ffffff"
app:fontFamily="@font/open_sans_regular" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:id="@+id/group2"
android:layout_below="@+id/group1">
<Button
android:id="@+id/ChatBtn"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableTop="@drawable/ic_chat"
android:text="@string/action_chat"
android:textColor="#ffffff" />
<Button
android:id="@+id/PadBtn"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableTop="@drawable/ic_pad"
android:text="@string/action_pad"
android:textColor="#ffffff"
app:fontFamily="@font/open_sans_regular" />
<Button
android:id="@+id/PadBtn"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableTop="@drawable/ic_pad"
android:text="@string/action_pad"
android:textColor="#ffffff" />
<Button
android:id="@+id/CalcBtn"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableTop="@drawable/ic_calc"
android:text="@string/action_calc"
android:textColor="#ffffff"
app:fontFamily="@font/open_sans_regular" />
<Button
android:id="@+id/CalcBtn"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableTop="@drawable/ic_calc"
android:text="@string/action_calc"
android:textColor="#ffffff" />
<Button
android:id="@+id/BinBtn"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableTop="@drawable/ic_bin"
android:text="@string/action_bin"
android:textColor="#ffffff"
app:fontFamily="@font/open_sans_regular" />
<Button
android:id="@+id/BinBtn"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableTop="@drawable/ic_bin"
android:text="@string/action_bin"
android:textColor="#ffffff" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:id="@+id/group3"
android:layout_below="@+id/group2">
<Button
android:id="@+id/UploadBtn"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableTop="@drawable/ic_upload"
android:text="@string/action_upload"
android:textColor="#ffffff"
app:fontFamily="@font/open_sans_regular" />
<Button
android:id="@+id/UploadBtn"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableTop="@drawable/ic_upload"
android:text="@string/action_upload"
android:textColor="#ffffff" />
<Button
android:id="@+id/SearxBtn"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableTop="@drawable/ic_searx"
android:text="@string/action_searx"
android:textColor="#ffffff"
app:fontFamily="@font/open_sans_regular" />
<Button
android:id="@+id/SearxBtn"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableTop="@drawable/ic_searx"
android:text="@string/action_searx"
android:textColor="#ffffff" />
<Button
android:id="@+id/PollsBtn"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableTop="@drawable/ic_poll"
android:text="@string/action_poll"
android:textColor="#ffffff"
app:fontFamily="@font/open_sans_regular" />
<Button
android:id="@+id/PollsBtn"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableTop="@drawable/ic_poll"
android:text="@string/action_poll"
android:textColor="#ffffff" />
<Button
android:id="@+id/BoardBtn"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableTop="@drawable/ic_board"
android:text="@string/action_board"
android:textColor="#ffffff"
app:fontFamily="@font/open_sans_regular" />
<Button
android:id="@+id/BoardBtn"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableTop="@drawable/ic_board"
android:text="@string/action_board"
android:textColor="#ffffff" />
</LinearLayout>
<Button
android:id="@+id/NotesBtn"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableTop="@drawable/ic_notes"
android:text="@string/action_notes"
android:textColor="#ffffff"
app:fontFamily="@font/open_sans_regular" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:id="@+id/group4"
android:layout_below="@+id/group3">
<Button
android:id="@+id/NotesBtn"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableTop="@drawable/ic_notes"
android:text="@string/action_notes"
android:textColor="#ffffff" />
<Button
android:id="@+id/UserBtn"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableTop="@drawable/ic_user"
android:text="@string/action_user"
android:textColor="#ffffff" />
<Button
android:id="@+id/UserBtn"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableTop="@drawable/ic_user"
android:text="@string/action_user"
android:textColor="#ffffff"
app:fontFamily="@font/open_sans_regular" />
<Button
android:id="@+id/StateBtn"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableTop="@drawable/ic_state"
android:text="@string/action_state"
android:textColor="#ffffff" />
<Button
android:id="@+id/StateBtn"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableTop="@drawable/ic_state"
android:text="@string/action_state"
android:textColor="#ffffff"
app:fontFamily="@font/open_sans_regular" />
<Button
android:id="@+id/HowToBtn"
@ -233,16 +232,9 @@
android:layout_height="wrap_content"
android:drawableTop="@drawable/ic_howto"
android:text="@string/action_howto"
android:textColor="#ffffff" />
android:textColor="#ffffff"
app:fontFamily="@font/open_sans_regular" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:id="@+id/group5"
android:layout_below="@+id/group4"><!-- android:gravity="center_horizontal" -->
<Button
android:id="@+id/AboutBtn"
style="?android:attr/borderlessButtonStyle"
@ -250,33 +242,10 @@
android:layout_height="wrap_content"
android:drawableTop="@drawable/ic_about"
android:text="@string/action_about"
android:textColor="#ffffff" />
<Button
android:id="@+id/Placeholder2"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxWidth="24dp"
android:text=""
android:textColor="#ffffff" /><!-- remove line android:maxWidth="24dp" when new button added -->
<Button
android:id="@+id/Placeholder3"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxWidth="24dp"
android:text=""
android:textColor="#ffffff" />
<Button
android:id="@+id/Placeholder4"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxWidth="24dp"
android:text=""
android:textColor="#ffffff" />
</LinearLayout>
</RelativeLayout>
android:textColor="#ffffff"
app:fontFamily="@font/open_sans_regular" />
</GridLayout>
</LinearLayout>
</HorizontalScrollView>
</ScrollView>
</FrameLayout>

View File

@ -0,0 +1,141 @@
<?xml version="1.0" encoding="utf-8"?>
<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"
android:orientation="vertical"
android:background="@color/bg_primary_blue_dark"
android:id="@+id/iconSettings">
<android.support.design.widget.AppBarLayout
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/bg_primary_blue"
android:paddingTop="@dimen/appbar_padding_top"
android:theme="@style/DisTheme.AppBarOverlay">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
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>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginVertical="@dimen/activity_vertical_margin"
android:text="@string/edit_apps_title"
android:textColor="#ffffff"
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">
<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_mail"
android:textColor="#ffffff"
android:drawableStart="@drawable/ic_mail"
android:drawablePadding="@dimen/activity_horizontal_margin_half"
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">
<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/Cloud"
android:textColor="#ffffff"
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">
<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: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">
<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: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>
</GridLayout>
</LinearLayout>

View File

@ -9,6 +9,6 @@
android:layout_height="350dp"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:background="@drawable/logodisroot"
android:background="@drawable/ic_logodisroot"
android:contentDescription="@string/logo" />
</RelativeLayout>

View File

@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/CheckForget">
@ -9,5 +11,6 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/activity_horizontal_margin"
android:text="@string/Forget" />
android:text="@string/Forget"
tools:ignore="MissingConstraints" />
</android.support.constraint.ConstraintLayout>

View File

@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/CheckRemember">
@ -9,5 +11,6 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/activity_horizontal_margin"
android:text="@string/Remember" />
android:text="@string/Remember"
tools:ignore="MissingConstraints" />
</android.support.constraint.ConstraintLayout>

View File

@ -7,7 +7,7 @@
android:background="@color/bg_primary_blue"
android:elevation="8dp"
android:minHeight="?attr/actionBarSize"
app:theme="@style/ThemeOverlay.MyApp.ActionBar">
android:theme="@style/ThemeOverlay.MyApp.ActionBar">
<TextView
android:id="@+id/textview_toolbar_title"

View File

@ -35,6 +35,10 @@
android:icon="@drawable/ic_battery"
android:id="@+id/action_optimization"
android:title="@string/action_optimization" />
<item
android:icon="@drawable/ic_reload"
android:id="@+id/action_set_icons"
android:title="@string/settings" />
<item
android:icon="@drawable/ic_about"
android:id="@+id/action_about"
@ -43,60 +47,5 @@
android:icon="@drawable/ic_exit"
android:id="@+id/action_exit"
android:title="@string/action_exit" />
<!--
<item
android:icon="@drawable/ic_mail"
android:id="@+id/action_mail"
android:title="@string/action_mail" />
<item
android:icon="@drawable/ic_cloud"
android:id="@+id/action_cloud"
android:title="@string/action_cloud" />
<item
android:icon="@drawable/ic_diaspora"
android:id="@+id/action_diaspora"
android:title="@string/action_diaspora" />
<item
android:icon="@drawable/ic_forum"
android:id="@+id/action_forum"
android:title="@string/action_forum" />
<item
android:icon="@drawable/ic_chat"
android:id="@+id/action_chat"
android:title="@string/action_chat" />
<item
android:icon="@drawable/ic_pad"
android:id="@+id/action_pad"
android:title="@string/action_pad" />
<item
android:icon="@drawable/ic_calc"
android:id="@+id/action_calc"
android:title="@string/action_calc" />
<item
android:icon="@drawable/ic_bin"
android:id="@+id/action_bin"
android:title="@string/action_bin" />
<item
android:icon="@drawable/ic_upload"
android:id="@+id/action_upload"
android:title="@string/action_upload" />
<item
android:icon="@drawable/ic_searx"
android:id="@+id/action_searx"
android:title="@string/action_searx" />
<item
android:icon="@drawable/ic_poll"
android:id="@+id/action_poll"
android:title="@string/action_poll" />
<item
android:icon="@drawable/ic_board"
android:id="@+id/action_board"
android:title="@string/action_board" />
<item
android:icon="@drawable/ic_user"
android:id="@+id/action_user"
android:title="@string/action_user" />
-->
</group>
</menu>

View File

@ -203,5 +203,11 @@
<string name="version">App version:</string>
<string name="androidVersion">Android version:</string>
<string name="deviceName">Device name:</string>
<string name="edit_apps_title">Show/hide apps</string>
<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="dashboard">Dashboard</string>
</resources>

View File

@ -164,4 +164,10 @@
<string name="version">App version:</string>
<string name="androidVersion">Android version:</string>
<string name="deviceName">Device name:</string>
<string name="edit_apps_title">Show/hide apps</string>
<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="dashboard">Dashboard</string>
</resources>

View File

@ -201,4 +201,10 @@
<string name="version">App version:</string>
<string name="androidVersion">Android version:</string>
<string name="deviceName">Device name:</string>
<string name="edit_apps_title">Show/hide apps</string>
<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="dashboard">Dashboard</string>
</resources>

View File

@ -163,4 +163,10 @@
<string name="version">App version:</string>
<string name="androidVersion">Android version:</string>
<string name="deviceName">Device name:</string>
<string name="edit_apps_title">Show/hide apps</string>
<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="dashboard">Dashboard</string>
</resources>

View File

@ -165,4 +165,10 @@
<string name="version">App version:</string>
<string name="androidVersion">Android version:</string>
<string name="deviceName">Device name:</string>
<string name="edit_apps_title">Show/hide apps</string>
<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="dashboard">Dashboard</string>
</resources>

View File

@ -163,4 +163,10 @@
<string name="version">App version:</string>
<string name="androidVersion">Android version:</string>
<string name="deviceName">Device name:</string>
<string name="edit_apps_title">Show/hide apps</string>
<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="dashboard">Dashboard</string>
</resources>

View File

@ -164,4 +164,10 @@
<string name="version">App version:</string>
<string name="androidVersion">Android version:</string>
<string name="deviceName">Device name:</string>
<string name="edit_apps_title">Show/hide apps</string>
<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="dashboard">Dashboard</string>
</resources>

View File

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

View File

@ -6,12 +6,12 @@
<string name="action_diaspora">Diaspora*</string>
<string name="action_forum">Forum</string>
<string name="action_chat">Chat</string>
<string name="action_pad">Etherpad</string>
<string name="action_calc">EtherCalc</string>
<string name="action_bin">Private bin</string>
<string name="action_pad">Pad</string>
<string name="action_calc">Calc</string>
<string name="action_bin">Paste bin</string>
<string name="action_upload">Upload</string>
<string name="action_searx">Searx</string>
<string name="action_poll">Poll</string>
<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_state">State</string>
@ -164,4 +164,10 @@
<string name="version">App version:</string>
<string name="androidVersion">Android version:</string>
<string name="deviceName">Device name:</string>
<string name="edit_apps_title">Show/hide apps</string>
<string name="MailBtnPref">Mail</string>
<string name="settings">Settings</string>
<string name="CloudBtnPref">Cloud</string>
<string name="remove">Remove this</string>
<string name="dashboard">Dashboard</string>
</resources>

View File

@ -1,9 +1,10 @@
<resources>
<style name="DisTheme" parent="Theme.AppCompat.Light.NoActionBar">
<item name="colorPrimary">@color/bg_primary_blue</item>
<item name="colorPrimaryDark">@color/bg_primary_blue_dark</item>
<item name="colorPrimary">@color/bg_primary_blue_dark</item>
<item name="colorPrimaryDark">@color/bg_primary_blue</item>
<item name="colorAccent">@color/bg_primary_blue</item>
<!--<item name="android:navigationBarColor">@color/bg_primary_blue_dark</item>-->
<item name="android:windowNoTitle">true</item>
<item name="windowActionBar">false</item>
<item name="windowActionModeOverlay">true</item>

View File

@ -1,10 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<changelog>
<release version="1.9.0" versioncode="23" >
<change>New theme and icon sets</change>
<change>New settings menu</change>
<change>Possibility to hide apps in dashboard</change>
<change>Better integration with Lufi</change>
</release>
<release version="1.2.3" versioncode="22" >
<change>Cleaned up code for better maintenance</change>
<change>Made Third party links klickable</change>
<change>Made application info fully translatable</change>
<change>Made Device info cully translatable</change>
<change>Made Device info fully translatable</change>
</release>
<release version="1.2.2" versioncode="21" >
<change>Removed battery optimization promt on updates</change>