Skip to content

Splashscreen implemented #189

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Splashscreen implemented #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
90aeb86
Added adaptive icon
stefan-niedermann Apr 10, 2018
428d919
Adjust drawer header to Notes app
stefan-niedermann Apr 10, 2018
7dffa3b
Splashscreen implemented
stefan-niedermann Apr 11, 2018
8d68633
Merge remote-tracking branch 'origin/master'
stefan-niedermann Apr 11, 2018
b43aca7
Keep old launchers on homescreen though use splashscreen
stefan-niedermann Apr 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
231 changes: 0 additions & 231 deletions .idea/codeStyleSettings.xml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion ncsmsgo/ncsmsgo.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
<exclude-output />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
<excludeFolder url="file://$MODULE_DIR$/build" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
Expand Down
8 changes: 4 additions & 4 deletions src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,14 +135,14 @@
android:name=".activities.OCSMSSettingsActivity"
android:label="@string/title_activity_general_settings">
</activity>

<activity
android:name=".activities.MainActivity"
android:label="@string/app_name"
android:theme="@style/OcSmsTheme.Drawer">
android:theme="@style/SplashTheme">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>

<category android:name="android.intent.category.LAUNCHER"/>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/fr/unix_experience/owncloud_sms/activities/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ public class MainActivity extends AppCompatActivity

@Override
protected void onCreate(Bundle savedInstanceState) {
setTheme(R.style.OcSmsTheme_Drawer);

if (_ConnectivityMonitor == null) {
_ConnectivityMonitor = new ConnectivityMonitor(getApplicationContext());
}
Expand Down
12 changes: 12 additions & 0 deletions src/main/res/drawable/splashscreen.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

<item android:drawable="@color/oc_primary" />

<item>
<bitmap
android:gravity="center"
android:src="@drawable/logo" />
</item>

</layer-list>
4 changes: 4 additions & 0 deletions src/main/res/values/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,4 +85,8 @@

<style name="OcSmsTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light"/>

<style name="SplashTheme" parent="OcSmsTheme">
<item name="android:windowBackground">@drawable/splashscreen</item>
</style>

</resources>