Merge gitea.presley.nz:brandon.presley/Massive
This commit is contained in:
commit
f04125efc5
2
App.tsx
2
App.tsx
|
@ -55,7 +55,7 @@ const App = () => {
|
||||||
const settings = await settingsRepo.findOne({where: {}})
|
const settings = await settingsRepo.findOne({where: {}})
|
||||||
console.log(`${App.name}.useEffect:`, {gotSettings: settings})
|
console.log(`${App.name}.useEffect:`, {gotSettings: settings})
|
||||||
setTheme(settings.theme)
|
setTheme(settings.theme)
|
||||||
setColor(settings.color)
|
if (settings.color) setColor(settings.color)
|
||||||
setInitialized(true)
|
setInitialized(true)
|
||||||
}
|
}
|
||||||
init()
|
init()
|
||||||
|
|
|
@ -43,8 +43,8 @@ android {
|
||||||
missingDimensionStrategy "RNNotifications.reactNativeVersion", "reactNative60"
|
missingDimensionStrategy "RNNotifications.reactNativeVersion", "reactNative60"
|
||||||
minSdkVersion rootProject.ext.minSdkVersion
|
minSdkVersion rootProject.ext.minSdkVersion
|
||||||
targetSdkVersion rootProject.ext.targetSdkVersion
|
targetSdkVersion rootProject.ext.targetSdkVersion
|
||||||
versionCode 36101
|
versionCode 36102
|
||||||
versionName "1.75"
|
versionName "1.76"
|
||||||
buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
|
buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
|
||||||
|
|
||||||
if (isNewArchitectureEnabled()) {
|
if (isNewArchitectureEnabled()) {
|
||||||
|
|
|
@ -1,19 +1,10 @@
|
||||||
import {MigrationInterface, QueryRunner, TableColumn} from 'typeorm'
|
import {MigrationInterface, QueryRunner} from 'typeorm'
|
||||||
import {darkColors} from '../colors'
|
|
||||||
|
|
||||||
export class addColor1667186320954 implements MigrationInterface {
|
export class addColor1667186320954 implements MigrationInterface {
|
||||||
public async up(queryRunner: QueryRunner): Promise<void> {
|
public async up(queryRunner: QueryRunner): Promise<void> {
|
||||||
await queryRunner
|
await queryRunner
|
||||||
.addColumn(
|
.query('ALTER TABLE settings ADD COLUMN color TEXT NULL')
|
||||||
'settings',
|
.catch(() => null)
|
||||||
new TableColumn({
|
|
||||||
name: 'color',
|
|
||||||
type: 'text',
|
|
||||||
isNullable: false,
|
|
||||||
default: `'${darkColors[0]}'`,
|
|
||||||
}),
|
|
||||||
)
|
|
||||||
.catch(console.error)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public async down(queryRunner: QueryRunner): Promise<void> {
|
public async down(queryRunner: QueryRunner): Promise<void> {
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "massive",
|
"name": "massive",
|
||||||
"version": "1.75",
|
"version": "1.76",
|
||||||
"private": true,
|
"private": true,
|
||||||
"license": "GPL-3.0-only",
|
"license": "GPL-3.0-only",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|
|
@ -21,7 +21,7 @@ export default class Settings {
|
||||||
showUnit: boolean
|
showUnit: boolean
|
||||||
|
|
||||||
@Column('text')
|
@Column('text')
|
||||||
color: string
|
color?: string
|
||||||
|
|
||||||
@Column('boolean')
|
@Column('boolean')
|
||||||
steps: boolean
|
steps: boolean
|
||||||
|
|
Loading…
Reference in New Issue
Block a user