diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6b96cf0c1a281ccd73e283f1ce6a88308c0daf49
--- /dev/null
+++ b/.idea/assetWizardSettings.xml
@@ -0,0 +1,14 @@
+<?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
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 31797606530aab9d027c507a5f9855ce65fc2824..29f152955edbc000fd7e0fb0ddcaccd8625967d6 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/app/build.gradle b/app/build.gradle
index a5468494924c5aa96cdfc726a4177e32fb36ad98..4c442ea28f81b9f306454cd3bd9bbceb14bc1b6d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,8 +6,8 @@ android {
applicationId "org.disroot.disrootapp"
minSdkVersion 15
targetSdkVersion 28
- versionCode 3
- versionName "0.0.3"
+ versionCode 4
+ versionName "0.0.4"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
buildTypes {
@@ -20,15 +20,21 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
+ //noinspection GradleCompatible
implementation 'com.android.support:appcompat-v7:28.0.0-rc02'
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+ //noinspection GradleCompatible
implementation 'com.android.support:appcompat-v7:27.1.1'
+ //noinspection GradleCompatible
implementation 'com.android.support:design:27.1.1'
+ //noinspection GradleCompatible
implementation 'com.android.support:support-v4:27.1.1'
+ //noinspection GradleCompatible
implementation 'com.android.support:customtabs:27.1.1'
+ //noinspection GradleCompatible
implementation 'com.android.support:cardview-v7:27.1.1'
}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b0de4bd5ad1585d28fdf93cc6c28fc7f282e64f4..f7fa6ce8a5b07e0028f5ad0a2a73ccec766f0658 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -13,8 +13,9 @@
android:icon="@mipmap/ic_disroot"
android:label="@string/app_name"
android:theme="@style/DisTheme"
+ android:supportsRtl="true"
android:allowBackup="true"
- android:supportsRtl="true">
+ android:fullBackupContent="@xml/backup_descriptor">
<activity
android:name="org.disroot.disrootapp.ui.SplashScreenActivity"
android:configChanges="orientation|screenSize"
@@ -45,13 +46,13 @@
android:name="org.disroot.disrootapp.ui.AboutActivity"
android:label="@string/title_activity_about"
android:theme="@style/DisTheme" />
- <activity android:name="org.disroot.disrootapp.ui.WelcomeActivity"></activity>
+ <activity android:name="org.disroot.disrootapp.ui.WelcomeActivity" />
<activity
android:name="wsdfhjxc.taponium.MainActivity"
- android:screenOrientation="portrait">
- android:label="@string/title_activity_tap"
+ android:screenOrientation="portrait"
+ android:label="@string/title_activity_tap">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" />
diff --git a/app/src/main/res/drawable-nodpi/logodisroot.png b/app/src/main/res/drawable-nodpi/logodisroot.png
new file mode 100644
index 0000000000000000000000000000000000000000..adcdde04ddcc3174dd0a7d780b293c774782bbfe
Binary files /dev/null and b/app/src/main/res/drawable-nodpi/logodisroot.png differ
diff --git a/app/src/main/res/drawable/logodisroot.png b/app/src/main/res/drawable/logodisroot.png
index fd71af9230b05914e1a5e9c6f65fd0b410a82bd9..adcdde04ddcc3174dd0a7d780b293c774782bbfe 100644
Binary files a/app/src/main/res/drawable/logodisroot.png and b/app/src/main/res/drawable/logodisroot.png differ
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index c10dabd6369dfa3c8c0d6ec28a138aff3be3ad5e..0da7f106c286b4be68c4f2d79e7b979e17584318 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<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"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -13,12 +12,12 @@
style="@android:style/Widget.ProgressBar.Horizontal"
android:layout_width="match_parent"
android:layout_height="10dp"
- android:progressBackgroundTint="#ffffff"
android:progressTint="@color/bg_primary_blue_dark"
android:visibility="gone"
android:indeterminate="false"
android:max="100"
- android:progress="1"/>
+ android:progress="1"
+ tools:ignore="UnusedAttribute" />
<FrameLayout
android:id="@+id/framelayout_container"
android:layout_width="match_parent"
@@ -44,7 +43,7 @@
<RelativeLayout
android:id="@+id/dashLayout"
android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_height="wrap_content"
android:background="#203140"
android:gravity="center_horizontal">
@@ -57,7 +56,8 @@
android:layout_marginTop="20dp"
android:layout_marginBottom="30dp"
style="?android:attr/borderlessButtonStyle"
- android:src="@drawable/logo" />
+ android:src="@drawable/logo"
+ android:contentDescription="@string/logo" />
<LinearLayout
android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_splash_screen.xml b/app/src/main/res/layout/activity_splash_screen.xml
index 929453fa05538449a81cb2824a7e0e86d00df757..62194ecb831104a2356291a1cb0d740cead23eef 100644
--- a/app/src/main/res/layout/activity_splash_screen.xml
+++ b/app/src/main/res/layout/activity_splash_screen.xml
@@ -5,9 +5,10 @@
<ImageView
android:id="@+id/imageView"
- android:layout_width="100dp"
- android:layout_height="100dp"
+ android:layout_width="155dp"
+ android:layout_height="350dp"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
- android:background="@drawable/logodisroot" />
+ android:background="@drawable/logodisroot"
+ android:contentDescription="@string/logo" />
</RelativeLayout>
diff --git a/app/src/main/res/layout/activity_welcome.xml b/app/src/main/res/layout/activity_welcome.xml
index 36b0dafa6c34301e6e7eb56d23717e3bfbbacaac..5ac021cd95b380c72fdf4ea1912214d5356a64e5 100644
--- a/app/src/main/res/layout/activity_welcome.xml
+++ b/app/src/main/res/layout/activity_welcome.xml
@@ -3,7 +3,6 @@
android:layout_height="wrap_content"
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"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/switch_item.xml b/app/src/main/res/layout/switch_item.xml
deleted file mode 100644
index ee492c6e41e2a3b2c4350d1c29323fbaa661b477..0000000000000000000000000000000000000000
--- a/app/src/main/res/layout/switch_item.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<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>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5f3cdeb905d14b41f31083706cc5030ae0e3f56a..8fd1978f10be7cf83d056c9f1476293f4d2a329a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -26,8 +26,8 @@
<string name="action_options">Actions</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="view_loading_description">Loading...</string>
- <string name="global_ok">ok</string>
+ <string name="view_loading_description">Loading…</string>
+ <string name="global_ok">OK</string>
<string name="more_help">Need more help?</string>
<string name="title_activity_about">AboutActivity</string>
<string name="title_activity_tap">TapActivity</string>
@@ -81,7 +81,7 @@
<string name="SpreadTheWordBtn">Share the app</string>
<string name="DisrootWeb">Disroot web</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="DiasporaInfo">Needs info...</string>
<string name="PadInfo">Pad Needs info...</string>
@@ -111,7 +111,8 @@
<string name="AboutInfo">This is the about page of this app</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="LogoTitle">Did you just really 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="LogoTitle">Did you really just try the long press on the logo?</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="logo">Logo</string>
</resources>
diff --git a/app/src/main/res/xml/backup_descriptor.xml b/app/src/main/res/xml/backup_descriptor.xml
new file mode 100644
index 0000000000000000000000000000000000000000..dc9e7f7f790be02bcfb59ec72861a8e22efb37f7
--- /dev/null
+++ b/app/src/main/res/xml/backup_descriptor.xml
@@ -0,0 +1,8 @@
+<?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>
diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml
index 9a3b3256043d97a90c61e525ca2d233fe12ead64..b2487e1b5c19768b2338f23cb5dd0dfff34c36a4 100644
--- a/app/src/main/res/xml/changelog_master.xml
+++ b/app/src/main/res/xml/changelog_master.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<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>Changed layout of the about activity</change>
<change>Floating mail icon makes you send mail to Disroot</change>
@@ -8,6 +8,7 @@
<change>ProgressBar shows actual progress</change>
<change>Added go bak arrow on the about activity</change>
<change>Added third party libraries in the about activity</change>
+ <change>Changed the splash logo</change>
</release>
<release version="0.0.3" versioncode="3" >
<change>If Pix-art is installed then it will be launched as chat app</change>