Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Toolbar instead of ActionBar in RepoDetailsActivity.

Browse Source
This commit is contained in:
Peter Serwylo 2017-02-14 11:16:23 +11:00
parent d8dc1698d6
commit 226554c026
3 changed files with 113 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/org/fdroid/fdroid/views/RepoDetailsActivity.java
View File

@ -17,6 +17,7 @@ import android.support.v4.app.NavUtils;
import android.support.v4.content.LocalBroadcastManager; import android.support.v4.content.LocalBroadcastManager;
import android.support.v7.app.ActionBarActivity; import android.support.v7.app.ActionBarActivity;
import android.support.v7.app.AlertDialog; import android.support.v7.app.AlertDialog;
import android.support.v7.widget.Toolbar;
import android.text.TextUtils; import android.text.TextUtils;
import android.text.format.DateUtils; import android.text.format.DateUtils;
import android.view.Menu; import android.view.Menu;
@ -93,8 +94,12 @@ public class RepoDetailsActivity extends ActionBarActivity {
((FDroidApp) getApplication()).applyTheme(this); ((FDroidApp) getApplication()).applyTheme(this);
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
setContentView(R.layout.repodetails); setContentView(R.layout.repodetails);
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
repoView = findViewById(R.id.repoView); repoView = findViewById(R.id.repoView);
repoId = getIntent().getLongExtra(ARG_REPO_ID, 0); repoId = getIntent().getLongExtra(ARG_REPO_ID, 0);

2
app/src/main/res/layout/repo_list_activity.xml
View File

@ -10,7 +10,7 @@
android:title="@string/menu_manage" android:title="@string/menu_manage"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:theme="?attr/toolbar_themne"/> android:theme="?attr/toolbar_theme"/>
<ListView <ListView
android:id="@+id/list" android:id="@+id/list"

197
app/src/main/res/layout/repodetails.xml
View File

@ -1,102 +1,117 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout <android.support.v7.widget.Toolbar
android:id="@+id/repoView" android:id="@+id/toolbar"
android:title="@string/repo_details"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="?attr/listPreferredItemPaddingLeft" android:theme="?attr/toolbar_theme" />
android:paddingStart="?attr/listPreferredItemPaddingLeft"
android:paddingRight="?attr/listPreferredItemPaddingRight"
android:paddingEnd="?attr/listPreferredItemPaddingRight"
android:orientation="vertical">
<!-- URL of this repo --> <ScrollView
<TextView android:layout_width="match_parent"
android:text="@string/repo_url" android:layout_height="match_parent">
style="@style/CaptionText" />
<TextView
android:id="@+id/input_repo_url"
style="@style/BodyText" />
<!-- Name of this repo --> <LinearLayout
<TextView android:id="@+id/repoView"
android:id="@+id/label_repo_name"
android:text="@string/repo_name"
style="@style/CaptionText" />
<TextView
android:id="@+id/text_repo_name"
style="@style/BodyText" />
<!-- Description - as pulled from the index file during last update... -->
<TextView
android:id="@+id/label_description"
android:text="@string/repo_description"
style="@style/CaptionText" />
<TextView
android:id="@+id/text_description"
style="@style/BodyText" />
<!-- Number of apps belonging to this repo -->
<TextView
android:id="@+id/label_num_apps"
android:text="@string/repo_num_apps"
style="@style/CaptionText" />
<TextView
android:id="@+id/text_num_apps"
style="@style/BodyText" />
<!-- The last time this repo was updated -->
<TextView
android:id="@+id/label_last_update"
android:text="@string/repo_last_update"
style="@style/CaptionText" />
<TextView
android:id="@+id/text_last_update"
style="@style/BodyText" />
<!-- The credentials used to access this repo (optional) -->
<TextView
android:id="@+id/label_username"
android:text="@string/login_name"
style="@style/CaptionText" />
<TextView
android:id="@+id/text_username"
style="@style/BodyText" />
<Button
android:id="@+id/button_edit_credentials"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/repo_edit_credentials"
android:onClick="showChangePasswordDialog" />
<!-- Signature (or "unsigned" if none) -->
<TextView
android:id="@+id/label_repo_fingerprint"
android:text="@string/repo_fingerprint"
style="@style/CaptionText" />
<TextView
android:id="@+id/text_repo_fingerprint"
android:typeface="monospace"
style="@style/BodyText" />
<TextView
android:id="@+id/text_repo_fingerprint_description"
style="@style/BodyText" />
<TextView
android:id="@+id/text_not_yet_updated"
android:text="@string/repo_not_yet_updated"
style="@style/BodyText" />
<ImageView
android:id="@+id/qr_code"
android:src="@drawable/swap_qr_example"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="16dp"/> android:paddingLeft="?attr/listPreferredItemPaddingLeft"
android:paddingStart="?attr/listPreferredItemPaddingLeft"
android:paddingRight="?attr/listPreferredItemPaddingRight"
android:paddingEnd="?attr/listPreferredItemPaddingRight"
android:orientation="vertical">
</LinearLayout> <!-- URL of this repo -->
<TextView
android:text="@string/repo_url"
style="@style/CaptionText" />
<TextView
android:id="@+id/input_repo_url"
style="@style/BodyText" />
</ScrollView> <!-- Name of this repo -->
<TextView
android:id="@+id/label_repo_name"
android:text="@string/repo_name"
style="@style/CaptionText" />
<TextView
android:id="@+id/text_repo_name"
style="@style/BodyText" />
<!-- Description - as pulled from the index file during last update... -->
<TextView
android:id="@+id/label_description"
android:text="@string/repo_description"
style="@style/CaptionText" />
<TextView
android:id="@+id/text_description"
style="@style/BodyText" />
<!-- Number of apps belonging to this repo -->
<TextView
android:id="@+id/label_num_apps"
android:text="@string/repo_num_apps"
style="@style/CaptionText" />
<TextView
android:id="@+id/text_num_apps"
style="@style/BodyText" />
<!-- The last time this repo was updated -->
<TextView
android:id="@+id/label_last_update"
android:text="@string/repo_last_update"
style="@style/CaptionText" />
<TextView
android:id="@+id/text_last_update"
style="@style/BodyText" />
<!-- The credentials used to access this repo (optional) -->
<TextView
android:id="@+id/label_username"
android:text="@string/login_name"
style="@style/CaptionText" />
<TextView
android:id="@+id/text_username"
style="@style/BodyText" />
<Button
android:id="@+id/button_edit_credentials"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/repo_edit_credentials"
android:onClick="showChangePasswordDialog" />
<!-- Signature (or "unsigned" if none) -->
<TextView
android:id="@+id/label_repo_fingerprint"
android:text="@string/repo_fingerprint"
style="@style/CaptionText" />
<TextView
android:id="@+id/text_repo_fingerprint"
android:typeface="monospace"
style="@style/BodyText" />
<TextView
android:id="@+id/text_repo_fingerprint_description"
style="@style/BodyText" />
<TextView
android:id="@+id/text_not_yet_updated"
android:text="@string/repo_not_yet_updated"
style="@style/BodyText" />
<ImageView
android:id="@+id/qr_code"
android:src="@drawable/swap_qr_example"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="16dp"/>
</LinearLayout>
</ScrollView>
</LinearLayout>