lina/BodyTune
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Fix for old devices (android less>9)

Browse Source
This commit is contained in:
Lina 2026-02-11 20:59:22 +01:00
parent 2db678cd17
commit 24c89045b0
3 changed files with 292 additions and 283 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.idea/deploymentTargetSelector.xml generated
View File

@ -4,10 +4,10 @@
<selectionStates>
<SelectionState runConfigName="app">
<option name="selectionMode" value="DROPDOWN" />
<DropdownSelection timestamp="2026-02-11T16:50:15.295594688Z">
<DropdownSelection timestamp="2026-02-11T19:42:19.363392546Z">
<Target type="DEFAULT_BOOT">
<handle>
<DeviceId pluginId="PhysicalDevice" identifier="serial=M7GEJFYHBA554L7T" />
<DeviceId pluginId="LocalEmulator" identifier="path=/home/lina/.android/avd/Medium_Phone.avd" />
</handle>
</Target>
</DropdownSelection>

121
app/src/main/assets/index.html
View File

@ -238,23 +238,32 @@ body.loaded {
</div>
</div>
<script>
let db = JSON.parse(localStorage.getItem('weight_tracker_data') || '{"entries":[], "config":{"goal":"keep", "target":0}}');
let wChart, mChart, wAxisChart; // Добавили wAxisChart
let confirmMode = false;
let translations = {}; // Будет заполнено через initLanguage
var db;
// Безопасная загрузка базы данных
try {
var savedData = localStorage.getItem('weight_tracker_data');
db = savedData ? JSON.parse(savedData) : { "entries": [], "config": { "goal": "keep", "target": 0 } };
} catch (e) {
console.error("Ошибка доступа к LocalStorage:", e);
// Резервный пустой объект, чтобы приложение не "упало"
db = { "entries": [], "config": { "goal": "keep", "target": 0 } };
}
var wChart, mChart, wAxisChart; // Добавили wAxisChart
var confirmMode = false;
var translations = {}; // Будет заполнено через initLanguage
async function initLanguage() {
let lang = 'ru';
var lang = 'ru';
if (window.Android && window.Android.getLanguage) {
const fullLang = window.Android.getLanguage();
var fullLang = window.Android.getLanguage();
lang = fullLang.startsWith('ru') ? 'ru' : 'en';
}
try {
if (window.Android && window.Android.getTranslations) {
const jsonString = window.Android.getTranslations(lang);
var jsonString = window.Android.getTranslations(lang);
translations = JSON.parse(jsonString);
document.querySelectorAll('[data-i18n]').forEach(el => {
const key = el.getAttribute('data-i18n');
var key = el.getAttribute('data-i18n');
if (translations[key]) {
if (el.tagName === 'INPUT') el.placeholder = translations[key];
else el.textContent = translations[key];
@ -272,8 +281,8 @@ body.loaded {
document.querySelectorAll('.goal-btn').forEach(b => b.classList.remove('active'));
if(document.getElementById('g-' + db.config.goal)) document.getElementById('g-' + db.config.goal).classList.add('active');
document.getElementById('targetWeight').value = db.config.target || '';
const unitKg = translations['unit_kg'] || 'kg';
const log = document.getElementById('log');
var unitKg = translations['unit_kg'] || 'kg';
var log = document.getElementById('log');
if (db.entries.length > 0) {
document.getElementById('histBox').style.display = 'block';
log.innerHTML = db.entries.slice().reverse().map(e => `
@ -295,40 +304,40 @@ const unitKg = translations['unit_kg'] || 'kg';
}
function drawCharts() {
const weights = db.entries
var weights = db.entries
.filter(e => e.weight)
.sort((a, b) => new Date(a.date) - new Date(b.date));
if (weights.length === 0) return;
const scrollContainer = document.getElementById('wScroll');
const wWrapper = document.getElementById('wWrapper');
const axisCanvas = document.getElementById('weightAxis');
const chartCanvas = document.getElementById('weightChart');
var scrollContainer = document.getElementById('wScroll');
var wWrapper = document.getElementById('wWrapper');
var axisCanvas = document.getElementById('weightAxis');
var chartCanvas = document.getElementById('weightChart');
const style = getComputedStyle(document.body);
const primaryColor = style.getPropertyValue('--primary').trim();
const textColor = style.getPropertyValue('--text').trim();
const subColor = style.getPropertyValue('--sub').trim();
var style = getComputedStyle(document.body);
var primaryColor = style.getPropertyValue('--primary').trim();
var textColor = style.getPropertyValue('--text').trim();
var subColor = style.getPropertyValue('--sub').trim();
// Цвета из твоей рабочей логики
const trendDown = '#4ade80'; // Зеленый (хорошо)
const trendUp = '#f87171'; // Красный (плохо)
const mintColor = primaryColor;
var trendDown = '#4ade80'; // Зеленый (хорошо)
var trendUp = '#f87171'; // Красный (плохо)
var mintColor = primaryColor;
// --- ТВОЯ РАБОЧАЯ ЛОГИКА ЦВЕТОВ ---
const pointColors = weights.map((e, idx) => {
const target = db.config.target || 0;
var pointColors = weights.map((e, idx) => {
var target = db.config.target || 0;
// 1. Режим УДЕРЖАНИЕ (keep)
if (db.config.goal === 'keep' && target > 0) {
const diff = Math.abs(e.weight - target);
var diff = Math.abs(e.weight - target);
return diff > 0.4 ? trendUp : trendDown;
}
// Для режимов Снижение и Набор сравниваем с предыдущим днем
if (idx === 0) return trendDown;
const dailyDiff = e.weight - weights[idx - 1].weight;
var dailyDiff = e.weight - weights[idx - 1].weight;
// 2. Режим СНИЖЕНИЕ (lose)
if (db.config.goal === 'lose') {
@ -344,13 +353,13 @@ function drawCharts() {
});
// Расчет границ шкалы (строго целые числа)
const targetVal = parseFloat(db.config.target) || 0;
const allValues = weights.map(e => e.weight);
var targetVal = parseFloat(db.config.target) || 0;
var allValues = weights.map(e => e.weight);
if (targetVal > 0) allValues.push(targetVal);
const minW = Math.floor(Math.min(...allValues) - 1);
const maxW = Math.ceil(Math.max(...allValues) + 1);
var minW = Math.floor(Math.min(...allValues) - 1);
var maxW = Math.ceil(Math.max(...allValues) + 1);
const commonYAxis = {
var commonYAxis = {
min: minW, max: maxW,
grid: { display: false, drawBorder: false },
ticks: { color: subColor, font: { size: 11, weight: 'bold' }, stepSize: 1, precision: 0, padding: 5 }
@ -377,7 +386,7 @@ function drawCharts() {
});
// Основной график
const chartWidth = Math.max(weights.length * 60, scrollContainer.clientWidth);
var chartWidth = Math.max(weights.length * 60, scrollContainer.clientWidth);
wWrapper.style.width = chartWidth + 'px';
chartCanvas.height = 240;
@ -409,18 +418,18 @@ function drawCharts() {
},
plugins: [{
afterDatasetsDraw: (chart) => {
const { ctx, chartArea: { right }, scales: { y } } = chart;
var { ctx, chartArea: { right }, scales: { y } } = chart;
ctx.save();
ctx.textAlign = 'center';
ctx.font = 'bold 11px sans-serif';
ctx.fillStyle = textColor;
chart.getDatasetMeta(0).data.forEach((point, index) => {
const val = chart.data.datasets[0].data[index];
var val = chart.data.datasets[0].data[index];
if (val) ctx.fillText(val, point.x, point.y - 12);
});
if (targetVal > 0) {
const yPos = y.getPixelForValue(targetVal);
var yPos = y.getPixelForValue(targetVal);
ctx.beginPath();
ctx.setLineDash([5, 5]);
ctx.strokeStyle = primaryColor + '66';
@ -440,9 +449,9 @@ function drawCharts() {
if (typeof renderMeasuresChart === 'function') renderMeasuresChart();
}
function renderMeasuresChart() {
const mType = document.getElementById('measureType').value;
const measures = db.entries.filter(e => e[mType]);
const mCtx = document.getElementById('measureChart').getContext('2d');
var mType = document.getElementById('measureType').value;
var measures = db.entries.filter(e => e[mType]);
var mCtx = document.getElementById('measureChart').getContext('2d');
if (mChart) mChart.destroy();
if (measures.length > 0) {
mChart = new Chart(mCtx, {
@ -458,12 +467,12 @@ function drawCharts() {
// Вспомогательные функции
function updateTrendDisplay() {
const entries = db.entries.filter(e => e.weight);
const el = document.getElementById('trendDisplay');
var entries = db.entries.filter(e => e.weight);
var el = document.getElementById('trendDisplay');
if (entries.length < 2) { el.innerText = translations['trend-analysis'] || "..."; return; }
const last = entries[entries.length - 1];
const avg = entries.slice(-8, -1).reduce((s, e) => s + e.weight, 0) / Math.max(1, entries.slice(-8, -1).length);
const diff = last.weight - avg;
var last = entries[entries.length - 1];
var avg = entries.slice(-8, -1).reduce((s, e) => s + e.weight, 0) / Math.max(1, entries.slice(-8, -1).length);
var diff = last.weight - avg;
if (Math.abs(diff) < 0.1) { el.innerText = translations['trend-stable']; el.style.color = "var(--sub)"; }
else if (diff > 0) { el.innerText = translations['trend-up']; el.style.color = "#f87171"; }
else { el.innerText = translations['trend-down']; el.style.color = "#4ade80"; }
@ -474,13 +483,13 @@ function drawCharts() {
function setGoal(g) { db.config.goal = g; saveDB(); renderUI(); }
function handleSaveClick() {
const date = document.getElementById('wDate').value;
var date = document.getElementById('wDate').value;
if (!date) return;
db.config.target = parseFloat(document.getElementById('targetWeight').value) || 0;
let entry = db.entries.find(e => e.date === date) || { date };
var entry = db.entries.find(e => e.date === date) || { date };
if (document.getElementById('wVal').value) entry.weight = parseFloat(document.getElementById('wVal').value);
['waist', 'chest', 'hips', 'bicep'].forEach(f => {
let v = document.getElementById('m' + f.charAt(0).toUpperCase() + f.slice(1)).value;
var v = document.getElementById('m' + f.charAt(0).toUpperCase() + f.slice(1)).value;
if (v) entry[f] = parseFloat(v);
});
if (!db.entries.find(e => e.date === date)) db.entries.push(entry);
@ -491,7 +500,7 @@ function drawCharts() {
function exportToCSV() {
if (!db.entries || db.entries.length === 0) return;
let csvContent = "date,weight,waist,chest,hips,bicep\n";
var csvContent = "date,weight,waist,chest,hips,bicep\n";
db.entries.forEach(e => {
csvContent += `${e.date},${e.weight || ''},${e.waist || ''},${e.chest || ''},${e.hips || ''},${e.bicep || ''}\n`;
});
@ -501,9 +510,9 @@ function exportToCSV() {
window.Android.exportCSV(csvContent, `weight_data_${new Date().toISOString().split('T')[0]}.csv`);
} else {
// Обычный браузерный способ (для тестов)
const blob = new Blob([csvContent], { type: 'text/csv' });
const url = URL.createObjectURL(blob);
const a = document.createElement('a');
var blob = new Blob([csvContent], { type: 'text/csv' });
var url = URL.createObjectURL(blob);
var a = document.createElement('a');
a.href = url;
a.download = 'data.csv';
a.click();
@ -516,21 +525,21 @@ function showImportModal() {
}
function processPastedCSV() {
const text = document.getElementById('csvPasteArea').value;
var text = document.getElementById('csvPasteArea').value;
if (!text.trim()) return;
try {
const lines = text.split(/\r?\n/);
const dataLines = lines.slice(1); // Пропускаем заголовок (date,weight...)
var lines = text.split(/\r?\n/);
var dataLines = lines.slice(1); // Пропускаем заголовок (date,weight...)
let count = 0;
var count = 0;
dataLines.forEach(line => {
if (!line.trim()) return;
const [date, weight, waist, chest, hips, bicep] = line.split(',');
var [date, weight, waist, chest, hips, bicep] = line.split(',');
if (!date || date.length < 8) return; // Проверка на корректность даты
let entry = db.entries.find(item => item.date === date);
var entry = db.entries.find(item => item.date === date);
if (!entry) {
entry = { date };
db.entries.push(entry);

6
app/src/main/java/pictures/tristagram/lina/bodytune/MainActivity.java
View File

@ -46,9 +46,9 @@ public class MainActivity extends AppCompatActivity {
settings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
// Поддержка темной темы на уровне WebView
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q) {
settings.setForceDark(WebSettings.FORCE_DARK_AUTO);
}
// if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q) {
// settings.setForceDark(WebSettings.FORCE_DARK_AUTO);
// }
webView.setWebViewClient(new WebViewClient());