diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 8222d9a..6c075a5 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/README.md b/README.md index 0630422..37c74f5 100644 --- a/README.md +++ b/README.md @@ -33,6 +33,7 @@ Credits/Libraries - [Droppy](https://github.com/shehabic/Droppy) - A simple yet-powerful and fully customizable Android drop-down menu. It supports Text with/without Icons, Separators, and even fully customized views. - [ExFile Picker](https://github.com/bartwell/ExFilePicker) - Open source Android library. Implement choosing files and directories in your application. - [Floating Action Button SpeedDial](https://github.com/leinardi/FloatingActionButtonSpeedDial) - A Floating Action Button Speed Dial implementation for Android that follows the Material Design specification +- [Markdown View](https://github.com/falnatsheh/MarkdownView) - MarkdownView is an Android webview with the capablity of loading Markdown text or file and display it as HTML, it uses MarkdownJ and extends Android webview. - [Material Dialogs](https://github.com/afollestad/material-dialogs) - A beautiful, fluid, and customizable dialogs API - [rclone](https://github.com/ncw/rclone) - "rsync for cloud storage" - Icon made by [Smashicons](https://www.flaticon.com/authors/smashicons) from [Flaticon](https://www.flaticon.com) diff --git a/app/build.gradle b/app/build.gradle index 9309e32..44eb524 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -37,6 +37,7 @@ dependencies { implementation 'com.mikepenz:community-material-typeface:2.0.46.1@aar' implementation 'com.mikepenz:fontawesome-typeface:5.0.6.0@aar' implementation "com.mikepenz:aboutlibraries:6.0.8" + implementation 'us.feras.mdv:markdownview:1.1.0' testImplementation 'junit:junit:4.12' androidTestImplementation 'com.android.support.test:runner:1.0.1' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index dedfd5c..6151f78 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -45,6 +45,14 @@ android:name=".AboutActivity" android:label="@string/title_activity_about" android:theme="@style/AppTheme.NoActionBar" /> + + + + \ No newline at end of file diff --git a/app/src/main/assets/changelog.md b/app/src/main/assets/changelog.md new file mode 100644 index 0000000..dfdc2b8 --- /dev/null +++ b/app/src/main/assets/changelog.md @@ -0,0 +1,10 @@ +### Version 0.3.0-alpha +*** + +* **New:** Changelog added under About screen +* **New:** Clicking on File/Folder icon will select it +* **New:** App icon +* **Fix:** Status bar color + +*** + diff --git a/app/src/main/java/ca/pkay/rcloneexplorer/AboutActivity.java b/app/src/main/java/ca/pkay/rcloneexplorer/AboutActivity.java index 2d52e78..2a8d61b 100644 --- a/app/src/main/java/ca/pkay/rcloneexplorer/AboutActivity.java +++ b/app/src/main/java/ca/pkay/rcloneexplorer/AboutActivity.java @@ -73,7 +73,8 @@ public boolean onSupportNavigateUp() { } private void showChangelog() { - Toast.makeText(this, "Coming soon", Toast.LENGTH_SHORT).show(); + Intent changelogIntent = new Intent(this, ChangelogActivity.class); + startActivity(changelogIntent); } private void showOpenSourceLibraries() { diff --git a/app/src/main/java/ca/pkay/rcloneexplorer/ChangelogActivity.java b/app/src/main/java/ca/pkay/rcloneexplorer/ChangelogActivity.java new file mode 100644 index 0000000..5905625 --- /dev/null +++ b/app/src/main/java/ca/pkay/rcloneexplorer/ChangelogActivity.java @@ -0,0 +1,34 @@ +package ca.pkay.rcloneexplorer; + +import android.os.Bundle; +import android.support.v7.app.ActionBar; +import android.support.v7.app.AppCompatActivity; +import android.support.v7.widget.Toolbar; + +import us.feras.mdv.MarkdownView; + + +public class ChangelogActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_changelog); + Toolbar toolbar = findViewById(R.id.toolbar); + setSupportActionBar(toolbar); + ActionBar actionBar = getSupportActionBar(); + if (actionBar != null) { + actionBar.setDisplayHomeAsUpEnabled(true); + actionBar.setDisplayShowHomeEnabled(true); + } + + MarkdownView markdownView = findViewById(R.id.markdownView); + markdownView.loadMarkdownFile("file:///android_asset/changelog.md"); + } + + @Override + public boolean onSupportNavigateUp() { + onBackPressed(); + return true; + } +} diff --git a/app/src/main/res/layout/activity_changelog.xml b/app/src/main/res/layout/activity_changelog.xml new file mode 100644 index 0000000..0de785c --- /dev/null +++ b/app/src/main/res/layout/activity_changelog.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/content_changelog.xml b/app/src/main/res/layout/content_changelog.xml new file mode 100644 index 0000000..d71b43b --- /dev/null +++ b/app/src/main/res/layout/content_changelog.xml @@ -0,0 +1,12 @@ + + + \ No newline at end of file diff --git a/app/src/main/res/values/about_libraries_markdown_view.xml b/app/src/main/res/values/about_libraries_markdown_view.xml new file mode 100644 index 0000000..8d252a0 --- /dev/null +++ b/app/src/main/res/values/about_libraries_markdown_view.xml @@ -0,0 +1,13 @@ + + + + Feras Alnatsheh + https://github.com/falnatsheh/ + Markdown View + MarkdownView is an Android webview with the capablity of loading Markdown text or file and display it as HTML, it uses MarkdownJ and extends Android webview. + + https://github.com/falnatsheh/MarkdownView/ + apache_2.0 + true + https://github.com/falnatsheh/MarkdownView/ + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 409b882..66aa8a3 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -7,4 +7,5 @@ Settings About + Changelog