diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0a47e62..d6948c7 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,8 +2,12 @@ + + - + diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..5fb5a4e Binary files /dev/null and b/app/src/main/ic_launcher-playstore.png differ diff --git a/app/src/main/java/com/astatin3/scoutingapp2025/MainActivity.java b/app/src/main/java/com/astatin3/scoutingapp2025/MainActivity.java index b99126a..0c3812b 100644 --- a/app/src/main/java/com/astatin3/scoutingapp2025/MainActivity.java +++ b/app/src/main/java/com/astatin3/scoutingapp2025/MainActivity.java @@ -12,6 +12,8 @@ import androidx.navigation.ui.NavigationUI; import com.astatin3.scoutingapp2025.databinding.ActivityMainBinding; +import com.astatin3.scoutingapp2025.SettingsVersionStack.latestSettings; + public class MainActivity extends AppCompatActivity { @@ -33,6 +35,8 @@ public class MainActivity extends AppCompatActivity { NavController navController = Navigation.findNavController(this, R.id.nav_host_fragment_activity_main); NavigationUI.setupActionBarWithNavController(this, navController, appBarConfiguration); NavigationUI.setupWithNavController(binding.navView, navController); + + latestSettings settings = new latestSettings(); } } \ No newline at end of file diff --git a/app/src/main/java/com/astatin3/scoutingapp2025/SettingsVersionStack/latestSettings.java b/app/src/main/java/com/astatin3/scoutingapp2025/SettingsVersionStack/latestSettings.java new file mode 100644 index 0000000..4b5ef0e --- /dev/null +++ b/app/src/main/java/com/astatin3/scoutingapp2025/SettingsVersionStack/latestSettings.java @@ -0,0 +1,9 @@ +package com.astatin3.scoutingapp2025.SettingsVersionStack; + +public class latestSettings { + public static v2 settings = new v2(); + public latestSettings(){ + settings.init_settings(); + settings.update(); + } +} diff --git a/app/src/main/java/com/astatin3/scoutingapp2025/SettingsVersionStack/settingsVersion.java b/app/src/main/java/com/astatin3/scoutingapp2025/SettingsVersionStack/settingsVersion.java index bfc9fd4..0f5b8c0 100644 --- a/app/src/main/java/com/astatin3/scoutingapp2025/SettingsVersionStack/settingsVersion.java +++ b/app/src/main/java/com/astatin3/scoutingapp2025/SettingsVersionStack/settingsVersion.java @@ -5,47 +5,100 @@ import com.astatin3.scoutingapp2025.fileEditor; import java.nio.charset.StandardCharsets; public abstract class settingsVersion { - private static String settingsFilename = "settings.txt"; + private static final String settingsFilename = "settings.txt"; + public abstract void defaultSettings(); public abstract int getVersion(); public abstract void update(); - public static String readLine(int line){ - if(!fileEditor.fileExist("settings.txt")){return null;} - - String[] fileContent = new String(fileEditor.readFile("settings.txt"), StandardCharsets.UTF_8).split("\n"); - - if(fileContent.length <= line){return null;} - - return fileContent[line]; + public static String get_settings_file_content(){ + byte[] data = fileEditor.readFile(settingsFilename); + if(data == null){return "";} + return new String(data, StandardCharsets.UTF_8); } - public static String w riteLine(int line, String data){ - String[] fileContent; + public int get_file_version(){ + String[] fileContent = get_settings_file_content().split("\n"); + try{ + return Integer.parseInt(fileContent[0]); + }catch(Exception e){ + return -1; + } + } + + public void set_file_version(int version){ + String[] fileContent = get_settings_file_content().split("\n"); + String output = String.valueOf(version); + for(int i = 0; i < fileContent.length; i++){ + output += ("\n" + fileContent[i]); + } + fileEditor.writeFile(settingsFilename, output.getBytes(StandardCharsets.UTF_8)); + } + + public String readTag(String search_tag){ + String[] fileContent = get_settings_file_content().split("\n"); + + try{ + for(String line : fileContent){ + if(line.isEmpty()){ + continue; + } + String[] split = line.split("="); + if(split[0].equals(search_tag)){ + return split[1]; + } + } + }catch (Exception e){ + e.printStackTrace(); + } + + return null; + } + + public void init_settings(){ if(!fileEditor.fileExist(settingsFilename)){ - fileContent = new String[]{}; + fileEditor.createFile(settingsFilename); + + defaultSettings(); + + set_file_version(getVersion()); + } + } + + public String forceWriteTag(String tag_name, String data){ + String fileContent = get_settings_file_content(); + String output = fileContent + "\n" + tag_name + "=" + data; + fileEditor.writeFile(settingsFilename, output.getBytes(StandardCharsets.UTF_8)); + return output; + } + + public String writeTag(String tag_name, String data){ + final boolean already_exists = readTag(tag_name) != null; + + if(!already_exists){ + String fileContent = get_settings_file_content(); + String output = fileContent + "\n" + tag_name + "=" + data; + fileEditor.writeFile(settingsFilename, output.getBytes(StandardCharsets.UTF_8)); + return output; }else{ - fileContent = new String(fileEditor.readFile(settingsFilename), StandardCharsets.UTF_8).split("\n"); - } - - String newFile = ""; - - for(int i = 0; i < Math.max(fileContent.length-1, line); i++){ - - if(i == line) { - newFile += data + "\n"; - - }else if(i > fileContent.length-1){ - newFile += fileContent[i]; - - } - - if(i < Math.max(fileContent.length - 1, line) - 1){ - newFile += "\n"; + String[] fileContent = get_settings_file_content().split("\n"); + try{ + for(int i = 0; i < fileContent.length; i++){ + if(fileContent[i].isEmpty()){ + continue; + } + String[] split = fileContent[i].split("="); + if(split[0].equals(tag_name)){ + fileContent[i] = tag_name + "=" + data; + String output = String.join("\n", fileContent); + fileEditor.writeFile(settingsFilename, output.getBytes(StandardCharsets.UTF_8)); + return output; + } + } + }catch (Exception e){ + e.printStackTrace(); } } - return newFile; - -// fileEditor.writeFile(settingsFilename, newFile.getBytes(StandardCharsets.UTF_8)); + return "No idea how this happened"; } } diff --git a/app/src/main/java/com/astatin3/scoutingapp2025/SettingsVersionStack/v0.java b/app/src/main/java/com/astatin3/scoutingapp2025/SettingsVersionStack/v0.java index 90f7c5b..af8d3a3 100644 --- a/app/src/main/java/com/astatin3/scoutingapp2025/SettingsVersionStack/v0.java +++ b/app/src/main/java/com/astatin3/scoutingapp2025/SettingsVersionStack/v0.java @@ -1,12 +1,17 @@ package com.astatin3.scoutingapp2025.SettingsVersionStack; public class v0 extends settingsVersion { - @Override public int getVersion() { return 0; } - public void update(){ + set_file_version(getVersion()); + } + @Override + public void defaultSettings() { + forceWriteTag("test1", "value1"); + forceWriteTag("test2", "value2"); + forceWriteTag("test3", "value3"); } } diff --git a/app/src/main/java/com/astatin3/scoutingapp2025/SettingsVersionStack/v1.java b/app/src/main/java/com/astatin3/scoutingapp2025/SettingsVersionStack/v1.java new file mode 100644 index 0000000..e8cb028 --- /dev/null +++ b/app/src/main/java/com/astatin3/scoutingapp2025/SettingsVersionStack/v1.java @@ -0,0 +1,23 @@ +package com.astatin3.scoutingapp2025.SettingsVersionStack; + +public class v1 extends v0 { + @Override + public int getVersion() { + return 1; + } + @Override + public void update(){ + if(get_file_version() < getVersion()){super.update();} + set_file_version(getVersion()); +// writeTag("test1", "value_v1_1"); + writeTag("test2", "value_v1_2"); + writeTag("test3", "value_v1_3"); + } + + @Override + public void defaultSettings() { + forceWriteTag("test1", "value1"); + forceWriteTag("test2", "value2"); + forceWriteTag("test3", "value3"); + } +} diff --git a/app/src/main/java/com/astatin3/scoutingapp2025/SettingsVersionStack/v2.java b/app/src/main/java/com/astatin3/scoutingapp2025/SettingsVersionStack/v2.java new file mode 100644 index 0000000..0188339 --- /dev/null +++ b/app/src/main/java/com/astatin3/scoutingapp2025/SettingsVersionStack/v2.java @@ -0,0 +1,22 @@ +package com.astatin3.scoutingapp2025.SettingsVersionStack; + +public class v2 extends v1 { + @Override + public int getVersion() { + return 2; + } + @Override + public void update(){ + if(get_file_version() < getVersion()){super.update();} + set_file_version(getVersion()); +// writeTag("test1", "value_v2_1"); +// writeTag("test2", "value_v2_2"); + writeTag("test3", "value_v2 _3"); + } + @Override + public void defaultSettings() { + forceWriteTag("test1", "value1"); + forceWriteTag("test2", "value2"); + forceWriteTag("test3", "value3"); + } +} diff --git a/app/src/main/java/com/astatin3/scoutingapp2025/fileEditor.java b/app/src/main/java/com/astatin3/scoutingapp2025/fileEditor.java index 8739ff4..773e34e 100644 --- a/app/src/main/java/com/astatin3/scoutingapp2025/fileEditor.java +++ b/app/src/main/java/com/astatin3/scoutingapp2025/fileEditor.java @@ -125,7 +125,7 @@ public final class fileEditor { public static boolean writeFile(String filepath, byte[] data) { try { - FileOutputStream output = new FileOutputStream(filepath); + FileOutputStream output = new FileOutputStream(baseDir + filepath); output.write(data); output.close(); return true; @@ -136,6 +136,20 @@ public final class fileEditor { } } + public static boolean createFile(String filepath){ + if(fileExist(filepath)){ + return true; + } + try { + File file = new File(baseDir + filepath); + return file.createNewFile(); + } + catch (IOException e) { + e.printStackTrace(); + return false; + } + } + public static boolean fileExist(String path){ File f = new File(baseDir + path); return f.exists() && !f.isDirectory(); diff --git a/app/src/main/java/com/astatin3/scoutingapp2025/ui/Settings/settingsFragment.java b/app/src/main/java/com/astatin3/scoutingapp2025/ui/settings/settingsFragment.java similarity index 92% rename from app/src/main/java/com/astatin3/scoutingapp2025/ui/Settings/settingsFragment.java rename to app/src/main/java/com/astatin3/scoutingapp2025/ui/settings/settingsFragment.java index 14c4431..f2c7b7e 100644 --- a/app/src/main/java/com/astatin3/scoutingapp2025/ui/Settings/settingsFragment.java +++ b/app/src/main/java/com/astatin3/scoutingapp2025/ui/settings/settingsFragment.java @@ -1,4 +1,4 @@ -package com.astatin3.scoutingapp2025.ui.Settings; +package com.astatin3.scoutingapp2025.ui.settings; import android.app.AlertDialog; import android.os.Bundle; @@ -13,7 +13,7 @@ import androidx.fragment.app.Fragment; import com.astatin3.scoutingapp2025.databinding.FragmentSettingsBinding; import com.astatin3.scoutingapp2025.fileEditor; -import com.astatin3.scoutingapp2025.SettingsVersionStack.v0; +import com.astatin3.scoutingapp2025.SettingsVersionStack.latestSettings; import com.skydoves.powerspinner.IconSpinnerAdapter; import com.skydoves.powerspinner.IconSpinnerItem; @@ -65,10 +65,7 @@ public class settingsFragment extends Fragment { spinnerView.selectItemByIndex(0); } - alert("test", v0.writeLine(1, "oeseo")); - - - alert("test", v0.readLine(0)); + alert("test", latestSettings.settings.readTag("test2")); return root; } diff --git a/app/src/main/java/com/astatin3/scoutingapp2025/ui/transfer/TBAView.java b/app/src/main/java/com/astatin3/scoutingapp2025/ui/transfer/TBAView.java index a56c800..dbd65c2 100644 --- a/app/src/main/java/com/astatin3/scoutingapp2025/ui/transfer/TBAView.java +++ b/app/src/main/java/com/astatin3/scoutingapp2025/ui/transfer/TBAView.java @@ -142,7 +142,7 @@ public class TBAView extends ScrollView { }else if(currentTime.after(startDate) && currentTime.before(endDate)){ tr.setBackgroundColor(0x30FFFF00); } - } catch (ParseException e) { + } catch (Exception e) { e.printStackTrace(); } diff --git a/app/src/main/java/com/astatin3/scoutingapp2025/ui/transfer/generatorView.java b/app/src/main/java/com/astatin3/scoutingapp2025/ui/transfer/generatorView.java index 0dd5866..6de9798 100644 --- a/app/src/main/java/com/astatin3/scoutingapp2025/ui/transfer/generatorView.java +++ b/app/src/main/java/com/astatin3/scoutingapp2025/ui/transfer/generatorView.java @@ -1,5 +1,6 @@ package com.astatin3.scoutingapp2025.ui.transfer; +import android.app.AlertDialog; import android.content.Context; import android.graphics.Bitmap; import android.graphics.Color; @@ -60,6 +61,16 @@ public class generatorView extends ConstraintLayout { super(context, attributeSet); } + private void alert(String title, String content) { + AlertDialog.Builder alert = new AlertDialog.Builder(getContext()); + alert.setMessage(content); + alert.setTitle(title); + alert.setPositiveButton("OK", null); + alert.setCancelable(true); + alert.create().show(); + } + + private Bitmap generateQrCode(String contents) throws WriterException { final int size = 512; @@ -139,16 +150,25 @@ public class generatorView extends ConstraintLayout { } + if(compiledData.isEmpty()){ + alert("Error!", "Empty data!"); + return; + } + + minQrSize = Math.round(compiledData.length()/maxQrCount)+1; + + qrSizeSlider.setMax(maxQrSize-minQrSize); + qrSpeedSlider.setMax((minQrSpeed-maxQrSpeed)*2); + + qrSizeSlider.setProgress(minQrSize+qrSize); + qrSpeedSlider.setProgress(defaultQrDelay+5); + sendData(compiledData); } private void sendData(String data){ -// minQrSize = 0; - minQrSize = Math.round(data.length()/maxQrCount)+1; - qrSizeSlider.setMax(maxQrSize-minQrSize); - qrSpeedSlider.setMax((minQrSpeed-maxQrSpeed)*2); qrCount = (data.length()/qrSize)+1; qrIndexD.setText(String.valueOf(qrCount)); @@ -181,7 +201,7 @@ public class generatorView extends ConstraintLayout { } }); - qrSpeedSlider.setProgress(defaultQrDelay+5); +// qrSizeSlider.setProgress(qr); qrBitmaps = new ArrayList<>(); diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml index 2b068d1..e4fa6af 100644 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -1,30 +1,440 @@ - - - - - - - - + android:viewportWidth="1080" + android:viewportHeight="972"> + - \ No newline at end of file + android:pathData="M682,159.1C686.8,158.6 691.7,157.9 696.5,159.2C736.4,171.1 774.1,189.3 813.5,202.5C838.5,211.8 855.7,233.5 878.4,246.6C883,249.2 888,250.9 892.5,253.6C894.1,254.4 894.3,256.4 894.7,257.9C897.3,269.5 900.6,281.2 906.3,291.7C924.1,325.5 956,349.7 990.5,364.7C995.5,367.5 998.7,372.9 1000.7,378.1C1006.3,394.1 1008.7,411 1013.6,427.2C1015,432.4 1016.9,437.6 1016.9,443C1017,449.6 1016.7,456.3 1014.5,462.5C1010,476.4 1002.1,488.9 996.1,502.1C991,511.6 988,522.5 981.2,531C979.4,533.7 976.2,534.4 973.3,535.3C953.3,541.5 933.5,549.8 917,563.1C913.1,566.2 907.8,566.2 903,566.9C897.3,567.6 891.1,567.9 886.1,571.1C881.6,573.9 879.8,579.1 877.4,583.5C856,625.7 825.3,662.8 789.6,693.7C765.6,714.4 739.1,732.1 711.3,747.3C660.8,774.8 604.8,789.6 550.4,807.3C558.3,799.8 567,793.3 575.3,786.3C589.6,774.9 603.6,763.2 617.1,751C622.5,747.2 626.5,741.8 632.1,738.1C636.9,734.6 640.4,729.6 644.1,725C649.5,719 655.4,713.5 661.9,708.8C673.2,697.2 685,685.8 694.9,672.9C703.8,662.1 711.6,650.3 718.8,638.3C737.6,607 752.5,572.9 759.3,536.9C762.5,520 763.4,502.7 762.6,485.6C753.3,488.3 743.8,490.9 734.5,493.8C725.9,496.9 717,499.2 708.4,502.4C690.1,508.9 672.6,517.4 654.7,524.7C617.5,539.7 581.1,557.1 548.2,580.1C520,599.8 494.6,624.2 477,654C474.2,658.9 471.4,663.8 468.8,668.8C466.5,673.2 466.3,678.3 466.5,683.1C476.2,682.8 485.5,680.3 494.9,677.9C507.1,674.5 518.3,668.5 529.4,662.5C536.4,658.4 542.8,653.1 550.2,649.5C551.1,665.5 546.2,681.7 536.7,694.6C525.7,709.8 510.9,721.6 497.1,734.1C493.9,737.2 490.1,739.9 488.2,744.1C481.6,758.8 473.5,773.4 461,783.9C454.4,789.9 445.4,792.1 436.8,793.2C426.8,794 416.8,795.3 406.8,794.2C384.7,791.8 364.3,782.4 343.8,774.5C337.6,772.5 331.7,768.8 324.9,769.3C314.9,769.7 305,768.6 295,769C287.4,769.6 279.8,769.5 272.2,770.3C276,748.2 271.7,725.3 261.7,705.4C248.6,679.3 227.7,657.7 203.7,641.3C182.1,626.4 157.8,615.6 132.5,608.7C130.1,607.9 127.2,607.6 125.7,605.3C122.4,601 119.9,596.1 118,591C99.8,548.6 81.4,506.2 63.1,463.8C60.9,459 59.3,454 56.6,449.5C54,444.8 53.3,439.4 50.7,434.7C68.3,425.5 86.1,416.7 103.7,407.7C142.7,387.7 181.9,367.9 221,348C246.1,335 271.7,323 296.7,309.8C303.6,306.9 310,302.8 316.8,299.7C338.7,288.8 360.4,277.4 382.3,266.6C380.8,262.3 379.1,258 377.5,253.7C420,243.1 463.6,237.1 505.6,224.6C522.2,219.5 538.5,213.7 554.1,206.1C562.4,202 571.3,199.4 579.8,195.6C612.9,181.2 645.5,163.4 682,159.1M684.3,178.3C648.9,184.5 615.4,198.4 583.3,214.3C566.6,222.3 550.5,231.5 534,239.9C539.3,242.3 544.5,245.1 550,246.9C561.8,252.9 574.9,256.1 588.1,256.9C592.5,262.9 596.1,269.5 598.2,276.7C601.2,286.7 600.5,297.8 595.5,307.1C609.1,325.8 623.3,344.1 637.2,362.6C663.9,303.9 690.1,244.9 716.8,186.3C709.5,183.4 701.8,181.8 694.3,179.8C691,178.9 687.7,177.9 684.3,178.3M699.7,241.8C695,252.4 689.8,262.9 685.9,273.9C682.1,281.9 678.3,289.8 674.7,297.9C732.2,330.3 789.8,362.5 847.5,394.6C874.9,410.7 902.8,425.9 930.5,441.6C953.2,454.4 976,467.1 998.8,479.9C1002.6,470.9 1007.6,462 1008.1,452C1007.5,445.6 1007.7,438.5 1003.9,433C998.7,426 990.8,421.9 983.5,417.5C980.8,416.3 980.6,413.2 980.3,410.6C987.8,411.6 995.5,412.7 1002.5,415.9C999.5,403.5 997.1,389.6 987.5,380.4C976.2,372.8 963.2,368.1 950.1,364.8C945.8,363.7 940.6,364.2 937.4,360.6C927.9,351 919.1,339 905.3,335.4C897.5,311.9 887.2,288.6 886.4,263.5C876.3,261.7 866.7,257.9 857.7,253C845.4,245.9 834.6,236.4 824.7,226.3C821.9,223.4 817.8,222.7 814.2,221.4C783.9,210.7 754.2,198.4 723.8,188.3C715.8,206.2 707.7,224 699.7,241.8M462,251.7C450.9,251.9 440.1,254.7 429.2,256.1C419.2,257.4 409.4,260.5 399.3,261C403.4,278.9 407.7,297 416.9,313C421.5,320.5 427.6,327.1 434.6,332.3C443.5,338.5 454.4,341 465,341.8C496,342.9 526.3,323 538.3,294.6C535.5,294.6 532.7,294.5 529.8,294.5C525,299.1 520.7,304.2 515.8,308.8C513.3,310.9 510.6,313.5 507,313.2C501.7,313.3 496.4,313.1 491.1,313.2C489.1,315.1 487,317.6 484,317.6C479.6,318.1 475.3,314.4 475.1,310C474.6,305.1 479.2,300.6 484,301.2C487.6,301.1 489.7,304.2 491.7,306.7C497.4,306.8 503.2,306.7 508.9,306.8C512.8,302.6 516.6,298.4 520.8,294.5C493.9,294.5 467,294.4 440.1,294.5C440.2,296.6 440.2,298.8 440.3,300.9C434.8,297.7 429.3,294.7 424,291.3C429.4,288.1 434.8,285 440.2,281.8C440.2,284 440.2,286.3 440.1,288.5C465.5,288.6 490.9,288.7 516.3,288.5C512.3,284.6 508.3,280.7 504.4,276.6C502.6,274.9 500.8,272.5 498,272.9C488,272.8 478.1,272.9 468.1,272.9C468,274.4 468,276 467.9,277.5C462.5,277.5 457.2,277.5 451.8,277.5C451.8,272.1 451.8,266.7 451.9,261.4C457.3,261.4 462.6,261.4 468,261.4C468,263.2 468,265 468,266.7C479.7,266.8 491.4,266.9 503.1,266.8C510.9,273.5 517.8,281.2 525.2,288.4C530.1,288.6 535.1,288.7 540,288.7C540.2,288 540.5,286.6 540.7,285.9C556.3,284.5 571.5,280.4 585.7,273.8C572.5,263.8 557.3,256.1 541,253.1C530.3,249.4 519,250.8 508,250.3C492.6,249.8 477.3,251.3 462,251.7M369.2,299.3C328,319.9 287,341 245.9,361.9C236.3,367.5 226.1,372.2 216.1,377.2C206.4,383.3 195.4,386.8 185.6,392.5C179.1,396.2 172.1,398.9 165.7,402.7C154,408.3 142.7,414.5 130.9,420C137.2,423.7 143,428.1 149.1,432C177.4,451 205.7,470 234.1,488.9C241.2,493.4 247.7,498.8 254.8,503.2C294.1,529.8 333.9,555.8 373.2,582.6C374.9,578.2 376.4,573.7 377.3,569.1C380,556.5 384.4,544.3 387,531.7C389.1,526.3 390.4,520.5 391.9,514.9C407.4,458.6 423,402.3 438.9,346.1C423.5,339.3 410.4,327.4 402.8,312.3C398.8,304.1 394.4,296.2 390.4,288.2C383.7,292.5 376.1,295.2 369.2,299.3M670.8,306.3C661.4,327.4 651.7,348.3 642.2,369.3C669.7,405.9 696.7,443 724.4,479.5C743.3,474.3 762.5,470 782,467.6C797.3,465.6 812.9,465.9 828.4,466.8C842.2,469.5 856.5,471.8 868.9,478.9C877,482.3 882.7,489.2 888.4,495.5C900.7,510 906.6,529.1 906.2,547.9C926.6,542.4 946.7,534.5 963.9,522C971.4,516.8 977.7,510.4 984,503.9C989.2,499.9 992.2,493.9 995.3,488.3C979.3,479.4 963.4,470.4 947.4,461.4C922.5,447.4 897.3,433.6 872.4,419.3C805.2,381.6 738.1,343.8 670.8,306.3M569.6,327.1C556.7,331.6 545.1,339.1 534.3,347.4C530.3,351 525.8,354 522.4,358.3C517.8,361.4 514.5,365.9 510.8,369.9C505.1,376.3 500.3,383.4 495.5,390.5C494.3,392.3 492.7,393.9 490.7,394.7C482.4,398.3 473.9,401.7 465.6,405.4C469.7,393 473.9,380.7 477.5,368.1C478.9,362.1 481.7,356.4 482.9,350.3C470.6,352.7 457.7,352.4 445.8,348.7C437.1,379.1 428.9,409.7 420.1,440.1C424.3,442.4 428.6,444.2 433,446C490.9,471.3 548.8,496.7 606.7,522C608.4,523 610.3,522.6 612,521.8C634.7,511 657.6,500.6 681.5,492.7C692.9,488.7 704.3,485 715.8,481.6C715.8,479.1 713.6,477.4 712.4,475.5C672.1,421.9 632,368 591.6,314.5C585.6,320.7 577.2,323.4 569.6,327.1M105.8,432.9C96.3,438.6 85.8,442.1 76.6,448.3C85.8,469.5 94.7,490.8 104.3,511.8C107.7,520.8 112.4,529.2 115.4,538.4C122.8,555.5 130.2,572.5 137.4,589.7C153.5,594.4 169.4,600.1 184.5,607.6C190,606.4 195.5,605.3 201,604C222,598.3 243.4,594.1 264.3,588.4C274.6,586.9 284.4,583.2 294.6,581.4C302.9,579.3 311.1,577.1 319.5,575.4C326.8,573.8 333.8,571.3 341.2,570.1C334.7,565.1 327.6,561 321,556.2C291.2,536.2 261.5,516.2 231.7,496.4C224.4,492.2 217.9,486.9 211,482C190.1,468 169.1,453.9 148.2,439.9C140.2,434.4 131.7,429.5 124,423.6C118,426.8 111.6,429.3 105.8,432.9M379.8,586.9C406.4,604.6 432.9,622.3 459.3,640.3C467.4,627.4 477.8,616.2 488.5,605.4C493.2,598.8 500.2,594.5 506.5,589.5C534.9,565.6 566.4,545.5 599.2,528.1C538.8,501.6 478.2,475.2 417.8,448.6C405.1,494.7 392.4,540.8 379.8,586.9M780.1,510C775.2,542.7 765.3,574.5 751.6,604.5C724.2,664 682.3,716.1 632.9,758.9C630.1,760.9 629.7,764.5 628.9,767.6C659.4,756.3 689.1,742.8 717.1,726.2C759.5,701.3 798.3,669.7 829.1,631.2C846.4,609.5 860.8,585.5 871.8,560.1C874.3,553.9 877.7,547.8 878.7,541.1C880.8,528 876.7,514 867.7,504.3C865.6,501.7 861.9,502.3 859,503C850.4,505.6 844.6,513 837.3,517.7C832.3,505.9 826.7,492.1 813.8,487.1C799.2,484.6 781.9,494.5 780.1,510M326,583.2C319.1,585 312,586.2 305.1,588.1C296.7,590.5 288,591.7 279.6,594.3C271.8,596.7 263.6,597.5 255.8,600C248.7,602.2 241.3,603.1 234.2,605.2C226.5,607.6 218.5,608.5 210.9,610.8C206.6,612.1 202.3,613.1 197.9,613.9C201.8,616.8 205.8,619.5 209.9,622.1C223.9,631.1 236.7,641.8 248.4,653.7C270.2,676.6 287.1,705.4 292,737C300.7,737.5 309.4,738 318,736.9C323.1,736.7 327.7,733.3 333,734.1C339.4,737.5 342.8,744.4 348.4,748.7C356,754.7 364.1,760.1 373.1,763.7C382.6,767.8 392.9,768.9 403.1,769.4C425.1,769.3 446.7,761.8 465.1,750C459.9,732.5 446.6,718.5 443.1,700.5C441.4,687.8 443.8,674.9 447.7,662.8C449.9,657.1 453,651.8 455.3,646.2C431.6,630.4 408,614.5 384.4,598.6C376.3,594 369,588 361.1,583C357.4,580.8 353.9,576.6 349.1,577.8C341.3,579.2 333.6,581 326,583.2M453,695.5C457.4,708.9 464.8,721.2 473.7,732.2C483.4,726.4 493.2,721 502.3,714.3C516.3,704.1 528.4,690.1 532.7,673C508.7,687.2 481.2,696.8 453,695.5Z" + android:fillColor="#000000"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_robologo.xml b/app/src/main/res/drawable/ic_robologo.xml new file mode 100644 index 0000000..34f9a49 --- /dev/null +++ b/app/src/main/res/drawable/ic_robologo.xml @@ -0,0 +1,435 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml index a5f66ae..1c3024b 100644 --- a/app/src/main/res/layout/fragment_settings.xml +++ b/app/src/main/res/layout/fragment_settings.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".ui.Settings.settingsFragment"> + tools:context=".ui.settings.settingsFragment"> - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 6f3b755..7353dbd 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp index c209e78..66d1339 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.webp and b/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp index b2dfe3d..af8cdc6 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp index 4f0f1d6..3cd7753 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.webp and b/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp index 62b611d..5ebfade 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp index 948a307..5af1395 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp and b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp index 1b9a695..aac428c 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp index 28d4b77..0b51656 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp index 9287f50..5950beb 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp index aa7d642..012c0b0 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp index 9126ae3..6955768 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml index aaee274..1cd58a6 100644 --- a/app/src/main/res/navigation/mobile_navigation.xml +++ b/app/src/main/res/navigation/mobile_navigation.xml @@ -21,7 +21,7 @@ diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml new file mode 100644 index 0000000..4808ee4 --- /dev/null +++ b/app/src/main/res/values/ic_launcher_background.xml @@ -0,0 +1,4 @@ + + + #059100 + \ No newline at end of file