Skip to content
Snippets Groups Projects
Commit 07d429f9 authored by Massimiliano's avatar Massimiliano
Browse files

Changed logo and fixed some warnings

parent 261aa471
Branches
Tags
No related merge requests found
Showing with 52 additions and 32 deletions
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="WizardSettings">
<option name="children">
<map>
<entry key="vectorWizard">
<value>
<PersistentState />
</value>
</entry>
</map>
</option>
</component>
</project>
\ No newline at end of file
No preview for this file type
...@@ -6,8 +6,8 @@ android { ...@@ -6,8 +6,8 @@ android {
applicationId "org.disroot.disrootapp" applicationId "org.disroot.disrootapp"
minSdkVersion 15 minSdkVersion 15
targetSdkVersion 28 targetSdkVersion 28
versionCode 3 versionCode 4
versionName "0.0.3" versionName "0.0.4"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
} }
buildTypes { buildTypes {
...@@ -20,15 +20,21 @@ android { ...@@ -20,15 +20,21 @@ android {
dependencies { dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar']) implementation fileTree(dir: 'libs', include: ['*.jar'])
//noinspection GradleCompatible
implementation 'com.android.support:appcompat-v7:28.0.0-rc02' implementation 'com.android.support:appcompat-v7:28.0.0-rc02'
implementation 'com.android.support.constraint:constraint-layout:1.1.3' implementation 'com.android.support.constraint:constraint-layout:1.1.3'
testImplementation 'junit:junit:4.12' testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.2' androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
//noinspection GradleCompatible
implementation 'com.android.support:appcompat-v7:27.1.1' implementation 'com.android.support:appcompat-v7:27.1.1'
//noinspection GradleCompatible
implementation 'com.android.support:design:27.1.1' implementation 'com.android.support:design:27.1.1'
//noinspection GradleCompatible
implementation 'com.android.support:support-v4:27.1.1' implementation 'com.android.support:support-v4:27.1.1'
//noinspection GradleCompatible
implementation 'com.android.support:customtabs:27.1.1' implementation 'com.android.support:customtabs:27.1.1'
//noinspection GradleCompatible
implementation 'com.android.support:cardview-v7:27.1.1' implementation 'com.android.support:cardview-v7:27.1.1'
} }
......
...@@ -13,8 +13,9 @@ ...@@ -13,8 +13,9 @@
android:icon="@mipmap/ic_disroot" android:icon="@mipmap/ic_disroot"
android:label="@string/app_name" android:label="@string/app_name"
android:theme="@style/DisTheme" android:theme="@style/DisTheme"
android:supportsRtl="true"
android:allowBackup="true" android:allowBackup="true"
android:supportsRtl="true"> android:fullBackupContent="@xml/backup_descriptor">
<activity <activity
android:name="org.disroot.disrootapp.ui.SplashScreenActivity" android:name="org.disroot.disrootapp.ui.SplashScreenActivity"
android:configChanges="orientation|screenSize" android:configChanges="orientation|screenSize"
...@@ -45,13 +46,13 @@ ...@@ -45,13 +46,13 @@
android:name="org.disroot.disrootapp.ui.AboutActivity" android:name="org.disroot.disrootapp.ui.AboutActivity"
android:label="@string/title_activity_about" android:label="@string/title_activity_about"
android:theme="@style/DisTheme" /> android:theme="@style/DisTheme" />
<activity android:name="org.disroot.disrootapp.ui.WelcomeActivity"></activity> <activity android:name="org.disroot.disrootapp.ui.WelcomeActivity" />
<activity <activity
android:name="wsdfhjxc.taponium.MainActivity" android:name="wsdfhjxc.taponium.MainActivity"
android:screenOrientation="portrait"> android:screenOrientation="portrait"
android:label="@string/title_activity_tap" android:label="@string/title_activity_tap">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
......
app/src/main/res/drawable-nodpi/logodisroot.png

55.9 KiB

app/src/main/res/drawable/logodisroot.png

11.7 KiB | W: | H:

app/src/main/res/drawable/logodisroot.png

55.9 KiB | W: | H:

app/src/main/res/drawable/logodisroot.png
app/src/main/res/drawable/logodisroot.png
app/src/main/res/drawable/logodisroot.png
app/src/main/res/drawable/logodisroot.png
  • 2-up
  • Swipe
  • Onion skin
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:ads="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
...@@ -13,12 +12,12 @@ ...@@ -13,12 +12,12 @@
style="@android:style/Widget.ProgressBar.Horizontal" style="@android:style/Widget.ProgressBar.Horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="10dp" android:layout_height="10dp"
android:progressBackgroundTint="#ffffff"
android:progressTint="@color/bg_primary_blue_dark" android:progressTint="@color/bg_primary_blue_dark"
android:visibility="gone" android:visibility="gone"
android:indeterminate="false" android:indeterminate="false"
android:max="100" android:max="100"
android:progress="1"/> android:progress="1"
tools:ignore="UnusedAttribute" />
<FrameLayout <FrameLayout
android:id="@+id/framelayout_container" android:id="@+id/framelayout_container"
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -44,7 +43,7 @@ ...@@ -44,7 +43,7 @@
<RelativeLayout <RelativeLayout
android:id="@+id/dashLayout" android:id="@+id/dashLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:background="#203140" android:background="#203140"
android:gravity="center_horizontal"> android:gravity="center_horizontal">
...@@ -57,7 +56,8 @@ ...@@ -57,7 +56,8 @@
android:layout_marginTop="20dp" android:layout_marginTop="20dp"
android:layout_marginBottom="30dp" android:layout_marginBottom="30dp"
style="?android:attr/borderlessButtonStyle" style="?android:attr/borderlessButtonStyle"
android:src="@drawable/logo" /> android:src="@drawable/logo"
android:contentDescription="@string/logo" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
......
...@@ -5,9 +5,10 @@ ...@@ -5,9 +5,10 @@
<ImageView <ImageView
android:id="@+id/imageView" android:id="@+id/imageView"
android:layout_width="100dp" android:layout_width="155dp"
android:layout_height="100dp" android:layout_height="350dp"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:background="@drawable/logodisroot" /> android:background="@drawable/logodisroot"
android:contentDescription="@string/logo" />
</RelativeLayout> </RelativeLayout>
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
xmlns:android="http://schemas.android.com/apk/res/android"> xmlns:android="http://schemas.android.com/apk/res/android">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:ads="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
......
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<Switch
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true" />
</RelativeLayout>
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
<string name="action_options">Actions</string> <string name="action_options">Actions</string>
<string name="activity_main_share_info">share link info</string> <string name="activity_main_share_info">share link info</string>
<string name="activity_main_manteiners">%s\n\nDeveloper: Massimiliano\n\ncontact us:\n<EMAIL mailto="contact@disroot.org">support@disroot.org</EMAIL></string> <string name="activity_main_manteiners">%s\n\nDeveloper: Massimiliano\n\ncontact us:\n<EMAIL mailto="contact@disroot.org">support@disroot.org</EMAIL></string>
<string name="view_loading_description">Loading...</string> <string name="view_loading_description">Loading</string>
<string name="global_ok">ok</string> <string name="global_ok">OK</string>
<string name="more_help">Need more help?</string> <string name="more_help">Need more help?</string>
<string name="title_activity_about">AboutActivity</string> <string name="title_activity_about">AboutActivity</string>
<string name="title_activity_tap">TapActivity</string> <string name="title_activity_tap">TapActivity</string>
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
<string name="SpreadTheWordBtn">Share the app</string> <string name="SpreadTheWordBtn">Share the app</string>
<string name="DisrootWeb">Disroot web</string> <string name="DisrootWeb">Disroot web</string>
<string name="FirstTitle">I almost forgot</string> <string name="FirstTitle">I almost forgot</string>
<string name="FirstInfo">You can do a long press on each icon to show you extra information...</string> <string name="FirstInfo">You can do a long press on each icon to show you extra information</string>
<string name="DiasporaTitle">Diaspora settings</string> <string name="DiasporaTitle">Diaspora settings</string>
<string name="DiasporaInfo">Needs info...</string> <string name="DiasporaInfo">Needs info...</string>
<string name="PadInfo">Pad Needs info...</string> <string name="PadInfo">Pad Needs info...</string>
...@@ -111,7 +111,8 @@ ...@@ -111,7 +111,8 @@
<string name="AboutInfo">This is the about page of this app</string> <string name="AboutInfo">This is the about page of this app</string>
<string name="ForumTitle">Forum Info</string> <string name="ForumTitle">Forum Info</string>
<string name="ForumInfo">Discourse is a fully open-source modern approach to discussion forums. It offers everything your community, group or collective needs to create their communication platform.</string> <string name="ForumInfo">Discourse is a fully open-source modern approach to discussion forums. It offers everything your community, group or collective needs to create their communication platform.</string>
<string name="LogoTitle">Did you just really try the long press on the logo?</string> <string name="LogoTitle">Did you really just try the long press on the logo?</string>
<string name="LogoInfo">What you want to know? It\'s just a logo.\nNow stop being so courious ;-)</string> <string name="LogoInfo">Why? It\'s just a logo.\nDon\'t be too courious ;-)</string>
<string name="LogoBtn">Disroot rules \\o/</string> <string name="LogoBtn">Disroot rules \\o/</string>
<string name="logo">Logo</string>
</resources> </resources>
<?xml version="1.0" encoding="utf-8"?>
<full-backup-content>
<!-- TODO Remove the following "exclude" elements to make them a part of the auto backup -->
<!-- Exclude the shared preferences file that contains the GCM registrationId -->
<exclude
domain="sharedpref"
path="org.disroot.disrootap.xml" />
</full-backup-content>
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<changelog> <changelog>
<release version="0.0.4" versioncode="3" > <release version="0.0.4" versioncode="4" >
<change>Fixed Download issue when tryng to download a file for the first time</change> <change>Fixed Download issue when tryng to download a file for the first time</change>
<change>Changed layout of the about activity</change> <change>Changed layout of the about activity</change>
<change>Floating mail icon makes you send mail to Disroot</change> <change>Floating mail icon makes you send mail to Disroot</change>
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
<change>ProgressBar shows actual progress</change> <change>ProgressBar shows actual progress</change>
<change>Added go bak arrow on the about activity</change> <change>Added go bak arrow on the about activity</change>
<change>Added third party libraries in the about activity</change> <change>Added third party libraries in the about activity</change>
<change>Changed the splash logo</change>
</release> </release>
<release version="0.0.3" versioncode="3" > <release version="0.0.3" versioncode="3" >
<change>If Pix-art is installed then it will be launched as chat app</change> <change>If Pix-art is installed then it will be launched as chat app</change>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment