new splashscreen, some cleanup
This commit is contained in:
parent
8e92a32c01
commit
0fd25ff124
11 changed files with 4 additions and 59 deletions
|
@ -1,47 +0,0 @@
|
||||||
package com.keylesspalace.tusky.db;
|
|
||||||
|
|
||||||
import android.arch.persistence.room.ColumnInfo;
|
|
||||||
import android.arch.persistence.room.Entity;
|
|
||||||
import android.arch.persistence.room.ForeignKey;
|
|
||||||
import android.arch.persistence.room.PrimaryKey;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Media model
|
|
||||||
*/
|
|
||||||
|
|
||||||
@Entity(foreignKeys = @ForeignKey(entity = TootEntity.class,
|
|
||||||
parentColumns = "uid",
|
|
||||||
childColumns = "toot_id"))
|
|
||||||
public class MediaEntity {
|
|
||||||
@ColumnInfo(name = "toot_id")
|
|
||||||
private int toot_id;
|
|
||||||
@PrimaryKey(autoGenerate = true)
|
|
||||||
private int uid;
|
|
||||||
@ColumnInfo(name = "url")
|
|
||||||
private String url;
|
|
||||||
|
|
||||||
// getter setter
|
|
||||||
public int getToot_id() {
|
|
||||||
return toot_id;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setToot_id(int toot_id) {
|
|
||||||
this.toot_id = toot_id;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getUid() {
|
|
||||||
return uid;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setUid(int uid) {
|
|
||||||
this.uid = uid;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getUrl() {
|
|
||||||
return url;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setUrl(String url) {
|
|
||||||
this.url = url;
|
|
||||||
}
|
|
||||||
}
|
|
BIN
app/src/main/res/drawable-hdpi/splash.png
Normal file
BIN
app/src/main/res/drawable-hdpi/splash.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 9.1 KiB |
BIN
app/src/main/res/drawable-mdpi/splash.png
Normal file
BIN
app/src/main/res/drawable-mdpi/splash.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 5.1 KiB |
BIN
app/src/main/res/drawable-xhdpi/splash.png
Normal file
BIN
app/src/main/res/drawable-xhdpi/splash.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 12 KiB |
BIN
app/src/main/res/drawable-xxhdpi/splash.png
Normal file
BIN
app/src/main/res/drawable-xxhdpi/splash.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 22 KiB |
BIN
app/src/main/res/drawable-xxxhdpi/splash.png
Normal file
BIN
app/src/main/res/drawable-xxxhdpi/splash.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 29 KiB |
|
@ -1,14 +1,11 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
|
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
<item>
|
<item>
|
||||||
<bitmap
|
<color android:color="@color/color_primary_dark_dark"/>
|
||||||
android:src="@drawable/splash_pattern"
|
|
||||||
android:tileMode="repeat" />
|
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<bitmap
|
<bitmap
|
||||||
android:src="@mipmap/ic_logo"
|
android:src="@drawable/splash"
|
||||||
android:gravity="center"
|
android:gravity="center" />
|
||||||
android:tileMode="disabled" />
|
|
||||||
</item>
|
</item>
|
||||||
</layer-list>
|
</layer-list>
|
Binary file not shown.
Before Width: | Height: | Size: 2.6 KiB |
|
@ -11,8 +11,6 @@
|
||||||
</declare-styleable>
|
</declare-styleable>
|
||||||
|
|
||||||
<!--Themed Attributes-->
|
<!--Themed Attributes-->
|
||||||
<attr name="splash_background_color" format="reference|color" />
|
|
||||||
<attr name="splash_wave_color" format="reference|color" />
|
|
||||||
<attr name="toolbar_background_color" format="reference" />
|
<attr name="toolbar_background_color" format="reference" />
|
||||||
<attr name="toolbar_icon_tint" format="reference" />
|
<attr name="toolbar_icon_tint" format="reference" />
|
||||||
<attr name="image_button_style" format="reference" />
|
<attr name="image_button_style" format="reference" />
|
||||||
|
|
|
@ -17,6 +17,7 @@
|
||||||
|
|
||||||
<style name="SplashTheme" parent="Theme.AppCompat.NoActionBar">
|
<style name="SplashTheme" parent="Theme.AppCompat.NoActionBar">
|
||||||
<item name="android:windowBackground">@drawable/background_splash</item>
|
<item name="android:windowBackground">@drawable/background_splash</item>
|
||||||
|
<item name="colorPrimaryDark">@color/color_primary_dark_dark</item>
|
||||||
<item name="android:windowNoTitle">true</item>
|
<item name="android:windowNoTitle">true</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
@ -41,8 +42,6 @@
|
||||||
|
|
||||||
<item name="bottomSheetDialogTheme">@style/AppTheme.BottomSheetDialog.Dark</item>
|
<item name="bottomSheetDialogTheme">@style/AppTheme.BottomSheetDialog.Dark</item>
|
||||||
|
|
||||||
<item name="splash_background_color">@color/color_background_dark</item>
|
|
||||||
<item name="splash_wave_color">@color/color_primary_dark</item>
|
|
||||||
<item name="toolbar_background_color">@color/toolbar_background_dark</item>
|
<item name="toolbar_background_color">@color/toolbar_background_dark</item>
|
||||||
<item name="toolbar_icon_tint">@color/toolbar_icon_dark</item>
|
<item name="toolbar_icon_tint">@color/toolbar_icon_dark</item>
|
||||||
<item name="image_button_style">@style/AppTheme.ImageButton.Dark</item>
|
<item name="image_button_style">@style/AppTheme.ImageButton.Dark</item>
|
||||||
|
@ -119,8 +118,6 @@
|
||||||
|
|
||||||
<item name="bottomSheetDialogTheme">@style/AppTheme.BottomSheetDialog.Light</item>
|
<item name="bottomSheetDialogTheme">@style/AppTheme.BottomSheetDialog.Light</item>
|
||||||
|
|
||||||
<item name="splash_background_color">@color/color_background_light</item>
|
|
||||||
<item name="splash_wave_color">@color/color_primary_light</item>
|
|
||||||
<item name="toolbar_background_color">@color/toolbar_background_light</item>
|
<item name="toolbar_background_color">@color/toolbar_background_light</item>
|
||||||
<item name="toolbar_icon_tint">@color/toolbar_icon_light</item>
|
<item name="toolbar_icon_tint">@color/toolbar_icon_light</item>
|
||||||
<item name="image_button_style">@style/AppTheme.ImageButton.Light</item>
|
<item name="image_button_style">@style/AppTheme.ImageButton.Light</item>
|
||||||
|
|
BIN
assets/splash.xcf
Normal file
BIN
assets/splash.xcf
Normal file
Binary file not shown.
Loading…
Reference in a new issue