desu/ns-usbloader-mobile
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Update cancel button icon

Browse source 
Update notification priority: no sound on modern devices when notification icon appears (in case it's not fixed for end user - application should bre re-installed)
Update games pattern image to be even more awesome
Make application theme to be applied based on user's choice when application starts.
Made disable buttons looks disable again!
This commit is contained in:
Dmitry Isaenko 2020-10-11 16:14:47 +03:00
parent 5e3193744d
commit 8bd76fdff6
11 changed files with 59 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
app/src/main/java/com/blogspot/developersu/ns_usbloader/ApplicationTheme.java Normal file
View file

@ -0,0 +1,28 @@
package com.blogspot.developersu.ns_usbloader;
import androidx.appcompat.app.AppCompatDelegate;
import static androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM;
import static androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_NO;
import static androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_YES;
public class ApplicationTheme {
private static final int SYSTEM_DEFAULT = 0;
private static final int DAY_THEME = 1;
private static final int NIGHT_THEME = 2;
private ApplicationTheme(){}
public static void setApplicationTheme(int itemId){
switch (itemId){
case SYSTEM_DEFAULT:
AppCompatDelegate.setDefaultNightMode(MODE_NIGHT_FOLLOW_SYSTEM);
break;
case DAY_THEME:
AppCompatDelegate.setDefaultNightMode(MODE_NIGHT_NO);
break;
case NIGHT_THEME:
AppCompatDelegate.setDefaultNightMode(MODE_NIGHT_YES);
}
}
}

12
app/src/main/java/com/blogspot/developersu/ns_usbloader/MainActivity.java
View file

@ -207,7 +207,10 @@ public class MainActivity extends AppCompatActivity implements NsResultReciever.
mDataset = new ArrayList<>();
usbDevice = getIntent().getParcelableExtra(UsbManager.EXTRA_DEVICE); // If it's started initially, then check if it's started from notification.
//Log.i("LPR", "DEVICE " +usbDevice);
if (usbDevice != null){
if (usbDevice == null) {
isUsbDeviceAccessible = false;
}
else {
UsbManager usbManager = (UsbManager) getSystemService(Context.USB_SERVICE);
// If somehow we can't get system service
if (usbManager == null) {
@ -216,9 +219,10 @@ public class MainActivity extends AppCompatActivity implements NsResultReciever.
}
isUsbDeviceAccessible = usbManager.hasPermission(usbDevice);
}
else
isUsbDeviceAccessible = false;
switch (getSharedPreferences("NSUSBloader", MODE_PRIVATE).getInt("PROTOCOL", NsConstants.PROTO_TF_USB)){
SharedPreferences preferences = getSharedPreferences("NSUSBloader", MODE_PRIVATE);
ApplicationTheme.setApplicationTheme(preferences.getInt("ApplicationTheme", 0));
switch (preferences.getInt("PROTOCOL", NsConstants.PROTO_TF_USB)){
case NsConstants.PROTO_TF_USB:
drawerNavView.setCheckedItem(R.id.nav_tf_usb);
break;

8
app/src/main/java/com/blogspot/developersu/ns_usbloader/NsNotificationPopUp.java
View file

@ -2,7 +2,6 @@ package com.blogspot.developersu.ns_usbloader;
import android.app.AlertDialog;
import android.content.Context;
import android.content.DialogInterface;
public class NsNotificationPopUp {
public static void getAlertWindow(Context context, String title, String message){
@ -10,12 +9,7 @@ public class NsNotificationPopUp {
builder.setTitle(title)
.setMessage(message)
.setCancelable(false)
.setPositiveButton("OK", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
dialogInterface.dismiss();
}
});
.setPositiveButton("OK", (dialogInterface, i) -> dialogInterface.dismiss());
builder.create().show();
}
}

23
app/src/main/java/com/blogspot/developersu/ns_usbloader/SettingsActivity.java
View file

@ -14,19 +14,10 @@ import android.widget.EditText;
import android.widget.Spinner;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.app.AppCompatDelegate;
import androidx.appcompat.widget.SwitchCompat;
import androidx.appcompat.widget.Toolbar;
import static androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM;
import static androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_NO;
import static androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_YES;
public class SettingsActivity extends AppCompatActivity {
private static final int SYSTEM_DEFAULT = 0;
private static final int DAY_THEME = 1;
private static final int NIGHT_THEME = 2;
private Spinner themeSpinner;
private EditText nsIp;
private EditText servAddr;
@ -52,7 +43,7 @@ public class SettingsActivity extends AppCompatActivity {
themeSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener(){
@Override
public void onItemSelected(AdapterView<?> adapterView, View view, int selectedItemPosition, long selectedItemId) {
setApplicationTheme(selectedItemPosition);
ApplicationTheme.setApplicationTheme(selectedItemPosition);
}
@Override
@ -138,18 +129,6 @@ public class SettingsActivity extends AppCompatActivity {
});
// Shitcode practices end
}
private void setApplicationTheme(int itemId){
switch (itemId){
case SYSTEM_DEFAULT:
AppCompatDelegate.setDefaultNightMode(MODE_NIGHT_FOLLOW_SYSTEM);
break;
case DAY_THEME:
AppCompatDelegate.setDefaultNightMode(MODE_NIGHT_NO);
break;
case NIGHT_THEME:
AppCompatDelegate.setDefaultNightMode(MODE_NIGHT_YES);
}
}
@Override
protected void onDestroy() {

2
app/src/main/java/com/blogspot/developersu/ns_usbloader/service/TransferTask.java
View file

@ -105,7 +105,7 @@ abstract class TransferTask {
NotificationChannel notificationChannel = new NotificationChannel(
NsConstants.NOTIFICATION_FOREGROUND_SERVICE_CHAN_ID,
notificationChanName,
NotificationManager.IMPORTANCE_DEFAULT);
NotificationManager.IMPORTANCE_LOW);
notificationChannel.setDescription(notificationChanDesc);
notificationManager = context.getSystemService(NotificationManager.class);
notificationManager.createNotificationChannel(notificationChannel);

5
app/src/main/res/color/main_button.xml Normal file
View file

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="#c2d9d9" android:state_enabled="false" />
<item android:color="@android:color/white" android:state_enabled="true" />
</selector>

7
app/src/main/res/drawable/ic_cancel.xml
View file

@ -5,13 +5,6 @@
android:viewportHeight="24">
<path
android:pathData="M12,2C17.53,2 22,6.47 22,12 22,17.53 17.53,22 12,22 6.47,22 2,17.53 2,12 2,6.47 6.47,2 12,2M15.59,7 L12,10.59 8.41,7 7,8.41 10.59,12 7,15.59 8.41,17 12,13.41 15.59,17 17,15.59 13.41,12 17,8.41Z"
android:fillColor="#ec0000"
android:fillAlpha="1"/>
<path
android:pathData="M7,15.59 L10.59,12 7,8.41 8.41,7 12,10.59 15.59,7 17,8.41 13.41,12 17,15.59 15.59,17 12,13.41 8.41,17Z"
android:strokeAlpha="1"
android:strokeWidth="0"
android:fillColor="#ffffff"
android:strokeColor="#00000000"
android:fillAlpha="1"/>
</vector>

14
app/src/main/res/drawable/ic_game_pattern.xml
View file

@ -107,9 +107,9 @@
<path android:fillColor="#d44949"
android:pathData="m196.807,45.179 l-10.662,-2.994c-0.226,-0.063 -0.462,0.069 -0.525,0.295l-0.23,0.82c-0.063,0.226 0.069,0.462 0.295,0.525l10.662,2.994c0.226,0.063 0.462,-0.069 0.525,-0.295l0.23,-0.82c0.063,-0.226 -0.069,-0.462 -0.295,-0.525zM200.751,37.437c-0.679,-0.191 -1.385,0.206 -1.576,0.885 -0.051,0.182 -0.058,0.363 -0.03,0.539l-2.168,0.591c-0.461,0.125 -0.934,-0.152 -1.049,-0.615l-1.062,-4.242c0.338,-0.149 0.612,-0.436 0.72,-0.821 0.191,-0.679 -0.206,-1.385 -0.885,-1.576 -0.679,-0.191 -1.385,0.206 -1.576,0.885 -0.108,0.384 -0.023,0.773 0.187,1.076l-3.115,3.068c-0.34,0.336 -0.89,0.325 -1.216,-0.021l-1.541,-1.633c0.112,-0.134 0.204,-0.294 0.255,-0.476 0.191,-0.679 -0.206,-1.385 -0.885,-1.576 -0.679,-0.191 -1.388,0.205 -1.578,0.884 -0.191,0.679 0.206,1.385 0.885,1.576 0.067,0.019 0.136,0.027 0.203,0.035l0.465,5.462 9.842,2.764 3.241,-4.421c0.061,0.028 0.125,0.057 0.192,0.076 0.679,0.191 1.385,-0.206 1.576,-0.885 0.191,-0.679 -0.206,-1.385 -0.885,-1.576z" android:strokeWidth="0.0266224"/>
<path android:fillColor="#e4e4e4"
android:pathData="m7.422,153.736c-0.439,0.048 -1.181,3.656 -1.976,4.396 -0.807,0.751 0.337,-0.383 -0.299,1.824 -0.476,1.655 -0.639,4.798 -0.603,9.619h4.627c-0.389,-1.039 -0.728,-2.363 -0.543,-3.099 0,0 0.003,0.758 0.381,1.161 0.379,0.402 0.946,1.41 0.866,1.144 -0.097,-0.325 -0.032,-0.42 -0.153,-0.788 -0.192,-0.601 -0.843,-1.891 -0.286,-5.065 0.128,2.352 0.29,2.355 0.336,2.35 0.203,-0.326 0.419,-3.112 0.771,-3.478 0.024,-0.024 0.15,2.356 0.22,2.043 0.085,-0.384 0.314,-1.105 0.448,-1.625 1.363,0.302 4.02,2.945 4.497,3.353 0.024,-0.946 -1.113,-2.575 -2.267,-3.962h0.002c4.343,3.686 4.913,5.773 5.629,7.867 -0.133,0.032 -0.262,0.066 -0.394,0.098h21.823c-0.243,-0.05 -0.487,-0.101 -0.725,-0.148 0.003,-0.008 0.005,-0.011 0.008,-0.021 0.871,-2.234 1.018,-4.242 5.737,-8.133h0c-1.125,1.314 -2.229,2.852 -2.209,3.747 0.465,-0.387 3.053,-2.885 4.382,-3.171 0.13,0.493 0.361,1.166 0.443,1.529 0.064,0.296 0.189,-1.95 0.211,-1.928 0.343,0.347 0.552,2.983 0.75,3.291 0.048,0.005 0.204,0.002 0.327,-2.226 0.543,3.005 -0.091,4.231 -0.278,4.8 -0.115,0.348 -0.064,0.438 -0.157,0.746 -0.08,0.252 0.489,-0.705 0.858,-1.086 0.369,-0.381 0.365,-1.098 0.365,-1.098 0.232,0.897 -0.382,2.723 -0.86,3.696h4.848c0.06,-5.029 -0.095,-8.206 -0.587,-9.868 -0.619,-2.089 0.488,-1.013 -0.298,-1.724 -0.827,-0.747 -1.584,-4.588 -1.998,-4.128 -0.549,0.118 -2.622,0.734 -3.312,1.339 0.272,-0.359 0.833,-1.211 0.833,-1.211 0,0 -0.85,0.337 -1.185,0.547 -1.885,1.182 -2.437,1.788 -2.773,2.081 -0.594,0.518 -0.787,0.826 -1.157,1.239 -0.802,0.898 0.116,-1.146 -0.128,-0.792 -0.865,1.255 -1.038,2.582 -1.932,3.946 -1.8,2.748 -2.065,3.681 -2.927,5.293 -0.446,0.834 -0.877,1.613 -1.303,2.362v0.569l-16.32,-0.024 0.016,-0.004v-0.928c-0.234,-0.448 -0.466,-0.889 -0.711,-1.361 -0.884,-1.703 -1.162,-2.685 -3.009,-5.587 -0.917,-1.44 -1.094,-2.844 -1.981,-4.17 -0.25,-0.374 0.682,1.798 -0.141,0.849 -0.379,-0.437 -0.571,-0.771 -1.181,-1.318 -0.345,-0.309 -0.918,-0.953 -2.852,-2.201 -0.344,-0.222 -1.206,-0.576 -1.206,-0.576 0,0 0.591,0.935 0.862,1.297 -0.699,-0.642 -2.833,-1.305 -3.399,-1.43h-0.005c-0.027,-0.03 -0.054,-0.043 -0.083,-0.04z" android:strokeWidth="2.12228"/>
android:pathData="m7.493,154.145c-0.439,0.048 -1.181,3.656 -1.976,4.396 -0.807,0.751 0.337,-0.383 -0.299,1.824 -0.476,1.655 -0.639,4.798 -0.603,9.619h4.627c-0.389,-1.039 -0.728,-2.363 -0.543,-3.099 0,0 0.003,0.758 0.381,1.161 0.379,0.402 0.946,1.41 0.866,1.144 -0.097,-0.325 -0.032,-0.42 -0.153,-0.788 -0.192,-0.601 -0.843,-1.891 -0.286,-5.065 0.128,2.352 0.29,2.355 0.336,2.35 0.203,-0.326 0.419,-3.112 0.771,-3.478 0.024,-0.024 0.15,2.356 0.22,2.043 0.085,-0.384 0.314,-1.105 0.448,-1.625 1.363,0.302 4.02,2.945 4.497,3.353 0.024,-0.946 -1.113,-2.575 -2.267,-3.962h0.002c4.343,3.686 4.913,5.773 5.629,7.867 -0.133,0.032 -0.262,0.066 -0.394,0.098h21.823c-0.243,-0.05 -0.487,-0.101 -0.725,-0.148 0.003,-0.008 0.005,-0.011 0.008,-0.021 0.871,-2.234 1.018,-4.242 5.737,-8.133h0c-1.125,1.314 -2.229,2.852 -2.209,3.747 0.465,-0.387 3.053,-2.885 4.382,-3.171 0.13,0.493 0.361,1.166 0.443,1.529 0.064,0.296 0.189,-1.95 0.211,-1.928 0.343,0.347 0.552,2.983 0.75,3.291 0.048,0.005 0.204,0.002 0.327,-2.226 0.543,3.005 -0.091,4.231 -0.278,4.8 -0.115,0.348 -0.064,0.438 -0.157,0.746 -0.08,0.252 0.489,-0.705 0.858,-1.086 0.369,-0.381 0.365,-1.098 0.365,-1.098 0.232,0.897 -0.382,2.723 -0.86,3.696h4.848c0.06,-5.029 -0.095,-8.206 -0.587,-9.868 -0.619,-2.089 0.488,-1.013 -0.298,-1.724 -0.827,-0.747 -1.584,-4.588 -1.998,-4.128 -0.549,0.118 -2.622,0.734 -3.312,1.339 0.272,-0.359 0.833,-1.211 0.833,-1.211 0,0 -0.85,0.337 -1.185,0.547 -1.885,1.182 -2.437,1.788 -2.773,2.081 -0.594,0.518 -0.787,0.826 -1.157,1.239 -0.802,0.898 0.116,-1.146 -0.128,-0.792 -0.865,1.255 -1.038,2.582 -1.932,3.946 -1.8,2.748 -2.065,3.681 -2.927,5.293 -0.446,0.834 -0.877,1.613 -1.303,2.362v0.569l-16.32,-0.024 0.016,-0.004v-0.928c-0.234,-0.448 -0.466,-0.889 -0.711,-1.361 -0.884,-1.703 -1.162,-2.685 -3.009,-5.587 -0.917,-1.44 -1.094,-2.844 -1.981,-4.17 -0.25,-0.374 0.682,1.798 -0.141,0.849 -0.379,-0.437 -0.571,-0.771 -1.181,-1.318 -0.345,-0.309 -0.918,-0.953 -2.852,-2.201 -0.344,-0.222 -1.206,-0.576 -1.206,-0.576 0,0 0.591,0.935 0.862,1.297 -0.699,-0.642 -2.833,-1.305 -3.399,-1.43h-0.005c-0.027,-0.03 -0.054,-0.043 -0.083,-0.04z" android:strokeWidth="2.12228"/>
<path android:fillColor="#e43131"
android:pathData="m33.872,169.626v-5.383h-9.001v5.355l-0.009,0.004z" android:strokeWidth="1.63353"/>
android:pathData="m33.942,170.035v-5.383h-9.001v5.355l-0.009,0.004z" android:strokeWidth="1.63353"/>
<path android:fillColor="#13cd78"
android:pathData="M119.969,139.66m-13.181,-7.367a15.1,15.1 74.2,1 1,26.362 14.733a15.1,15.1 74.2,1 1,-26.362 -14.733"
android:strokeColor="#00000000" android:strokeWidth="0.302001"/>
@ -156,11 +156,11 @@
<path android:fillColor="#f81839"
android:pathData="m99.334,89.831a2.89,2.89 0,0 1,1.447 -3.823,2.89 2.89,0 0,1 3.823,1.447c0.154,0.34 0.542,0.487 0.882,0.334 0.34,-0.154 0.487,-0.542 0.334,-0.882l-0.274,-0.608 1.216,-0.548 0.274,0.608a2.001,2.001 0,0 1,-1.001 2.646,2.001 2.001,0 0,1 -2.646,-1.001 1.556,1.556 0,0 0,-2.058 -0.779,1.556 1.556,0 0,0 -0.779,2.058l1.013,-0.457 0.472,1.046c2.657,-0.359 5.347,1.042 6.506,3.612a6.225,6.225 0,0 1,-3.116 8.234,6.225 6.225,0 0,1 -8.234,-3.116c-1.159,-2.57 -0.428,-5.514 1.6,-7.267l-0.472,-1.046 1.013,-0.457m8.715,-3.93 l1.621,-0.731 0.366,0.811 -1.621,0.731 -0.366,-0.811m-3.163,-0.525 l-0.731,-1.621 0.811,-0.366 0.731,1.621 -0.811,0.366m1.687,-0.39 l0.632,-1.67 0.835,0.316 -0.632,1.67z" android:strokeWidth="0.889269"/>
<path android:fillColor="#be2929"
android:pathData="m33.867,164.243v5.355l0.017,0.004 -4.514,0.007 -4.514,-0.007 0.017,-0.004v-5.355l-3.704,0.001v5.355l-0.017,0.004 6.163,0.009 -6.046,0.009v0.006l8.101,-0.012 8.102,0.012v-0.006l-6.046,-0.009 6.163,-0.009 -0.017,-0.004v-5.355z" android:strokeWidth="2.19845"/>
android:pathData="m33.937,164.652v5.355l0.017,0.004 -4.514,0.007 -4.514,-0.007 0.017,-0.004v-5.355l-3.704,0.001v5.355l-0.017,0.004 6.163,0.009 -6.046,0.009v0.006l8.101,-0.012 8.102,0.012v-0.006l-6.046,-0.009 6.163,-0.009 -0.017,-0.004v-5.355z" android:strokeWidth="2.19845"/>
<path android:fillColor="#cc3a3a"
android:pathData="m29.321,160.229c0,0 -4.452,4.006 -4.452,4.016l9,0z" android:strokeWidth="2.19845"/>
android:pathData="m29.391,160.638c0,0 -4.452,4.006 -4.452,4.016h9z" android:strokeWidth="2.19845"/>
<path android:fillColor="#9e1e1e"
android:pathData="m29.322,160.229v0.001l0.002,0.001 -0.002,-0.001zM29.324,160.23c0.003,0.002 4.544,4.004 4.544,4.014 -2.32,0 -7.609,-0 -8.996,-0 0,-0.01 4.447,-4.011 4.449,-4.013 -0.002,0.001 -8.153,4.004 -8.153,4.014 7.893,0 11.4,-0 16.404,-0 0,-0.01 -8.246,-4.013 -8.249,-4.014z" android:strokeWidth="2.19845"/>
android:pathData="m29.392,160.638v0.001l0.002,0.001 -0.002,-0.001zM29.394,160.639c0.003,0.002 4.544,4.004 4.544,4.014 -2.32,0 -7.609,-0 -8.996,-0 0,-0.01 4.447,-4.011 4.449,-4.013 -0.002,0.001 -8.153,4.004 -8.153,4.014 7.893,0 11.4,-0 16.404,-0 0,-0.01 -8.246,-4.013 -8.249,-4.014z" android:strokeWidth="2.19845"/>
<path android:fillColor="#00c8fc"
android:pathData="m45.93,72.542c-4.816,-1.418 -10.031,2.204 -10.893,5.132 -3.163,10.72 -5.179,17.551 -8.193,27.819 -0.886,3.01 1.557,8.798 6.373,10.217l12.422,3.658L58.351,76.2Z" android:strokeWidth="1"/>
<path android:fillColor="#ec0000"
@ -178,4 +178,8 @@
android:strokeColor="#00000000" android:strokeWidth="1.18854"/>
<path android:fillColor="#d3d3d3"
android:pathData="m48.409,51.364c-0.951,2.75 0.508,5.749 3.258,6.7l15.274,5.28c0.351,0.121 0.602,0.143 0.801,0.112 0.211,-0.033 0.376,-0.091 0.538,-0.146 0.325,-0.111 0.638,-0.231 0.951,-0.296 0.626,-0.128 1.146,-0.169 1.941,0.727l-0.03,-0.035c0.803,1.004 2.241,1.554 5.2,2.661 2.959,1.107 7.426,2.621 14.049,4.905l0.576,-1.673C84.341,67.314 79.872,65.795 76.964,64.707 74.057,63.619 72.696,62.813 72.526,62.6l-0.014,-0.02 -0.015,-0.016c-1.164,-1.311 -2.623,-1.491 -3.62,-1.286 -0.416,0.085 -0.643,0.424 -1.006,0.298l0.001,-0.002 -15.559,-5.378c-1.719,-0.594 -2.631,-2.469 -2.037,-4.187 0.594,-1.719 2.469,-2.63 4.188,-2.036l13.069,4.518c0.687,0.238 1.052,0.987 0.815,1.675 -0.238,0.687 -0.988,1.052 -1.675,0.814l-11.825,-4.087 -0.645,1.867 11.825,4.087c1.719,0.594 3.594,-0.317 4.188,-2.036 0.594,-1.719 -0.318,-3.593 -2.037,-4.187l-13.069,-4.518c-2.75,-0.95 -5.749,0.508 -6.7,3.258z" android:strokeWidth="1.31699"/>
<path android:fillColor="#bfbfbf"
android:pathData="m45.589,161.687c-4.719,3.891 -4.866,5.899 -5.737,8.133l-0.078,0.165 0.777,0.001h8.871c0.478,-0.974 1.091,-2.796 0.859,-3.692 0,0 0.004,0.718 -0.365,1.099 -0.369,0.381 -0.938,1.338 -0.858,1.086 0.093,-0.308 0.042,-0.398 0.157,-0.746 0.187,-0.569 0.821,-1.795 0.278,-4.8 -0.124,2.228 -0.28,2.231 -0.328,2.226 -0.197,-0.308 -0.407,-2.945 -0.75,-3.291 -0.023,-0.023 -0.147,2.224 -0.211,1.928 -0.083,-0.363 -0.313,-1.037 -0.443,-1.529 -1.328,0.286 -3.916,2.784 -4.381,3.171 -0.02,-0.895 1.084,-2.434 2.209,-3.748zM13.509,162.023c1.155,1.387 2.292,3.016 2.268,3.962 -0.477,-0.408 -3.135,-3.052 -4.497,-3.353 -0.133,0.52 -0.363,1.241 -0.448,1.625 -0.07,0.313 -0.196,-2.067 -0.22,-2.043 -0.352,0.366 -0.568,3.152 -0.77,3.478 -0.047,0.005 -0.209,0.002 -0.336,-2.35 -0.556,3.174 0.095,4.465 0.287,5.065 0.121,0.368 0.056,0.462 0.153,0.788 0.08,0.266 -0.488,-0.742 -0.867,-1.144 -0.378,-0.402 -0.38,-1.161 -0.38,-1.161 -0.185,0.736 0.153,2.057 0.542,3.095h9.521c0.146,0 0.282,0.003 0.417,0.003 -0.716,-2.094 -1.323,-4.277 -5.666,-7.964z" android:strokeWidth="1.771"/>
<path android:fillColor="#bfbfbf"
android:pathData="m151.936,41.075c-0.012,-1.544 -0.031,-4.142 -0.043,-5.771l-0.022,-2.963 2.13,-0.021c1.171,-0.012 3.768,-0.031 5.771,-0.043l3.641,-0.021 0.021,1.865c0.012,1.026 0.031,3.623 0.043,5.771l0.022,3.906 -2.328,0.022c-1.281,0.012 -3.878,0.031 -5.771,0.043l-3.443,0.022zM156.267,39.528c0.002,-0.002 -0.004,-0.656 -0.013,-1.451l-0.017,-1.447l-1.471,0 -1.471,0l0.02,0.074c0.011,0.041 0.02,0.7 0.02,1.466l0.001,1.391 1.463,-0.014c0.805,-0.008 1.465,-0.016 1.467,-0.019zM162.049,38.044c-0.013,-0.805 -0.025,-1.466 -0.028,-1.47 -0.003,-0.003 -0.655,0.003 -1.451,0.014l-1.446,0.02l0,1.45 0,1.45l1.474,0 1.474,0z" android:strokeWidth="0.836693"/>
</vector>

2
app/src/main/res/drawable/side_nav_bar.xml
View file

@ -6,7 +6,7 @@
android:shape="rectangle">
<gradient
android:angle="135"
android:endColor="#d87dff"
android:endColor="#aa62c8"
android:centerColor="#087bb9"
android:startColor="#904dfa"
android:type="linear" />

8
app/src/main/res/layout/content_main.xml
View file

@ -38,7 +38,6 @@
<LinearLayout
android:id="@+id/buttonsBoxLayout"
style="?android:attr/buttonBarStyle"
android:layout_width="match_parent"
android:layout_height="0dp"
android:background="@color/lightAccent"
@ -55,7 +54,8 @@
android:layout_weight="1"
android:text="@string/select_file_btn"
android:textAllCaps="false"
android:textColor="#ffffff"
android:textColor="@color/main_button"
app:drawableTint="@color/main_button"
app:drawableTopCompat="@drawable/ic_select_file" />
<Button
@ -66,9 +66,9 @@
android:layout_weight="1"
android:text="@string/upload_btn"
android:textAllCaps="false"
android:textColor="#ffffff"
android:textColor="@color/main_button"
app:drawableTint="@color/main_button"
app:drawableTopCompat="@drawable/ic_upload_btn" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

1
app/src/main/res/values/styles.xml
View file

@ -19,4 +19,5 @@
</style>
<style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.DayNight" />
</resources>