diff options
Diffstat (limited to 'app')
-rw-r--r-- | app/src/main/java/it/niedermann/owncloud/notes/android/activity/AboutActivity.java | 13 | ||||
-rw-r--r-- | app/src/main/java/it/niedermann/owncloud/notes/android/fragment/about/AboutFragmentCreditsTab.java (renamed from app/src/main/java/it/niedermann/owncloud/notes/android/fragment/about/AboutFragmentCredentialsTab.java) | 4 | ||||
-rw-r--r-- | app/src/main/res/layout/activity_about.xml | 119 | ||||
-rw-r--r-- | app/src/main/res/layout/fragment_about_contribution_tab.xml | 21 | ||||
-rw-r--r-- | app/src/main/res/layout/fragment_about_credentials_tab.xml | 12 | ||||
-rw-r--r-- | app/src/main/res/layout/fragment_about_credits_tab.xml | 86 | ||||
-rw-r--r-- | app/src/main/res/layout/fragment_about_license_tab.xml | 21 | ||||
-rw-r--r-- | app/src/main/res/values-de/strings.xml | 26 | ||||
-rw-r--r-- | app/src/main/res/values/strings.xml | 26 | ||||
-rw-r--r-- | app/src/main/res/values/styles.xml | 1 |
10 files changed, 154 insertions, 175 deletions
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/AboutActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/AboutActivity.java index 53a887a6..78b44bd7 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/AboutActivity.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/AboutActivity.java @@ -6,7 +6,7 @@ import android.support.v7.app.AppCompatActivity; import it.niedermann.owncloud.notes.R; import it.niedermann.owncloud.notes.android.fragment.about.AboutFragmentContributingTab; -import it.niedermann.owncloud.notes.android.fragment.about.AboutFragmentCredentialsTab; +import it.niedermann.owncloud.notes.android.fragment.about.AboutFragmentCreditsTab; import it.niedermann.owncloud.notes.android.fragment.about.AboutFragmentLicenseTab; public class AboutActivity extends AppCompatActivity { @@ -20,12 +20,11 @@ public class AboutActivity extends AppCompatActivity { mTabHost = (FragmentTabHost) findViewById(android.R.id.tabhost); mTabHost.setup(this, getSupportFragmentManager(), R.id.realtabcontent); - mTabHost.addTab(mTabHost.newTabSpec("Credentials").setIndicator("Credentials"), - AboutFragmentCredentialsTab.class, null); - mTabHost.addTab(mTabHost.newTabSpec("Contribution").setIndicator("Contribution"), + mTabHost.addTab(mTabHost.newTabSpec(getString(R.string.about_credits_tab_title)).setIndicator(getString(R.string.about_credits_tab_title)), + AboutFragmentCreditsTab.class, null); + mTabHost.addTab(mTabHost.newTabSpec(getString(R.string.about_contribution_tab_title)).setIndicator(getString(R.string.about_contribution_tab_title)), AboutFragmentContributingTab.class, null); - mTabHost.addTab(mTabHost.newTabSpec("License").setIndicator("License"), + mTabHost.addTab(mTabHost.newTabSpec(getString(R.string.about_license_tab_title)).setIndicator(getString(R.string.about_license_tab_title)), AboutFragmentLicenseTab.class, null); } - -} +}
\ No newline at end of file diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/about/AboutFragmentCredentialsTab.java b/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/about/AboutFragmentCreditsTab.java index 59691335..7e5b5e18 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/about/AboutFragmentCredentialsTab.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/about/AboutFragmentCreditsTab.java @@ -8,9 +8,9 @@ import android.view.ViewGroup; import it.niedermann.owncloud.notes.R; -public class AboutFragmentCredentialsTab extends Fragment { +public class AboutFragmentCreditsTab extends Fragment { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - return inflater.inflate(R.layout.fragment_about_credentials_tab, container, false); + return inflater.inflate(R.layout.fragment_about_credits_tab, container, false); } }
\ No newline at end of file diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index 5288d075..4ecc60a4 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -4,7 +4,8 @@ android:id="@android:id/tabhost" xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + > <LinearLayout android:layout_width="match_parent" @@ -31,118 +32,4 @@ android:layout_weight="1"/> </LinearLayout> -</android.support.v4.app.FragmentTabHost> - - <!--<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:padding="@dimen/activity_horizontal_margin"> - - <TabHost - android:layout_width="match_parent" - android:layout_height="match_parent" - android:id="@+id/tabhost"> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> - - <TabWidget - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:id="@+id/about_tabs"> - </TabWidget> - - <FrameLayout - android:id="@android:id/tabcontent" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <LinearLayout - android:id="@+id/linearLayout" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> - - <TextView - android:id="@+id/about_version_title" - style="?android:attr/listSeparatorTextViewStyle" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/about_version_title"/> - - <TextView - android:id="@+id/about_version" - style="?android:attr/editTextPreferenceStyle" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:padding="10dp" - android:text="@string/about_version"/> - - <TextView - android:id="@+id/about_author_title" - style="?android:attr/listSeparatorTextViewStyle" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/about_author_title"/> - - <TextView - android:id="@+id/about_author" - style="?android:attr/editTextPreferenceStyle" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:padding="10dp" - android:text="@string/about_author"/> - - <TextView - android:id="@+id/about_app_icon_disclaimer_title" - style="?android:attr/listSeparatorTextViewStyle" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/about_app_icon_disclaimer_title"/> - - <TextView - android:id="@+id/about_app_icon_disclaimer" - style="?android:attr/editTextPreferenceStyle" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:padding="10dp" - android:text="@string/about_app_icon_disclaimer"/> - - <TextView - android:id="@+id/about_icons_disclaimer_title" - style="?android:attr/listSeparatorTextViewStyle" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/about_icons_disclaimer_title"/> - - <TextView - android:id="@+id/about_icons_disclaimer" - style="?android:attr/editTextPreferenceStyle" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:padding="10dp" - android:text="@string/about_icons_disclaimer"/> - </LinearLayout> - - <LinearLayout - android:id="@+id/linearLayout2" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> - </LinearLayout> - - <LinearLayout - android:id="@+id/linearLayout3" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> - </LinearLayout> - </FrameLayout> - </LinearLayout> - </TabHost> - -</LinearLayout-->
\ No newline at end of file +</android.support.v4.app.FragmentTabHost>
\ No newline at end of file diff --git a/app/src/main/res/layout/fragment_about_contribution_tab.xml b/app/src/main/res/layout/fragment_about_contribution_tab.xml index f474ee60..2856319d 100644 --- a/app/src/main/res/layout/fragment_about_contribution_tab.xml +++ b/app/src/main/res/layout/fragment_about_contribution_tab.xml @@ -1,12 +1,17 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:padding="@dimen/activity_horizontal_margin"> +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent"> - <TextView + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="Contribute on Github.com"/> -</LinearLayout>
\ No newline at end of file + android:orientation="vertical" + android:padding="@dimen/activity_horizontal_margin"> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="Contribute on Github.com"/> + </LinearLayout> +</ScrollView>
\ No newline at end of file diff --git a/app/src/main/res/layout/fragment_about_credentials_tab.xml b/app/src/main/res/layout/fragment_about_credentials_tab.xml deleted file mode 100644 index cb4da7ec..00000000 --- a/app/src/main/res/layout/fragment_about_credentials_tab.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:padding="@dimen/activity_horizontal_margin"> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="Maintainer: Niedermann IT-Dienstleistungen"/> -</LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/fragment_about_credits_tab.xml b/app/src/main/res/layout/fragment_about_credits_tab.xml new file mode 100644 index 00000000..82f378fe --- /dev/null +++ b/app/src/main/res/layout/fragment_about_credits_tab.xml @@ -0,0 +1,86 @@ +<?xml version="1.0" encoding="utf-8"?> +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:padding="@dimen/activity_horizontal_margin"> + + <TextView + android:id="@+id/textView" + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:layout_marginBottom="30dp" + android:layout_marginTop="30dp" + android:drawableTop="@drawable/ic_launcher" + android:text="@string/app_name" + android:textAppearance="?android:attr/textAppearanceMedium" + android:textColor="@color/fg_default_low" + android:textSize="26sp"/> + + <TextView + android:id="@+id/about_version_title" + style="?android:attr/listSeparatorTextViewStyle" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/about_version_title"/> + + <TextView + android:id="@+id/about_version" + style="?android:attr/editTextPreferenceStyle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:padding="10dp" + android:text="@string/about_version"/> + + <TextView + android:id="@+id/about_author_title" + style="?android:attr/listSeparatorTextViewStyle" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/about_author_title"/> + + <TextView + android:id="@+id/about_author" + style="?android:attr/editTextPreferenceStyle" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:padding="10dp" + android:text="@string/about_author"/> + + <TextView + android:id="@+id/about_app_icon_disclaimer_title" + style="?android:attr/listSeparatorTextViewStyle" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/about_app_icon_disclaimer_title"/> + + <TextView + android:id="@+id/about_app_icon_disclaimer" + style="?android:attr/editTextPreferenceStyle" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:padding="10dp" + android:text="@string/about_app_icon_disclaimer"/> + + <TextView + android:id="@+id/about_icons_disclaimer_title" + style="?android:attr/listSeparatorTextViewStyle" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/about_icons_disclaimer_title"/> + + <TextView + android:id="@+id/about_icons_disclaimer" + style="?android:attr/editTextPreferenceStyle" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:padding="10dp" + android:text="@string/about_icons_disclaimer"/> + </LinearLayout> +</ScrollView>
\ No newline at end of file diff --git a/app/src/main/res/layout/fragment_about_license_tab.xml b/app/src/main/res/layout/fragment_about_license_tab.xml index bd9629f9..f235d11c 100644 --- a/app/src/main/res/layout/fragment_about_license_tab.xml +++ b/app/src/main/res/layout/fragment_about_license_tab.xml @@ -1,12 +1,17 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:padding="@dimen/activity_horizontal_margin"> +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent"> - <TextView + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="This app is licensed under the GPLv2"/> -</LinearLayout>
\ No newline at end of file + android:orientation="vertical" + android:padding="@dimen/activity_horizontal_margin"> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="This app is licensed under GPLv2"/> + </LinearLayout> +</ScrollView>
\ No newline at end of file diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index c9f61b56..7f5c6bcf 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -30,17 +30,6 @@ <string name="listview_updated_this_month">Diesen Monat</string> <string name="listview_updated_earlier">Früher</string> - <!-- About --> - - <string name="about_version_title">Version</string> - <string name="about_version">Sie benutzen aktuell <strong>v0.4.0</strong></string> - <string name="about_author_title">Autor</string> - <string name="about_author">Diese Android-App wird entwickelt von <a href="http://www.niedermann.it/">Niedermann IT-Dienstleistungen</a></string> - <string name="about_app_icon_disclaimer_title">App-Icon</string> - <string name="about_app_icon_disclaimer"><p>Ursprüngliches Icon wurde erstellt von <a href="http://www.freepik.com" title="Freepik">Freepik</a> auf <a href="http://www.flaticon.com/free-icon/ceo-copyrighting_15475" title="Flaticon">www.flaticon.com</a></p></string> - <string name="about_icons_disclaimer_title">Icons</string> - <string name="about_icons_disclaimer"><p>Alle weiteren Icons, die in dieser App verwendet werden, sind <a href="https://materialdesignicons.com/" title="Link to Website">Material Design Icons</a> von Google Inc. und unter einer Creative Commons License lizensiert.</p></string> - <!-- Settings --> <string name="settings_server">Server</string> @@ -68,4 +57,19 @@ <!-- Snackbar Actions --> <string name="snackbar_settings">Einstellungen</string> + + <!-- About --> + + <string name="about_version_title">Version</string> + <string name="about_version">Sie benutzen aktuell <strong>v0.4.0</strong></string> + <string name="about_author_title">Autor</string> + <string name="about_author">Diese Android-App wird entwickelt von <a href="http://www.niedermann.it/">Niedermann IT-Dienstleistungen</a></string> + <string name="about_app_icon_disclaimer_title">App-Icon</string> + <string name="about_app_icon_disclaimer"><p>Ursprüngliches Icon wurde erstellt von <a href="http://www.freepik.com" title="Freepik">Freepik</a> auf <a href="http://www.flaticon.com/free-icon/ceo-copyrighting_15475" title="Flaticon">www.flaticon.com</a></p></string> + <string name="about_icons_disclaimer_title">Icons</string> + <string name="about_icons_disclaimer"><p>Alle weiteren Icons, die in dieser App verwendet werden, sind <a href="https://materialdesignicons.com/" title="Link to Website">Material Design Icons</a> von Google Inc. und unter einer Creative Commons License lizensiert.</p></string> + + <string name="about_credits_tab_title">Credits</string> + <string name="about_contribution_tab_title">Contribution</string> + <string name="about_license_tab_title">License</string> </resources>
\ 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 293112ac..95d3eb9f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -30,17 +30,6 @@ <string name="listview_updated_this_month">this month</string> <string name="listview_updated_earlier">earlier</string> - <!-- About --> - - <string name="about_version_title">Version</string> - <string name="about_version">You are currently using <strong>v0.4.0</strong></string> - <string name="about_author_title">Author</string> - <string name="about_author">This Android-Application is developed and presented by <a href="http://www.niedermann.it/">Niedermann IT-Dienstleistungen</a></string> - <string name="about_app_icon_disclaimer_title">App-Icon</string> - <string name="about_app_icon_disclaimer"><p>Original icon made by <a href="http://www.freepik.com" title="Freepik">Freepik</a> from <a href="http://www.flaticon.com/free-icon/ceo-copyrighting_15475" title="Flaticon">www.flaticon.com</a></p></string> - <string name="about_icons_disclaimer_title">Icons</string> - <string name="about_icons_disclaimer"><p>All further icons used by this app are <a href="https://materialdesignicons.com/" title="Link to Website">Material Design Icons</a> made by Google Inc. and licensed under a Creative Commons License.</p></string> - <!-- Settings --> <string name="settings_server">Server</string> @@ -69,4 +58,19 @@ <!-- Snackbar Actions --> <string name="snackbar_settings">Settings</string> + + <!-- About --> + + <string name="about_version_title">Version</string> + <string name="about_version">You are currently using <strong>v0.4.0</strong></string> + <string name="about_author_title">Author</string> + <string name="about_author">This Android-Application is developed and presented by <a href="http://www.niedermann.it/">Niedermann IT-Dienstleistungen</a></string> + <string name="about_app_icon_disclaimer_title">App-Icon</string> + <string name="about_app_icon_disclaimer"><p>Original icon made by <a href="http://www.freepik.com" title="Freepik">Freepik</a> from <a href="http://www.flaticon.com/free-icon/ceo-copyrighting_15475" title="Flaticon">www.flaticon.com</a></p></string> + <string name="about_icons_disclaimer_title">Icons</string> + <string name="about_icons_disclaimer"><p>All further icons used by this app are <a href="https://materialdesignicons.com/" title="Link to Website">Material Design Icons</a> made by Google Inc. and licensed under a Creative Commons License.</p></string> + + <string name="about_credits_tab_title">Credits</string> + <string name="about_contribution_tab_title">Contribution</string> + <string name="about_license_tab_title">License</string> </resources>
\ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 53dc8a57..7db95b53 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -11,6 +11,7 @@ <item name="android:buttonStyle">@style/ocbutton</item> <item name="android:windowBackground">@color/bg_normal</item> </style> + <style name="fab"> <item name="android:layout_margin">16dp</item> <item name="android:layout_width">wrap_content</item> |